22 files changed, 63 insertions, 63 deletions
diff --git a/world/map/npc/002-2/_import.txt b/world/map/npc/002-2/_import.txt
index 673ba2d1..c2bd041a 100644
--- a/world/map/npc/002-2/_import.txt
+++ b/world/map/npc/002-2/_import.txt
@@ -1,6 +1,6 @@
 // Map 002-2: Sandstorm Desert Indoors
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 002-2.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 002-2
 npc: npc/002-2/_mobs.txt
 npc: npc/002-2/_warps.txt
 npc: npc/002-2/bakery.txt
diff --git a/world/map/npc/002-2/_mobs.txt b/world/map/npc/002-2/_mobs.txt
index 0cdda50c..c099a80f 100644
--- a/world/map/npc/002-2/_mobs.txt
+++ b/world/map/npc/002-2/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Sandstorm Desert Indoors mobs
 
 
 
-002-2.gat,0,0,0|script|Mob002-2|-1
+002-2,0,0,0|script|Mob002-2|-1
 {
     end;
 }
diff --git a/world/map/npc/002-2/_warps.txt b/world/map/npc/002-2/_warps.txt
index fc78534b..dc02d56b 100644
--- a/world/map/npc/002-2/_warps.txt
+++ b/world/map/npc/002-2/_warps.txt
@@ -1,22 +1,22 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Sandstorm Desert Indoors warps
 
-002-2.gat,44,34|warp|Outside|-1,-1,002-1.gat,73,36
-002-2.gat,44,20|warp|First Floor|0,-1,002-2.gat,45,78
-002-2.gat,46,79|warp|First Floor|0,-1,002-2.gat,43,21
-002-2.gat,46,55|warp|Penthouse|0,-1,002-2.gat,44,109
-002-2.gat,45,110|warp|Second Floor|0,-1,002-2.gat,45,56
-002-2.gat,23,110|warp|Outside|-1,-1,002-1.gat,67,30
-002-2.gat,34,20|warp|Casino|-1,-1,002-2.gat,79,69
-002-2.gat,37,20|warp|Theatre|-1,-1,002-2.gat,72,31
-002-2.gat,72,32|warp|First Floor|-1,-1,002-2.gat,37,21
-002-2.gat,79,70|warp|First Floor|-1,-1,002-2.gat,34,21
-002-2.gat,40,20|warp|Salon|-1,-1,002-2.gat,126,35
-002-2.gat,126,36|warp|First Floor|-1,-1,002-2.gat,40,21
-002-2.gat,75,101|warp|Outside|-1,-1,002-1.gat,109,46
-002-2.gat,83,101|warp|Outside|-1,-1,002-1.gat,115,46
-002-2.gat,78,132|warp|Outside|-1,-1,002-1.gat,114,36
-002-2.gat,68,121|warp|Outside|-1,-1,002-1.gat,110,28
-002-2.gat,120,67|warp|Outside|-1,-1,002-1.gat,99,44
-002-2.gat,120,95|warp|Outside|-1,-1,002-1.gat,57,36
-002-2.gat,119,132|warp|To Outside|-1,-1,002-1.gat,57,27
+002-2,44,34|warp|Outside|-1,-1,002-1,73,36
+002-2,44,20|warp|First Floor|0,-1,002-2,45,78
+002-2,46,79|warp|First Floor|0,-1,002-2,43,21
+002-2,46,55|warp|Penthouse|0,-1,002-2,44,109
+002-2,45,110|warp|Second Floor|0,-1,002-2,45,56
+002-2,23,110|warp|Outside|-1,-1,002-1,67,30
+002-2,34,20|warp|Casino|-1,-1,002-2,79,69
+002-2,37,20|warp|Theatre|-1,-1,002-2,72,31
+002-2,72,32|warp|First Floor|-1,-1,002-2,37,21
+002-2,79,70|warp|First Floor|-1,-1,002-2,34,21
+002-2,40,20|warp|Salon|-1,-1,002-2,126,35
+002-2,126,36|warp|First Floor|-1,-1,002-2,40,21
+002-2,75,101|warp|Outside|-1,-1,002-1,109,46
+002-2,83,101|warp|Outside|-1,-1,002-1,115,46
+002-2,78,132|warp|Outside|-1,-1,002-1,114,36
+002-2,68,121|warp|Outside|-1,-1,002-1,110,28
+002-2,120,67|warp|Outside|-1,-1,002-1,99,44
+002-2,120,95|warp|Outside|-1,-1,002-1,57,36
+002-2,119,132|warp|To Outside|-1,-1,002-1,57,27
diff --git a/world/map/npc/002-2/bakery.txt b/world/map/npc/002-2/bakery.txt
index e5328723..5a21678a 100644
--- a/world/map/npc/002-2/bakery.txt
+++ b/world/map/npc/002-2/bakery.txt
@@ -1,7 +1,7 @@
 // The bakery
 
 // The chef
