17 files changed, 47 insertions, 47 deletions
diff --git a/world/map/npc/030-2/_import.txt b/world/map/npc/030-2/_import.txt
index c3867abf..2588ec56 100644
--- a/world/map/npc/030-2/_import.txt
+++ b/world/map/npc/030-2/_import.txt
@@ -1,6 +1,6 @@
 // Map 030-2: Christmas Inn
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 030-2.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 030-2
 npc: npc/030-2/_mobs.txt
 npc: npc/030-2/_warps.txt
 npc: npc/030-2/avalia.txt
diff --git a/world/map/npc/030-2/_mobs.txt b/world/map/npc/030-2/_mobs.txt
index 98e36e84..4e45ffc1 100644
--- a/world/map/npc/030-2/_mobs.txt
+++ b/world/map/npc/030-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.
 // Christmas Inn mobs
 
 
 
-030-2.gat,0,0,0|script|Mob030-2|-1
+030-2,0,0,0|script|Mob030-2|-1
 {
     end;
 }
diff --git a/world/map/npc/030-2/_warps.txt b/world/map/npc/030-2/_warps.txt
index af368314..a004a838 100644
--- a/world/map/npc/030-2/_warps.txt
+++ b/world/map/npc/030-2/_warps.txt
@@ -1,18 +1,18 @@
-// 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.
 // Christmas Inn warps
 
-030-2.gat,88,51|warp|To Outside|-1,-1,020-1.gat,33,94
-030-2.gat,72,31|warp|To Basement|-1,-1,030-2.gat,51,31
-030-2.gat,194,68|warp|To Fourth Floor|-1,-1,030-2.gat,78,88
-030-2.gat,52,31|warp|To First Floor|-1,-1,030-2.gat,73,31
-030-2.gat,75,19|warp|To Second Floor|0,-1,030-2.gat,127,50
-030-2.gat,102,19|warp|To Second Floor|0,-1,030-2.gat,153,50
-030-2.gat,127,51|warp|To First Floor|0,-1,030-2.gat,75,20
-030-2.gat,154,51|warp|To First Floor|0,-1,030-2.gat,101,20
-030-2.gat,156,24|warp|To Third Floor|-1,0,030-2.gat,21,78
-030-2.gat,20,78|warp|To Second Floor|-1,0,030-2.gat,155,24
-030-2.gat,42,105|warp|To Fourth Floor|0,-1,030-2.gat,93,74
-030-2.gat,94,73|warp|To Third Floor|0,-1,030-2.gat,41,104
-030-2.gat,102,73|warp|To Fifth Floor|0,-1,030-2.gat,127,104
-030-2.gat,127,105|warp|To Fourth Floor|0,-1,030-2.gat,102,74
-030-2.gat,78,87|warp|To Private Room|-1,-1,030-2.gat,194,67
+030-2,88,51|warp|To Outside|-1,-1,020-1,33,94
+030-2,72,31|warp|To Basement|-1,-1,030-2,51,31
+030-2,194,68|warp|To Fourth Floor|-1,-1,030-2,78,88
+030-2,52,31|warp|To First Floor|-1,-1,030-2,73,31
+030-2,75,19|warp|To Second Floor|0,-1,030-2,127,50
+030-2,102,19|warp|To Second Floor|0,-1,030-2,153,50
+030-2,127,51|warp|To First Floor|0,-1,030-2,75,20
+030-2,154,51|warp|To First Floor|0,-1,030-2,101,20
+030-2,156,24|warp|To Third Floor|-1,0,030-2,21,78
+030-2,20,78|warp|To Second Floor|-1,0,030-2,155,24
+030-2,42,105|warp|To Fourth Floor|0,-1,030-2,93,74
+030-2,94,73|warp|To Third Floor|0,-1,030-2,41,104
+030-2,102,73|warp|To Fifth Floor|0,-1,030-2,127,104
+030-2,127,105|warp|To Fourth Floor|0,-1,030-2,102,74
+030-2,78,87|warp|To Private Room|-1,-1,030-2,194,67
diff --git a/world/map/npc/030-2/avalia.txt b/world/map/npc/030-2/avalia.txt
index cce6121d..a23cacb7 100644
--- a/world/map/npc/030-2/avalia.txt
+++ b/world/map/npc/030-2/avalia.txt
@@ -1,7 +1,7 @@
 // Annual Xmas
 // Author: cinderweb, wushin
 
