Merge remote-tracking branch 'origin/master' into waric

Conflicts:
	world/map/db/mob_db.txt

1 files changed, 44 insertions, 22 deletions

diff --git a/world/map/npc/025-4/battlecaves.txt b/world/map/npc/025-4/battlecaves.txt
index a0349847..b3d69f3b 100644
--- a/world/map/npc/025-4/battlecaves.txt
+++ b/world/map/npc/025-4/battlecaves.txt
@@ -2,7 +2,8 @@
 
 // ---------------------------------    Cave 1    -----------------------------------
 
-025-4.gat,41,85,0|script|#StartCaveFight1|324,{
+025-4.gat,41,85,0|script|#StartCaveFight1|324,
+{
     if ($@battlecave1 == 2 && $@cave1fighter$ == strcharinfo(0))
         end;
     if ($@battlecave1 == 2 && $@cave1fighter$ != strcharinfo(0))
@@ -74,7 +75,8 @@ L_no_root:
 
 // ---------------------  Cave 1 Checker  ----------------------------
 
-025-4.gat,41,97,0|script|#CheckCaveFight1|45,1,1,{
+025-4.gat,41,97,0|script|#CheckCaveFight1|45,1,1,
+{
     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.";
@@ -88,7 +90,8 @@ L_Done:
 // ---------------------------------    Cave 2   ---------------------------------------
 
 
-025-4.gat,115,77,0|script|#StartCaveFight2|324,{
+025-4.gat,115,77,0|script|#StartCaveFight2|324,
+{
     if ($@battlecave2 == 2 && $@cave2fighter$ == strcharinfo(0))
         end;
     if ($@battlecave2 == 2 && $@cave2fighter$ != strcharinfo(0))
@@ -160,7 +163,8 @@ L_no_root:
 
 // ---------------------  Cave 2 Checker  ----------------------------
 
-025-4.gat,110,96,0|script|#CheckCaveFight2|45,1,1,{
+025-4.gat,110,96,0|script|#CheckCaveFight2|45,1,1,
+{
     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.";
@@ -172,7 +176,8 @@ L_Done:
 }
 
 // ------------------------------------    Cave 3    --------------------------------------
-025-4.gat,164,103,0|script|#StartCaveFight3|324,{
+025-4.gat,164,103,0|script|#StartCaveFight3|324,
+{
     if ($@battlecave3 == 2 && $@cave3fighter$ == strcharinfo(0))
         end;
     if ($@battlecave3 == 2 && $@cave3fighter$ != strcharinfo(0))
@@ -245,7 +250,8 @@ L_no_root:
 
 // ---------------------  Cave 3 Checker  ----------------------------
 
-025-4.gat,168,117,0|script|#CheckCaveFight3|45,1,1,{
+025-4.gat,168,117,0|script|#CheckCaveFight3|45,1,1,
+{
     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.";
@@ -257,7 +263,8 @@ L_Done:
 }
 
 // ---------------------------    Cave 4    --------------------------------
-025-4.gat,39,143,0|script|#StartCaveFight4|324,{
+025-4.gat,39,143,0|script|#StartCaveFight4|324,
+{
     if ($@battlecave4 == 2 && $@cave4fighter$ == strcharinfo(0))
         end;
     if ($@battlecave4 == 2 && $@cave4fighter$ != strcharinfo(0))
@@ -332,7 +339,8 @@ L_no_root:
 
 // ---------------------  Cave 4 Checker  ----------------------------
 
-025-4.gat,32,156,0|script|#CheckCaveFight4|45,1,1,{
+025-4.gat,32,156,0|script|#CheckCaveFight4|45,1,1,
+{
     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.";
@@ -345,7 +353,8 @@ L_Done:
 
 // ----------------------------    Cave 5    ------------------------------
 
-025-4.gat,109,143,0|script|#StartCaveFight5|324,{
+025-4.gat,109,143,0|script|#StartCaveFight5|324,
+{
     if ($@battlecave5 == 2 && $@cave5fighter$ == strcharinfo(0))
         end;
     if ($@battlecave5 == 2 && $@cave5fighter$ != strcharinfo(0))
@@ -420,7 +429,8 @@ L_no_root:
 
 // ---------------------  Cave 5 Checker  ----------------------------
 
-025-4.gat,100,160,0|script|#CheckCaveFight5|45,1,1,{
+025-4.gat,100,160,0|script|#CheckCaveFight5|45,1,1,
+{
     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.";
@@ -433,7 +443,8 @@ L_Done:
 
 // --------------------------------    Cave 6    -----------------------------------------
 
-025-4.gat,162,162,0|script|#StartCaveFight6|324,{
+025-4.gat,162,162,0|script|#StartCaveFight6|324,
+{
     if ($@battlecave6 == 2 && $@cave6fighter$ == strcharinfo(0))
         end;
     if ($@battlecave6 == 2 && $@cave6fighter$ != strcharinfo(0))
@@ -508,7 +519,8 @@ L_no_root:
 
 // ---------------------  Cave 6 Checker  ----------------------------
 
-025-4.gat,159,174,0|script|#CheckCaveFight6|45,1,1,{
+025-4.gat,159,174,0|script|#CheckCaveFight6|45,1,1,
+{
     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.";
@@ -521,7 +533,8 @@ L_Done:
 
 // --------------------------------    Cave 7    -----------------------------------
 
-025-4.gat,44,202,0|script|#StartCaveFight7|324,{
+025-4.gat,44,202,0|script|#StartCaveFight7|324,
+{
     if ($@battlecave7 == 2 && $@cave7fighter$ == strcharinfo(0))
         end;
     if ($@battlecave7 == 2 && $@cave7fighter$ != strcharinfo(0))
@@ -598,7 +611,8 @@ L_no_root:
 
 // ---------------------  Cave 7 Checker  ----------------------------
 
-025-4.gat,42,219,0|script|#CheckCaveFight7|45,1,1,{
+025-4.gat,42,219,0|script|#CheckCaveFight7|45,1,1,
+{
     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.";
@@ -611,7 +625,8 @@ L_Done:
 
 // ---------------------------    Cave 8    -------------------------------
 
-025-4.gat,105,210,0|script|#StartCaveFight8|324,{
+025-4.gat,105,210,0|script|#StartCaveFight8|324,
+{
     if ($@battlecave8 == 2 && $@cave8fighter$ == strcharinfo(0))
         end;
     if ($@battlecave8 == 2 && $@cave8fighter$ != strcharinfo(0))
@@ -688,7 +703,8 @@ L_no_root:
 
 // ---------------------  Cave 8 Checker  ----------------------------
 
-025-4.gat,105,216,0|script|#CheckCaveFight8|45,1,1,{
+025-4.gat,105,216,0|script|#CheckCaveFight8|45,1,1,
+{
     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.";
@@ -701,7 +717,8 @@ L_Done:
 
 // ---------------------------    Cave 9    -------------------------------
 
-025-4.gat,157,220,0|script|#StartCaveFight9|324,{
+025-4.gat,157,220,0|script|#StartCaveFight9|324,
+{
     if ($@battlecave9 == 2 && $@cave9fighter$ == strcharinfo(0))
         end;
     if ($@battlecave9 == 2 && $@cave9fighter$ != strcharinfo(0))
@@ -778,7 +795,8 @@ L_no_root:
 
 // ---------------------  Cave 9 Checker  ----------------------------
 
-025-4.gat,157,226,0|script|#CheckCaveFight9|45,1,1,{
+025-4.gat,157,226,0|script|#CheckCaveFight9|45,1,1,
+{
     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.";
@@ -791,7 +809,8 @@ L_Done:
 
 // ---------------------  Boss Cave  ----------------------------
 
-025-4.gat,157,30,0|script|#StartBossCaveFight|325,{
+025-4.gat,157,30,0|script|#StartBossCaveFight|325,
+{
     if ($@battlecave10 == 2 && $@cave10fighter$ == strcharinfo(0))
         end;
     if (Rossy_Quest >= 16)
@@ -891,7 +910,8 @@ L_no_root:
 
 // ---------------------  Boss Cave Checker  ----------------------------
 
-025-4.gat,157,48,0|script|#CheckCaveFightBoss|45,1,1,{
+025-4.gat,157,48,0|script|#CheckCaveFightBoss|45,1,1,
+{
     if (Rossy_Quest >= 17)
         goto L_Done;
     if (Rossy_Quest == 16)
@@ -917,7 +937,8 @@ L_Out:
 
 // ---------------------  Julia Cave Checker Outside  ----------------------------
 
-025-4.gat,157,24,0|script|#CheckJuliaCaveOutside|45,1,1,{
+025-4.gat,157,24,0|script|#CheckJuliaCaveOutside|45,1,1,
+{
     if (Rossy_Quest > 15)
         goto L_Done;
     message strcharinfo(0), "As you try to walk through, you bump into a strong magical barrier.";
@@ -931,7 +952,8 @@ L_Done:
 
 // ---------------------  Julia Cave Checker Inside  ----------------------------
 
-025-4.gat,93,35,0|script|#CheckJuliaCaveInside|45,1,1,{
+025-4.gat,93,35,0|script|#CheckJuliaCaveInside|45,1,1,
+{
     if (Rossy_Quest >= 17)
         goto L_Done;
     if (Rossy_Quest == 16)