-002-2.gat,21,22,0|script|Riskim|148
+002-2,21,22,0|script|Riskim|148
 {
     mes "[Riskim]";
     mes "";
@@ -120,7 +120,7 @@ L_End:
 }
 
 // Server
-002-2.gat,28,31,0|script|Sara|108
+002-2,28,31,0|script|Sara|108
 {
     mes "[Sara]";
     mes "";
@@ -129,10 +129,10 @@ L_End:
 }
 
 // The cashier
-002-2.gat,25,22,0|shop|Drabur|112,WhiteCake:*1,ChocolateCake:*1,OrangeCake:*1,AppleCake:*1,Cake:*1,CherryCake:*1,OrangeCupcake:*1,Milk:*1,XmasCake:*1
+002-2,25,22,0|shop|Drabur|112,WhiteCake:*1,ChocolateCake:*1,OrangeCake:*1,AppleCake:*1,Cake:*1,CherryCake:*1,OrangeCupcake:*1,Milk:*1,XmasCake:*1
 
 // Bus boy
-002-2.gat,21,28,0|script|Iormo|160
+002-2,21,28,0|script|Iormo|160
 {
     mes "[Iormo]";
     mes "";
@@ -141,7 +141,7 @@ L_End:
 }
 
 // An old couple eating at the bakery
-002-2.gat,24,27,0|script|Rynoh|159
+002-2,24,27,0|script|Rynoh|159
 {
     mes "[Rynoh]";
     mes "";
@@ -149,7 +149,7 @@ L_End:
     close;
 }
 
