Merge pull request #267 from mekolat/gat

remove .gat

7 files changed, 84 insertions, 84 deletions

diff --git a/world/map/npc/011-6/_import.txt b/world/map/npc/011-6/_import.txt
index b8e7e693..34a781ad 100644
--- a/world/map/npc/011-6/_import.txt
+++ b/world/map/npc/011-6/_import.txt
@@ -1,6 +1,6 @@
 // Map 011-6: Bandit Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 011-6.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 011-6
 npc: npc/011-6/_mobs.txt
 npc: npc/011-6/_warps.txt
 npc: npc/011-6/barrier.txt
diff --git a/world/map/npc/011-6/_mobs.txt b/world/map/npc/011-6/_mobs.txt
index c627e4aa..f86fdd66 100644
--- a/world/map/npc/011-6/_mobs.txt
+++ b/world/map/npc/011-6/_mobs.txt
@@ -1,56 +1,56 @@
-// 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.
 // Bandit Cave mobs
 
-011-6.gat,152,72,283,127|monster|Silkworm|1035,9,30000ms,100000ms,Mob011-6::On1035
-011-6.gat,263,38,30,34|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
-011-6.gat,262,114,38,38|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
-011-6.gat,132,119,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
-011-6.gat,170,66,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
-011-6.gat,67,70,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
-011-6.gat,196,107,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
-011-6.gat,196,29,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
-011-6.gat,36,37,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
-011-6.gat,112,40,45,48|monster|Bandit|1064,2,30000ms,60000ms,Mob011-6::On1064
-011-6.gat,31,99,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
-011-6.gat,223,250,123,65|monster|Bat|1017,5,30000ms,100000ms,Mob011-6::On1017
-011-6.gat,224,175,118,25|monster|Bat|1017,3,30000ms,100000ms,Mob011-6::On1017
-011-6.gat,257,77,4,126|monster|Bat|1017,6,30000ms,100000ms,Mob011-6::On1017
-011-6.gat,192,77,4,126|monster|Bat|1017,9,30000ms,100000ms,Mob011-6::On1017
-011-6.gat,167,110,87,13|monster|Bat|1017,9,30000ms,100000ms,Mob011-6::On1017
-011-6.gat,75,70,104,96|monster|Bat|1017,23,30000ms,100000ms,Mob011-6::On1017
-011-6.gat,78,195,129,97|monster|Bat|1017,9,30000ms,100000ms,Mob011-6::On1017
-011-6.gat,168,109,36,37|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019
-011-6.gat,199,76,36,37|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019
-011-6.gat,88,163,29,27|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019
-011-6.gat,48,113,35,19|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019
-011-6.gat,177,94,20,28|monster|EvilMushroom|1013,4,30000ms,100000ms,Mob011-6::On1013
-011-6.gat,194,49,20,28|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013
-011-6.gat,51,115,47,24|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013
-011-6.gat,63,169,13,17|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013
-011-6.gat,100,226,29,14|monster|SpikyMushroom|1019,3,30000ms,100000ms,Mob011-6::On1019
-011-6.gat,260,44,53,16|monster|SpikyMushroom|1019,3,30000ms,100000ms,Mob011-6::On1019
-011-6.gat,272,48,21,28|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013
-011-6.gat,95,78,31,25|monster|YellowSlime|1007,5,30000ms,100000ms,Mob011-6::On1007
-011-6.gat,59,36,19,25|monster|YellowSlime|1007,5,30000ms,100000ms,Mob011-6::On1007
-011-6.gat,26,69,19,25|monster|YellowSlime|1007,5,30000ms,100000ms,Mob011-6::On1007
-011-6.gat,61,101,14,10|monster|YellowSlime|1007,3,30000ms,100000ms,Mob011-6::On1007
-011-6.gat,50,61,9,12|monster|YellowSlime|1007,3,30000ms,100000ms,Mob011-6::On1007
-011-6.gat,128,39,9,12|monster|YellowSlime|1007,3,30000ms,100000ms,Mob011-6::On1007
-011-6.gat,41,178,9,12|monster|YellowSlime|1007,1,30000ms,100000ms,Mob011-6::On1007
-011-6.gat,70,229,9,12|monster|YellowSlime|1007,1,30000ms,100000ms,Mob011-6::On1007
-011-6.gat,20,204,9,12|monster|YellowSlime|1007,1,30000ms,100000ms,Mob011-6::On1007
-011-6.gat,114,190,9,12|monster|YellowSlime|1007,4,30000ms,100000ms,Mob011-6::On1007
-011-6.gat,137,205,9,12|monster|YellowSlime|1007,2,30000ms,100000ms,Mob011-6::On1007
-011-6.gat,79,220,29,14|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
-011-6.gat,115,210,29,14|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
-011-6.gat,41,193,31,31|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
-011-6.gat,70,143,31,31|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
-011-6.gat,97,183,29,14|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
-011-6.gat,172,252,9,12|monster|CaveMaggot|1056,4,30000ms,100000ms,Mob011-6::On1056
-011-6.gat,263,236,16,5|monster|CaveMaggot|1056,3,30000ms,100000ms,Mob011-6::On1056
+011-6,152,72,283,127|monster|Silkworm|1035,9,30000ms,100000ms,Mob011-6::On1035
+011-6,263,38,30,34|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6,262,114,38,38|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6,132,119,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6,170,66,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6,67,70,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6,196,107,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6,196,29,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6,36,37,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6,112,40,45,48|monster|Bandit|1064,2,30000ms,60000ms,Mob011-6::On1064
+011-6,31,99,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6,223,250,123,65|monster|Bat|1017,5,30000ms,100000ms,Mob011-6::On1017
+011-6,224,175,118,25|monster|Bat|1017,3,30000ms,100000ms,Mob011-6::On1017
+011-6,257,77,4,126|monster|Bat|1017,6,30000ms,100000ms,Mob011-6::On1017
+011-6,192,77,4,126|monster|Bat|1017,9,30000ms,100000ms,Mob011-6::On1017
+011-6,167,110,87,13|monster|Bat|1017,9,30000ms,100000ms,Mob011-6::On1017
+011-6,75,70,104,96|monster|Bat|1017,23,30000ms,100000ms,Mob011-6::On1017
+011-6,78,195,129,97|monster|Bat|1017,9,30000ms,100000ms,Mob011-6::On1017
+011-6,168,109,36,37|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019
+011-6,199,76,36,37|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019
+011-6,88,163,29,27|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019
+011-6,48,113,35,19|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019
+011-6,177,94,20,28|monster|EvilMushroom|1013,4,30000ms,100000ms,Mob011-6::On1013
+011-6,194,49,20,28|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013
+011-6,51,115,47,24|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013
+011-6,63,169,13,17|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013
+011-6,100,226,29,14|monster|SpikyMushroom|1019,3,30000ms,100000ms,Mob011-6::On1019
+011-6,260,44,53,16|monster|SpikyMushroom|1019,3,30000ms,100000ms,Mob011-6::On1019
+011-6,272,48,21,28|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013
+011-6,95,78,31,25|monster|YellowSlime|1007,5,30000ms,100000ms,Mob011-6::On1007
+011-6,59,36,19,25|monster|YellowSlime|1007,5,30000ms,100000ms,Mob011-6::On1007
+011-6,26,69,19,25|monster|YellowSlime|1007,5,30000ms,100000ms,Mob011-6::On1007
+011-6,61,101,14,10|monster|YellowSlime|1007,3,30000ms,100000ms,Mob011-6::On1007
+011-6,50,61,9,12|monster|YellowSlime|1007,3,30000ms,100000ms,Mob011-6::On1007
+011-6,128,39,9,12|monster|YellowSlime|1007,3,30000ms,100000ms,Mob011-6::On1007
+011-6,41,178,9,12|monster|YellowSlime|1007,1,30000ms,100000ms,Mob011-6::On1007
+011-6,70,229,9,12|monster|YellowSlime|1007,1,30000ms,100000ms,Mob011-6::On1007
+011-6,20,204,9,12|monster|YellowSlime|1007,1,30000ms,100000ms,Mob011-6::On1007
+011-6,114,190,9,12|monster|YellowSlime|1007,4,30000ms,100000ms,Mob011-6::On1007
+011-6,137,205,9,12|monster|YellowSlime|1007,2,30000ms,100000ms,Mob011-6::On1007
+011-6,79,220,29,14|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
+011-6,115,210,29,14|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
+011-6,41,193,31,31|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
+011-6,70,143,31,31|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
+011-6,97,183,29,14|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
+011-6,172,252,9,12|monster|CaveMaggot|1056,4,30000ms,100000ms,Mob011-6::On1056
+011-6,263,236,16,5|monster|CaveMaggot|1056,3,30000ms,100000ms,Mob011-6::On1056
 
 
-011-6.gat,0,0,0|script|Mob011-6|-1
+011-6,0,0,0|script|Mob011-6|-1
 {
     end;
 
diff --git a/world/map/npc/011-6/_warps.txt b/world/map/npc/011-6/_warps.txt
index 8465b47d..479892e5 100644
--- a/world/map/npc/011-6/_warps.txt
+++ b/world/map/npc/011-6/_warps.txt
@@ -1,25 +1,25 @@
-// 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.
 // Bandit Cave warps
 
-011-6.gat,51,75|warp|To Small Bandit Cave|-1,-1,011-6.gat,260,127
-011-6.gat,61,71|warp|To Small Bandit Cave|-1,-1,011-6.gat,270,124
-011-6.gat,270,125|warp|To Bandit Cave|-1,-1,011-6.gat,61,72
-011-6.gat,260,128|warp|To Bandit Cave|-1,-1,011-6.gat,51,76
-011-6.gat,145,118|warp|To Bandit Cave|-1,-1,011-6.gat,47,119
-011-6.gat,196,26|warp|To Small Bandit Cave|-1,-1,011-6.gat,261,46
-011-6.gat,261,47|warp|To Second Bandit Cave|-1,-1,011-6.gat,196,27
-011-6.gat,271,52|warp|To Bandit Cave|-1,-1,011-6.gat,98,31
-011-6.gat,98,30|warp|To Small Bandit Cave|-1,-1,011-6.gat,271,51
-011-6.gat,47,120|warp|To Second Bandit Cave|-1,-1,011-6.gat,145,117
-011-6.gat,49,101|warp|To Woodland|-1,-1,011-1.gat,38,37
-011-6.gat,24,206|warp|To Lake Cave|-1,-1,011-4.gat,16,58
-011-6.gat,47,185|warp|To Lake Cave|-1,-1,011-4.gat,39,36
-011-6.gat,97,169|warp|To Lake Cave|-1,-1,011-4.gat,89,21
-011-6.gat,113,182|warp|To Lake Cave|-1,-1,011-4.gat,106,33
-011-6.gat,122,211|warp|To Lake Cave|-1,-1,011-4.gat,115,62
-011-6.gat,94,225|warp|To Lake Cave|-1,-1,011-4.gat,87,76
-011-6.gat,68,235|warp|To Lake Cave|-1,-1,011-4.gat,62,87
-011-6.gat,251,278|warp|To Lake Cave|-1,-1,011-4.gat,111,122
-011-6.gat,186,182|warp|To Lake Cave|0,-1,011-4.gat,32,6
-011-6.gat,266,182|warp|To Lake Cave|-1,-1,011-4.gat,45,119
-011-6.gat,174,256|warp|To Bandit Lord Cave|-1,-1,011-6.gat,264,237
+011-6,51,75|warp|To Small Bandit Cave|-1,-1,011-6,260,127
+011-6,61,71|warp|To Small Bandit Cave|-1,-1,011-6,270,124
+011-6,270,125|warp|To Bandit Cave|-1,-1,011-6,61,72
+011-6,260,128|warp|To Bandit Cave|-1,-1,011-6,51,76
+011-6,145,118|warp|To Bandit Cave|-1,-1,011-6,47,119
+011-6,196,26|warp|To Small Bandit Cave|-1,-1,011-6,261,46
+011-6,261,47|warp|To Second Bandit Cave|-1,-1,011-6,196,27
+011-6,271,52|warp|To Bandit Cave|-1,-1,011-6,98,31
+011-6,98,30|warp|To Small Bandit Cave|-1,-1,011-6,271,51
+011-6,47,120|warp|To Second Bandit Cave|-1,-1,011-6,145,117
+011-6,49,101|warp|To Woodland|-1,-1,011-1,38,37
+011-6,24,206|warp|To Lake Cave|-1,-1,011-4,16,58
+011-6,47,185|warp|To Lake Cave|-1,-1,011-4,39,36
+011-6,97,169|warp|To Lake Cave|-1,-1,011-4,89,21
+011-6,113,182|warp|To Lake Cave|-1,-1,011-4,106,33
+011-6,122,211|warp|To Lake Cave|-1,-1,011-4,115,62
+011-6,94,225|warp|To Lake Cave|-1,-1,011-4,87,76
+011-6,68,235|warp|To Lake Cave|-1,-1,011-4,62,87
+011-6,251,278|warp|To Lake Cave|-1,-1,011-4,111,122
+011-6,186,182|warp|To Lake Cave|0,-1,011-4,32,6
+011-6,266,182|warp|To Lake Cave|-1,-1,011-4,45,119
+011-6,174,256|warp|To Bandit Lord Cave|-1,-1,011-6,264,237
diff --git a/world/map/npc/011-6/barrier.txt b/world/map/npc/011-6/barrier.txt
index 7b4f2b25..15639a18 100644
--- a/world/map/npc/011-6/barrier.txt
+++ b/world/map/npc/011-6/barrier.txt
@@ -1,4 +1,4 @@
-011-6.gat,264,236,0|script|#BL_Barrier2|45,0,0
+011-6,264,236,0|script|#BL_Barrier2|45,0,0
 {
     set @state, ((QUEST_Hurnscald & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
 
@@ -7,7 +7,7 @@
     goto L_End;
 
 L_Bandit_Lord_Hideout_Open:
-    warp "011-6.gat",174,255;
+    warp "011-6",174,255;
     goto L_End;
 
 L_End:
diff --git a/world/map/npc/011-6/bryant.txt b/world/map/npc/011-6/bryant.txt
index 2aaa15fe..fae31706 100644
--- a/world/map/npc/011-6/bryant.txt
+++ b/world/map/npc/011-6/bryant.txt
@@ -1,7 +1,7 @@
 //NPC to set the state for killing the bandit lord.
 // Variables used: nibble 0 of QUEST_Hurnscald
 
-011-6.gat,27,200,0|script|Bryant|126
+011-6,27,200,0|script|Bryant|126
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
@@ -25,7 +25,7 @@ L_Bryant_Summon:
     mes "\"I believe I saw him run into a cave south and east of here. There is a red carpet in front of the cave entrance. Be careful and good luck.\"";
     set @state, 4;
     callsub S_Update_Var;
-    monster "011-6.gat",260,250,"BanditLord",1065,1, "Bryant::OnBanditLordDead";
+    monster "011-6",260,250,"BanditLord",1065,1, "Bryant::OnBanditLordDead";
     goto L_Close;
 
 OnBanditLordDead:
@@ -53,15 +53,15 @@ L_Bryant_Waits:
 L_Bryant_No:
     mes "[Bryant]";
     mes "\"Well, maybe he ran off. I'm pretty sure he should be there now.\"";
-    killmonster "011-6.gat", "Bryant::OnBanditLordDead";
-    monster "011-6.gat",260,250,"BanditLord",1065,1, "Bryant::OnBanditLordDead";
+    killmonster "011-6", "Bryant::OnBanditLordDead";
+    monster "011-6",260,250,"BanditLord",1065,1, "Bryant::OnBanditLordDead";
     goto L_Close;
 
 L_Bryant_Yes:
     mes "[Bryant]";
     mes "\"I don't think you killed him. Please try to find and kill him. He should be in the cave south and east of here with the red carpet in front of it.\"";
-    killmonster "011-6.gat", "Bryant::OnBanditLordDead";
-    monster "011-6.gat",260,250,"BanditLord",1065,1, "Bryant::OnBanditLordDead";
+    killmonster "011-6", "Bryant::OnBanditLordDead";
+    monster "011-6",260,250,"BanditLord",1065,1, "Bryant::OnBanditLordDead";
     goto L_Close;
 
 L_Bryant_Quiet:
diff --git a/world/map/npc/011-6/crastur.txt b/world/map/npc/011-6/crastur.txt
index aae2ff38..16dda84f 100644
--- a/world/map/npc/011-6/crastur.txt
+++ b/world/map/npc/011-6/crastur.txt
@@ -1,4 +1,4 @@
-011-6.gat,172,250,0|script|Crastur the Ugly|418
+011-6,172,250,0|script|Crastur the Ugly|418
 {
     set @spants_state, ((QUEST_WG_state & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT);
     set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
diff --git a/world/map/npc/011-6/mapflags.txt b/world/map/npc/011-6/mapflags.txt
index 0ff444d7..47ba426a 100644
--- a/world/map/npc/011-6/mapflags.txt
+++ b/world/map/npc/011-6/mapflags.txt
@@ -1 +1 @@
-011-6.gat|mapflag|resave|011-1,103,34
+011-6|mapflag|resave|011-1,103,34