diff options
Diffstat (limited to 'world/map/npc/031-4/cindyCave.txt')
-rw-r--r-- | world/map/npc/031-4/cindyCave.txt | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/world/map/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt index 6e6e143b..c724733a 100644 --- a/world/map/npc/031-4/cindyCave.txt +++ b/world/map/npc/031-4/cindyCave.txt @@ -54,18 +54,15 @@ L_Try_Cage: mes "As you try to open the door of the cage, there is a loud squeaking noise."; next; mes "You get an uncomfortable feeling and Cindy starts to shiver."; - next; - mes "\"Oh no, the Yetis...\""; if ($@FIGHT_YETI_STATUS != 0) goto L_Yeti; + npctalk "Oh no, the Yetis..."; // initialize fight set $@FIGHT_YETI_STATUS, 1; 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 +151,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; @@ -173,7 +170,7 @@ L_NextWave: areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, $@FIGHT_YETI_WAVE*2 + $@FIGHT_YETI_PLAYER_COUNT*5, "Cindy::onPetDeath"; if ($@FIGHT_YETI_WAVE > 22) set $@YETI_COUNT, $@YETI_COUNT + $@FIGHT_YETI_WAVE*2 + $@FIGHT_YETI_PLAYER_COUNT*5; - set $@FIGHT_YETI_NUMBER, (1 + (1 * $@FIGHT_YETI_WAVE) + (2 * $@FIGHT_YETI_PLAYER_COUNT))/4; + set $@FIGHT_YETI_NUMBER, (5 + (1 * $@FIGHT_YETI_WAVE) + (2 * $@FIGHT_YETI_PLAYER_COUNT))/4; set $@YETI_COUNT, $@YETI_COUNT + $@FIGHT_YETI_NUMBER; areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, $@FIGHT_YETI_NUMBER, "Cindy::onPetDeath"; @@ -236,7 +233,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; |