Some critical bugfixes

1 files changed, 81 insertions, 81 deletions

diff --git a/world/map/npc/025-3/barriers.txt b/world/map/npc/025-3/barriers.txt
index eefe5b2c..d6c69016 100644
--- a/world/map/npc/025-3/barriers.txt
+++ b/world/map/npc/025-3/barriers.txt
@@ -5,7 +5,7 @@
 025-3.gat,78,127,0	script	#WarpBattleCave1	45,1,1,{
 
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 26, 63, 60, 97) >= 1 || $@battlecave1 == 1) goto L_SomeoneInside;
+    if (getareausers("025-4.gat", 26, 63, 60, 97) >= 1 || $@battlecave1 > 0) goto L_SomeoneInside;
     if (cavefights & BATTLE_CAVE1) goto L_AlreadyDone;
     if (Rossy_Quest < 15) goto L_Block;
 
@@ -57,7 +57,7 @@ L_Win:
     setnpctimer 0;
     end;
 
-S_PreCleaning:
+S_Cleaning:
     set $@wave_cave1, 0;
     set $@cave1_kills, 0;
     set $@cave1start, 0;
@@ -70,37 +70,37 @@ S_PreCleaning:
     return;
 
 L_Ranaway:
-    callsub S_PreCleaning;
+    callsub S_Cleaning;
     end;
 
 L_BadAir:
-    callsub S_PreCleaning;
     warp "025-3.gat", 78, 129;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
+    callsub S_Cleaning;
     end;
 
 L_Cleaning:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave1fighter$));
     warp "025-3.gat", 78, 129;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
+    callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave1fighter$));
     warp "025-3.gat", 78, 129;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
+    callsub S_Cleaning;
     end;
 
 L_CleaningNorid:
-    callsub S_PreCleaning;
+    callsub S_Cleaning;
     end;
 
 OnGetout:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave1fighter$));
     warp "025-3.gat", 78, 129;
+    callsub S_Cleaning;
     end;
 
 L_AlreadyClean:
@@ -115,7 +115,7 @@ L_AlreadyClean:
 025-3.gat,53,107,0	script	#WarpBattleCave2	45,1,1,{
 
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 97, 62, 126, 96) >= 1 || $@battlecave2 == 1) goto L_SomeoneInside;
+    if (getareausers("025-4.gat", 97, 62, 126, 96) >= 1 || $@battlecave2 > 0) goto L_SomeoneInside;
     if (cavefights & BATTLE_CAVE2) goto L_AlreadyDone;
     if (Rossy_Quest < 15) goto L_Block;
 
@@ -167,7 +167,7 @@ L_Win:
     setnpctimer 0;
     end;
 
-S_PreCleaning:
+S_Cleaning:
     set $@wave_cave2, 0;
     set $@cave2_kills, 0;
     set $@cave2start, 0;
@@ -180,37 +180,37 @@ S_PreCleaning:
     return;
 
 L_Ranaway:
-    callsub S_PreCleaning;
+    callsub S_Cleaning;
     end;
 
 L_BadAir:
-    callsub S_PreCleaning;
     warp "025-3.gat", 53, 109;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
+    callsub S_Cleaning;
     end;
 
 L_Cleaning:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave2fighter$));
     warp "025-3.gat", 53, 109;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
+    callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave2fighter$));
     warp "025-3.gat", 53, 109;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
+    callsub S_Cleaning;
     end;
 
 L_CleaningNorid:
-    callsub S_PreCleaning;
+    callsub S_Cleaning;
     end;
 
 OnGetout:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave2fighter$));
     warp "025-3.gat", 53, 109;
+    callsub S_Cleaning;
     end;
 
 L_AlreadyClean:
@@ -224,7 +224,7 @@ L_AlreadyClean:
 025-3.gat,71,83,0	script	#WarpBattleCave3	45,1,1,{
 
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 150, 84, 177, 117) >= 1 || $@battlecave3 == 1) goto L_SomeoneInside;
+    if (getareausers("025-4.gat", 150, 84, 177, 117) >= 1 || $@battlecave3 > 0) goto L_SomeoneInside;
     if (cavefights & BATTLE_CAVE3) goto L_AlreadyDone;
     if (Rossy_Quest < 15) goto L_Block;
 
@@ -276,7 +276,7 @@ L_Win:
     setnpctimer 0;
     end;
 