-002-2.gat,26,27,0|script|Ontas|154
+002-2,26,27,0|script|Ontas|154
 {
     mes "[Ontas]";
     mes "";
diff --git a/world/map/npc/002-2/barber.txt b/world/map/npc/002-2/barber.txt
index eb1a5821..076dbfab 100644
--- a/world/map/npc/002-2/barber.txt
+++ b/world/map/npc/002-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)
-002-2.gat,117,30,0|script|Issay|156
+002-2,117,30,0|script|Issay|156
 {
     mes "[Issay the Barber]";
     mes "\"Do you need a change of style?\"";
diff --git a/world/map/npc/002-2/bleacher.txt b/world/map/npc/002-2/bleacher.txt
index 3391a62c..e93201d2 100644
--- a/world/map/npc/002-2/bleacher.txt
+++ b/world/map/npc/002-2/bleacher.txt
@@ -1,6 +1,6 @@
 //
 
-002-2.gat,72,92,0|script|Candide|156
+002-2,72,92,0|script|Candide|156
 {
     mes "[Candide]";
     mes "\"I've figured out how that volcanic ash bleaches cloth.";
diff --git a/world/map/npc/002-2/casino.txt b/world/map/npc/002-2/casino.txt
index d49313a6..14ac5226 100644
--- a/world/map/npc/002-2/casino.txt
+++ b/world/map/npc/002-2/casino.txt
@@ -1,7 +1,7 @@
 // Casino
 
 // takes part in quest given by 021-2/kylian.txt
-002-2.gat,79,68,0|script|#CasinoEntrance|32767,13,0
+002-2,79,68,0|script|#CasinoEntrance|32767,13,0
 {
     set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowCasinoNT;
     set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
@@ -15,34 +15,34 @@ L_End:
     end;
 }
 
-002-2.gat,86,29,0|script|Valdo|117
+002-2,86,29,0|script|Valdo|117
 {
     mes "[Valdo the Worker]";
     mes "\"Please let me work. I'm really in a hurry!\"";
     close;
 }
 
-002-2.gat,84,62,0|script|Slots#1|400
+002-2,84,62,0|script|Slots#1|400
 {
     callfunc "SlotMachine";
     close;
 }
 
-002-2.gat,86,62,0|script|Slots#2|400
+002-2,86,62,0|script|Slots#2|400
 {
     callfunc "SlotMachine";
     close;
 }
 
-002-2.gat,88,62,0|script|Slots#3|400
+002-2,88,62,0|script|Slots#3|400
 {
     callfunc "SlotMachine";
     close;
 }
 
-002-2.gat,78,56,0|shop|MoneyChanger|124,CasinoCoins:*1
+002-2,78,56,0|shop|MoneyChanger|124,CasinoCoins:*1
 
-002-2.gat,75,60,0|script|BlackJack|107
+002-2,75,60,0|script|BlackJack|107
 {
     mes "[Croupier]";
     mes "\"Would you like to play Black Jack?";
@@ -117,7 +117,7 @@ L_Close:
     close;
 }
 
-002-2.gat,69,67,0|script|Roulette|107
+002-2,69,67,0|script|Roulette|107
 {
     mes "[Croupier]";
     mes "\"Good evening monsieur...";
diff --git a/world/map/npc/002-2/dedication.txt b/world/map/npc/002-2/dedication.txt
index 4ab9ba22..dfd507ca 100644
--- a/world/map/npc/002-2/dedication.txt
+++ b/world/map/npc/002-2/dedication.txt
@@ -1,6 +1,6 @@
 // Dedication to Irene Christina
 
-002-2.gat,116,123,0|script|#IreneDedication|400
+002-2,116,123,0|script|#IreneDedication|400
 {
     mes "~ Irene Christina ~";
     mes "The song in this house is dedicated to Irene.";
diff --git a/world/map/npc/002-2/eurni.txt b/world/map/npc/002-2/eurni.txt
index a084acbc..c63a71eb 100644
--- a/world/map/npc/002-2/eurni.txt
+++ b/world/map/npc/002-2/eurni.txt
@@ -1,6 +1,6 @@
 //
 
-002-2.gat,22,77,0|script|Eurni|136
+002-2,22,77,0|script|Eurni|136
 {
     set @halloween_npc_id, $@halloween_npc_eurni;
     callfunc "TrickOrTreat";
diff --git a/world/map/npc/002-2/hetchel.txt b/world/map/npc/002-2/hetchel.txt
index 134d40dc..d87c1f64 100644
--- a/world/map/npc/002-2/hetchel.txt
+++ b/world/map/npc/002-2/hetchel.txt
@@ -17,7 +17,7 @@
 //
 //  @silkpants_state: variable indicating silkpant quest status.
 
-002-2.gat,76,92,0|script|Hetchel|376
+002-2,76,92,0|script|Hetchel|376
 {
     set @wg_state, ((QUEST_WG_state & BYTE_0_MASK) >> BYTE_0_SHIFT);
     set @spants_state, ((QUEST_WG_state & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT);
@@ -408,7 +408,7 @@ L_Close:
     close;
 }
 
-002-2.gat,73,95,0|script|HetchelDebug|376
+002-2,73,95,0|script|HetchelDebug|376
 {
 set @wg_state, ((QUEST_WG_state & BYTE_0_MASK) >> BYTE_0_SHIFT);
 set @spants_state, ((QUEST_WG_state & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT);
diff --git a/world/map/npc/002-2/imec.txt b/world/map/npc/002-2/imec.txt
index 851dd49b..59966ff0 100644
--- a/world/map/npc/002-2/imec.txt
+++ b/world/map/npc/002-2/imec.txt
@@ -2,7 +2,7 @@
 // after finishing this, daily quest with scorpion stingers
 // Using bit 8 and 9 of QUEST_NorthTulimshar (first half of nibble 2)
 // author: Jenalya
-002-2.gat,36,75,0|script|Imec|162
+002-2,36,75,0|script|Imec|162
 {
     set @state, ((QUEST_NorthTulimshar & TWOBIT_4_MASK) >> TWOBIT_4_SHIFT);
     set @EXP, 90;
diff --git a/world/map/npc/002-2/inya.txt b/world/map/npc/002-2/inya.txt
index d05b19b4..7f0184f8 100644
--- a/world/map/npc/002-2/inya.txt
+++ b/world/map/npc/002-2/inya.txt
@@ -1,9 +1,9 @@
 //Gemstones: Diamond (white) , Ruby (red), Emerald (green), Sapphire (blue), Topaz (yellow), Amethyst (purple)
 //The power of the gems is important to future balance of these rings. Are they related to stats, tiers of power, schools of magic?
 
-002-2.gat,116,61,0|shop|#InyaShop|127,SimpleRing:*1
+002-2,116,61,0|shop|#InyaShop|127,SimpleRing:*1
 
-002-2.gat,116,61,0|script|Inya|106
+002-2,116,61,0|script|Inya|106
 {
     mes "[Inya]";
     mes "\"I am Inya, a jeweler of fine rings. I sell and make rings.\"";
diff --git a/world/map/npc/002-2/kps.txt b/world/map/npc/002-2/kps.txt
index a17df1a3..558166ec 100644
--- a/world/map/npc/002-2/kps.txt
+++ b/world/map/npc/002-2/kps.txt
@@ -4,7 +4,7 @@
 // reuse the 4 bits
 // To Mark 4 Different NPCs.
 // setarray $@kps_npc_bits, $@knowYanisNT, $@knowLatoyNT, $@knowWeellosNT, $@knowCasinoNT;
-002-2.gat,120,89,0|script|KPS Manager|191
+002-2,120,89,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);
diff --git a/world/map/npc/002-2/kylian.txt b/world/map/npc/002-2/kylian.txt
index 7f832b87..b1dadac2 100644
--- a/world/map/npc/002-2/kylian.txt
+++ b/world/map/npc/002-2/kylian.txt
@@ -57,14 +57,14 @@ OnInit:
     set $@delivery_exp_mod, 10;
     end;
 }
-002-2.gat,44,107,0|script|#KylianOut|32767,1,1
+002-2,44,107,0|script|#KylianOut|32767,1,1
 {
     set @KylianNTLicense, 0;
     set @KylianNTSightSeeing, 0;
     set @KylianNTCasino, 0;
     end;
 }
-002-2.gat,43,101,0|script|Kylian|193
+002-2,43,101,0|script|Kylian|193
 {
     set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
 
@@ -404,7 +404,7 @@ L_MoreWorkTimer:
 L_Close:
     close;
 }
-002-2.gat,40,101,0|script|KylianDebug#1|193
+002-2,40,101,0|script|KylianDebug#1|193
 {
     callfunc "KylianDebug";
     end;
@@ -413,7 +413,7 @@ OnInit:
         disablenpc "KylianDebug#1";
     end;
 }
-002-2.gat,118,89,0|script|KylianDebug#2|193
+002-2,118,89,0|script|KylianDebug#2|193
 {
     callfunc "KylianDebug";
     end;
diff --git a/world/map/npc/002-2/latoy.txt b/world/map/npc/002-2/latoy.txt
index 3e8701a2..49be414e 100644
--- a/world/map/npc/002-2/latoy.txt
+++ b/world/map/npc/002-2/latoy.txt
@@ -1,9 +1,9 @@
 // A snobby store that won't sell to the player
 // takes part in quest given by 021-2/kylian.txt
 
-002-2.gat,86,93,0|shop|#LatoyShop|127,SilkHeadband:*4,SilkGloves:*4,SilkPants:*4,SilkRobe:*4
+002-2,86,93,0|shop|#LatoyShop|127,SilkHeadband:*4,SilkGloves:*4,SilkPants:*4,SilkRobe:*4
 
-002-2.gat,86,93,0|script|Latoy|106
+002-2,86,93,0|script|Latoy|106
 {
     set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowLatoyNT;
     set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
diff --git a/world/map/npc/002-2/mapflags.txt b/world/map/npc/002-2/mapflags.txt
index 5448030e..b33ced4f 100644
--- a/world/map/npc/002-2/mapflags.txt
+++ b/world/map/npc/002-2/mapflags.txt
@@ -1 +1 @@
-002-2.gat|mapflag|resave|001-1,60,105
+002-2|mapflag|resave|001-1,60,105
diff --git a/world/map/npc/002-2/omar.txt b/world/map/npc/002-2/omar.txt
index 048f129c..6e51a706 100644
--- a/world/map/npc/002-2/omar.txt
+++ b/world/map/npc/002-2/omar.txt
@@ -21,7 +21,7 @@ function|script|KadiyaSubquestConsts
     return;
 }
 
-002-2.gat,117,126,0|script|Omar|162
+002-2,117,126,0|script|Omar|162
 {
     callfunc "ElanoreFix";
     callfunc "KadiyaSubquestConsts";
@@ -178,7 +178,7 @@ S_update_var:
     return;
 }
 
-002-2.gat,124,124,0|script|Kadiya|174
+002-2,124,124,0|script|Kadiya|174
 {
     set @child_number, 7;
     callfunc "XmasList";
diff --git a/world/map/npc/002-2/phaet.txt b/world/map/npc/002-2/phaet.txt
index eb464e1e..a0ec83ee 100644
--- a/world/map/npc/002-2/phaet.txt
+++ b/world/map/npc/002-2/phaet.txt
@@ -1,6 +1,6 @@
 //
 
-002-2.gat,75,56,0|script|Phaet|125,0,0
+002-2,75,56,0|script|Phaet|125,0,0
 {
     mes "[Phaet the Royal Guard]";
     mes "\"Hey, you seem tough enough! Would you like to prove your skills? I'll let you in the arena if you give me 50 gp. You can fight against other players there.\"";
@@ -21,7 +21,7 @@ L_Sure:
     mes "[Phaet the Royal Guard]";
     mes "\"Get ready!\"";
     next;
-    warp "001-3.gat", 0, 0;
+    warp "001-3", 0, 0;
     close;
 
 L_NoMoney:
diff --git a/world/map/npc/002-2/rebecca.txt b/world/map/npc/002-2/rebecca.txt
index 54244115..faf53007 100644
--- a/world/map/npc/002-2/rebecca.txt
+++ b/world/map/npc/002-2/rebecca.txt
@@ -1,6 +1,6 @@
 //
 
-002-2.gat,44,27,0|script|Rebecca|118
+002-2,44,27,0|script|Rebecca|118
 {
     set @npcname$, "Rebecca the Inn Keeper";
     set @cost, 100;
diff --git a/world/map/npc/002-2/shops.txt b/world/map/npc/002-2/shops.txt
index b1818d04..f1f09592 100644
--- a/world/map/npc/002-2/shops.txt
+++ b/world/map/npc/002-2/shops.txt
@@ -1,3 +1,3 @@
 // Bartender
 
-002-2.gat,68,25,0|shop|Bartender#Casino|112,Beer:*1,Cake:*1,CherryCake:*1
+002-2,68,25,0|shop|Bartender#Casino|112,Beer:*1,Cake:*1,CherryCake:*1
diff --git a/world/map/npc/002-2/stranger.txt b/world/map/npc/002-2/stranger.txt
index 563af742..c1d4699e 100644
--- a/world/map/npc/002-2/stranger.txt
+++ b/world/map/npc/002-2/stranger.txt
@@ -1,4 +1,4 @@
-002-2.gat,38,57,0|script|Stranger|192
+002-2,38,57,0|script|Stranger|192
 {
     set @IRONINGOT, 5;
     set @PINKANTENNA, 21;
diff --git a/world/map/npc/002-2/troupe_leader.txt b/world/map/npc/002-2/troupe_leader.txt
index c736899d..de8517c5 100644
--- a/world/map/npc/002-2/troupe_leader.txt
+++ b/world/map/npc/002-2/troupe_leader.txt
@@ -1,6 +1,6 @@
 //
 
-002-2.gat,81,21,0|script|Troupe Leader|165
+002-2,81,21,0|script|Troupe Leader|165
 {
     callfunc "ClearVariables";