diff options
Diffstat (limited to 'world/map/npc/031-4')
| -rw-r--r-- | world/map/npc/031-4/_mobs.txt | 3 | ||||
| -rw-r--r-- | world/map/npc/031-4/barrier.txt | 3 | ||||
| -rw-r--r-- | world/map/npc/031-4/cindyCave.txt | 23 |
3 files changed, 16 insertions, 13 deletions
diff --git a/world/map/npc/031-4/_mobs.txt b/world/map/npc/031-4/_mobs.txt index 5bbd2f39..5bc52ad0 100644 --- a/world/map/npc/031-4/_mobs.txt +++ b/world/map/npc/031-4/_mobs.txt @@ -3,6 +3,7 @@ -031-4.gat,0,0,0|script|Mob031-4|-1,{ +031-4.gat,0,0,0|script|Mob031-4|-1, +{ end; } diff --git a/world/map/npc/031-4/barrier.txt b/world/map/npc/031-4/barrier.txt index 83daffd7..e8401ba8 100644 --- a/world/map/npc/031-4/barrier.txt +++ b/world/map/npc/031-4/barrier.txt @@ -1,4 +1,5 @@ -031-4.gat,40,71,0|script|#YetiBarrier|45,0,0,{ +031-4.gat,40,71,0|script|#YetiBarrier|45,0,0, +{ if ($@FIGHT_YETI_STATUS == 1) goto L_Block; warp "031-3.gat", 46, 25; end; diff --git a/world/map/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt index ef84a33f..6c03e951 100644 --- a/world/map/npc/031-4/cindyCave.txt +++ b/world/map/npc/031-4/cindyCave.txt @@ -4,7 +4,8 @@ // state2: Cindy is saved, she gives you a reward (wizard hat or wooden staff) // state3: and greater: Cindy is saved, she asks you to visit them -031-4.gat,42,42,0|script|Cindy|198, { +031-4.gat,42,42,0|script|Cindy|198, +{ if ($@FIGHT_YETI_STATUS != 0) goto L_Yeti; set @KEYS_AMOUNT, 10; @@ -63,7 +64,7 @@ L_Try_Cage: set $@FIGHT_YETI_WAVE, 0; set $@YETI_COUNT, 1; set $@FIGHT_YETI_PLAYER_COUNT, getmapusers("031-4.gat"); - areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, 1, "Cindy::onPetDeath"; + areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, 1, "Cindy::OnPetDeath"; initnpctimer; goto L_Close; @@ -141,7 +142,7 @@ OnTimer5000: L_Return_1: set $@FIGHT_YETI_PLAYER_COUNT, 0; - areatimer "031-4.gat", 0, 0, 95, 91, 10, "Cindy::onTick"; + areatimer "031-4.gat", 0, 0, 95, 91, 10, "Cindy::OnTick"; end; L_CaveLogic: @@ -151,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; @@ -167,13 +168,13 @@ L_NextWave: && $@FIGHT_YETI_WAVE < 22) goto L_Return_1; if ($@FIGHT_YETI_WAVE > 22) - areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, $@FIGHT_YETI_WAVE*2 + $@FIGHT_YETI_PLAYER_COUNT*5, "Cindy::onPetDeath"; + 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, (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"; + areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, $@FIGHT_YETI_NUMBER, "Cindy::OnPetDeath"; if ($@FIGHT_YETI_WAVE == 1) mapannounce "031-4.gat", "Cindy: Yetis!", 0; @@ -220,17 +221,17 @@ L_NextWave: goto L_Return_1; // Called on each player once every 5 seconds -onTick: +OnTick: if (isdead()) end; set $@FIGHT_YETI_PLAYER_COUNT, $@FIGHT_YETI_PLAYER_COUNT + 1; end; -onPetDeath: +OnPetDeath: set $@YETI_COUNT, $@YETI_COUNT - 1; end; L_CleanUp: - areatimer "031-4.gat", 0, 0, 95, 91, 10, "Cindy::onReward"; + 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, 0; @@ -238,12 +239,12 @@ L_CleanUp: set $@YETI_COUNT, 0; set $@FIGHT_YETI_ROUND_PEN, 0; set $@FIGHT_YETI_NUMBER, 0; - killmonster "031-4.gat", "Cindy::onPetDeath"; + killmonster "031-4.gat", "Cindy::OnPetDeath"; stopnpctimer; setnpctimer 0; end; -onReward: +OnReward: if (isdead()) end; set @bonus, (BaseLevel/2); set DailyQuestBonus, DailyQuestBonus + @bonus; |