NPCs on 009-* fixed

5 files changed, 28 insertions, 28 deletions

diff --git a/world/map/npc/009-4/barriers.txt b/world/map/npc/009-4/barriers.txt
index ae960d97..9e3e85b9 100644
--- a/world/map/npc/009-4/barriers.txt
+++ b/world/map/npc/009-4/barriers.txt
@@ -1,5 +1,5 @@
 //# see detailed description at orum.txt
-function|script|GetBarrierColor|,
+function|script|GetBarrierColor
 {
     if (@Barrier < 0 || @Barrier > 2)
         goto L_Error;
@@ -22,7 +22,7 @@ L_Error2:
     goto L_GetBarrierColor;
 }
 
-function|script|SetBarrierColor|,
+function|script|SetBarrierColor
 {
     if (@Barrier < 0 || @Barrier > 2)
         goto L_Error;
@@ -44,7 +44,7 @@ L_Error2:
 
 
 // Starting Barrier / Quest Entrance
-009-4.gat,37,120,0|script|#OrumCaveStartBarrier|127,1,0,
+009-4.gat,37,120,0|script|#OrumCaveStartBarrier|127,1,0
 {
     if (OrumQuest >= 3) close;
     if (OrumQuest == 2) goto L_Started;
@@ -60,7 +60,7 @@ L_Started:
 }
 
 // First Barrier
-009-4.gat,57,29,0|script|#OrumCaveFirstBarrier|127,1,0,
+009-4.gat,57,29,0|script|#OrumCaveFirstBarrier|127,1,0
 {
     if (OrumQuest >= 5) close;
 
@@ -70,7 +70,7 @@ L_Started:
 }
 
 // Second Barrier
-009-4.gat,61,54,0|script|#OrumCaveSecondBarrier|127,1,0,
+009-4.gat,61,54,0|script|#OrumCaveSecondBarrier|127,1,0
 {
     if (OrumQuest == 3) set OrumQuest, 4;
 
@@ -99,7 +99,7 @@ L_Advance_Quest:
 }
 
 // Third Barrier
-009-4.gat,24,66,0|script|#OrumCaveThirdBarrier|127,1,0,
+009-4.gat,24,66,0|script|#OrumCaveThirdBarrier|127,1,0
 {
     if (OrumQuest == 3) set OrumQuest, 4;
 
@@ -143,7 +143,7 @@ L_Advance_Quest:
 }
 
 // Ending Barrier
-009-4.gat,48,38,0|script|#OrumCaveEndBarrier|127,1,0,
+009-4.gat,48,38,0|script|#OrumCaveEndBarrier|127,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 c547af05..db99d50c 100644
--- a/world/map/npc/009-4/orum.txt
+++ b/world/map/npc/009-4/orum.txt
@@ -18,7 +18,7 @@
 //# OrumQuestBarrier    nibble (0,1,2) stores the color of the barriers           #
 //#################################################################################
 
-009-4.gat,35,115,0|script|OrumDebug|158,
+009-4.gat,35,115,0|script|OrumDebug|158
 {
     mes "[Orum Debug]";
     menu
@@ -49,7 +49,7 @@ OnInit:
         disablenpc "OrumDebug";
     end;
 }
-009-4.gat,37,115,0|script|Orum#barrier|158,
+009-4.gat,37,115,0|script|Orum#barrier|158
 {
     // needed to pass the very first barrier
     set @B0_WISPPOWDER, 4;
@@ -592,7 +592,7 @@ L_Close:
     set @TorchColor, 0;
     close;
 }
-function|script|SetUpOrumQuest|,
+function|script|SetUpOrumQuest
 {
     // Second Barrier
     set @BarrierColor, 1 + rand(3) * 4;
diff --git a/world/map/npc/009-4/orum_warps.txt b/world/map/npc/009-4/orum_warps.txt
index d4267eb1..86afb56f 100644
--- a/world/map/npc/009-4/orum_warps.txt
+++ b/world/map/npc/009-4/orum_warps.txt
@@ -1,4 +1,4 @@
-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;
@@ -8,7 +8,7 @@ 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;
@@ -19,7 +19,7 @@ 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;
diff --git a/world/map/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt
index e9d8ff3e..b92098c0 100644
--- a/world/map/npc/009-4/torches.txt
+++ b/world/map/npc/009-4/torches.txt
@@ -1,5 +1,5 @@
 //# see detailed description at orum.txt
-function|script|GetTorchColor|,
+function|script|GetTorchColor
 {
     if (@Torch < 0 || @Torch > 2) goto L_Error;
 
@@ -13,7 +13,7 @@ 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;
@@ -31,7 +31,7 @@ L_Error2:
     close;
 }
 
-function|script|GetTorchIntensity|,
+function|script|GetTorchIntensity
 {
     if (@Torch < 0 || @Torch > 2) goto L_Error;
 
@@ -45,7 +45,7 @@ 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;
@@ -63,7 +63,7 @@ L_Error2:
     close;
 }
 
-function|script|DoneWithTorches|,
+function|script|DoneWithTorches
 {
     if (OrumQuest < 11 && OrumQuest >= 8)
         goto L_Return;
@@ -87,7 +87,7 @@ L_Return:
 }
 
 // To make sure in range of torches
-function|script|InRangeTorch1|,
+function|script|InRangeTorch1
 {
     if (isin("009-4.gat",67,20,69,25))
         goto L_Return;
@@ -97,7 +97,7 @@ function|script|InRangeTorch1|,
 L_Return:
     return;
 }
-function|script|InRangeTorch2|,
+function|script|InRangeTorch2
 {
     if (isin("009-4.gat",65,41,69,46))
         goto L_Return;
@@ -107,7 +107,7 @@ function|script|InRangeTorch2|,
 L_Return:
     return;
 }
-function|script|InRangeTorch3|,
+function|script|InRangeTorch3
 {
     if (isin("009-4.gat",33,84,37,88))
         goto L_Return;
@@ -118,7 +118,7 @@ L_Return:
     return;
 }
 
-function|script|TorchLoop|,
+function|script|TorchLoop
 {
     // Variables used here:
     // @Torch - pass before calling
@@ -281,7 +281,7 @@ L_Failed:
 }
 
 // First Torch
-009-4.gat,68,21,0|script|Torch#1|400,
+009-4.gat,68,21,0|script|Torch#1|400
 {
     callfunc "InRangeTorch1";
     callfunc "DoneWithTorches";
@@ -293,7 +293,7 @@ L_Failed:
 }
 
 // Second Torch
-009-4.gat,67,42,0|script|Torch#2|400,
+009-4.gat,67,42,0|script|Torch#2|400
 {
     callfunc "InRangeTorch2";
     callfunc "DoneWithTorches";
@@ -305,7 +305,7 @@ L_Failed:
 }
 
 // Third Torch
-009-4.gat,33,86,0|script|Torch#3|400,
+009-4.gat,33,86,0|script|Torch#3|400
 {
     callfunc "InRangeTorch3";
     callfunc "DoneWithTorches";
diff --git a/world/map/npc/009-4/waric.txt b/world/map/npc/009-4/waric.txt
index ca28d2f7..b83a14cc 100644
--- a/world/map/npc/009-4/waric.txt
+++ b/world/map/npc/009-4/waric.txt
@@ -1,6 +1,6 @@
 //# see detailed description at orum.txt
 
-009-4.gat,99,33,0|script|#WizardTrap|127,2,1,
+009-4.gat,99,33,0|script|#WizardTrap|127,2,1
 {
     set @gender$, "They're";
     if (Sex == 0)
@@ -19,7 +19,7 @@
     close;
 }
 
-009-4.gat,120,43,0|script|Orum#trap|158,
+009-4.gat,120,43,0|script|Orum#trap|158
 {
     mes "[Orum]";
     mes "\"I told you to forget about this place but you did not heed my advice!\"";
@@ -28,7 +28,7 @@
     close;
 }
 
-009-4.gat,118,42,0|script|Waric#trap|153,
+009-4.gat,118,42,0|script|Waric#trap|153
 {
     set @EXP_LEARNED_ALOT, 10000;
     if (OrumQuest >= 13)