-030-2.gat,198,61,0|script|Avalia|356
+030-2,198,61,0|script|Avalia|356
 {
     callfunc "XmasStates";
 
@@ -12,7 +12,7 @@
 L_OffSeason:
     mes "[Avalia]";
     mes "\"What are you doing in here? Get out!\"";
-    warp "030-2.gat",88,80;
+    warp "030-2",88,80;
     close;
 
 L_XmasMain:
@@ -189,7 +189,7 @@ L_Close:
     close;
 }
 
-030-2.gat,190,64,0|script|Milis|330
+030-2,190,64,0|script|Milis|330
 {
     callfunc "XmasStates";
 
@@ -200,7 +200,7 @@ L_Close:
 L_OffSeason:
     mes "[Milis]";
     mes "\"What are you doing in here, get out!\"";
-    warp "030-2.gat",88,80;
+    warp "030-2",88,80;
     close;
 
 L_XmasMain:
diff --git a/world/map/npc/030-2/basic_npcs.txt b/world/map/npc/030-2/basic_npcs.txt
index 9e78162f..6dae901f 100644
--- a/world/map/npc/030-2/basic_npcs.txt
+++ b/world/map/npc/030-2/basic_npcs.txt
@@ -3,7 +3,7 @@
 
 // In the office
 
-030-2.gat,37,81,0|script|Oswal|328
+030-2,37,81,0|script|Oswal|328
 {
     mes "[Oswal]";
     mes "\"Welcome. I hope you enjoy your visit in Santa's residence. You already saw the workshop where the Christmas presents are crafted, right?\"";
@@ -13,14 +13,14 @@
     close;
 }
 
-030-2.gat,37,85,0|script|Taito|328
+030-2,37,85,0|script|Taito|328
 {
     mes "[Taito]";
     mes "\"Hello. I'm sorry, but I'm very busy at the moment and want to concentrate. If you have any questions, ask one of the other helpers.\"";
     close;
 }
 
-030-2.gat,31,77,0|script|Rikhard|329
+030-2,31,77,0|script|Rikhard|329
 {
     mes "[Rikhard]";
     mes "\"I'm really glad that this year's Christmas preparations are going well. You know, last year nearly everything went wrong, so we all had to work really hard on that, and the everyday issues had to be neglected.\"";
@@ -35,7 +35,7 @@
     close;
 }
 
-030-2.gat,31,85,0|script|Akseli|329
+030-2,31,85,0|script|Akseli|329
 {
     mes "[Akseli]";
     mes "\"Ah, a visitor! Do you enjoy your time in Santa's residence?\"";
@@ -65,7 +65,7 @@ L_Close:
 
 // In the workshop
 
-030-2.gat,78,34,0|script|Aaron|328
+030-2,78,34,0|script|Aaron|328
 {
     mes "[Aaron]";
     mes "\"Welcome to Santa's famous Christmas workshop. Feel free to have a look around and talk to the craftsmen.\"";
@@ -74,7 +74,7 @@ L_Close:
     close;
 }
 
-030-2.gat,154,33,0|script|Iivo|329
+030-2,154,33,0|script|Iivo|329
 {
     mes "You see a helper cutting some leather pieces. He looks very focused on his work. Then he notices you.";
     mes "[Iivo]";
diff --git a/world/map/npc/030-2/bedding_helper.txt b/world/map/npc/030-2/bedding_helper.txt
index c07105f0..8e35d4c2 100644
--- a/world/map/npc/030-2/bedding_helper.txt
+++ b/world/map/npc/030-2/bedding_helper.txt
@@ -3,7 +3,7 @@
 // Osmo asks for some White Fur which is used for bedding some presents in the boxes
 // can be sabotaged by given Cloth instead
 
-030-2.gat,37,77,0|script|Osmo|328
+030-2,37,77,0|script|Osmo|328
 {
     callfunc "XmasStates";
 
diff --git a/world/map/npc/030-2/chief_helper.txt b/world/map/npc/030-2/chief_helper.txt
index 0f361872..969d0272 100644
--- a/world/map/npc/030-2/chief_helper.txt
+++ b/world/map/npc/030-2/chief_helper.txt
@@ -2,7 +2,7 @@
 // author: Jenalya, wushin
 // Warrick is the Chief of Santa's helpers
 
-030-2.gat,127,42,0|script|Chief Warrick|329
+030-2,127,42,0|script|Chief Warrick|329
 {
     callfunc "XmasStates";
 
diff --git a/world/map/npc/030-2/eljas.txt b/world/map/npc/030-2/eljas.txt
index aaa9c29c..82bdb120 100644
--- a/world/map/npc/030-2/eljas.txt
+++ b/world/map/npc/030-2/eljas.txt
@@ -1,7 +1,7 @@
 // Annual Xmas and Year round info
 // Author: Jenalya, wushin
 
-030-2.gat,87,41,0|script|Eljas|328,5,1
+030-2,87,41,0|script|Eljas|328,5,1
 {
     callfunc "XmasStates";
     callfunc "ThrowOutTheBum";
diff --git a/world/map/npc/030-2/empty_boxes_helper.txt b/world/map/npc/030-2/empty_boxes_helper.txt
index aabf07a2..fbc720f7 100644
--- a/world/map/npc/030-2/empty_boxes_helper.txt
+++ b/world/map/npc/030-2/empty_boxes_helper.txt
@@ -3,7 +3,7 @@
 // Urmas asks for raw logs to make empty presents boxes
 // later he can be asked for those boxes to put toys in
 
-030-2.gat,140,41,0|script|Urmas|328
+030-2,140,41,0|script|Urmas|328
 {
     callfunc "XmasStates";
 
diff --git a/world/map/npc/030-2/glitter_helper.txt b/world/map/npc/030-2/glitter_helper.txt
index e0637675..b04e3b2a 100644
--- a/world/map/npc/030-2/glitter_helper.txt
+++ b/world/map/npc/030-2/glitter_helper.txt
@@ -3,7 +3,7 @@
 // Veneri asks for Diamond Powder and Ruby Powder for decoration
 // can be sabotaged with Red Powder and Yellow Powder, Saboteur can make that out of Wisp and Spectre Powder
 
-030-2.gat,31,81,0|script|Veneri|328
+030-2,31,81,0|script|Veneri|328
 {
     callfunc "XmasStates";
 
diff --git a/world/map/npc/030-2/guards.txt b/world/map/npc/030-2/guards.txt
index 3fdc1ffa..54a17465 100644
--- a/world/map/npc/030-2/guards.txt
+++ b/world/map/npc/030-2/guards.txt
@@ -1,6 +1,6 @@
 // Annual Xmas Bouncers
 
-030-2.gat,85,43,0|script|Valjas|330
+030-2,85,43,0|script|Valjas|330
 {
     callfunc "XmasStates";
     callfunc "ThrowOutTheBum";
@@ -9,7 +9,7 @@
     close;
 }
 
-030-2.gat,89,43,0|script|Halas|330
+030-2,89,43,0|script|Halas|330
 {
     callfunc "XmasStates";
     callfunc "ThrowOutTheBum";
@@ -18,7 +18,7 @@
     close;
 }
 
-030-2.gat,89,84,0|script|Kilis|330,5,2
+030-2,89,84,0|script|Kilis|330,5,2
 {
     callfunc "XmasStates";
     callfunc "ThrowOutTheBum";
diff --git a/world/map/npc/030-2/mapflags.txt b/world/map/npc/030-2/mapflags.txt
index ea9d797f..17712898 100644
--- a/world/map/npc/030-2/mapflags.txt
+++ b/world/map/npc/030-2/mapflags.txt
@@ -1 +1 @@
-030-2.gat|mapflag|resave|020-1,52,118
+030-2|mapflag|resave|020-1,52,118
diff --git a/world/map/npc/030-2/present_helper.txt b/world/map/npc/030-2/present_helper.txt
index 0a027ca0..2a265245 100644
--- a/world/map/npc/030-2/present_helper.txt
+++ b/world/map/npc/030-2/present_helper.txt
@@ -2,7 +2,7 @@
 // Author: wushin
 // Present Reclamation
 
-030-2.gat,47,82,0|script|Jonathan|328
+030-2,47,82,0|script|Jonathan|328
 {
     callfunc "XmasStates";
 
diff --git a/world/map/npc/030-2/roasted_acorns_helper.txt b/world/map/npc/030-2/roasted_acorns_helper.txt
index f942c118..5d835d8d 100644
--- a/world/map/npc/030-2/roasted_acorns_helper.txt
+++ b/world/map/npc/030-2/roasted_acorns_helper.txt
@@ -1,7 +1,7 @@
 // Annual Xmas
 // author: Jenalya, wushin
 
-030-2.gat,89,23,0|script|Verneri|334
+030-2,89,23,0|script|Verneri|334
 {
     callfunc "XmasStates";
 
diff --git a/world/map/npc/030-2/shipping_helper.txt b/world/map/npc/030-2/shipping_helper.txt
index e7f7b2f0..7c588cb6 100644
--- a/world/map/npc/030-2/shipping_helper.txt
+++ b/world/map/npc/030-2/shipping_helper.txt
@@ -1,21 +1,21 @@
 // Annual Xmas
 // Author: Jenalya, wushin
 
-030-2.gat,30,88,0|script|Mo|328
+030-2,30,88,0|script|Mo|328
 {
     set $@npc_name$, "Mo";
     callfunc "helpersPacking";
     close;
 }
 
-030-2.gat,33,88,0|script|Lorrie|329
+030-2,33,88,0|script|Lorrie|329
 {
     set $@npc_name$, "Lorrie";
     callfunc "helpersPacking";
     close;
 }
 
-030-2.gat,37,88,0|script|Curlee|329
+030-2,37,88,0|script|Curlee|329
 {
     set $@npc_name$, "Curlee";
     callfunc "helpersPacking";
diff --git a/world/map/npc/030-2/storage_helper.txt b/world/map/npc/030-2/storage_helper.txt
index 1767ceaf..d1c3f357 100644
--- a/world/map/npc/030-2/storage_helper.txt
+++ b/world/map/npc/030-2/storage_helper.txt
@@ -1,7 +1,7 @@
 // Annual Christmas
 // author: Jenalya, wushin
 
-030-2.gat,25,35,0|script|Vellamo|328
+030-2,25,35,0|script|Vellamo|328
 {
     set @halloween_npc_id, $@halloween_npc_vellamo;
     callfunc "TrickOrTreat";
@@ -50,7 +50,7 @@ L_Close:
     close;
 }
 
-030-2.gat,33,29,0|script|Ismo|329
+030-2,33,29,0|script|Ismo|329
 {
     callfunc "XmasStates";
 
diff --git a/world/map/npc/030-2/wrapping_paper_helper.txt b/world/map/npc/030-2/wrapping_paper_helper.txt
index 75198417..3ac10b12 100644
--- a/world/map/npc/030-2/wrapping_paper_helper.txt
+++ b/world/map/npc/030-2/wrapping_paper_helper.txt
@@ -3,7 +3,7 @@
 // also for some dyes to make them colorful
 // later he can be asked for those papers to wrap boxes
 
-030-2.gat,140,31,0|script|Reino|328
+030-2,140,31,0|script|Reino|328
 {
     callfunc "XmasStates";