summaryrefslogtreecommitdiff
path: root/npc/018-7-1/demure.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/018-7-1/demure.txt')
-rw-r--r--npc/018-7-1/demure.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/npc/018-7-1/demure.txt b/npc/018-7-1/demure.txt
index bcb08251e..869b68c30 100644
--- a/npc/018-7-1/demure.txt
+++ b/npc/018-7-1/demure.txt
@@ -140,7 +140,6 @@ OnDem2:
Zeny += rand2(500, 1500)*max(1, @d_mode2);
// FIXME: Add a proper reward
maptimer2(.@m$, 100, strnpcinfo(NPC_NAME_UNIQUE)+"::OnBye");
- // FIXME: @d_* might not be set
01871_Demure_BlackBox();
}
end;
@@ -177,9 +176,11 @@ OnDem1:
// And finally, change form (ressurect)
.@m=monster(.@m$, 87, 57, strmobinfo(1, DemureSecondForm), DemureSecondForm, 1, strnpcinfo(NPC_NAME_UNIQUE)+"::OnDem2");
- .@p=getunitdata(.@m, UDT_MAXHP);
- setunitdata(.@m, UDT_MAXHP, .@p*@d_count*@d_mode3);
- setunitdata(.@m, UDT_HP, .@p*@d_count*@d_mode3);
+ if (@d_count) {
+ .@p=getunitdata(.@m, UDT_MAXHP);
+ setunitdata(.@m, UDT_MAXHP, .@p*@d_count*@d_mode3);
+ setunitdata(.@m, UDT_HP, .@p*@d_count*@d_mode3);
+ }
mapannounce(getmap(), .@n$+"I'll leave a 2x2 black square where you used to be!", bc_map | bc_pc);
end;