NPCs on 021-* fixed

9 files changed, 27 insertions, 27 deletions

diff --git a/world/map/npc/021-2/barber.txt b/world/map/npc/021-2/barber.txt
index a4075a36..d057786d 100644
--- a/world/map/npc/021-2/barber.txt
+++ b/world/map/npc/021-2/barber.txt
@@ -1,5 +1,5 @@
 // A barber (later we can make it so certain styles need to come from him, for a price)
-021-2.gat,72,101,0|script|Issay|156,
+021-2.gat,72,101,0|script|Issay|156
 {
     mes "[Issay the Barber]";
     mes "\"Do you need a change of style?\"";
diff --git a/world/map/npc/021-2/government_building.txt b/world/map/npc/021-2/government_building.txt
index 9aea5916..441b77a0 100644
--- a/world/map/npc/021-2/government_building.txt
+++ b/world/map/npc/021-2/government_building.txt
@@ -1,7 +1,7 @@
 // The government builing in the south west
 
 // A clerk
-021-2.gat,27,17,0|script|Estard|107,
+021-2.gat,27,17,0|script|Estard|107
 {
     mes "[Estard]";
     mes "\"Hello what can I do for you?\"";
@@ -135,7 +135,7 @@ S_give_rings:
     return;
 }
 
-021-2.gat,36,17,0|script|Tathin|107,
+021-2.gat,36,17,0|script|Tathin|107
 {
     mes "[Tathin]";
     mes "\"Hello what Can I do for you?\"";
@@ -172,7 +172,7 @@ L_Close:
 }
 
 // Guard
-021-2.gat,20,19,0|script|Guard#govt_in|123,1,1,
+021-2.gat,20,19,0|script|Guard#govt_in|123,1,1
 {
     mes "[Guard]";
     mes "\"You can't come back here.\"";
diff --git a/world/map/npc/021-2/heathin.txt b/world/map/npc/021-2/heathin.txt
index 5f9f26c7..022c91ab 100644
--- a/world/map/npc/021-2/heathin.txt
+++ b/world/map/npc/021-2/heathin.txt
@@ -1,6 +1,6 @@
 //Items for NPC are incomplete. Makes "simple ring" which can be crafted into a useful ring by Inya and terranite armor.
 
-021-2.gat,70,129,0|script|Heathin|147,
+021-2.gat,70,129,0|script|Heathin|147
 {
     set @TARROW_REQ_TERRA_ORE, 1;
     set @TARROW_REQ_COAL, 5;
diff --git a/world/map/npc/021-2/jhedia.txt b/world/map/npc/021-2/jhedia.txt
index baf8ee2e..cc2f9165 100644
--- a/world/map/npc/021-2/jhedia.txt
+++ b/world/map/npc/021-2/jhedia.txt
@@ -1,6 +1,6 @@
 // Ingot maker takes iron ore, gives ingots for future crafting purposes.
 
-021-2.gat,70,124,0|script|Jhedia|160,
+021-2.gat,70,124,0|script|Jhedia|160
 {
     set @Cost_Per_Ingot, 1000;
     set @Iron_Ore_Per, 5;
diff --git a/world/map/npc/021-2/kps.txt b/world/map/npc/021-2/kps.txt
index ccfd1d8d..fb6ce235 100644
--- a/world/map/npc/021-2/kps.txt
+++ b/world/map/npc/021-2/kps.txt
@@ -4,7 +4,7 @@
 // reuse the 4 bits
 // To Mark 4 Different NPCs.
 // setarray $@kps_npc_bits, $@knowYanisNT, $@knowLatoyNT, $@knowWeellosNT, $@knowCasinoNT;
-021-2.gat,27,124,0|script|KPS Manager|191,
+021-2.gat,27,124,0|script|KPS Manager|191
 {
     set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
     set @run, ((QUEST_NorthTulimshar & TWOBIT_8_MASK) >> TWOBIT_8_SHIFT);
@@ -84,7 +84,7 @@ L_RandJob:
     goto L_JobInfo;
 
 L_JobInfo:
-    mes "\"We have a delivery for : " + $@random_quests$[@rand_quest] + "\"";
+    mes "\"We have a delivery for:* " + $@random_quests$[@rand_quest] + "\"";
     menu
         "Take It.", L_StartRun,
         "Anything Else?", L_RandJob,
@@ -99,7 +99,7 @@ L_StartRun:
     goto L_Close;
 
 L_RunStarted:
-    mes "Deliver this package to : " + $@random_quests$[@run] + "\"";
+    mes "Deliver this package to:* " + $@random_quests$[@run] + "\"";
     goto L_Close;
 
 L_RunComplete:
@@ -152,12 +152,12 @@ L_NoPackages:
 L_Close:
     close;
 }
-function|script|SetKylianRun|,
+function|script|SetKylianRun
 {
     set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(TWOBIT_8_MASK)) | (@run << TWOBIT_8_SHIFT);
     return;
 }
-function|script|SetKylianRunCnt|,
+function|script|SetKylianRunCnt
 {
     set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(TWOBIT_9_MASK)) | (@run_cnt << TWOBIT_9_SHIFT);
     return;
diff --git a/world/map/npc/021-2/kylian.txt b/world/map/npc/021-2/kylian.txt
index 5109314d..5a162242 100644
--- a/world/map/npc/021-2/kylian.txt
+++ b/world/map/npc/021-2/kylian.txt
@@ -39,7 +39,7 @@
 // @KylianNTSightSeeing
 // @KylianNTCasino
 
--|script|#businessmanNTconfig|-1,
+-|script|#businessmanNTconfig|-1
 {
     end;
 
@@ -57,14 +57,14 @@ OnInit:
     set $@delivery_exp_mod, 10;
     end;
 }
-021-2.gat,25,67,0|script|#KylianOut|32767,1,1,
+021-2.gat,25,67,0|script|#KylianOut|32767,1,1
 {
     set @KylianNTLicense, 0;
     set @KylianNTSightSeeing, 0;
     set @KylianNTCasino, 0;
     end;
 }
-021-2.gat,89,55,0|script|Kylian|193,
+021-2.gat,89,55,0|script|Kylian|193
 {
     set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
 
@@ -353,12 +353,12 @@ L_Close:
     // those are used to check if the player logged out in the meanwhile
     close;
 }
-function|script|SetKylianQuest|,
+function|script|SetKylianQuest
 {
     set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(NIBBLE_5_MASK)) | (@state << NIBBLE_5_SHIFT);
     return;
 }
-function|script|KylianDebug|,
+function|script|KylianDebug
 {
     set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
     callfunc "ClearVarTMW_Quest";
@@ -404,7 +404,7 @@ L_MoreWorkTimer:
 L_Close:
     close;
 }
-021-2.gat,87,55,0|script|KylianDebug#1|193,
+021-2.gat,87,55,0|script|KylianDebug#1|193
 {
     callfunc "KylianDebug";
     end;
@@ -413,7 +413,7 @@ OnInit:
         disablenpc "KylianDebug#1";
     end;
 }
-021-2.gat,29,124,0|script|KylianDebug#2|193,
+021-2.gat,29,124,0|script|KylianDebug#2|193
 {
     callfunc "KylianDebug";
     end;
diff --git a/world/map/npc/021-2/manakins.txt b/world/map/npc/021-2/manakins.txt
index 2df6f6dc..85f757a5 100644
--- a/world/map/npc/021-2/manakins.txt
+++ b/world/map/npc/021-2/manakins.txt
@@ -1,19 +1,19 @@
 // Display Manakins. 
 
 // Forge
-021-2.gat,76,131,0|script|Terranite Armor#Female|401,
+021-2.gat,76,131,0|script|Terranite Armor#Female|401
 {
     mes "Terranite Armor complete set, made to order, inquire with Heathin";
     close;
 }
 
-021-2.gat,81,131,0|script|Terranite Armor#Male|402,
+021-2.gat,81,131,0|script|Terranite Armor#Male|402
 {
     mes "Terranite Armor complete set, made to order, inquire with Heathin";
     close;
 }
 
-021-2.gat,81,136,0|script|Terranite|403,
+021-2.gat,81,136,0|script|Terranite|403
 {
     mes "Ahhh! A Terranite! Wait it appears to just be a display model.";
     close;
@@ -21,25 +21,25 @@
 
 // Museum
 
-021-2.gat,71,161,0|script|Talponian#Female|404,
+021-2.gat,71,161,0|script|Talponian#Female|404
 {
     mes "A Female Talponian.";
     close;
 }
 
-021-2.gat,77,161,0|script|Talponian#Male|405,
+021-2.gat,77,161,0|script|Talponian#Male|405
 {
     mes "A Male Talponian.";
     close;
 }
 
-021-2.gat,83,161,0|script|Gispaan#Female|406,
+021-2.gat,83,161,0|script|Gispaan#Female|406
 {
     mes "A Female Gispaan.";
     close;
 }
 
-021-2.gat,89,161,0|script|Gispaan#Male|407,
+021-2.gat,89,161,0|script|Gispaan#Male|407
 {
     mes "A Male Gispaan.";
     close;
diff --git a/world/map/npc/021-2/rebecca.txt b/world/map/npc/021-2/rebecca.txt
index 90ad16e9..37df8d65 100644
--- a/world/map/npc/021-2/rebecca.txt
+++ b/world/map/npc/021-2/rebecca.txt
@@ -1,6 +1,6 @@
 //
 
-021-2.gat,26,54,0|script|Rebecca|118,
+021-2.gat,26,54,0|script|Rebecca|118
 {
     set @npcname$, "Rebecca the Inn Keeper";
     set @cost, 100;
diff --git a/world/map/npc/021-2/yanis.txt b/world/map/npc/021-2/yanis.txt
index 86c40fad..0cc28962 100644
--- a/world/map/npc/021-2/yanis.txt
+++ b/world/map/npc/021-2/yanis.txt
@@ -1,7 +1,7 @@
 // Government official taking care about shop licenses
 // involved in quest given by 021-1/imec.txt and 021-2/kylian.txt
 
-021-2.gat,33,17,0|script|Yanis|107,
+021-2.gat,33,17,0|script|Yanis|107
 {
     set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowYanisNT;
     set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);