-S_PreCleaning:
+S_Cleaning:
     set $@wave_cave3, 0;
     set $@cave3_kills, 0;
     set $@cave3start, 0;
@@ -289,37 +289,37 @@ S_PreCleaning:
     return;
 
 L_Ranaway:
-    callsub S_PreCleaning;
+    callsub S_Cleaning;
     end;
 
 L_BadAir:
-    callsub S_PreCleaning;
     warp "025-3.gat", 71, 85;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
+    callsub S_Cleaning;
     end;
 
 L_Cleaning:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave3fighter$));
     warp "025-3.gat", 71, 85;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
+    callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave3fighter$));
     warp "025-3.gat", 71, 85;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
+    callsub S_Cleaning;
     end;
 
 L_CleaningNorid:
-    callsub S_PreCleaning;
+    callsub S_Cleaning;
     end;
 
 OnGetout:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave3fighter$));
     warp "025-3.gat", 71, 85;
+    callsub S_Cleaning;
     end;
 
 L_AlreadyClean:
@@ -333,7 +333,7 @@ L_AlreadyClean:
 025-3.gat,80,83,0	script	#WarpBattleCave4	45,1,1,{
 
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 28, 124, 57, 156) >= 1 || $@battlecave4 == 1) goto L_SomeoneInside;
+    if (getareausers("025-4.gat", 28, 124, 57, 156) >= 1 || $@battlecave4 > 0) goto L_SomeoneInside;
     if (cavefights & BATTLE_CAVE4) goto L_AlreadyDone;
     if (Rossy_Quest < 15) goto L_Block;
 
@@ -385,7 +385,7 @@ L_Win:
     setnpctimer 0;
     end;
 
-S_PreCleaning:
+S_Cleaning:
     set $@wave_cave4, 0;
     set $@cave4_kills, 0;
     set $@cave4start, 0;
@@ -398,37 +398,37 @@ S_PreCleaning:
     return;
 
 L_Ranaway:
-    callsub S_PreCleaning;
+    callsub S_Cleaning;
     end;
 
 L_BadAir:
-    callsub S_PreCleaning;
     warp "025-3.gat", 80, 85;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
+    callsub S_Cleaning;
     end;
 
 L_Cleaning:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave4fighter$));
     warp "025-3.gat", 80, 85;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
+    callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave4fighter$));
     warp "025-3.gat", 80, 85;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
+    callsub S_Cleaning;
     end;
 
 L_CleaningNorid:
-    callsub S_PreCleaning;
+    callsub S_Cleaning;
     end;
 
 OnGetout:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave4fighter$));
     warp "025-3.gat", 80, 85;
+    callsub S_Cleaning;
     end;
 
 L_AlreadyClean:
@@ -442,7 +442,7 @@ L_AlreadyClean:
 025-3.gat,71,30,0	script	#WarpBattleCave5	45,1,1,{
 
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 91, 131, 124, 160) >= 1 || $@battlecave5 == 1) goto L_SomeoneInside;
+    if (getareausers("025-4.gat", 91, 131, 124, 160) >= 1 || $@battlecave5 > 0) goto L_SomeoneInside;
     if (cavefights & BATTLE_CAVE5) goto L_AlreadyDone;
     if (Rossy_Quest < 15) goto L_Block;
 
@@ -494,7 +494,7 @@ L_Win:
     setnpctimer 0;
     end;
 
-S_PreCleaning:
+S_Cleaning:
     set $@wave_cave5, 0;
     set $@cave5_kills, 0;
     set $@cave5start, 0;
@@ -507,37 +507,37 @@ S_PreCleaning:
     return;
 
 L_Ranaway:
-    callsub S_PreCleaning;
+    callsub S_Cleaning;
     end;
 
 L_BadAir:
-    callsub S_PreCleaning;
     warp "025-3.gat", 71, 32;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
+    callsub S_Cleaning;
     end;
 
 L_Cleaning:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave5fighter$));
     warp "025-3.gat", 71, 32;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
+    callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave5fighter$));
     warp "025-3.gat", 71, 32;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
+    callsub S_Cleaning;
     end;
 
 L_CleaningNorid:
-    callsub S_PreCleaning;
+    callsub S_Cleaning;
     end;
 
 OnGetout:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave5fighter$));
     warp "025-3.gat", 71, 32;
+    callsub S_Cleaning;
     end;
 
 L_AlreadyClean:
@@ -551,7 +551,7 @@ L_AlreadyClean:
 025-3.gat,128,35,0	script	#WarpBattleCave6	45,1,1,{
 
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 153, 143, 178, 174) >= 1 || $@battlecave6 == 1) goto L_SomeoneInside;
+    if (getareausers("025-4.gat", 153, 143, 178, 174) >= 1 || $@battlecave6 > 0) goto L_SomeoneInside;
     if (cavefights & BATTLE_CAVE6) goto L_AlreadyDone;
     if (Rossy_Quest < 15) goto L_Block;
 
@@ -603,7 +603,7 @@ L_Win:
     setnpctimer 0;
     end;
 
-S_PreCleaning:
+S_Cleaning:
     set $@wave_cave6, 0;
     set $@cave6_kills, 0;
     set $@cave6start, 0;
@@ -616,37 +616,37 @@ S_PreCleaning:
     return;
 
 L_Ranaway:
-    callsub S_PreCleaning;
+    callsub S_Cleaning;
     end;
 
 L_BadAir:
-    callsub S_PreCleaning;
     warp "025-3.gat", 128, 37;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
+    callsub S_Cleaning;
     end;
 
 L_Cleaning:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave6fighter$));
     warp "025-3.gat", 128, 37;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
+    callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave6fighter$));
     warp "025-3.gat", 128, 37;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
+    callsub S_Cleaning;
     end;
 
 L_CleaningNorid:
-    callsub S_PreCleaning;
+    callsub S_Cleaning;
     end;
 
 OnGetout:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave6fighter$));
     warp "025-3.gat", 128, 37;
+    callsub S_Cleaning;
     end;
 
 L_AlreadyClean:
@@ -660,7 +660,7 @@ L_AlreadyClean:
 025-3.gat,70,57,0	script	#WarpBattleCave7	45,1,1,{
 
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 27, 185, 61, 219) >= 1 || $@battlecave7 == 1) goto L_SomeoneInside;
+    if (getareausers("025-4.gat", 27, 185, 61, 219) >= 1 || $@battlecave7 > 0) goto L_SomeoneInside;
     if (cavefights & BATTLE_CAVE7) goto L_AlreadyDone;
     if (Rossy_Quest < 15) goto L_Block;
 
@@ -712,7 +712,7 @@ L_Win:
     setnpctimer 0;
     end;
 
-S_PreCleaning:
+S_Cleaning:
     set $@wave_cave7, 0;
     set $@cave7_kills, 0;
     set $@cave7start, 0;
@@ -725,37 +725,37 @@ S_PreCleaning:
     return;
 
 L_Ranaway:
-    callsub S_PreCleaning;
+    callsub S_Cleaning;
     end;
 
 L_BadAir:
-    callsub S_PreCleaning;
     warp "025-3.gat", 70, 59;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
+    callsub S_Cleaning;
     end;
 
 L_Cleaning:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave7fighter$));
     warp "025-3.gat", 70, 59;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
+    callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave7fighter$));
     warp "025-3.gat", 70, 59;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
+    callsub S_Cleaning;
     end;
 
 L_CleaningNorid:
-    callsub S_PreCleaning;
+    callsub S_Cleaning;
     end;
 
 OnGetout:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave7fighter$));
     warp "025-3.gat", 70, 59;
+    callsub S_Cleaning;
     end;
 
 L_AlreadyClean:
@@ -769,7 +769,7 @@ L_AlreadyClean:
 025-3.gat,138,92,0	script	#WarpBattleCave8	45,1,1,{
 
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 90, 193, 119, 216) >= 1 || $@battlecave8 == 1) goto L_SomeoneInside;
+    if (getareausers("025-4.gat", 90, 193, 119, 216) >= 1 || $@battlecave8 > 0) goto L_SomeoneInside;
     if (cavefights & BATTLE_CAVE8) goto L_AlreadyDone;
     if (Rossy_Quest < 15) goto L_Block;
 
@@ -821,7 +821,7 @@ L_Win:
     setnpctimer 0;
     end;
 
-S_PreCleaning:
+S_Cleaning:
     set $@wave_cave8, 0;
     set $@cave8_kills, 0;
     set $@cave8start, 0;
@@ -834,37 +834,37 @@ S_PreCleaning:
     return;
 
 L_Ranaway:
-    callsub S_PreCleaning;
+    callsub S_Cleaning;
     end;
 
 L_BadAir:
-    callsub S_PreCleaning;
     warp "025-3.gat", 138, 94;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
