remove .gat from npcs

7 files changed, 46 insertions, 46 deletions

diff --git a/world/map/npc/029-2/barrels.txt b/world/map/npc/029-2/barrels.txt
index aba6ed58..4ff3e6de 100644
--- a/world/map/npc/029-2/barrels.txt
+++ b/world/map/npc/029-2/barrels.txt
@@ -1,6 +1,6 @@
 // Barrels
 // Author: Wushin
-029-2.gat,23,86,0|script|Barrel#0|400
+029-2,23,86,0|script|Barrel#0|400
 {
     setarray @npc_loc, 23, 86, 2;
     set @barrel, 0;
@@ -12,49 +12,49 @@ OnMaggotDeath:
     callfunc "MobPoints";
     end;
 }
-029-2.gat,28,86,0|script|Barrel#1|400
+029-2,28,86,0|script|Barrel#1|400
 {
     setarray @npc_loc, 28, 86, 2;
     set @barrel, 1;
     callfunc "CheckBarrel";
     end;
 }
-029-2.gat,31,91,0|script|Barrel#2|400
+029-2,31,91,0|script|Barrel#2|400
 {
     setarray @npc_loc, 31, 91, 2;
     set @barrel, 2;
     callfunc "CheckBarrel";
     end;
 }
-029-2.gat,36,85,0|script|Barrel#3|400
+029-2,36,85,0|script|Barrel#3|400
 {
     setarray @npc_loc, 36, 85, 2;
     set @barrel, 3;
     callfunc "CheckBarrel";
     end;
 }
-029-2.gat,40,89,0|script|Barrel#4|400
+029-2,40,89,0|script|Barrel#4|400
 {
     setarray @npc_loc, 40, 89, 2;
     set @barrel, 4;
     callfunc "CheckBarrel";
     end;
 }
-029-2.gat,38,91,0|script|Barrel#5|400
+029-2,38,91,0|script|Barrel#5|400
 {
     setarray @npc_loc, 38, 91, 2;
     set @barrel, 5;
     callfunc "CheckBarrel";
     end;
 }
-029-2.gat,29,92,0|script|Barrel#6|400
+029-2,29,92,0|script|Barrel#6|400
 {
     setarray @npc_loc, 29, 92, 2;
     set @barrel, 6;
     callfunc "CheckBarrel";
     end;
 }
