Merge pull request #267 from mekolat/gat

remove .gat

9 files changed, 55 insertions, 55 deletions

diff --git a/world/map/npc/009-4/_import.txt b/world/map/npc/009-4/_import.txt
index 7b30fd2e..c10d7df3 100644
--- a/world/map/npc/009-4/_import.txt
+++ b/world/map/npc/009-4/_import.txt
@@ -1,6 +1,6 @@
 // Map 009-4: Orum Caves
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 009-4.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 009-4
 npc: npc/009-4/_mobs.txt
 npc: npc/009-4/_warps.txt
 npc: npc/009-4/barriers.txt
diff --git a/world/map/npc/009-4/_mobs.txt b/world/map/npc/009-4/_mobs.txt
index 3be599b8..64e2c4da 100644
--- a/world/map/npc/009-4/_mobs.txt
+++ b/world/map/npc/009-4/_mobs.txt
@@ -1,16 +1,16 @@
-// 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.
 // Orum Caves mobs
 
-009-4.gat,117,97,24,15|monster|Silkworm|1035,3,20000ms,14000ms,Mob009-4::On1035
-009-4.gat,115,98,24,15|monster|CaveSnake|1021,5,20000ms,14000ms,Mob009-4::On1021
-009-4.gat,103,28,24,15|monster|CaveSnake|1021,3,20000ms,14000ms,Mob009-4::On1021
-009-4.gat,106,27,24,15|monster|Silkworm|1035,3,20000ms,14000ms,Mob009-4::On1035
-009-4.gat,119,45,12,10|monster|Silkworm|1035,3,20000ms,14000ms,Mob009-4::On1035
-009-4.gat,72,130,24,15|monster|Maggot|1002,3,20000ms,14000ms,Mob009-4::On1002
-009-4.gat,38,116,24,15|monster|Maggot|1002,3,20000ms,14000ms,Mob009-4::On1002
+009-4,117,97,24,15|monster|Silkworm|1035,3,20000ms,14000ms,Mob009-4::On1035
+009-4,115,98,24,15|monster|CaveSnake|1021,5,20000ms,14000ms,Mob009-4::On1021
+009-4,103,28,24,15|monster|CaveSnake|1021,3,20000ms,14000ms,Mob009-4::On1021
+009-4,106,27,24,15|monster|Silkworm|1035,3,20000ms,14000ms,Mob009-4::On1035
+009-4,119,45,12,10|monster|Silkworm|1035,3,20000ms,14000ms,Mob009-4::On1035
+009-4,72,130,24,15|monster|Maggot|1002,3,20000ms,14000ms,Mob009-4::On1002
+009-4,38,116,24,15|monster|Maggot|1002,3,20000ms,14000ms,Mob009-4::On1002
 
 
-009-4.gat,0,0,0|script|Mob009-4|-1
+009-4,0,0,0|script|Mob009-4|-1
 {
     end;
 
diff --git a/world/map/npc/009-4/_warps.txt b/world/map/npc/009-4/_warps.txt
index 18912219..ff172624 100644
--- a/world/map/npc/009-4/_warps.txt
+++ b/world/map/npc/009-4/_warps.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.
 // Orum Caves warps
 
-009-4.gat,37,112|warp|To Hurnscald Cave|-1,-1,009-3.gat,163,114
-009-4.gat,72,136|warp|To Torches Cave|-1,-1,009-4.gat,36,27
-009-4.gat,37,123|warp|To Torches Cave|-1,-1,009-4.gat,36,27
-009-4.gat,72,125|warp|To Hurnscald Cave|-1,-1,009-3.gat,163,114
-009-4.gat,103,22|warp|To Torches Cave|-1,-1,009-4.gat,51,46
-009-4.gat,103,76|warp|To Torches Cave|-1,-1,009-4.gat,51,46
+009-4,37,112|warp|To Hurnscald Cave|-1,-1,009-3,163,114
+009-4,72,136|warp|To Torches Cave|-1,-1,009-4,36,27
+009-4,37,123|warp|To Torches Cave|-1,-1,009-4,36,27
+009-4,72,125|warp|To Hurnscald Cave|-1,-1,009-3,163,114
+009-4,103,22|warp|To Torches Cave|-1,-1,009-4,51,46
+009-4,103,76|warp|To Torches Cave|-1,-1,009-4,51,46
diff --git a/world/map/npc/009-4/barriers.txt b/world/map/npc/009-4/barriers.txt
index 49fd3877..adaa384e 100644
--- a/world/map/npc/009-4/barriers.txt
+++ b/world/map/npc/009-4/barriers.txt
@@ -44,7 +44,7 @@ L_Error2:
 
 
 // Starting Barrier / Quest Entrance
-009-4.gat,37,119,0|script|#OrumCaveStartMessage|127,0,0
+009-4,37,119,0|script|#OrumCaveStartMessage|127,0,0
 {
     if (OrumQuest >= 3) end;
     if (OrumQuest == 2) goto L_Started;
@@ -58,15 +58,15 @@ L_Started:
     close;
 }
 
-009-4.gat,37,120,0|script|#OrumCaveStartBarrier|127,0,0
+009-4,37,120,0|script|#OrumCaveStartBarrier|127,0,0
 {
     if (OrumQuest >= 3) end;
-    warp "009-4.gat", 37, 118;
+    warp "009-4", 37, 118;
     end;
 }
 
 // First Barrier
-009-4.gat,57,29,0|script|#OrumCaveFirstBarrier|127,0,0
+009-4,57,29,0|script|#OrumCaveFirstBarrier|127,0,0
 {
     if (OrumQuest >= 5) close;
 
@@ -76,7 +76,7 @@ L_Started:
 }
 
 // Second Barrier
-009-4.gat,61,55,0|script|#OrumCaveSecondMessage|127,0,0
+009-4,61,55,0|script|#OrumCaveSecondMessage|127,0,0
 {
     if (OrumQuest == 3) set OrumQuest, 4;
 
@@ -103,15 +103,15 @@ L_Advance_Quest:
     end;
 }
 
-009-4.gat,61,54,0|script|#OrumCaveSecondBarrier|127,0,0
+009-4,61,54,0|script|#OrumCaveSecondBarrier|127,0,0
 {
     if (OrumQuest >= 9) end;
-    warp "009-4.gat", 60, 56;
+    warp "009-4", 60, 56;
     end;
 }
 
 // Third Barrier
-009-4.gat,24,65,0|script|#OrumCaveThirdMessage|127,0,0
+009-4,24,65,0|script|#OrumCaveThirdMessage|127,0,0
 {
     if (OrumQuest == 3) set OrumQuest, 4;
     if (OrumQuest > 8 && @Torch1Color == @firstColor && @Torch2Color == @secondColor)
@@ -152,15 +152,15 @@ L_Advance_Quest:
     end;
 }
 
-009-4.gat,24,66,0|script|#OrumCaveThirdBarrier|127,0,0
+009-4,24,66,0|script|#OrumCaveThirdBarrier|127,0,0
 {
     if (OrumQuest >= 10) end;
-    warp "009-4.gat", 23, 64;
+    warp "009-4", 23, 64;
     end;
 }
 
 // Ending Barrier
-009-4.gat,48,37,0|script|#OrumCaveEndMessage|127,0,0
+009-4,48,37,0|script|#OrumCaveEndMessage|127,0,0
 {
     if (OrumQuest >= 11) end;
     if (OrumQuest == 3) set OrumQuest, 4;
@@ -272,9 +272,9 @@ L_Advance_Quest:
     close;
 }
 
-009-4.gat,48,38,0|script|#OrumCaveEndBarrier|127,0,0
+009-4,48,38,0|script|#OrumCaveEndBarrier|127,0,0
 {
     if (OrumQuest >= 11) end;
-    warp "009-4.gat", 47, 36;
+    warp "009-4", 47, 36;
     end;
 }
diff --git a/world/map/npc/009-4/mapflags.txt b/world/map/npc/009-4/mapflags.txt
index 05aa9324..f9b9cfa9 100644
--- a/world/map/npc/009-4/mapflags.txt
+++ b/world/map/npc/009-4/mapflags.txt
@@ -1 +1 @@
-009-4.gat|mapflag|resave|009-4,37,118
+009-4|mapflag|resave|009-4,37,118
diff --git a/world/map/npc/009-4/orum.txt b/world/map/npc/009-4/orum.txt
index db99d50c..84afced4 100644
--- a/world/map/npc/009-4/orum.txt
+++ b/world/map/npc/009-4/orum.txt
@@ -18,7 +18,7 @@
 //# OrumQuestBarrier    nibble (0,1,2) stores the color of the barriers           #
 //#################################################################################
 
-009-4.gat,35,115,0|script|OrumDebug|158
+009-4,35,115,0|script|OrumDebug|158
 {
     mes "[Orum Debug]";
     menu
@@ -49,7 +49,7 @@ OnInit:
         disablenpc "OrumDebug";
     end;
 }
-009-4.gat,37,115,0|script|Orum#barrier|158
+009-4,37,115,0|script|Orum#barrier|158
 {
     // needed to pass the very first barrier
     set @B0_WISPPOWDER, 4;
diff --git a/world/map/npc/009-4/orum_warps.txt b/world/map/npc/009-4/orum_warps.txt
index 86afb56f..6353a14a 100644
--- a/world/map/npc/009-4/orum_warps.txt
+++ b/world/map/npc/009-4/orum_warps.txt
@@ -1,33 +1,33 @@
-009-3.gat,162,113,0|script|#OrumQuestEnter|45,0,0
+009-3,162,113,0|script|#OrumQuestEnter|45,0,0
 {
     if (OrumQuest >= 12) goto L_Second_Entrance;
-    warp "009-4.gat", 37, 113;
+    warp "009-4", 37, 113;
     close;
 
 L_Second_Entrance:
-    warp "009-4.gat", 72, 126;
+    warp "009-4", 72, 126;
     close;
 }
-009-4.gat,36,26,0|script|#LairExit|45,0,0
+009-4,36,26,0|script|#LairExit|45,0,0
 {
     if (OrumQuest >= 12) goto L_Second_Entrance;
-    warp "009-4.gat", 37, 122;
+    warp "009-4", 37, 122;
     close;
 
 L_Second_Entrance:
-    warp "009-4.gat", 72, 135;
+    warp "009-4", 72, 135;
     close;
 }
 
-009-4.gat,51,47,0|script|#CavernEnter|45,0,0
+009-4,51,47,0|script|#CavernEnter|45,0,0
 {
     if (OrumQuest >= 14) goto L_Second_Cavern;
     if (OrumQuest < 12) goto L_See_Orum;
-    warp "009-4.gat", 103, 23;
+    warp "009-4", 103, 23;
     close;
 
 L_Second_Cavern:
-    warp "009-4.gat", 103, 77;
+    warp "009-4", 103, 77;
     close;
 
 L_See_Orum:
diff --git a/world/map/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt
index fbb88a84..7049b446 100644
--- a/world/map/npc/009-4/torches.txt
+++ b/world/map/npc/009-4/torches.txt
@@ -89,7 +89,7 @@ L_Return:
 // To make sure in range of torches
 function|script|InRangeTorch1
 {
-    if (isin("009-4.gat",67,20,69,25))
+    if (isin("009-4",67,20,69,25))
         goto L_Return;
     mes "You're too far away to do anything with that torch.";
     close;
@@ -99,7 +99,7 @@ L_Return:
 }
 function|script|InRangeTorch2
 {
-    if (isin("009-4.gat",65,41,69,46))
+    if (isin("009-4",65,41,69,46))
         goto L_Return;
     mes "You're too far away to do anything with that torch.";
     close;
@@ -109,7 +109,7 @@ L_Return:
 }
 function|script|InRangeTorch3
 {
-    if (isin("009-4.gat",33,84,37,88))
+    if (isin("009-4",33,84,37,88))
         goto L_Return;
     mes "You're too far away to do anything with that torch.";
     close;
@@ -281,7 +281,7 @@ L_Failed:
 }
 
 // First Torch
-009-4.gat,68,21,0|script|Torch#1|400
+009-4,68,21,0|script|Torch#1|400
 {
     callfunc "InRangeTorch1";
     callfunc "DoneWithTorches";
@@ -293,7 +293,7 @@ L_Failed:
 }
 
 // Second Torch
-009-4.gat,67,42,0|script|Torch#2|400
+009-4,67,42,0|script|Torch#2|400
 {
     callfunc "InRangeTorch2";
     callfunc "DoneWithTorches";
@@ -305,7 +305,7 @@ L_Failed:
 }
 
 // Third Torch
-009-4.gat,33,86,0|script|Torch#3|400
+009-4,33,86,0|script|Torch#3|400
 {
     callfunc "InRangeTorch3";
     callfunc "DoneWithTorches";
diff --git a/world/map/npc/009-4/waric.txt b/world/map/npc/009-4/waric.txt
index b83a14cc..29eff17b 100644
--- a/world/map/npc/009-4/waric.txt
+++ b/world/map/npc/009-4/waric.txt
@@ -1,6 +1,6 @@
 //# see detailed description at orum.txt
 
-009-4.gat,99,33,0|script|#WizardTrap|127,2,1
+009-4,99,33,0|script|#WizardTrap|127,2,1
 {
     set @gender$, "They're";
     if (Sex == 0)
@@ -10,7 +10,7 @@
 
     mes "As you explore further into the cave you see a figure looking at you who appears angry. But as you begin to speak, he quickly chants some words and you start to lose conciousness!";
     next;
-    warp "009-4.gat", 117, 40;
+    warp "009-4", 117, 40;
     mes "When you awake you find yourself unable to move. You seem to be held in place by something. As your eyes regain focus you see Orum talking with the figure you saw earlier. Orum looks over at you and mumbles.";
     mes "";
     mes "[Orum]";
@@ -19,7 +19,7 @@
     close;
 }
 
-009-4.gat,120,43,0|script|Orum#trap|158
+009-4,120,43,0|script|Orum#trap|158
 {
     mes "[Orum]";
     mes "\"I told you to forget about this place but you did not heed my advice!\"";
@@ -28,7 +28,7 @@
     close;
 }
 
-009-4.gat,118,42,0|script|Waric#trap|153
+009-4,118,42,0|script|Waric#trap|153
 {
     set @EXP_LEARNED_ALOT, 10000;
     if (OrumQuest >= 13)
@@ -92,10 +92,10 @@ L_Explain:
     next;
     set OrumQuest, 14;
     misceffect 10;
-    warp "008-1.gat", 65, 90;
+    warp "008-1", 65, 90;
     getexp @EXP_LEARNED_ALOT, 0;
     mes "You awake on your back with a squirrel sitting on top of you arranging it's acorns. It quickly gathers them up and runs off as it sees you looking at it them.";
-    monster "008-1.gat", 65, 90, "Squirrel", 1038, 1;
+    monster "008-1", 65, 90, "Squirrel", 1038, 1;
     goto L_Close;
 
 L_Close: