diff options
| author | Stefan Dombrowski <sdo451@gmail.com> | 2013-03-07 23:32:53 +0100 |
|---|---|---|
| committer | Stefan Dombrowski <sdo451@gmail.com> | 2013-03-07 23:32:53 +0100 |
| commit | fd8956b7ed1c09f4466c99be15b6861643c7b55d (patch) | |
| tree | 76566f0e00ed355f00cb73edd3281e2d682020f9 | |
| parent | b976cc54209283a62c43f2208a62be2809483493 (diff) | |
| download | serverdata-fd8956b7ed1c09f4466c99be15b6861643c7b55d.tar.gz serverdata-fd8956b7ed1c09f4466c99be15b6861643c7b55d.tar.bz2 serverdata-fd8956b7ed1c09f4466c99be15b6861643c7b55d.tar.xz serverdata-fd8956b7ed1c09f4466c99be15b6861643c7b55d.zip | |
Cindy: Fixing trigger for next wave
A next wave was triggered when only one Yeti was alive. This means when
during the 10th wave only one last Yeti was alive, then every 5 seconds
$@FIGHT_YETI_WAVE was incremented. If the last Yeti was not killed within
one minute, then wave 22 was reached and the deadly Yeti spawn happend.
This bug fix also resolves the timing problem mentioned in the comment.
| -rw-r--r-- | world/map/npc/031-4/cindyCave.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/world/map/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt index 6e6e143b..7b555538 100644 --- a/world/map/npc/031-4/cindyCave.txt +++ b/world/map/npc/031-4/cindyCave.txt @@ -64,8 +64,6 @@ L_Try_Cage: set $@FIGHT_YETI_WAVE, 0; set $@YETI_COUNT, 1; set $@FIGHT_YETI_PLAYER_COUNT, getmapusers("031-4.gat"); - // this yeti is spawned because of some timing problems - // without it, the first and second wave start nearly the same time areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, 1, "Cindy::onPetDeath"; initnpctimer; @@ -154,7 +152,7 @@ L_CaveLogic: if ($@FIGHT_YETI_PLAYER_COUNT <= 0) goto L_CleanUp; set $@FIGHT_YETI_ROUND_TIMER, $@FIGHT_YETI_ROUND_TIMER + 5; // Advance 5 seconds - if (mobcount("031-4.gat", "Cindy::onPetDeath") <= 0) + if (mobcount("031-4.gat", "Cindy::onPetDeath") < 0) goto L_NextWave; if ($@FIGHT_YETI_ROUND_TIMER + $@FIGHT_YETI_ROUND_PEN >= 120) goto L_NextWave; @@ -236,7 +234,7 @@ L_CleanUp: areatimer "031-4.gat", 0, 0, 95, 91, 10, "Cindy::onReward"; set $@FIGHT_YETI_STATUS, 0; set $@FIGHT_YETI_PLAYER_COUNT, 0; - set $@FIGHT_YETI_WAVE, 1; + set $@FIGHT_YETI_WAVE, 0; set $@FIGHT_YETI_ROUND_TIMER, 0; set $@YETI_COUNT, 0; set $@FIGHT_YETI_ROUND_PEN, 0; |