5 files changed, 18 insertions, 18 deletions
diff --git a/world/map/npc/018-1/flowerpentagram3.txt b/world/map/npc/018-1/flowerpentagram3.txt
index 08d72e79..857c412d 100644
--- a/world/map/npc/018-1/flowerpentagram3.txt
+++ b/world/map/npc/018-1/flowerpentagram3.txt
@@ -1,6 +1,6 @@
 // Author: Jenalya
 
-018-1.gat,83,29,0|script|#FlowerPentagram3|400
+018-1,83,29,0|script|#FlowerPentagram3|400
 {
     if (OrumQuest >= 31) goto L_PlacedFifthFlower;
 
@@ -17,7 +17,7 @@ L_ThirdFlower:
         "Leave.", L_Close;
 
 L_Next:
-    if (isin("018-1.gat", 82, 28, 84, 30))
+    if (isin("018-1", 82, 28, 84, 30))
         goto L_Place;
 
     mes "This isn't working, you're too far away.";
@@ -25,12 +25,12 @@ L_Next:
 
 L_Place:
     set @localMonsterCount,
-        mobcount("018-1.gat", "#FlowerPentagram3::OnSquirrelDeath") +
-        mobcount("018-1.gat", "#FlowerPentagram3::OnMushroomDeath") +
-        mobcount("018-1.gat", "#FlowerPentagram3::OnBlueparDeath") +
-        mobcount("018-1.gat", "#FlowerPentagram3::OnScorpionDeath") +
-        mobcount("018-1.gat", "#FlowerPentagram3::OnRScorpionDeath") +
-        mobcount("018-1.gat", "#FlowerPentagram3::OnAScorpionDeath") +
+        mobcount("018-1", "#FlowerPentagram3::OnSquirrelDeath") +
+        mobcount("018-1", "#FlowerPentagram3::OnMushroomDeath") +
+        mobcount("018-1", "#FlowerPentagram3::OnBlueparDeath") +
+        mobcount("018-1", "#FlowerPentagram3::OnScorpionDeath") +
+        mobcount("018-1", "#FlowerPentagram3::OnRScorpionDeath") +
+        mobcount("018-1", "#FlowerPentagram3::OnAScorpionDeath") +
         6; // the mobcount function has an offset of -1, so we add 6 to have the actual amount of monsters
     if (@localMonsterCount > 4)
         goto L_MonstersAlive;
@@ -42,12 +42,12 @@ L_Place:
     mes "You feel the now familiar tension around you. Here they come.";
     set OrumQuest, 24;
     close2;
-    areamonster "018-1.gat", 73, 22, 89, 36, "", 1105, 1, "#FlowerPentagram3::OnSquirrelDeath";
-    areamonster "018-1.gat", 73, 22, 89, 36, "", 1106, 2, "#FlowerPentagram3::OnMushroomDeath";
-    areamonster "018-1.gat", 73, 22, 89, 36, "", 1107, 1, "#FlowerPentagram3::OnBlueparDeath";
-    areamonster "018-1.gat", 73, 22, 89, 36, "", 1003, 2, "#FlowerPentagram3::OnScorpionDeath";
-    areamonster "018-1.gat", 73, 22, 89, 36, "", 1004, 1, "#FlowerPentagram3::OnRScorpionDeath";
-    areamonster "018-1.gat", 73, 22, 89, 36, "", 1057, 2, "#FlowerPentagram3::OnAScorpionDeath";
+    areamonster "018-1", 73, 22, 89, 36, "", 1105, 1, "#FlowerPentagram3::OnSquirrelDeath";
+    areamonster "018-1", 73, 22, 89, 36, "", 1106, 2, "#FlowerPentagram3::OnMushroomDeath";
+    areamonster "018-1", 73, 22, 89, 36, "", 1107, 1, "#FlowerPentagram3::OnBlueparDeath";
+    areamonster "018-1", 73, 22, 89, 36, "", 1003, 2, "#FlowerPentagram3::OnScorpionDeath";
+    areamonster "018-1", 73, 22, 89, 36, "", 1004, 1, "#FlowerPentagram3::OnRScorpionDeath";
+    areamonster "018-1", 73, 22, 89, 36, "", 1057, 2, "#FlowerPentagram3::OnAScorpionDeath";
     set @value, 15;
     callfunc "QuestSagathaAnnoy";
     set @value, 0;
diff --git a/world/map/npc/018-1/mapflags.txt b/world/map/npc/018-1/mapflags.txt
index b694150b..a1b62aab 100644
--- a/world/map/npc/018-1/mapflags.txt
+++ b/world/map/npc/018-1/mapflags.txt
@@ -1 +1 @@
-018-1.gat|mapflag|resave|018-2,88,32
+018-1|mapflag|resave|018-2,88,32
diff --git a/world/map/npc/018-1/mike.txt b/world/map/npc/018-1/mike.txt
index 0ee02342..38fce03d 100644
--- a/world/map/npc/018-1/mike.txt
+++ b/world/map/npc/018-1/mike.txt
@@ -1,4 +1,4 @@
-018-1.gat,77,60,0|script|Mike|113
+018-1,77,60,0|script|Mike|113
 {
     mes "[Mike]";
     mes "\"I need black stingers to make some medicine to cure my sister.\"";
diff --git a/world/map/npc/018-1/miners.txt b/world/map/npc/018-1/miners.txt
index f7837f0c..a634ded4 100644
--- a/world/map/npc/018-1/miners.txt
+++ b/world/map/npc/018-1/miners.txt
@@ -1,5 +1,5 @@
 //
-018-1.gat,80,61,0|script|Miner|109
+018-1,80,61,0|script|Miner|109
 {
     mes "[Miner]";
     mes "\"Be careful in there.\"";
diff --git a/world/map/npc/018-1/sword.txt b/world/map/npc/018-1/sword.txt
index 58ad8ed2..8d5dc827 100644
--- a/world/map/npc/018-1/sword.txt
+++ b/world/map/npc/018-1/sword.txt
@@ -1,4 +1,4 @@
-018-1.gat,110,43,0|script|#IceSword#_M|400
+018-1,110,43,0|script|#IceSword#_M|400
 {
     if (getskilllv(SKILL_MAGIC))
         goto L_message;