Skip to content

Commit

Permalink
Do the damage after the fireshield messaging is sent
Browse files Browse the repository at this point in the history
  • Loading branch information
jskz committed Nov 18, 2021
1 parent 92c17fe commit 65cb59d
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions scripts/combat.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,6 @@ function onCombatUpdate() {

if(victim && victim.combat) {
if(victim.affected & Golem.AffectedTypes.AFFECT_FIRESHIELD) {
this.damage(
victim,
vch,
false,
~~(Math.random() * victim.level),
Golem.Combat.DamageTypeExotic
);

vch.send("{ROuch! You are burned by " + victim.getShortDescription(vch) + "{R's reactive fireshield!{x\r\n");
victim.send("{RYour reactive fireshield lights up and burns " + vch.getShortDescription(victim) + "{R!{x\r\n");

Expand All @@ -160,6 +152,14 @@ function onCombatUpdate() {
);
}
}

this.damage(
victim,
vch,
false,
~~(Math.random() * victim.level),
Golem.Combat.DamageTypeExotic
);
}
}
}
Expand Down

0 comments on commit 65cb59d

Please sign in to comment.