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

Conflicts:
	world/map/db/mob_db.txt

6 files changed, 54 insertions, 32 deletions

diff --git a/world/map/npc/009-4/_mobs.txt b/world/map/npc/009-4/_mobs.txt
index fcae92f7..38dc2f30 100644
--- a/world/map/npc/009-4/_mobs.txt
+++ b/world/map/npc/009-4/_mobs.txt
@@ -10,7 +10,8 @@
 009-4.gat,38,116,24,15|monster|Maggot|1002,3,20000,14000,Mob009-4::On1002
 
 
-009-4.gat,0,0,0|script|Mob009-4|-1,{
+009-4.gat,0,0,0|script|Mob009-4|-1,
+{
 On1002:
     set @mobID, 1002;
     callfunc "MobPoints";
diff --git a/world/map/npc/009-4/barriers.txt b/world/map/npc/009-4/barriers.txt
index 78635c54..939f4ae2 100644
--- a/world/map/npc/009-4/barriers.txt
+++ b/world/map/npc/009-4/barriers.txt
@@ -1,5 +1,6 @@
 //# see detailed description at orum.txt
-function|script|GetBarrierColor|{
+function|script|GetBarrierColor|,
+{
     if (@Barrier < 0 || @Barrier > 2) goto L_Error;
 
     set @Mask, 15;
@@ -12,7 +13,8 @@ L_Error:
     close;
 }
 
-function|script|SetBarrierColor|{
+function|script|SetBarrierColor|,
+{
     if (@Barrier < 0 || @Barrier > 2)
         goto L_Error;
     if (@BarrierColor <= 0 || @BarrierColor > 12)
@@ -33,8 +35,8 @@ L_Error2:
 
 
 // Starting Barrier / Quest Entrance
-009-4.gat,37,120,0|script|#OrumCaveStartBarrier|0,1,0,{
-
+009-4.gat,37,120,0|script|#OrumCaveStartBarrier|0,1,0,
+{
     if (OrumQuest >= 3) close;
     if (OrumQuest == 2) goto L_Started;
 
@@ -49,8 +51,8 @@ L_Started:
 }
 
 // First Barrier
-009-4.gat,57,29,0|script|#OrumCaveFirstBarrier|0,1,0,{
-
+009-4.gat,57,29,0|script|#OrumCaveFirstBarrier|0,1,0,
+{
     if (OrumQuest >= 5) close;
 
     message strcharinfo(0), "Nothing seems to happen as you enter this room. The barrier must need both of its torches to function properly.";
@@ -59,8 +61,8 @@ L_Started:
 }
 
 // Second Barrier
-009-4.gat,61,54,0|script|#OrumCaveSecondBarrier|0,1,0,{
-
+009-4.gat,61,54,0|script|#OrumCaveSecondBarrier|0,1,0,
+{
     if (OrumQuest == 3) set OrumQuest, 4;
 
     set @Barrier, 0;
@@ -88,8 +90,8 @@ L_Advance_Quest:
 }
 
 // Third Barrier
-009-4.gat,24,66,0|script|#OrumCaveThirdBarrier|0,1,0,{
-
+009-4.gat,24,66,0|script|#OrumCaveThirdBarrier|0,1,0,
+{
     if (OrumQuest == 3) set OrumQuest, 4;
 
     set @Barrier, 1;
@@ -132,8 +134,8 @@ L_Advance_Quest:
 }
 
 // Ending Barrier
-009-4.gat,48,38,0|script|#OrumCaveEndBarrier|0,1,0,{
-
+009-4.gat,48,38,0|script|#OrumCaveEndBarrier|0,1,0,
+{
     if (OrumQuest >= 11) close;
     if (OrumQuest == 3) set OrumQuest, 4;
 
diff --git a/world/map/npc/009-4/orum.txt b/world/map/npc/009-4/orum.txt
index 8ee21c7c..a8c4b505 100644
--- a/world/map/npc/009-4/orum.txt
+++ b/world/map/npc/009-4/orum.txt
@@ -18,7 +18,8 @@
 //# OrumQuestBarrier    nibble (0,1,2) stores the color of the barriers           #
 //#################################################################################
 
-009-4.gat,37,115,0|script|Orum|158,{
+009-4.gat,37,115,0|script|Orum|158,
+{
     // needed to pass the very first barrier
     set @B0_WISPPOWDER, 4;
     set @B0_POLTERGEISTPOWDER, 2;
diff --git a/world/map/npc/009-4/orum_warps.txt b/world/map/npc/009-4/orum_warps.txt
index 858e0ea0..d4267eb1 100644
--- a/world/map/npc/009-4/orum_warps.txt
+++ b/world/map/npc/009-4/orum_warps.txt
@@ -1,4 +1,5 @@
-009-3.gat,162,113,0|script|#OrumQuestEnter|45,0,0,{
+009-3.gat,162,113,0|script|#OrumQuestEnter|45,0,0,
+{
     if (OrumQuest >= 12) goto L_Second_Entrance;
     warp "009-4.gat", 37, 113;
     close;
@@ -7,7 +8,8 @@ L_Second_Entrance:
     warp "009-4.gat", 72, 126;
     close;
 }
-009-4.gat,36,26,0|script|#LairExit|45,0,0,{
+009-4.gat,36,26,0|script|#LairExit|45,0,0,
+{
     if (OrumQuest >= 12) goto L_Second_Entrance;
     warp "009-4.gat", 37, 122;
     close;
@@ -17,7 +19,8 @@ L_Second_Entrance:
     close;
 }
 
-009-4.gat,51,47,0|script|#CavernEnter|45,0,0,{
+009-4.gat,51,47,0|script|#CavernEnter|45,0,0,
+{
     if (OrumQuest >= 14) goto L_Second_Cavern;
     if (OrumQuest < 12) goto L_See_Orum;
     warp "009-4.gat", 103, 23;
diff --git a/world/map/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt
index 86dd95fe..03acc6b0 100644
--- a/world/map/npc/009-4/torches.txt
+++ b/world/map/npc/009-4/torches.txt
@@ -1,6 +1,7 @@
 //# see detailed description at orum.txt
 //# see detailed description at orum.txt
-function|script|GetTorchColor|{
+function|script|GetTorchColor|,
+{
     if (@Torch < 0 || @Torch > 2) goto L_Error;
 
     set @Mask, 15;
@@ -13,7 +14,8 @@ L_Error:
     close;
 }
 
-function|script|SetTorchColor|{
+function|script|SetTorchColor|,
+{
     if (@Torch < 0 || @Torch > 2) goto L_Error;
     if (@TorchColor < 1 || @TorchColor > 12) goto L_Error2;
 
@@ -30,7 +32,8 @@ L_Error2:
     close;
 }
 
-function|script|GetTorchIntensity|{
+function|script|GetTorchIntensity|,
+{
     if (@Torch < 0 || @Torch > 2) goto L_Error;
 
     set @Mask, 15;
@@ -43,7 +46,8 @@ L_Error:
     close;
 }
 
-function|script|SetTorchIntensity|{
+function|script|SetTorchIntensity|,
+{
     if (@Torch < 0 || @Torch > 2) goto L_Error;
     if (@TorchIntensity < 0 || @TorchIntensity > 2) goto L_Error2;
 
@@ -60,7 +64,8 @@ L_Error2:
     close;
 }
 
-function|script|DoneWithTorches|{
+function|script|DoneWithTorches|,
+{
     if (OrumQuest < 11 && OrumQuest >= 8)
         return;
 
@@ -80,26 +85,30 @@ L_Different:
 }
 
 // To make sure in range of torches
-function|script|InRangeTorch1|{
+function|script|InRangeTorch1|,
+{
     if (isin("009-4.gat",67,20,69,25))
         return;
     mes "You're too far away to do anything with that torch.";
     close;
 }
-function|script|InRangeTorch2|{
+function|script|InRangeTorch2|,
+{
     if (isin("009-4.gat",65,41,69,46))
         return;
     mes "You're too far away to do anything with that torch.";
     close;
 }
-function|script|InRangeTorch3|{
+function|script|InRangeTorch3|,
+{
     if (isin("009-4.gat",33,84,37,88))
         return;
     mes "You're too far away to do anything with that torch.";
     close;
 }
 
-function|script|TorchLoop|{
+function|script|TorchLoop|,
+{
     // Variables used here:
     // @Torch - pass before calling
     // @TorchColor - initialized here, updated throughout
@@ -259,7 +268,8 @@ L_Failed:
 }
 
 // First Torch
-009-4.gat,68,21,0|script|Torch|400,{
+009-4.gat,68,21,0|script|Torch|400,
+{
     callfunc "InRangeTorch1";
     callfunc "DoneWithTorches";
 
@@ -269,7 +279,8 @@ L_Failed:
 }
 
 // Second Torch
-009-4.gat,67,42,0|script|Torch|400,{
+009-4.gat,67,42,0|script|Torch|400,
+{
     callfunc "InRangeTorch2";
     callfunc "DoneWithTorches";
 
@@ -279,7 +290,8 @@ L_Failed:
 }
 
 // Third Torch
-009-4.gat,33,86,0|script|Torch|400,{
+009-4.gat,33,86,0|script|Torch|400,
+{
     callfunc "InRangeTorch3";
     callfunc "DoneWithTorches";
 
diff --git a/world/map/npc/009-4/waric.txt b/world/map/npc/009-4/waric.txt
index c373522a..9231bb94 100644
--- a/world/map/npc/009-4/waric.txt
+++ b/world/map/npc/009-4/waric.txt
@@ -1,6 +1,7 @@
 //# see detailed description at orum.txt
 
-009-4.gat,99,33,0|script|#WizardTrap|0,2,1,{
+009-4.gat,99,33,0|script|#WizardTrap|0,2,1,
+{
     set @gender$, "They're";
     if (Sex == 0)
         set @gender$, "She's";
@@ -18,7 +19,8 @@
     close;
 }
 
-009-4.gat,120,43,0|script|Orum|158,{
+009-4.gat,120,43,0|script|Orum|158,
+{
     mes "[Orum]";
     mes "\"I told you to forget about this place but you did not heed my advice!\"";
     next;
@@ -26,7 +28,8 @@
     close;
 }
 
-009-4.gat,118,42,0|script|Waric|153,{
+009-4.gat,118,42,0|script|Waric|153,
+{
     set @EXP_LEARNED_ALOT, 10000;
     if (OrumQuest >= 13)
         goto L_Behave;