From 9198b1c0070028b3c33853ca865058391eb9e85a Mon Sep 17 00:00:00 2001 From: Coffee Date: Thu, 14 Jul 2011 09:34:54 -0300 Subject: Some critical bugfixes --- world/map/npc/025-4/battlecaves.txt | 83 ++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 37 deletions(-) (limited to 'world/map/npc/025-4') diff --git a/world/map/npc/025-4/battlecaves.txt b/world/map/npc/025-4/battlecaves.txt index 8fffc869..0862312c 100644 --- a/world/map/npc/025-4/battlecaves.txt +++ b/world/map/npc/025-4/battlecaves.txt @@ -3,8 +3,8 @@ // --------------------------------- Cave 1 ----------------------------------- 025-4.gat,41,85,0 script #StartCaveFight1 324,{ - if ($@wave_cave1 != 0 && $@cave1fighter$ == strcharinfo(0)) end; - if ($@wave_cave1 != 0 && $@cave1fighter$ != strcharinfo(0)) goto L_Cheat; + if ($@battlecave1 == 2 && $@cave1fighter$ == strcharinfo(0)) end; + if ($@battlecave1 == 2 && $@cave1fighter$ != strcharinfo(0)) goto L_Cheat; if (Rossy_Quest < 15) goto L_Cheat; if ($@battlecave1 == 1) goto L_Start; @@ -21,7 +21,8 @@ L_Start: close2; delitem "Root", 1; message strcharinfo(0), "As you place the root on the energy source, earth monsters seem to emerge from the ground."; - + set $@battlecave1, 2; + L_Summon: set $@cave1_loop, $@cave1_loop + 1; areamonster "025-4.gat",26,63,60,97,"",$@CAVE1_MONSTERS_IDS[$@cave1_loop],$@CAVE1_MONSTERS_QTY[$@cave1_loop],"#StartCaveFight1::OnMonsterDeath"; @@ -133,7 +134,7 @@ onInit: // --------------------- Cave 1 Checker ---------------------------- 025-4.gat,41,97,0 script #CheckCaveFight1 45,1,1,{ - if (cavefights & BATTLE_CAVE1 || $@wave_cave1 == 0) goto L_Done; + if (cavefights & BATTLE_CAVE1 || $@battlecave1 == 1) goto L_Done; message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters."; end; @@ -146,8 +147,8 @@ L_Done: 025-4.gat,115,77,0 script #StartCaveFight2 324,{ - if ($@wave_cave2 != 0 && $@cave2fighter$ == strcharinfo(0)) end; - if ($@wave_cave2 != 0 && $@cave2fighter$ != strcharinfo(0)) goto L_Cheat; + if ($@battlecave2 == 2 && $@cave2fighter$ == strcharinfo(0)) end; + if ($@battlecave2 == 2 && $@cave2fighter$ != strcharinfo(0)) goto L_Cheat; if (Rossy_Quest < 15) goto L_Cheat; if ($@battlecave2 == 1) goto L_Start; @@ -164,7 +165,7 @@ L_Start: close2; delitem "Root", 1; message strcharinfo(0), "As you place the root on the energy source, earth monsters seem to emerge from the ground."; - + set $@battlecave2, 2; L_Summon: set $@cave2_loop, $@cave2_loop + 1; @@ -205,7 +206,7 @@ L_no_root: // --------------------- Cave 2 Checker ---------------------------- 025-4.gat,110,96,0 script #CheckCaveFight2 45,1,1,{ - if (cavefights & BATTLE_CAVE2 || $@wave_cave2 == 0) goto L_Done; + if (cavefights & BATTLE_CAVE2 || $@battlecave2 == 1) goto L_Done; message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters."; end; @@ -216,8 +217,8 @@ L_Done: // ------------------------------------ Cave 3 -------------------------------------- 025-4.gat,164,103,0 script #StartCaveFight3 324,{ - if ($@wave_cave3 != 0 && $@cave3fighter$ == strcharinfo(0)) end; - if ($@wave_cave3 != 0 && $@cave3fighter$ != strcharinfo(0)) goto L_Cheat; + if ($@battlecave3 == 2 && $@cave3fighter$ == strcharinfo(0)) end; + if ($@battlecave3 == 2 && $@cave3fighter$ != strcharinfo(0)) goto L_Cheat; if (Rossy_Quest < 15) goto L_Cheat; if ($@battlecave3 == 1) goto L_Start; @@ -234,7 +235,7 @@ L_Start: close2; delitem "Root", 1; message strcharinfo(0), "As you place the root on the energy source, earth monsters seem to emerge from the ground."; - + set $@battlecave3, 2; L_Summon: set $@cave3_loop, $@cave3_loop + 1; @@ -276,7 +277,7 @@ L_no_root: // --------------------- Cave 3 Checker ---------------------------- 025-4.gat,168,117,0 script #CheckCaveFight3 45,1,1,{ - if (cavefights & BATTLE_CAVE3 || $@wave_cave3 == 0) goto L_Done; + if (cavefights & BATTLE_CAVE3 || $@battlecave3 == 1) goto L_Done; message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters."; end; @@ -287,8 +288,8 @@ L_Done: // --------------------------- Cave 4 -------------------------------- 025-4.gat,39,143,0 script #StartCaveFight4 324,{ - if ($@wave_cave4 != 0 && $@cave4fighter$ == strcharinfo(0)) end; - if ($@wave_cave4 != 0 && $@cave4fighter$ != strcharinfo(0)) goto L_Cheat; + if ($@battlecave4 == 2 && $@cave4fighter$ == strcharinfo(0)) end; + if ($@battlecave4 == 2 && $@cave4fighter$ != strcharinfo(0)) goto L_Cheat; if (Rossy_Quest < 15) goto L_Cheat; if ($@battlecave4 == 1) goto L_Start; @@ -305,6 +306,7 @@ L_Start: close2; delitem "Root", 1; message strcharinfo(0), "As you place the root on the energy source, earth monsters seem to emerge from the ground."; + set $@battlecave4, 2; L_Summon: set $@cave4_loop, $@cave4_loop + 1; @@ -346,20 +348,23 @@ L_no_root: // --------------------- Cave 4 Checker ---------------------------- 025-4.gat,32,156,0 script #CheckCaveFight4 45,1,1,{ - if (cavefights & BATTLE_CAVE4 || $@wave_cave4 == 0) goto L_Done; + message strcharinfo(0), $@battlecave4; + if (cavefights & BATTLE_CAVE4 || $@battlecave4 == 1) goto L_Done; message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters."; end; L_Done: + message strcharinfo(0), $@battlecave4; donpcevent "#WarpBattleCave4::OnGetout"; + message strcharinfo(0), $@battlecave4; end; } // ---------------------------- Cave 5 ------------------------------ 025-4.gat,109,143,0 script #StartCaveFight5 324,{ - if ($@wave_cave5 != 0 && $@cave5fighter$ == strcharinfo(0)) end; - if ($@wave_cave5 != 0 && $@cave5fighter$ != strcharinfo(0)) goto L_Cheat; + if ($@battlecave5 == 2 && $@cave5fighter$ == strcharinfo(0)) end; + if ($@battlecave5 == 2 && $@cave5fighter$ != strcharinfo(0)) goto L_Cheat; if (Rossy_Quest < 15) goto L_Cheat; if ($@battlecave5 == 1) goto L_Start; @@ -376,6 +381,7 @@ L_Start: close2; delitem "Root", 1; message strcharinfo(0), "As you place the root on the energy source, earth monsters seem to emerge from the ground."; + set $@battlecave5, 2; L_Summon: set $@cave5_loop, $@cave5_loop + 1; @@ -417,7 +423,7 @@ L_no_root: // --------------------- Cave 5 Checker ---------------------------- 025-4.gat,100,160,0 script #CheckCaveFight5 45,1,1,{ - if (cavefights & BATTLE_CAVE5 || $@wave_cave5 == 0) goto L_Done; + if (cavefights & BATTLE_CAVE5 || $@battlecave5 == 1) goto L_Done; message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters."; end; @@ -429,8 +435,8 @@ L_Done: // -------------------------------- Cave 6 ----------------------------------------- 025-4.gat,162,162,0 script #StartCaveFight6 324,{ - if ($@wave_cave6 != 0 && $@cave6fighter$ == strcharinfo(0)) end; - if ($@wave_cave6 != 0 && $@cave6fighter$ != strcharinfo(0)) goto L_Cheat; + if ($@battlecave6 == 2 && $@cave6fighter$ == strcharinfo(0)) end; + if ($@battlecave6 == 2 && $@cave6fighter$ != strcharinfo(0)) goto L_Cheat; if (Rossy_Quest < 15) goto L_Cheat; if ($@battlecave6 == 1) goto L_Start; @@ -447,6 +453,7 @@ L_Start: close2; delitem "Root", 1; message strcharinfo(0), "As you place the root on the energy source, earth monsters seem to emerge from the ground."; + set $@battlecave6, 2; L_Summon: set $@cave6_loop, $@cave6_loop + 1; @@ -488,7 +495,7 @@ L_no_root: // --------------------- Cave 6 Checker ---------------------------- 025-4.gat,159,174,0 script #CheckCaveFight6 45,1,1,{ - if (cavefights & BATTLE_CAVE6 || $@wave_cave6 == 0) goto L_Done; + if (cavefights & BATTLE_CAVE6 || $@battlecave6 == 1) goto L_Done; message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters."; end; @@ -500,8 +507,8 @@ L_Done: // -------------------------------- Cave 7 ----------------------------------- 025-4.gat,44,202,0 script #StartCaveFight7 324,{ - if ($@wave_cave7 != 0 && $@cave7fighter$ == strcharinfo(0)) end; - if ($@wave_cave7 != 0 && $@cave7fighter$ != strcharinfo(0)) goto L_Cheat; + if ($@battlecave7 == 2 && $@cave7fighter$ == strcharinfo(0)) end; + if ($@battlecave7 == 2 && $@cave7fighter$ != strcharinfo(0)) goto L_Cheat; if (Rossy_Quest < 15) goto L_Cheat; if ($@battlecave7 == 1) goto L_Start; @@ -518,8 +525,8 @@ L_Start: close2; delitem "Root", 1; message strcharinfo(0), "As you place the root on the energy source, earth monsters seem to emerge from the ground."; - - + set $@battlecave7, 2; + L_Summon: set $@cave7_loop, $@cave7_loop + 1; areamonster "025-4.gat",27, 185, 61, 219,"",$@CAVE7_MONSTERS_IDS[$@cave7_loop],$@CAVE7_MONSTERS_QTY[$@cave7_loop],"#StartCaveFight7::OnMonsterDeath"; @@ -560,7 +567,7 @@ L_no_root: // --------------------- Cave 7 Checker ---------------------------- 025-4.gat,42,219,0 script #CheckCaveFight7 45,1,1,{ - if (cavefights & BATTLE_CAVE7 || $@wave_cave7 == 0) goto L_Done; + if (cavefights & BATTLE_CAVE7 || $@battlecave7 == 1) goto L_Done; message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters."; end; @@ -572,8 +579,8 @@ L_Done: // --------------------------- Cave 8 ------------------------------- 025-4.gat,105,210,0 script #StartCaveFight8 324,{ - if ($@wave_cave8 != 0 && $@cave8fighter$ == strcharinfo(0)) end; - if ($@wave_cave8 != 0 && $@cave8fighter$ != strcharinfo(0)) goto L_Cheat; + if ($@battlecave8 == 2 && $@cave8fighter$ == strcharinfo(0)) end; + if ($@battlecave8 == 2 && $@cave8fighter$ != strcharinfo(0)) goto L_Cheat; if (Rossy_Quest < 15) goto L_Cheat; if ($@battlecave8 == 1) goto L_Start; @@ -589,8 +596,8 @@ L_Start: if ((countitem("Root")<1)) goto L_no_root; close2; delitem "Root", 1; - message strcharinfo(0), "As you place the root on the energy source, earth monsters seem to emerge from the ground."; - + message strcharinfo(0), "As you place the root on the energy source, earth monsters seem to emerge from the ground."; + set $@battlecave8, 2; L_Summon: set $@cave8_loop, $@cave8_loop + 1; @@ -632,7 +639,7 @@ L_no_root: // --------------------- Cave 8 Checker ---------------------------- 025-4.gat,105,216,0 script #CheckCaveFight8 45,1,1,{ - if (cavefights & BATTLE_CAVE8 || $@wave_cave8 == 0) goto L_Done; + if (cavefights & BATTLE_CAVE8 || $@battlecave8 == 1) goto L_Done; message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters."; end; @@ -644,8 +651,8 @@ L_Done: // --------------------------- Cave 9 ------------------------------- 025-4.gat,157,220,0 script #StartCaveFight9 324,{ - if ($@wave_cave9 != 0 && $@cave9fighter$ == strcharinfo(0)) end; - if ($@wave_cave9 != 0 && $@cave9fighter$ != strcharinfo(0)) goto L_Cheat; + if ($@battlecave9 == 2 && $@cave9fighter$ == strcharinfo(0)) end; + if ($@battlecave9 == 2 && $@cave9fighter$ != strcharinfo(0)) goto L_Cheat; if (Rossy_Quest < 15) goto L_Cheat; if ($@battlecave9 == 1) goto L_Start; @@ -662,6 +669,7 @@ L_Start: close2; delitem "Root", 1; message strcharinfo(0), "As you place the root on the energy source, earth monsters seem to emerge from the ground."; + set $@battlecave9, 2; L_Summon: set $@cave9_loop, $@cave9_loop + 1; @@ -703,7 +711,7 @@ L_no_root: // --------------------- Cave 9 Checker ---------------------------- 025-4.gat,157,226,0 script #CheckCaveFight9 45,1,1,{ - if (cavefights & BATTLE_CAVE9 || $@wave_cave9 == 0) goto L_Done; + if (cavefights & BATTLE_CAVE9 || $@battlecave9 == 1) goto L_Done; message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters."; end; @@ -715,7 +723,7 @@ L_Done: // --------------------- Boss Cave ---------------------------- 025-4.gat,157,30,0 script #StartBossCaveFight 325,{ - if ($@wave_cave10 != 0) end; + if ($@battlecave10 == 2 && $@cave10fighter$ == strcharinfo(0)) end; if (Rossy_Quest >= 16) end; if ($@battlecave10 == 1 && cavefights & BATTLE_CAVE1 && cavefights & BATTLE_CAVE2 && cavefights & BATTLE_CAVE3 && cavefights & BATTLE_CAVE4 && cavefights & BATTLE_CAVE5 && cavefights & BATTLE_CAVE6 && cavefights & BATTLE_CAVE7 && cavefights & BATTLE_CAVE8 && cavefights & BATTLE_CAVE9 && Rossy_Quest == 15) goto L_Start; message strcharinfo(0), "You shouldn't be here, you cheater."; @@ -730,6 +738,7 @@ L_Start: close2; delitem "Root", 1; message strcharinfo(0), "As you place the root on the energy source, earth monsters seem to emerge from the ground."; + set $@battlecave10, 2; L_Summon: set $@cave10_loop, $@cave10_loop + 1; @@ -812,8 +821,8 @@ L_no_root: 025-4.gat,157,48,0 script #CheckCaveFightBoss 45,1,1,{ if (Rossy_Quest >= 17) goto L_Done; if (Rossy_Quest == 16) goto L_Julia; - if (Rossy_Quest < 16 && $@wave_cave10 == 0) goto L_Out; - if (Rossy_Quest < 16 && $@wave_cave10 != 0) goto L_Julia; + if (Rossy_Quest < 16 && $@battlecave10 == 1) goto L_Out; + if (Rossy_Quest < 16 && $@battlecave10 == 2) goto L_Julia; end; L_Julia: -- cgit v1.2.3-60-g2f50