10 files changed, 68 insertions, 68 deletions

diff --git a/world/map/npc/006-1/_import.txt b/world/map/npc/006-1/_import.txt
index b3f17a58..0885c461 100644
--- a/world/map/npc/006-1/_import.txt
+++ b/world/map/npc/006-1/_import.txt
@@ -1,6 +1,6 @@
 // Map 006-1: Desert Mountains
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 006-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 006-1
 npc: npc/006-1/_mobs.txt
 npc: npc/006-1/_warps.txt
 npc: npc/006-1/mapflags.txt
diff --git a/world/map/npc/006-1/_mobs.txt b/world/map/npc/006-1/_mobs.txt
index 9a376631..d2a6f7f0 100644
--- a/world/map/npc/006-1/_mobs.txt
+++ b/world/map/npc/006-1/_mobs.txt
@@ -1,30 +1,30 @@
-// 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.
 // Desert Mountains mobs
 
-006-1.gat,49,52,7,3|monster|Snake|1010,1,100000ms,30000ms,Mob006-1::On1010
-006-1.gat,53,36,16,13|monster|MountainSnake|1026,3,150000ms,10000ms,Mob006-1::On1026
-006-1.gat,89,26,33,13|monster|MountainSnake|1026,5,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,113,41,12,37|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,113,51,6,3|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,86,46,29,5|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,105,73,21,14|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,73,102,8,13|monster|MountainSnake|1026,4,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,104,100,11,15|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,82,72,25,16|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,95,114,17,4|monster|MountainSnake|1026,5,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,57,119,18,2|monster|MountainSnake|1026,4,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,33,97,27,33|monster|Scorpion|1003,10,100000ms,30000ms,Mob006-1::On1003
-006-1.gat,58,49,3,3|monster|GreenSlime|1005,3,100000ms,30000ms,Mob006-1::On1005
-006-1.gat,34,50,5,4|monster|Snake|1010,2,40000ms,50000ms,Mob006-1::On1010
-006-1.gat,96,92,20,48|monster|Snake|1010,2,40000ms,50000ms,Mob006-1::On1010
-006-1.gat,35,97,28,29|monster|Maggot|1002,20,100000ms,30000ms,Mob006-1::On1002
-006-1.gat,28,73,3,2|monster|GreenSlime|1005,2,100000ms,30000ms,Mob006-1::On1005
-006-1.gat,33,59,3,2|monster|GreenSlime|1005,2,100000ms,30000ms,Mob006-1::On1005
-006-1.gat,37,73,7,3|monster|Snake|1010,1,100000ms,30000ms,Mob006-1::On1010
-006-1.gat,100,36,38,24|monster|Snake|1010,2,40000ms,50000ms,Mob006-1::On1010
-
-
-006-1.gat,0,0,0|script|Mob006-1|-1
+006-1,49,52,7,3|monster|Snake|1010,1,100000ms,30000ms,Mob006-1::On1010
+006-1,53,36,16,13|monster|MountainSnake|1026,3,150000ms,10000ms,Mob006-1::On1026
+006-1,89,26,33,13|monster|MountainSnake|1026,5,15000ms,75000ms,Mob006-1::On1026
+006-1,113,41,12,37|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
+006-1,113,51,6,3|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
+006-1,86,46,29,5|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
+006-1,105,73,21,14|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
+006-1,73,102,8,13|monster|MountainSnake|1026,4,15000ms,75000ms,Mob006-1::On1026
+006-1,104,100,11,15|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
+006-1,82,72,25,16|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
+006-1,95,114,17,4|monster|MountainSnake|1026,5,15000ms,75000ms,Mob006-1::On1026
+006-1,57,119,18,2|monster|MountainSnake|1026,4,15000ms,75000ms,Mob006-1::On1026
+006-1,33,97,27,33|monster|Scorpion|1003,10,100000ms,30000ms,Mob006-1::On1003
+006-1,58,49,3,3|monster|GreenSlime|1005,3,100000ms,30000ms,Mob006-1::On1005
+006-1,34,50,5,4|monster|Snake|1010,2,40000ms,50000ms,Mob006-1::On1010
+006-1,96,92,20,48|monster|Snake|1010,2,40000ms,50000ms,Mob006-1::On1010
+006-1,35,97,28,29|monster|Maggot|1002,20,100000ms,30000ms,Mob006-1::On1002
+006-1,28,73,3,2|monster|GreenSlime|1005,2,100000ms,30000ms,Mob006-1::On1005
+006-1,33,59,3,2|monster|GreenSlime|1005,2,100000ms,30000ms,Mob006-1::On1005
+006-1,37,73,7,3|monster|Snake|1010,1,100000ms,30000ms,Mob006-1::On1010
+006-1,100,36,38,24|monster|Snake|1010,2,40000ms,50000ms,Mob006-1::On1010
+
+
+006-1,0,0,0|script|Mob006-1|-1
 {
     end;
 
diff --git a/world/map/npc/006-1/_warps.txt b/world/map/npc/006-1/_warps.txt
index 551d74a2..baf86c92 100644
--- a/world/map/npc/006-1/_warps.txt
+++ b/world/map/npc/006-1/_warps.txt
@@ -1,32 +1,32 @@
-// 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.
 // Desert Mountains warps
 
-006-1.gat,40,26|warp|To Desert Mountain Cave|-1,-1,006-3.gat,40,28
-006-1.gat,60,58|warp|To Desert Mountain Cave|-1,-1,006-3.gat,60,70
-006-1.gat,62,30|warp|To Desert Mountain Cave|-1,-1,006-3.gat,62,32
-006-1.gat,55,27|warp|To Desert Mountain Cave|-1,-1,006-3.gat,55,29
-006-1.gat,77,44|warp|To Desert Mountain Cave|-1,-1,006-3.gat,77,46
-006-1.gat,86,24|warp|To Desert Mountain Cave|-1,-1,006-3.gat,86,26
-006-1.gat,91,24|warp|To Desert Mountain Cave|-1,-1,006-3.gat,91,26
-006-1.gat,98,46|warp|To Desert Mountain Cave|-1,-1,006-3.gat,104,46
-006-1.gat,114,22|warp|To Desert Mountain Cave|-1,-1,006-3.gat,122,26
-006-1.gat,114,49|warp|To Desert Mountain Cave|-1,-1,006-3.gat,114,51
-006-1.gat,102,53|warp|To Desert Mountain Cave|-1,-1,006-3.gat,110,58
-006-1.gat,117,57|warp|To Desert Mountain Cave|-1,-1,006-3.gat,125,61
-006-1.gat,92,63|warp|To Desert Mountain Cave|-1,-1,006-3.gat,92,65
-006-1.gat,112,74|warp|To Desert Mountain Cave|-1,-1,006-3.gat,112,76
-006-1.gat,111,110|warp|To Desert Mountain Cave|-1,-1,032-3.gat,56,60
-006-1.gat,83,117|warp|To Desert Mountain Cave|-1,-1,006-3.gat,79,121
-006-1.gat,38,121|warp|To Desert Mountain Cave|-1,-1,006-3.gat,38,123
-006-1.gat,74,90|warp|To Desert Mountain Cave|-1,-1,006-3.gat,74,92
-006-1.gat,51,90|warp|To Desert Mountain Cave|-1,-1,006-3.gat,51,92
-006-1.gat,30,123|warp|To Outback Cave|-1,-1,032-3.gat,128,33
-006-1.gat,33,85|warp|To Pachua's Village|-1,-1,006-2.gat,58,43
-006-1.gat,23,85|warp|To Pachua's Village|-1,-1,006-2.gat,48,43
-006-1.gat,23,100|warp|To Pachua's Village|-1,-1,006-2.gat,67,64
-006-1.gat,21,108|warp|To Pachua's Village|-1,-1,006-2.gat,65,72
-006-1.gat,37,26|warp|To Desert Mountains|-1,-1,006-1.gat,37,23
-006-1.gat,37,24|warp|To Desert Mountains|-1,-1,006-1.gat,37,27
-006-1.gat,55,46|warp|Snake Cave|-1,-1,005-3.gat,86,31
-006-1.gat,20,48|warp|To Sandstorm Desert|-1,0,002-1.gat,118,95
-006-1.gat,51,68|warp|Snake Cave|-1,-1,005-3.gat,73,59
+006-1,40,26|warp|To Desert Mountain Cave|-1,-1,006-3,40,28
+006-1,60,58|warp|To Desert Mountain Cave|-1,-1,006-3,60,70
+006-1,62,30|warp|To Desert Mountain Cave|-1,-1,006-3,62,32
+006-1,55,27|warp|To Desert Mountain Cave|-1,-1,006-3,55,29
+006-1,77,44|warp|To Desert Mountain Cave|-1,-1,006-3,77,46
+006-1,86,24|warp|To Desert Mountain Cave|-1,-1,006-3,86,26
+006-1,91,24|warp|To Desert Mountain Cave|-1,-1,006-3,91,26
+006-1,98,46|warp|To Desert Mountain Cave|-1,-1,006-3,104,46
+006-1,114,22|warp|To Desert Mountain Cave|-1,-1,006-3,122,26
+006-1,114,49|warp|To Desert Mountain Cave|-1,-1,006-3,114,51
+006-1,102,53|warp|To Desert Mountain Cave|-1,-1,006-3,110,58
+006-1,117,57|warp|To Desert Mountain Cave|-1,-1,006-3,125,61
+006-1,92,63|warp|To Desert Mountain Cave|-1,-1,006-3,92,65
+006-1,112,74|warp|To Desert Mountain Cave|-1,-1,006-3,112,76
+006-1,111,110|warp|To Desert Mountain Cave|-1,-1,032-3,56,60
+006-1,83,117|warp|To Desert Mountain Cave|-1,-1,006-3,79,121
+006-1,38,121|warp|To Desert Mountain Cave|-1,-1,006-3,38,123
+006-1,74,90|warp|To Desert Mountain Cave|-1,-1,006-3,74,92
+006-1,51,90|warp|To Desert Mountain Cave|-1,-1,006-3,51,92
+006-1,30,123|warp|To Outback Cave|-1,-1,032-3,128,33
+006-1,33,85|warp|To Pachua's Village|-1,-1,006-2,58,43
+006-1,23,85|warp|To Pachua's Village|-1,-1,006-2,48,43
+006-1,23,100|warp|To Pachua's Village|-1,-1,006-2,67,64
+006-1,21,108|warp|To Pachua's Village|-1,-1,006-2,65,72
+006-1,37,26|warp|To Desert Mountains|-1,-1,006-1,37,23
+006-1,37,24|warp|To Desert Mountains|-1,-1,006-1,37,27
+006-1,55,46|warp|Snake Cave|-1,-1,005-3,86,31
+006-1,20,48|warp|To Sandstorm Desert|-1,0,002-1,118,95
+006-1,51,68|warp|Snake Cave|-1,-1,005-3,73,59
diff --git a/world/map/npc/006-1/mapflags.txt b/world/map/npc/006-1/mapflags.txt
index 85c94b9f..5b3b3a39 100644
--- a/world/map/npc/006-1/mapflags.txt
+++ b/world/map/npc/006-1/mapflags.txt
@@ -1 +1 @@
-006-1.gat|mapflag|resave|006-1,36,18
+006-1|mapflag|resave|006-1,36,18
diff --git a/world/map/npc/006-1/mika.txt b/world/map/npc/006-1/mika.txt
index 82b3db85..2d4a37a7 100644
--- a/world/map/npc/006-1/mika.txt
+++ b/world/map/npc/006-1/mika.txt
@@ -1,4 +1,4 @@
-006-1.gat,39,22,0|script|Mika|114
+006-1,39,22,0|script|Mika|114
 {
     mes "[Mika]";
     mes "\"My father told me about a man living in this desert who makes clothes out of snake skin.\"";
diff --git a/world/map/npc/006-1/miriam.txt b/world/map/npc/006-1/miriam.txt
index 4279e3d5..7fab4bcd 100644
--- a/world/map/npc/006-1/miriam.txt
+++ b/world/map/npc/006-1/miriam.txt
@@ -18,7 +18,7 @@
 // after you gained the speed skill, all variables are reset to zero.
 //#############################################
 
-006-1.gat,115,111,0|script|Miriam|175
+006-1,115,111,0|script|Miriam|175
 {
     setarray @npc_loc, 115, 111, 2;
     callfunc "PCtoNPCRange";
@@ -240,7 +240,7 @@ L_LetsDoThis:
     close2;
     message strcharinfo(0), "Miriam quickly grabs your arm and pull you to the place where she is sitting.";
     // Warp the player to the place where the NPC is defined, so he can't cheat.
-    warp "032-1.gat",55,21;
+    warp "032-1",55,21;
     npctalk "Run " +strcharinfo(0)+ ", run!";
     set QUEST_MIRIAM, 5;
     set QUEST_MIRIAM_start, gettimetick(2);
@@ -319,7 +319,7 @@ L_goodjob:
     next;
     mes "You feel dizzy and as soon as you move your head and look to the ground, Miriam pushes you hard, sending you meters away from her.";
     close2;
-    warp "032-1.gat",55,22;
+    warp "032-1",55,22;
     // free all used player variables. This can be done, since there is a conditional on the speedskill at the beginning.
     set QUEST_MIRIAM_start, 0;
     set QUEST_MIRIAM_run, 0;
diff --git a/world/map/npc/006-1/pachua.txt b/world/map/npc/006-1/pachua.txt
index a84922da..7b39dce7 100644
--- a/world/map/npc/006-1/pachua.txt
+++ b/world/map/npc/006-1/pachua.txt
@@ -1,4 +1,4 @@
-006-1.gat,24,113,0|script|Pachua|143
+006-1,24,113,0|script|Pachua|143
 {
     setarray @npc_loc, 24, 113, 4;
     callfunc "PCtoNPCRange";
diff --git a/world/map/npc/006-1/spirit.txt b/world/map/npc/006-1/spirit.txt
index 5f7d06fb..ef88d7d7 100644
--- a/world/map/npc/006-1/spirit.txt
+++ b/world/map/npc/006-1/spirit.txt
@@ -286,13 +286,13 @@ S_update_var:
     return;
 }
 
-006-1.gat,63,79,0|script|#EarthImp0#_M|400
+006-1,63,79,0|script|#EarthImp0#_M|400
 {
     callfunc "EarthImpTouch";
     end;
 }
 
-006-1.gat,64,79,0|script|#EarthImp1#_M|400
+006-1,64,79,0|script|#EarthImp1#_M|400
 {
     callfunc "EarthImpTouch";
     end;
diff --git a/world/map/npc/006-1/traveler.txt b/world/map/npc/006-1/traveler.txt
index 82b8c8a5..f87cf083 100644
--- a/world/map/npc/006-1/traveler.txt
+++ b/world/map/npc/006-1/traveler.txt
@@ -2,7 +2,7 @@
 // Author: Wombat, wushin
 // cost depending on level and adapted to new scripting guidelines: Jenalya
 
-006-1.gat,25,95,0|script|Rhutan the Traveler|103
+006-1,25,95,0|script|Rhutan the Traveler|103
 {
     set @NpcName$, "Rhutan";
     set @NpcTravelBit, $@pachua_bit;
diff --git a/world/map/npc/006-1/tree.txt b/world/map/npc/006-1/tree.txt
index dbef23f2..ecbc3584 100644
--- a/world/map/npc/006-1/tree.txt
+++ b/world/map/npc/006-1/tree.txt
@@ -155,13 +155,13 @@ L_Close:
 
 }
 
-006-1.gat,82,59,0|script|#DruidTree0#_M|400
+006-1,82,59,0|script|#DruidTree0#_M|400
 {
     callfunc "QuestTreeTouch";
     end;
 }
 
-006-1.gat,83,59,0|script|#DruidTree1#_M|400
+006-1,83,59,0|script|#DruidTree1#_M|400
 {
     callfunc "QuestTreeTouch";
     end;