From 5ad572d82984ca863fc1ff2b2c259628daa4afea Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Wed, 5 Nov 2014 11:07:38 -0600
Subject: NPCS on 001-* fixed

---
 world/map/npc/001-1/banker.txt         | 2 +-
 world/map/npc/001-1/barber.txt         | 2 +-
 world/map/npc/001-1/bard.txt           | 2 +-
 world/map/npc/001-1/bernard.txt        | 2 +-
 world/map/npc/001-1/bleacher.txt       | 2 +-
 world/map/npc/001-1/children.txt       | 2 +-
 world/map/npc/001-1/constable.txt      | 2 +-
 world/map/npc/001-1/dock.txt           | 2 +-
 world/map/npc/001-1/elanore.txt        | 8 +++-----
 world/map/npc/001-1/entertainer.txt    | 2 +-
 world/map/npc/001-1/gossip.txt         | 2 +-
 world/map/npc/001-1/guards.txt         | 4 ++--
 world/map/npc/001-1/guide.txt          | 2 +-
 world/map/npc/001-1/luca.txt           | 2 +-
 world/map/npc/001-1/mikhail.txt        | 2 +-
 world/map/npc/001-1/monster_guide.txt  | 2 +-
 world/map/npc/001-1/npcs.txt           | 4 ++--
 world/map/npc/001-1/rewards_master.txt | 2 +-
 world/map/npc/001-1/sandra.txt         | 2 +-
 world/map/npc/001-1/sarah.txt          | 2 +-
 world/map/npc/001-1/soul-menhir.txt    | 2 +-
 world/map/npc/001-1/trader.txt         | 2 +-
 world/map/npc/001-1/traveler.txt       | 2 +-
 world/map/npc/001-1/vincent.txt        | 2 +-
 24 files changed, 28 insertions(+), 30 deletions(-)

(limited to 'world/map/npc/001-1')