+    callsub S_Cleaning;
     end;
 
 L_Cleaning:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave8fighter$));
     warp "025-3.gat", 138, 94;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
+    callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave8fighter$));
     warp "025-3.gat", 138, 94;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
+    callsub S_Cleaning;
     end;
 
 L_CleaningNorid:
-    callsub S_PreCleaning;
+    callsub S_Cleaning;
     end;
 
 OnGetout:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave8fighter$));
     warp "025-3.gat", 138, 94;
+    callsub S_Cleaning;
     end;
 
 L_AlreadyClean:
@@ -878,7 +878,7 @@ L_AlreadyClean:
 025-3.gat,138,160,0	script	#WarpBattleCave9	45,1,1,{
 
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 144, 192, 173, 226) >= 1 || $@battlecave9 == 1) goto L_SomeoneInside;
+    if (getareausers("025-4.gat", 144, 192, 173, 226) >= 1 || $@battlecave9 > 0) goto L_SomeoneInside;
     if (cavefights & BATTLE_CAVE9) goto L_AlreadyDone;
     if (Rossy_Quest < 15) goto L_Block;
 
@@ -930,7 +930,7 @@ L_Win:
     setnpctimer 0;
     end;
 
-S_PreCleaning:
+S_Cleaning:
     set $@wave_cave9, 0;
     set $@cave9_kills, 0;
     set $@cave9start, 0;
@@ -943,37 +943,37 @@ S_PreCleaning:
     return;
 
 L_Ranaway:
-    callsub S_PreCleaning;
+    callsub S_Cleaning;
     end;
 
 L_BadAir:
-    callsub S_PreCleaning;
     warp "025-3.gat", 138, 158;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
+    callsub S_Cleaning;
     end;
 
 L_Cleaning:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave9fighter$));
     warp "025-3.gat", 138, 158;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
+    callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave9fighter$));
     warp "025-3.gat", 138, 158;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
+    callsub S_Cleaning;
     end;
 
 L_CleaningNorid:
-    callsub S_PreCleaning;
+    callsub S_Cleaning;
     end;
 
 OnGetout:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave9fighter$));
     warp "025-3.gat", 138, 158;
+    callsub S_Cleaning;
     end;
 
 L_AlreadyClean:
@@ -998,7 +998,7 @@ L_AlreadyClean:
     if (cavefights & BATTLE_CAVE8) set @barrier_force, @barrier_force + 1;
     if (cavefights & BATTLE_CAVE9) set @barrier_force, @barrier_force + 1;
     if (@barrier_force != 0) goto L_Hurt;
-    if (getareausers("025-4.gat", 142, 24, 172, 48) >= 1 || $@battlecave10 == 1) goto L_SomeoneInside;
+    if (getareausers("025-4.gat", 142, 24, 172, 48) >= 1 || $@battlecave10 > 0) goto L_SomeoneInside;
     if (@barrier_force == 0) goto L_StartFight;
     end;
 
@@ -1049,7 +1049,7 @@ L_Win:
     setnpctimer 0;
     end;
 
-S_PreCleaning:
+S_Cleaning:
     set $@wave_cave10, 0;
     set $@cave10_kills, 0;
     set $@cave10start, 0;
@@ -1063,44 +1063,44 @@ S_PreCleaning:
     return;
 
 L_Ranaway:
-    callsub S_PreCleaning;
+    callsub S_Cleaning;
     end;
 
 L_BadAir:
-    callsub S_PreCleaning;
     warp "025-4.gat", 93, 33;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run as fast as you can to save Julia!";
+    callsub S_Cleaning;
     end;
 
 L_Cleaning:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave10fighter$));
     warp "025-3.gat", 77, 168;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
+    callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave10fighter$));
     warp "025-3.gat", 77, 168;
     if ($@wave_cave10 < 5) message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     if ($@wave_cave10 == 5) message strcharinfo(0), "This horrible monster is probably too powerful for you right now.";
+    callsub S_Cleaning;
     end;
 
 L_CleaningNorid:
-    callsub S_PreCleaning;
+    callsub S_Cleaning;
     end;
 
 OnGetout:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave10fighter$));
     warp "025-3.gat", 77, 168;
+    callsub S_Cleaning;
     end;
 
 OnWin:
-    callsub S_PreCleaning;
     attachrid(getcharid(3,$@cave10fighter$));
     warp "025-4.gat", 93, 33;
+    callsub S_Cleaning;
     end;
 
 L_AlreadyClean: