summaryrefslogtreecommitdiff
path: root/npc/031-4/cindyCave.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/031-4/cindyCave.txt')
-rw-r--r--npc/031-4/cindyCave.txt6
1 files changed, 1 insertions, 5 deletions
diff --git a/npc/031-4/cindyCave.txt b/npc/031-4/cindyCave.txt
index a7306f70..9f9f88ae 100644
--- a/npc/031-4/cindyCave.txt
+++ b/npc/031-4/cindyCave.txt
@@ -148,15 +148,12 @@ L_Return_1:
end;
L_CaveLogic:
- $@FIGHT_YETI_ROUND_PEN = $@FIGHT_YETI_PLAYER_COUNT;
- if ($@FIGHT_YETI_ROUND_PEN > 60)
- $@FIGHT_YETI_ROUND_PEN = 60;
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", "Cindy::OnPetDeath") <= 0)
goto L_NextWave;
- if ($@FIGHT_YETI_ROUND_TIMER + $@FIGHT_YETI_ROUND_PEN >= ($@YETI_FOREVER ? 45 : 120))
+ if ($@FIGHT_YETI_ROUND_TIMER + min($@FIGHT_YETI_PLAYER_COUNT, 60) >= ($@YETI_FOREVER ? 45 : 120))
goto L_NextWave;
goto L_Return_1;
@@ -203,7 +200,6 @@ L_CleanUp:
$@FIGHT_YETI_WAVE = 0;
$@FIGHT_YETI_ROUND_TIMER = 0;
$@YETI_COUNT = 0;
- $@FIGHT_YETI_ROUND_PEN = 0;
$@FIGHT_YETI_NUMBER = 0;
$@YETI_FOREVER = false;
killmonster "031-4", "Cindy::OnPetDeath";