diff --git a/world/map/npc/001-1/banker.txt b/world/map/npc/001-1/banker.txt
index ddd1d4e3..cd5e84df 100644
--- a/world/map/npc/001-1/banker.txt
+++ b/world/map/npc/001-1/banker.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,58,50,0|script|Tybalt|107,
+001-1.gat,58,50,0|script|Tybalt|107
 {
     callfunc "ClearVariables";
     set @npcname$, "Tybalt";
diff --git a/world/map/npc/001-1/barber.txt b/world/map/npc/001-1/barber.txt
index 53d60778..f1e0262a 100644
--- a/world/map/npc/001-1/barber.txt
+++ b/world/map/npc/001-1/barber.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,52,36,0|script|Nicolas|100,
+001-1.gat,52,36,0|script|Nicolas|100
 {
     mes "[Nicolas the Barber]";
     mes "\"Do you need a barber?\"";
diff --git a/world/map/npc/001-1/bard.txt b/world/map/npc/001-1/bard.txt
index d4c3b8f7..6b0d7d77 100644
--- a/world/map/npc/001-1/bard.txt
+++ b/world/map/npc/001-1/bard.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,40,73,0|script|Bard|152,
+001-1.gat,40,73,0|script|Bard|152
 {
     setarray @songs$, "\"There once was a bard, who had it hard, because a man in dark green, was very mean.\"",
         "\"At Hurnscald inn, there was a person of fairest skin, declining wedding bands from quite a many hands.\"",
diff --git a/world/map/npc/001-1/bernard.txt b/world/map/npc/001-1/bernard.txt
index a5783e1f..9084f020 100644
--- a/world/map/npc/001-1/bernard.txt
+++ b/world/map/npc/001-1/bernard.txt
@@ -1,6 +1,6 @@
 // Variables used: nibble 0 of QUEST_SouthTulimshar
 
-001-1.gat,35,43,0|script|Bernard|117,
+001-1.gat,35,43,0|script|Bernard|117
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/001-1/bleacher.txt b/world/map/npc/001-1/bleacher.txt
index baed6f2e..f6fd399c 100644
--- a/world/map/npc/001-1/bleacher.txt
+++ b/world/map/npc/001-1/bleacher.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,29,50,0|script|Candide|156,
+001-1.gat,29,50,0|script|Candide|156
 {
     mes "[Candide]";
     mes "\"I've figured out how that volcanic ash bleaches cloth.";
diff --git a/world/map/npc/001-1/children.txt b/world/map/npc/001-1/children.txt
index 15ead65e..7213370c 100644
--- a/world/map/npc/001-1/children.txt
+++ b/world/map/npc/001-1/children.txt
@@ -1,6 +1,6 @@
 // Aisha
 
-001-1.gat,95,29,0|script|Aisha|108,
+001-1.gat,95,29,0|script|Aisha|108
 {
     set @TEMP,rand(10);
     if(@TEMP == 1) goto L_1;
diff --git a/world/map/npc/001-1/constable.txt b/world/map/npc/001-1/constable.txt
index e5de9b92..0b167873 100644
--- a/world/map/npc/001-1/constable.txt
+++ b/world/map/npc/001-1/constable.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,37,35,0|script|Constable Perry Graf|150,
+001-1.gat,37,35,0|script|Constable Perry Graf|150
 {
 //    set @npcname$, "Constable Perry Graf";
     set @canSkip, 1;
diff --git a/world/map/npc/001-1/dock.txt b/world/map/npc/001-1/dock.txt
index f0cb0a77..4677097d 100644
--- a/world/map/npc/001-1/dock.txt
+++ b/world/map/npc/001-1/dock.txt
@@ -1,6 +1,6 @@
 // Ferry Sign
 // Author: Wushin
-001-1.gat,48,71,0|script|Ferry Schedule#1|396,
+001-1.gat,48,71,0|script|Ferry Schedule#1|396
 {
     callfunc "FerryManifest";
     end;
diff --git a/world/map/npc/001-1/elanore.txt b/world/map/npc/001-1/elanore.txt
index 94631d2f..ce330f8a 100644
--- a/world/map/npc/001-1/elanore.txt
+++ b/world/map/npc/001-1/elanore.txt
@@ -1,6 +1,6 @@
 //
 
-function|script|ElanoreFix|,
+function|script|ElanoreFix
 {
     set @Q_MASK, NIBBLE_1_MASK;
     set @Q_SHIFT, NIBBLE_1_SHIFT;
@@ -17,7 +17,7 @@ function|script|ElanoreFix|,
     return;
 }
 
-001-1.gat,58,68,0|script|Elanore#_M|108,
+001-1.gat,58,68,0|script|Elanore#_M|108
 {
     set @has_magic, getskilllv(SKILL_MAGIC);
 
@@ -614,8 +614,6 @@ L_Close:
     close;
 
 S_update_var:
-    set QUEST_MAGIC2,
-        (QUEST_MAGIC2 & ~(@Q_MASK)
-        | (@Q_status << @Q_SHIFT));
+    set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(@Q_MASK) | (@Q_status << @Q_SHIFT));
     return;
 }
diff --git a/world/map/npc/001-1/entertainer.txt b/world/map/npc/001-1/entertainer.txt
index 2cb68e35..3bc2e141 100644
--- a/world/map/npc/001-1/entertainer.txt
+++ b/world/map/npc/001-1/entertainer.txt
@@ -1,6 +1,6 @@
 // Emote NPC allows for players to learn the emote skill
 
-001-1.gat,30,43,0|script|Entertainer|165,
+001-1.gat,30,43,0|script|Entertainer|165
 {
     mes "[Entertainer]";
     mes "\"Yes how can I help you?\"";
diff --git a/world/map/npc/001-1/gossip.txt b/world/map/npc/001-1/gossip.txt
index d535e22a..28d4455d 100644
--- a/world/map/npc/001-1/gossip.txt
+++ b/world/map/npc/001-1/gossip.txt
@@ -1,6 +1,6 @@
 // NPC to provide hints on progression of linear quest chain in Tulimshar
 
-001-1.gat,49,31,0|script|Gladys|154,
+001-1.gat,49,31,0|script|Gladys|154
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/001-1/guards.txt b/world/map/npc/001-1/guards.txt
index 9be261d0..c481e098 100644
--- a/world/map/npc/001-1/guards.txt
+++ b/world/map/npc/001-1/guards.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,48,79,0|script|Ekinu|104,
+001-1.gat,48,79,0|script|Ekinu|104
 {
     mes "[Ekinu the Town Guard]";
     mes "\"What a disaster... I can't believe that we managed to rebuild the town so quickly.\"";
@@ -75,7 +75,7 @@ L_Close:
     close;
 }
 
-001-1.gat,40,79,0|script|Ryan|104,
+001-1.gat,40,79,0|script|Ryan|104
 {
     if (getskilllv(SKILL_MAGIC)) goto L_message;
 
diff --git a/world/map/npc/001-1/guide.txt b/world/map/npc/001-1/guide.txt
index 07dd6bc3..69a0231d 100644
--- a/world/map/npc/001-1/guide.txt
+++ b/world/map/npc/001-1/guide.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,32,27,0|script|Ian|102,
+001-1.gat,32,27,0|script|Ian|102
 {
     // This line is only relevant for players, who started before the timestamp was introduced.
     // Set the graduation cap flag at the right position.
diff --git a/world/map/npc/001-1/luca.txt b/world/map/npc/001-1/luca.txt
index fb851b77..af1b1487 100644
--- a/world/map/npc/001-1/luca.txt
+++ b/world/map/npc/001-1/luca.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,108,55,0|script|Luca|102,
+001-1.gat,108,55,0|script|Luca|102
 {
     set @EXP_BRAWLING, 2000;
 
diff --git a/world/map/npc/001-1/mikhail.txt b/world/map/npc/001-1/mikhail.txt
index 9f61dd6c..bc8406fc 100644
--- a/world/map/npc/001-1/mikhail.txt
+++ b/world/map/npc/001-1/mikhail.txt
@@ -1,6 +1,6 @@
 // Variables used: nibble 0 of QUEST_SouthTulimshar
 
-001-1.gat,54,43,0|script|Mikhail|120,
+001-1.gat,54,43,0|script|Mikhail|120
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/001-1/monster_guide.txt b/world/map/npc/001-1/monster_guide.txt
index a46dfc28..6efa1bcb 100644
--- a/world/map/npc/001-1/monster_guide.txt
+++ b/world/map/npc/001-1/monster_guide.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,49,51,0|script|Aidan|102,
+001-1.gat,49,51,0|script|Aidan|102
 {
     if (MPQUEST == 0)
         goto L_Register;
diff --git a/world/map/npc/001-1/npcs.txt b/world/map/npc/001-1/npcs.txt
index 9fa58b97..5d59ddd6 100644
--- a/world/map/npc/001-1/npcs.txt
+++ b/world/map/npc/001-1/npcs.txt
@@ -1,6 +1,6 @@
 // Talk NPCs to help make trek interesting around the Bazaar.
 
-001-1.gat,46,26,0|script|Yalina|209,
+001-1.gat,46,26,0|script|Yalina|209
 {
     set @npcname$, "Yalina";
 
@@ -14,7 +14,7 @@
     close;
 }
 
-001-1.gat,84,72,0|script|Cyndala|210,
+001-1.gat,84,72,0|script|Cyndala|210
 {
     set @npcname$, "Cyndala";
 
diff --git a/world/map/npc/001-1/rewards_master.txt b/world/map/npc/001-1/rewards_master.txt
index 1ae6b168..995704b1 100644
--- a/world/map/npc/001-1/rewards_master.txt
+++ b/world/map/npc/001-1/rewards_master.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,50,51,0|script|Ishi|106,
+001-1.gat,50,51,0|script|Ishi|106
 {
     if (MPQUEST == 0) goto L_Register;
     if (tvis == 0) set tvis, 1;
diff --git a/world/map/npc/001-1/sandra.txt b/world/map/npc/001-1/sandra.txt
index ae394a3e..13ae156b 100644
--- a/world/map/npc/001-1/sandra.txt
+++ b/world/map/npc/001-1/sandra.txt
@@ -1,6 +1,6 @@
 // Variables used: nibble 3 of QUEST_SouthTulimshar
 
-001-1.gat,110,71,0|script|Sandra|114,
+001-1.gat,110,71,0|script|Sandra|114
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/001-1/sarah.txt b/world/map/npc/001-1/sarah.txt
index b218ac4b..a355684a 100644
--- a/world/map/npc/001-1/sarah.txt
+++ b/world/map/npc/001-1/sarah.txt
@@ -1,6 +1,6 @@
 // Variables used: nibble 1 of QUEST_SouthTulimshar
 
-001-1.gat,137,78,0|script|Sarah|106,
+001-1.gat,137,78,0|script|Sarah|106
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/001-1/soul-menhir.txt b/world/map/npc/001-1/soul-menhir.txt
index be22cb89..792f256e 100644
--- a/world/map/npc/001-1/soul-menhir.txt
+++ b/world/map/npc/001-1/soul-menhir.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,38,69,0|script|Soul Menhir#tulimshar|345,
+001-1.gat,38,69,0|script|Soul Menhir#tulimshar|345
 {
     callfunc "ClearVariables";
     set @map$, "001-1.gat";
diff --git a/world/map/npc/001-1/trader.txt b/world/map/npc/001-1/trader.txt
index 493ab3fa..c4c9fd12 100644
--- a/world/map/npc/001-1/trader.txt
+++ b/world/map/npc/001-1/trader.txt
@@ -3,7 +3,7 @@
 // Updated by: TheKandiman
 // Reviewed by: Wombat
 
-001-1.gat,57,31,0|script|Trader|115,
+001-1.gat,57,31,0|script|Trader|115
 {
     set @Ironprice, 1000;
     set @Sulphurprice, 1200;
diff --git a/world/map/npc/001-1/traveler.txt b/world/map/npc/001-1/traveler.txt
index 554e9c5f..e91da7c0 100644
--- a/world/map/npc/001-1/traveler.txt
+++ b/world/map/npc/001-1/traveler.txt
@@ -2,7 +2,7 @@
 // Author: Wombat, wushin
 // cost depending on level and adapted to new scripting guidelines: Jenalya
 
-001-1.gat,39,67,0|script|Nina the Traveler|103,
+001-1.gat,39,67,0|script|Nina the Traveler|103
 {
     set @NpcName$, "Nina";
     set @NpcTravelBit, $@tulimshar_bit;
diff --git a/world/map/npc/001-1/vincent.txt b/world/map/npc/001-1/vincent.txt
index 7f46ac44..9f342d94 100644
--- a/world/map/npc/001-1/vincent.txt
+++ b/world/map/npc/001-1/vincent.txt
@@ -1,6 +1,6 @@
 // Variables used: nibble 2 of QUEST_SouthTulimshar
 
-001-1.gat,135,42,0|script|Vincent|113,
+001-1.gat,135,42,0|script|Vincent|113
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
-- 
cgit v1.2.3-60-g2f50