22 files changed, 34 insertions, 34 deletions
diff --git a/world/map/npc/009-2/airlia.txt b/world/map/npc/009-2/airlia.txt
index df430683..c7e52273 100644
--- a/world/map/npc/009-2/airlia.txt
+++ b/world/map/npc/009-2/airlia.txt
@@ -6,7 +6,7 @@
 //   * Airlia quest = 2 unlocks other options, perhaps with future Warrior Guild prospects (this is long term)
 
 
-009-2.gat,123,71,0|script|Airlia|108
+009-2,123,71,0|script|Airlia|108
 {
     // Subquest 1a: Caretaker's daughter (initial, once)
     set @LETTER_REWARD_GOLD_INITIAL, 1000;
diff --git a/world/map/npc/009-2/alan.txt b/world/map/npc/009-2/alan.txt
index b02b1904..12f5cde8 100644
--- a/world/map/npc/009-2/alan.txt
+++ b/world/map/npc/009-2/alan.txt
@@ -8,7 +8,7 @@
 //#################################################################################
 
 // Archer Shop Master
-009-2.gat,99,23,0|script|Alan|125
+009-2,99,23,0|script|Alan|125
 {
     callfunc "ClearVariables";
 
diff --git a/world/map/npc/009-2/bernard.txt b/world/map/npc/009-2/bernard.txt
index 307e7591..f0c03fbc 100644
--- a/world/map/npc/009-2/bernard.txt
+++ b/world/map/npc/009-2/bernard.txt
@@ -1,6 +1,6 @@
 // Variables used: nibble 0 of QUEST_SouthTulimshar
 
-009-2.gat,67,79,0|script|Bernard|117
+009-2,67,79,0|script|Bernard|117
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/009-2/doctor.txt b/world/map/npc/009-2/doctor.txt
index 8810e4e3..9137d8d4 100644
--- a/world/map/npc/009-2/doctor.txt
+++ b/world/map/npc/009-2/doctor.txt
@@ -1,6 +1,6 @@
 // Doctor
 
-009-2.gat,148,25,0|script|Doctor|107
+009-2,148,25,0|script|Doctor|107
 {
     callfunc "ClearVariables";
 
diff --git a/world/map/npc/009-2/drunks.txt b/world/map/npc/009-2/drunks.txt
index c5585d59..608f7db6 100644
--- a/world/map/npc/009-2/drunks.txt
+++ b/world/map/npc/009-2/drunks.txt
@@ -1,6 +1,6 @@
 //Left drinking contest guy
 
-009-2.gat,65,55,0|script|Drinker#1|121
+009-2,65,55,0|script|Drinker#1|121
 {
     mes "[Binge Drinker]";
     mes "\"Ha! I'll drink muuuch mo.. more than you! Im not ooone biiit dr...dr..unk!\"";
@@ -9,7 +9,7 @@
 
 //Right drinking contest guy
 
-009-2.gat,68,55,0|script|Drinker#2|121
+009-2,68,55,0|script|Drinker#2|121
 {
     mes "[Binge Drinker]";
     mes "\"I can still drink more! Better give up you... you... teelotaler! MORE BEER MELINDA!\"";
diff --git a/world/map/npc/009-2/entertainer.txt b/world/map/npc/009-2/entertainer.txt
index 1b2b9622..57119894 100644
--- a/world/map/npc/009-2/entertainer.txt
+++ b/world/map/npc/009-2/entertainer.txt
@@ -1,6 +1,6 @@
 // Emote NPC allows for players to learn the emote skill
 
-009-2.gat,61,49,0|script|Entertainer|165
+009-2,61,49,0|script|Entertainer|165
 {
     mes "[Entertainer]";
     mes "\"Yes how can I help you?\"";
diff --git a/world/map/npc/009-2/inspector.txt b/world/map/npc/009-2/inspector.txt
index 476b4596..1effd16b 100644
--- a/world/map/npc/009-2/inspector.txt
+++ b/world/map/npc/009-2/inspector.txt
@@ -1,6 +1,6 @@
 //
 
-009-2.gat,24,99,0|script|Inspector#Hurnscald|150
+009-2,24,99,0|script|Inspector#Hurnscald|150
 {
     callfunc "ClearVariables";
 
diff --git a/world/map/npc/009-2/kfahr.txt b/world/map/npc/009-2/kfahr.txt
index ef5cb001..49e0c449 100644
--- a/world/map/npc/009-2/kfahr.txt
+++ b/world/map/npc/009-2/kfahr.txt
@@ -13,7 +13,7 @@
 //#
 //#################################################################################
 
-009-2.gat,67,57,0|script|Kfahr|125
+009-2,67,57,0|script|Kfahr|125
 {
     set @halloween_npc_id, $@halloween_npc_kfahr;
     callfunc "TrickOrTreat";
diff --git a/world/map/npc/009-2/lena.txt b/world/map/npc/009-2/lena.txt
index e29863c5..3917cec0 100644
--- a/world/map/npc/009-2/lena.txt
+++ b/world/map/npc/009-2/lena.txt
@@ -1,7 +1,7 @@
 // Quest for Fairy Hat and Forest Armor
 // Variables used: nibble 0 of QUEST_Hurnscald
 
-009-2.gat,146,43,0|script|Lena|182
+009-2,146,43,0|script|Lena|182
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
@@ -34,8 +34,8 @@ L_Lena_Approves:
     callsub S_Update_Var;
     mes "[Lena]";
     mes "\"You look like you can handle yourself in a fight. If you can take on this scourge I'll reward you with a hat like mine. In order to prove your mettle, bring me 10 Bandit Hoods so I know they've met their match.\"";
-    areamonster "008-1.gat",25,60,40,65,"Bandit",1064,3, "::";
-    areamonster "011-1.gat",35,40,65,60,"Bandit",1064,3, "::";
+    areamonster "008-1",25,60,40,65,"Bandit",1064,3, "::";
+    areamonster "011-1",35,40,65,60,"Bandit",1064,3, "::";
     goto L_Close;
 
 L_Lena_No_Fan:
@@ -76,8 +76,8 @@ L_Lena_Bandit_Leader:
 L_Lena_Bandit_Leader_Yes:
     set @state, 3;
     callsub S_Update_Var;
-    areamonster "008-1.gat",25,60,40,65,"Bandit",1064,3, "::";
-    areamonster "011-1.gat",35,40,65,60,"Bandit",1064,3, "::";
+    areamonster "008-1",25,60,40,65,"Bandit",1064,3, "::";
+    areamonster "011-1",35,40,65,60,"Bandit",1064,3, "::";
     mes "[Lena]";
     mes "\"You have a brave heart. Though I know you can succeed on your own, I recommend finding others to help you defeat the bandit leader. I believe he could pose a significant threat to solitary individuals seeking to challenge him. Good luck!\"";
     goto L_Close;
diff --git a/world/map/npc/009-2/mapflags.txt b/world/map/npc/009-2/mapflags.txt
index 66f03254..e18532fc 100644
--- a/world/map/npc/009-2/mapflags.txt
+++ b/world/map/npc/009-2/mapflags.txt
@@ -1,2 +1,2 @@
-009-2.gat|mapflag|town
-009-2.gat|mapflag|resave|009-2,149,43
+009-2|mapflag|town
+009-2|mapflag|resave|009-2,149,43
diff --git a/world/map/npc/009-2/misc.txt b/world/map/npc/009-2/misc.txt
index ff350b88..b28d43b5 100644
--- a/world/map/npc/009-2/misc.txt
+++ b/world/map/npc/009-2/misc.txt
@@ -1,6 +1,6 @@
 //Note in bar
 
-009-2.gat,54,49,0|script|Note#bar|400
+009-2,54,49,0|script|Note#bar|400
 {
     mes "[Note]";
     mes "\"We refuse service to anyone who:\"";
@@ -12,7 +12,7 @@
 }
 
 //Bookshelf
-009-2.gat,109,44,0|script|#Book|400
+009-2,109,44,0|script|#Book|400
 {
     if (getskilllv(SKILL_MAGIC))
         goto L_magic;
diff --git a/world/map/npc/009-2/nicholas.txt b/world/map/npc/009-2/nicholas.txt
index 568f9a71..a91fb153 100644
--- a/world/map/npc/009-2/nicholas.txt
+++ b/world/map/npc/009-2/nicholas.txt
@@ -11,7 +11,7 @@
 //#
 //#################################################################################
 
-009-2.gat,185,55,0|script|Nicholas|135
+009-2,185,55,0|script|Nicholas|135
 {
     set @SETZER_XP, 100000;
     set @SHIELD_XP, 20000;
diff --git a/world/map/npc/009-2/nurse.txt b/world/map/npc/009-2/nurse.txt
index 3c6be98a..fa1ee5d2 100644
--- a/world/map/npc/009-2/nurse.txt
+++ b/world/map/npc/009-2/nurse.txt
@@ -22,7 +22,7 @@
 
 
 //######################################################################################
-009-2.gat,147,65,0|script|Nurse|119
+009-2,147,65,0|script|Nurse|119
 {
     callfunc "ClearVariables";
     set @halloween_npc_id, $@halloween_npc_nurse;
diff --git a/world/map/npc/009-2/olana.txt b/world/map/npc/009-2/olana.txt
index 7c654759..9fcfe351 100644
--- a/world/map/npc/009-2/olana.txt
+++ b/world/map/npc/009-2/olana.txt
@@ -1,6 +1,6 @@
 // Authors: alastrim, Ali-g, Dark Mage
 
-009-2.gat,63,79,0|script|Olana|190
+009-2,63,79,0|script|Olana|190
 {
     set @MinLevel, 60;
 
diff --git a/world/map/npc/009-2/peter.txt b/world/map/npc/009-2/peter.txt
index e5375149..818f09cf 100644
--- a/world/map/npc/009-2/peter.txt
+++ b/world/map/npc/009-2/peter.txt
@@ -1,7 +1,7 @@
 // Nicholas' Apprentice and Armorsmith
-009-2.gat,183,57,0|shop|#PeterShop|127,Knife:*1,SharpKnife:*1,Dagger:*1
+009-2,183,57,0|shop|#PeterShop|127,Knife:*1,SharpKnife:*1,Dagger:*1
 
-009-2.gat,183,57,0|script|Peter|157
+009-2,183,57,0|script|Peter|157
 {
     set @peter_chain_mail_coal, 10;
     set @peter_chain_mail_ingot, 5;
diff --git a/world/map/npc/009-2/richard.txt b/world/map/npc/009-2/richard.txt
index f7c48633..b39a7969 100644
--- a/world/map/npc/009-2/richard.txt
+++ b/world/map/npc/009-2/richard.txt
@@ -1,6 +1,6 @@
 //
 
-009-2.gat,20,99,0|script|Richard|161
+009-2,20,99,0|script|Richard|161
 {
     callfunc "ClearVariables";
     set @npcname$, "Richard";
diff --git a/world/map/npc/009-2/selim.txt b/world/map/npc/009-2/selim.txt
index c34f3968..f9dc3b40 100644
--- a/world/map/npc/009-2/selim.txt
+++ b/world/map/npc/009-2/selim.txt
@@ -5,7 +5,7 @@
 //#                                                                               #
 //#################################################################################
 
-009-2.gat,32,104,0|script|Selim|326
+009-2,32,104,0|script|Selim|326
 {
     setarray @all_colours$, "red", "green", "dark blue", "yellow", "light blue", "pink", "black", "orange", "purple", "dark green";
 
diff --git a/world/map/npc/009-2/shops.txt b/world/map/npc/009-2/shops.txt
index 52508ce2..3dcfbc9a 100644
--- a/world/map/npc/009-2/shops.txt
+++ b/world/map/npc/009-2/shops.txt
@@ -1,9 +1,9 @@
 // Bartender
-009-2.gat,65,49,0|shop|Barkeeper|112,Beer:*1,Cake:*1,Steak:*1
+009-2,65,49,0|shop|Barkeeper|112,Beer:*1,Cake:*1,Steak:*1
 
 // Receptionist
 // Offers the player to rest at the inn for 100gp
-009-2.gat,50,48,0|script|Receptionist#inn|108
+009-2,50,48,0|script|Receptionist#inn|108
 {
     set @npcname$, "Receptionist";
     set @cost, 100;
@@ -12,10 +12,10 @@
 }
 
 // Archer Shop
-009-2.gat,97,24,0|shop|Apprentice|120,SlingBullet:*1,Arrow:*2,IronArrow:*1,Bow:*1,ShortBow:*2
+009-2,97,24,0|shop|Apprentice|120,SlingBullet:*1,Arrow:*2,IronArrow:*1,Bow:*1,ShortBow:*2
 
 // Potion Shop
-009-2.gat,123,22,0|shop|Potions#_M|400,CactusDrink:*1,CactusPotion:*1,IronPotion:*1,ConcentrationPotion:*1,SlowPoisonPotion:*1
+009-2,123,22,0|shop|Potions#_M|400,CactusDrink:*1,CactusPotion:*1,IronPotion:*1,ConcentrationPotion:*1,SlowPoisonPotion:*1
 
 // General Store
-009-2.gat,32,99,0|shop|General Store#hurnscald|112,Milk:*1,BottleOfWater:*1,CottonShirt:*1,CottonShorts:*1,Boots:*1,SerfHat:*1,CottonHeadband:*1,CottonGloves:*1
+009-2,32,99,0|shop|General Store#hurnscald|112,Milk:*1,BottleOfWater:*1,CottonShirt:*1,CottonShorts:*1,Boots:*1,SerfHat:*1,CottonHeadband:*1,CottonGloves:*1
diff --git a/world/map/npc/009-2/trader.txt b/world/map/npc/009-2/trader.txt
index c386b05a..aaba3afb 100644
--- a/world/map/npc/009-2/trader.txt
+++ b/world/map/npc/009-2/trader.txt
@@ -3,7 +3,7 @@
 // Updated by: TheKandiman
 // Reviewed by: Wombat
 
-009-2.gat,29,98,0|script|Trader|115
+009-2,29,98,0|script|Trader|115
 {
     set @Ironprice, 1000;
     set @Sulphurprice, 1200;
diff --git a/world/map/npc/009-2/waitress.txt b/world/map/npc/009-2/waitress.txt
index 57eca972..1bacd738 100644
--- a/world/map/npc/009-2/waitress.txt
+++ b/world/map/npc/009-2/waitress.txt
@@ -1,6 +1,6 @@
 // Waitress
 
-009-2.gat,60,52,0|script|Melinda|140
+009-2,60,52,0|script|Melinda|140
 {
     mes "[Melinda]";
     mes "\"Hi, sweetie! Want a fresh beer for 170 GP?\"";
diff --git a/world/map/npc/009-2/wyara.txt b/world/map/npc/009-2/wyara.txt
index f8df574a..c6875740 100644
--- a/world/map/npc/009-2/wyara.txt
+++ b/world/map/npc/009-2/wyara.txt
@@ -1,7 +1,7 @@
 // ----------------------------------------
 // Wyara the Hurnscald witch
 // ----------------------------------------
-009-2.gat,121,26,0|script|Wyara#_M|103
+009-2,121,26,0|script|Wyara#_M|103
 {
     set @Q_MASK, NIBBLE_2_MASK;
     set @Q_SHIFT, NIBBLE_2_SHIFT;
diff --git a/world/map/npc/009-2/yalina.txt b/world/map/npc/009-2/yalina.txt
index 92055b48..db701188 100644
--- a/world/map/npc/009-2/yalina.txt
+++ b/world/map/npc/009-2/yalina.txt
@@ -1,4 +1,4 @@
-009-2.gat,148,47,0|script|Yalina|209
+009-2,148,47,0|script|Yalina|209
 {
     set @npcname$, "Yalina";