NPCs on 042-* fixed

6 files changed, 19 insertions, 19 deletions

diff --git a/world/map/npc/042-1/hasan.txt b/world/map/npc/042-1/hasan.txt
index 39e549cd..734e0df0 100644
--- a/world/map/npc/042-1/hasan.txt
+++ b/world/map/npc/042-1/hasan.txt
@@ -6,7 +6,7 @@
 // They respond by asking play for help
 // Hasan tells them to but out of it.
 
-042-1.gat,104,49,0|script|Scared Man|160,
+042-1.gat,104,49,0|script|Scared Man|160
 {
     setarray @npc_loc, 104, 49, 4;
     callfunc "PCtoNPCRange";
@@ -24,7 +24,7 @@ L_TutDone:
 L_End:
     end;
 }
-042-1.gat,102,49,0|script|Hasan|189,2,2,
+042-1.gat,102,49,0|script|Hasan|189,2,2
 {
     setarray @npc_loc, 102, 49, 4;
     callfunc "PCtoNPCRange";
@@ -172,7 +172,7 @@ OnTouch:
         end;
     goto L_Main;
 }
-042-1.gat,0,0,0|script|#ScorpionTrigger|35,
+042-1.gat,0,0,0|script|#ScorpionTrigger|35
 {
     end;
 
diff --git a/world/map/npc/042-1/kaan.txt b/world/map/npc/042-1/kaan.txt
index 1444cd67..92067c41 100644
--- a/world/map/npc/042-1/kaan.txt
+++ b/world/map/npc/042-1/kaan.txt
@@ -1,7 +1,7 @@
 // This file is part of the Tutorial
 // Author: Jenalya
 
-042-1.gat,109,87,0|script|Kaan|160,
+042-1.gat,109,87,0|script|Kaan|160
 {
     setarray @npc_loc, 109, 87, 4;
     callfunc "PCtoNPCRange";
diff --git a/world/map/npc/042-1/liana.txt b/world/map/npc/042-1/liana.txt
index f1e5a4f9..c6df63a9 100644
--- a/world/map/npc/042-1/liana.txt
+++ b/world/map/npc/042-1/liana.txt
@@ -1,6 +1,6 @@
 // Talk NPCs to help make trek interesting between Tutorial and Bazaar.
 
-042-1.gat,82,96,0|script|Liana|205,
+042-1.gat,82,96,0|script|Liana|205
 {
     setarray @npc_loc, 82, 96, 4;
     callfunc "PCtoNPCRange";
diff --git a/world/map/npc/042-1/tutorial.txt b/world/map/npc/042-1/tutorial.txt
index d51c30be..bed98436 100644
--- a/world/map/npc/042-1/tutorial.txt
+++ b/world/map/npc/042-1/tutorial.txt
@@ -1,7 +1,7 @@
 // This file is part of the Tutorial
 // Author: Jenalya
 // if you enter the tutorial area from outside, it is set to be already done
--|script|#TutorialConfig|-1,
+-|script|#TutorialConfig|-1
 {
     end;
 
@@ -12,20 +12,20 @@ OnInit:
     set $@SpokeToKaan, (1 << 31);
     end;
 }
-function|script|TutorialState|,
+function|script|TutorialState
 {
     callfunc "ClearVariables";
     set @tutorial, ((STARTAREA & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
     set @kaan_talked, (STARTAREA & $@SpokeToKaan);
     return;
 }
-function|script|SetTutorialMask|,
+function|script|SetTutorialMask
 {
     set STARTAREA, (STARTAREA & ~(NIBBLE_0_MASK) | (@tutorial_tmp << NIBBLE_0_SHIFT));
     set @tutorial_tmp, 0;
     return;
 }
-042-2.gat,21,26,0|script|TutDebug|154,
+042-2.gat,21,26,0|script|TutDebug|154
 {
     mes "[TutDebug]";
     mes "Reset?";
diff --git a/world/map/npc/042-1/valon.txt b/world/map/npc/042-1/valon.txt
index f4296af9..b50207a3 100644
--- a/world/map/npc/042-1/valon.txt
+++ b/world/map/npc/042-1/valon.txt
@@ -1,6 +1,6 @@
 // This file is part of the Tutorial
 // Author: Jenalya, Wushin
--|script|#ValonConfig|-1,
+-|script|#ValonConfig|-1
 {
     end;
 
@@ -10,7 +10,7 @@ OnInit:
     setarray $@ValonMobCnt, 10,5,3,1;
     end;
 }
-function|script|ValonState|,
+function|script|ValonState
 {
     set @valon_state, ((STARTAREA & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT);
     set @valon_mob, 0;
@@ -19,18 +19,18 @@ function|script|ValonState|,
     set @valon_count, ((STARTAREA & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT);
     return;
 }
-function|script|setValonMask|,
+function|script|setValonMask
 {
     set STARTAREA, (STARTAREA & ~(NIBBLE_1_MASK) | (@valon_tmp << NIBBLE_1_SHIFT));
     set @valon_tmp, 0;
     return;
 }
-function|script|ResetValonCntMask|,
+function|script|ResetValonCntMask
 {
     set STARTAREA, (STARTAREA & ~(NIBBLE_2_MASK) | (0 << NIBBLE_2_SHIFT));
     return;
 }
-function|script|AddValonCntMask|,
+function|script|AddValonCntMask
 {
     set @valon_tmp, (@valon_count + 1);
     if (@valon_tmp > $@ValonMobCnt[@valon_mob])
@@ -40,14 +40,14 @@ function|script|AddValonCntMask|,
     callfunc "ValonProgress";
     return;
 }
-function|script|ValonProgress|,
+function|script|ValonProgress
 {
     callfunc "ValonState";
     if ((@valon_state > 1) && (@valon_state < 6))
         message strcharinfo(0), $@ValonMobName$[@valon_mob] + ": " + @valon_count + "/" + $@ValonMobCnt[@valon_mob];
     return;
 }
-042-1.gat,51,111,0|script|ValonDebug|156,
+042-1.gat,51,111,0|script|ValonDebug|156
 {
     mes "[Valon Debug]";
     mes "Reset?";
@@ -69,7 +69,7 @@ OnInit:
         disablenpc "ValonDebug";
     end;
 }
-042-1.gat,48,111,0|script|Valon|156,
+042-1.gat,48,111,0|script|Valon|156
 {
     setarray @npc_loc, 48, 111, 4;
     callfunc "PCtoNPCRange";
diff --git a/world/map/npc/042-1/zegas.txt b/world/map/npc/042-1/zegas.txt
index 36443a91..4a153ebe 100644
--- a/world/map/npc/042-1/zegas.txt
+++ b/world/map/npc/042-1/zegas.txt
@@ -1,7 +1,7 @@
 // Barrels
 // Author: Wushin
 // Npc
-042-1.gat,97,75,0|script|Zegas|165,
+042-1.gat,97,75,0|script|Zegas|165
 {
     setarray @npc_loc, 97, 75, 2;
     callfunc "PCtoNPCRange";
@@ -78,7 +78,7 @@ L_Thanks:
 L_Close:
     close;
 }
-042-1.gat,100,75,0|script|ZegasDebug|165,
+042-1.gat,100,75,0|script|ZegasDebug|165
 {
     mes "[Zegas Debug]";
     mes "Reset ?";