-029-2.gat,24,91,0|script|Barrel#7|400
+029-2,24,91,0|script|Barrel#7|400
 {
     setarray @npc_loc, 24, 91, 2;
     set @barrel, 7;
diff --git a/world/map/npc/029-2/barrels_config.txt b/world/map/npc/029-2/barrels_config.txt
index 5407a944..665903fb 100644
--- a/world/map/npc/029-2/barrels_config.txt
+++ b/world/map/npc/029-2/barrels_config.txt
@@ -1,6 +1,6 @@
 // Barrels
 // Author: Wushin
-029-2.gat,33,88,24,7|monster|HouseMaggot|1050,2,100000ms,30000ms,Barrel#0::OnMaggotDeath
+029-2,33,88,24,7|monster|HouseMaggot|1050,2,100000ms,30000ms,Barrel#0::OnMaggotDeath
 -|script|#BarrelConfig|-1
 {
     end;
@@ -88,12 +88,12 @@ L_QuestReward:
     misceffect 33;
     set @barrel_tmp, 3;
     callfunc "SetBarrelMask";
-    killmonster getmap() + ".gat", "Barrel#0::OnMaggotDeath";
+    killmonster getmap() + "", "Barrel#0::OnMaggotDeath";
     goto L_Return;
 
 L_Spawn:
     message strcharinfo(0), "Uck, More Maggots!";
-    areamonster getmap() + ".gat", @npc_loc[0], @npc_loc[1], (@npc_loc[0] + 1), (@npc_loc[1] + 1), $@BarrelSpawnName$, $@BarrelSpawnId, $@BarrelSpawnCnt, "Barrel#0::OnMaggotDeath";
+    areamonster getmap() + "", @npc_loc[0], @npc_loc[1], (@npc_loc[0] + 1), (@npc_loc[1] + 1), $@BarrelSpawnName$, $@BarrelSpawnId, $@BarrelSpawnCnt, "Barrel#0::OnMaggotDeath";
     goto L_Return;
 
 L_Reward:
diff --git a/world/map/npc/029-2/mapflags.txt b/world/map/npc/029-2/mapflags.txt
index ef75b6c6..1de2d675 100644
--- a/world/map/npc/029-2/mapflags.txt
+++ b/world/map/npc/029-2/mapflags.txt
@@ -1,2 +1,2 @@
-029-2.gat|mapflag|nosave|029-2,22,24
-029-2.gat|mapflag|resave|029-2,22,24
+029-2|mapflag|nosave|029-2,22,24
+029-2|mapflag|resave|029-2,22,24
diff --git a/world/map/npc/029-2/sorfina.txt b/world/map/npc/029-2/sorfina.txt
index 4f55ef76..0c0fef07 100644
--- a/world/map/npc/029-2/sorfina.txt
+++ b/world/map/npc/029-2/sorfina.txt
@@ -1,6 +1,6 @@
 // This file is part of the Tutorial
 // Author: Jenalya
-029-2.gat,27,27,0|script|Sorfina|154,0,1
+029-2,27,27,0|script|Sorfina|154,0,1
 {
     setarray @npc_loc, 27, 27, 2;
     callfunc "PCtoNPCRange";
@@ -260,7 +260,7 @@ OnTouch:
     goto L_Start;
 }
 
-029-2.gat,33,27,0|script|#Carpet|32767,1,1
+029-2,33,27,0|script|#Carpet|32767,1,1
 {
     end;
 
@@ -279,7 +279,7 @@ OnTouch:
     close;
 }
 
-029-2.gat,29,23,0|script|Dresser#tutorial|400
+029-2,29,23,0|script|Dresser#tutorial|400
 {
     setarray @npc_loc, 29, 23, 2;
     callfunc "PCtoNPCRange";
@@ -317,7 +317,7 @@ L_CloseDis:
     close;
 }
 
-029-2.gat,44,31,0|script|#DoorOutTut1|45,0,0
+029-2,44,31,0|script|#DoorOutTut1|45,0,0
 {
     end;
 
@@ -325,14 +325,14 @@ OnTouch:
     callfunc "TutorialState";
     if (@tutorial < 4)
         goto L_Block;
-    warp "029-2.gat", 112, 85;
+    warp "029-2", 112, 85;
     end;
 
 L_Block:
     message strcharinfo(0), "Sorfina: Wait a moment! You're not ready to leave.";
     end;
 }
-029-2.gat,23,24,0|script|#GameRules1|32767,0,1
+029-2,23,24,0|script|#GameRules1|32767,0,1
 {
     end;
 
@@ -345,7 +345,7 @@ OnTouch:
     callfunc "GameRules";
     close;
 }
-029-2.gat,21,24,0|script|#GameRules2|32767,0,1
+029-2,21,24,0|script|#GameRules2|32767,0,1
 {
     end;
 
@@ -358,7 +358,7 @@ OnTouch:
     mes "If you're using another client, settings and controls may be different.";
     close;
 }
-029-2.gat,22,26,0|script|#GameRules3|32767,1,0
+029-2,22,26,0|script|#GameRules3|32767,1,0
 {
     if (TUT_var == 0)
         goto L_KnockBack;
@@ -366,13 +366,13 @@ OnTouch:
 
 L_KnockBack:
     message strcharinfo(0), "Please Accept the Game rules";
-    warp "029-2.gat", 22, 24;
+    warp "029-2", 22, 24;
     goto L_Close;
 
 L_Close:
     close;
 }
-029-2.gat,24,24,0|script|#GameRules4|32767,0,1
+029-2,24,24,0|script|#GameRules4|32767,0,1
 {
     if (TUT_var == 0)
         goto L_KnockBack;
@@ -380,7 +380,7 @@ L_Close:
 
 L_KnockBack:
     message strcharinfo(0), "Please Accept the Game rules";
-    warp "029-2.gat", 22, 24;
+    warp "029-2", 22, 24;
     goto L_Close;
 
 L_Close:
diff --git a/world/map/npc/029-2/stat_reset.txt b/world/map/npc/029-2/stat_reset.txt
index f3af6df6..896bbf6b 100644
--- a/world/map/npc/029-2/stat_reset.txt
+++ b/world/map/npc/029-2/stat_reset.txt
@@ -1,6 +1,6 @@
 //
 
-029-2.gat,98,92,0|script|Jessie|159
+029-2,98,92,0|script|Jessie|159
 {
     setarray @npc_loc, 98, 91, 4;
     callfunc "PCtoNPCRange";
diff --git a/world/map/npc/029-2/tanisha.txt b/world/map/npc/029-2/tanisha.txt
index 92ffccaf..450bc77c 100644
--- a/world/map/npc/029-2/tanisha.txt
+++ b/world/map/npc/029-2/tanisha.txt
@@ -2,14 +2,14 @@
 // Authors: Jenalya, alastrim
 // Cleanup: o11c
 
-029-2.gat,110,88,0|script|Tanisha|114
+029-2,110,88,0|script|Tanisha|114
 {
     setarray @npc_loc, 110, 88, 4;
     callfunc "PCtoNPCRange";
     if (@npc_check)
         goto L_Close;
 
-    if (isin("029-2.gat", 98, 84, 106, 89))
+    if (isin("029-2", 98, 84, 106, 89))
         goto L_Fighting;
 
     callfunc "TutorialState";
@@ -49,7 +49,7 @@ L_Next1:
     // since the check happens here, it is actually possible to have
     // more than $@Maggot_MaxHunters in the area at one time
     // but that's not a BIG problem
-    if (getareausers("029-2.gat", 98, 84, 106, 89) >= $@Maggot_MaxHunters)
+    if (getareausers("029-2", 98, 84, 106, 89) >= $@Maggot_MaxHunters)
         goto L_Crowded;
     next;
     goto L_Fight_Again;
@@ -87,13 +87,13 @@ L_ContinueFight:
     callfunc "SetTutorialMask";
     set @Maggot_Kills, 0;
     set @time, 0;
-    if (getareausers("029-2.gat", 98, 84, 106, 89) == 0)
+    if (getareausers("029-2", 98, 84, 106, 89) == 0)
         initnpctimer;
-    warp "029-2.gat", 101, 87;
+    warp "029-2", 101, 87;
     goto L_Summon;
 
 L_Summon:
-    areamonster "029-2.gat", 98, 84, 106, 89, "", 1002, 1, "Tanisha::OnMaggotDeath";
+    areamonster "029-2", 98, 84, 106, 89, "", 1002, 1, "Tanisha::OnMaggotDeath";
     end;
 
 L_Stats:
@@ -191,7 +191,7 @@ L_Crowded:
     goto L_Close;
 
 L_Sleep:
-    warp "029-2.gat", 101, 87;
+    warp "029-2", 101, 87;
     mes "[Tanisha]";
     mes "\"What are you doing in there?";
     mes "Sleeping?";
@@ -199,7 +199,7 @@ L_Sleep:
     set @Maggot_Kills, 0;
     set @time, 0;
     close2;
-    if (getareausers("029-2.gat", 98, 84, 106, 89) == 0)
+    if (getareausers("029-2", 98, 84, 106, 89) == 0)
         goto L_CleanUp;
     end;
 
@@ -215,7 +215,7 @@ L_Fail:
         "No, I need a rest.", L_Close;
 
 L_Next2:
-    if (getareausers("029-2.gat", 98, 84, 106, 89) >= $@Maggot_MaxHunters)
+    if (getareausers("029-2", 98, 84, 106, 89) >= $@Maggot_MaxHunters)
         goto L_Crowded;
     goto L_Fight_Again;
 
@@ -225,17 +225,17 @@ L_Fighting:
 
 OnTimer1000:
     setnpctimer 0;
-    if (getareausers("029-2.gat", 98, 84, 106, 89) == 0)
+    if (getareausers("029-2", 98, 84, 106, 89) == 0)
         goto L_CleanUp;
     // This is needed because multiple players can be in the area at once
-    areatimer "029-2.gat", 98, 84, 106, 89, 0, "Tanisha::OnTick";
+    areatimer "029-2", 98, 84, 106, 89, 0, "Tanisha::OnTick";
     end;
 
 L_CleanUp:
-    killmonster "029-2.gat", "Tanisha::OnMaggotDeath";
+    killmonster "029-2", "Tanisha::OnMaggotDeath";
     set $@Maggot_Hunters, 0;
     stopnpctimer;
-    areamonster "029-2.gat", 98, 84, 106, 89, "", 1002, 1, "Tanisha::OnMaggotDeath";
+    areamonster "029-2", 98, 84, 106, 89, "", 1002, 1, "Tanisha::OnMaggotDeath";
     end;
 
 OnTick:
@@ -257,17 +257,17 @@ OnMaggotDeath:
         message strcharinfo(0), "Tanisha: Ohh... Irrhk... Eeeeww... They just appear from nowhere!";
     if (@Maggot_Kills == 3)
         message strcharinfo(0), "Tanisha: Yuck... I think I am getting sick.";
-    if (isin("029-2.gat", 98, 84, 106, 89))
+    if (isin("029-2", 98, 84, 106, 89))
         set @Maggot_Kills, @Maggot_Kills + 1;
     if (@Maggot_Kills < 5)
         goto L_Summon;
     // else, complete
-    warp "029-2.gat", 110, 88;
+    warp "029-2", 110, 88;
     set @tutorial_tmp, 7;
     callfunc "SetTutorialMask";
     set @Maggot_Kills, 0;
     set @time, 0;
-    if (getareausers("029-2.gat", 98, 84, 106, 89) == 0)
+    if (getareausers("029-2", 98, 84, 106, 89) == 0)
         goto L_CleanUp;
     end;
 
@@ -276,10 +276,10 @@ L_Close:
 
 OnInit:
     set $@Maggot_MaxHunters, 4;
-    areamonster "029-2.gat", 98, 84, 106, 89, "", 1002, 1, "Tanisha::OnMaggotDeath";
+    areamonster "029-2", 98, 84, 106, 89, "", 1002, 1, "Tanisha::OnMaggotDeath";
     end;
 }
-029-2.gat,114,93,0|script|#DoorOutTut2|45,0,0
+029-2,114,93,0|script|#DoorOutTut2|45,0,0
 {
     end;
 
@@ -290,7 +290,7 @@ OnTouch:
     goto L_Block;
 
 L_Warp:
-    warp "029-1.gat", 32, 100;
+    warp "029-1", 32, 100;
     end;
 
 L_Block:
diff --git a/world/map/npc/029-2/two_arms.txt b/world/map/npc/029-2/two_arms.txt
index 012527b6..07fcf065 100644
--- a/world/map/npc/029-2/two_arms.txt
+++ b/world/map/npc/029-2/two_arms.txt
@@ -1,4 +1,4 @@
 // Forge Shops
 
-029-2.gat,99,25,0|shop|Rosen|311,SlingShot:*1,SlingBullet:*1,ShortBow:*4,Arrow:*2,IronArrow:*1
-029-2.gat,112,24,0|shop|Toichi|377,Knife:*1,SharpKnife:*1,Dagger:*1,LeatherShirt:*1,LeatherShield:*1
+029-2,99,25,0|shop|Rosen|311,SlingShot:*1,SlingBullet:*1,ShortBow:*4,Arrow:*2,IronArrow:*1
+029-2,112,24,0|shop|Toichi|377,Knife:*1,SharpKnife:*1,Dagger:*1,LeatherShirt:*1,LeatherShield:*1