mirror of
https://github.com/gooba42/adventureland.git
synced 2026-10-24 05:31:26 -05:00
Merge pull request #129 from FreezePhoenix/patch-9
Add skill information to miss/evade/avoid hit events
This commit is contained in:
+4
-3
@@ -3166,7 +3166,7 @@ function complete_attack(attacker, target, info) {
|
|||||||
return xy_emit(
|
return xy_emit(
|
||||||
info.action,
|
info.action,
|
||||||
"hit",
|
"hit",
|
||||||
{ pid: def.pid, hid: attacker.id, id: target.id, damage: 0, evade: true },
|
{ pid: def.pid, hid: attacker.id, id: target.id, damage: 0, evade: true, source: def.source },
|
||||||
attacker.id,
|
attacker.id,
|
||||||
);
|
);
|
||||||
} else if (
|
} else if (
|
||||||
@@ -3178,7 +3178,7 @@ function complete_attack(attacker, target, info) {
|
|||||||
return xy_emit(
|
return xy_emit(
|
||||||
info.action,
|
info.action,
|
||||||
"hit",
|
"hit",
|
||||||
{ pid: def.pid, hid: attacker.id, id: target.id, damage: 0, miss: true },
|
{ pid: def.pid, hid: attacker.id, id: target.id, damage: 0, miss: true, source: def.source },
|
||||||
attacker.id,
|
attacker.id,
|
||||||
);
|
);
|
||||||
} else if (
|
} else if (
|
||||||
@@ -3194,6 +3194,7 @@ function complete_attack(attacker, target, info) {
|
|||||||
id: target.id,
|
id: target.id,
|
||||||
damage: 0,
|
damage: 0,
|
||||||
avoid: true,
|
avoid: true,
|
||||||
|
source: def.source,
|
||||||
x: info.action.x,
|
x: info.action.x,
|
||||||
y: info.action.y,
|
y: info.action.y,
|
||||||
map: info.attacker.map,
|
map: info.attacker.map,
|
||||||
@@ -3298,7 +3299,7 @@ function complete_attack(attacker, target, info) {
|
|||||||
xy_emit(
|
xy_emit(
|
||||||
info.action,
|
info.action,
|
||||||
"hit",
|
"hit",
|
||||||
{ pid: def.pid, hid: attacker.id, id: target.id, damage: 0, miss: true },
|
{ pid: def.pid, hid: attacker.id, id: target.id, damage: 0, miss: true, source: def.source },
|
||||||
attacker.id,
|
attacker.id,
|
||||||
);
|
);
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
Reference in New Issue
Block a user