remove .gat from npcs

2 files changed, 95 insertions, 95 deletions

diff --git a/world/map/npc/025-3/barriers.txt b/world/map/npc/025-3/barriers.txt
index dac14128..c9c404fa 100644
--- a/world/map/npc/025-3/barriers.txt
+++ b/world/map/npc/025-3/barriers.txt
@@ -2,11 +2,11 @@
 
 // -----------------------------------Warp to Cave 1 ---------------------------------------
 
-025-3.gat,78,127,0|script|#WarpBattleCave1|45,1,1
+025-3,78,127,0|script|#WarpBattleCave1|45,1,1
 {
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
         goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 26, 63, 60, 97) >= 1 || $@battlecave1 > 0)
+    if (getareausers("025-4", 26, 63, 60, 97) >= 1 || $@battlecave1 > 0)
         goto L_SomeoneInside;
     if (cavefights & BATTLE_CAVE1)
         goto L_AlreadyDone;
@@ -16,7 +16,7 @@
 
 L_StartFight:
     set $@battlecave1, 1;
-    warp "025-4.gat", 41, 95;
+    warp "025-4", 41, 95;
     set $@cave1fighter$, strcharinfo(0);
     set $@cave1fighterdeaths, PC_DIE_COUNTER;
     set $@cave1start, gettimetick(2);
@@ -50,7 +50,7 @@ OnTimer5000:
         goto L_AlreadyClean;
     if (attachrid(getcharid(3,$@cave1fighter$))==0)
         goto OnNoRid;
-    if (getareausers("025-4.gat", 26, 63, 60, 97) < 1)
+    if (getareausers("025-4", 26, 63, 60, 97) < 1)
         goto OnNoRid;
     if (PC_DIE_COUNTER > $@cave1fighterdeaths)
         goto L_CleaningDead;
@@ -86,25 +86,25 @@ S_Cleaning:
     cleararray $@cave1_monsters_QTY[0], 0, 2;
     set $@cave1_waves, 0;
     set $@cave1_time, 0;
-    killmonster "025-4.gat", "#StartCaveFight1::OnMonsterDeath";
+    killmonster "025-4", "#StartCaveFight1::OnMonsterDeath";
     stopnpctimer;
     setnpctimer 0;
     return;
 
 L_BadAir:
-    warp "025-3.gat", 78, 129;
+    warp "025-3", 78, 129;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
     callsub S_Cleaning;
     end;
 
 L_Cleaning:
-    warp "025-3.gat", 78, 129;
+    warp "025-3", 78, 129;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    warp "025-3.gat", 78, 129;
+    warp "025-3", 78, 129;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     callsub S_Cleaning;
     end;
@@ -116,7 +116,7 @@ OnNoRid:
 OnGetout:
     if (attachrid(getcharid(3,$@cave1fighter$)) == 0)
         goto OnNoRid;
-    warp "025-3.gat", 78, 129;
+    warp "025-3", 78, 129;
     callsub S_Cleaning;
     end;
 
@@ -129,11 +129,11 @@ L_AlreadyClean:
 
 // ---------------------------- Warp to Cave 2 ----------------------------
 
-025-3.gat,53,107,0|script|#WarpBattleCave2|45,1,1
+025-3,53,107,0|script|#WarpBattleCave2|45,1,1
 {
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
         goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 97, 62, 126, 96) >= 1 || $@battlecave2 > 0)
+    if (getareausers("025-4", 97, 62, 126, 96) >= 1 || $@battlecave2 > 0)
         goto L_SomeoneInside;
     if (cavefights & BATTLE_CAVE2)
         goto L_AlreadyDone;
@@ -143,7 +143,7 @@ L_AlreadyClean:
 
 L_StartFight:
     set $@battlecave2, 1;
-    warp "025-4.gat", 110, 94;
+    warp "025-4", 110, 94;
     set $@cave2fighter$, strcharinfo(0);
     set $@cave2fighterdeaths, PC_DIE_COUNTER;
     set $@cave2start, gettimetick(2);
@@ -177,7 +177,7 @@ OnTimer5000:
         goto L_AlreadyClean;
     if (attachrid(getcharid(3,$@cave2fighter$))==0)
         goto OnNoRid;
-    if (getareausers("025-4.gat", 97, 62, 126, 96) < 1)
+    if (getareausers("025-4", 97, 62, 126, 96) < 1)
         goto OnNoRid;
     if (PC_DIE_COUNTER > $@cave2fighterdeaths)
         goto L_CleaningDead;
@@ -213,25 +213,25 @@ S_Cleaning:
     cleararray $@cave2_monsters_QTY[0], 0, 2;
     set $@cave2_waves, 0;
     set $@cave2_time, 0;
-    killmonster "025-4.gat", "#StartCaveFight2::OnMonsterDeath";
+    killmonster "025-4", "#StartCaveFight2::OnMonsterDeath";
     stopnpctimer;
     setnpctimer 0;
     return;
 
 L_BadAir:
-    warp "025-3.gat", 53, 109;
+    warp "025-3", 53, 109;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
     callsub S_Cleaning;
     end;
 
 L_Cleaning:
-    warp "025-3.gat", 53, 109;
+    warp "025-3", 53, 109;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    warp "025-3.gat", 53, 109;
+    warp "025-3", 53, 109;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     callsub S_Cleaning;
     end;
@@ -243,7 +243,7 @@ OnNoRid:
 OnGetout:
     if (attachrid(getcharid(3,$@cave2fighter$)) == 0)
         goto OnNoRid;
-    warp "025-3.gat", 53, 109;
+    warp "025-3", 53, 109;
     callsub S_Cleaning;
     end;
 
@@ -255,11 +255,11 @@ L_AlreadyClean:
 
 // --------------------------------- Warp to Cave 3 ----------------------------------------
 
-025-3.gat,71,83,0|script|#WarpBattleCave3|45,1,1
+025-3,71,83,0|script|#WarpBattleCave3|45,1,1
 {
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
         goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 150, 84, 177, 117) >= 1 || $@battlecave3 > 0)
+    if (getareausers("025-4", 150, 84, 177, 117) >= 1 || $@battlecave3 > 0)
         goto L_SomeoneInside;
     if (cavefights & BATTLE_CAVE3)
         goto L_AlreadyDone;
@@ -269,7 +269,7 @@ L_AlreadyClean:
 
 L_StartFight:
     set $@battlecave3, 1;
-    warp "025-4.gat", 168, 115;
+    warp "025-4", 168, 115;
     set $@cave3fighter$, strcharinfo(0);
     set $@cave3fighterdeaths, PC_DIE_COUNTER;
     set $@cave3start, gettimetick(2);
@@ -303,7 +303,7 @@ OnTimer5000:
         goto L_AlreadyClean;
     if (attachrid(getcharid(3,$@cave3fighter$))==0)
         goto OnNoRid;
-    if (getareausers("025-4.gat", 150, 84, 177, 117) < 1)
+    if (getareausers("025-4", 150, 84, 177, 117) < 1)
         goto OnNoRid;
     if (cavefights & BATTLE_CAVE3)
         goto L_Win;
@@ -339,25 +339,25 @@ S_Cleaning:
     cleararray $@cave3_monsters_QTY[0], 0, 2;
     set $@cave3_waves, 0;
     set $@cave3_time, 0;
-    killmonster "025-4.gat", "#StartCaveFight3::OnMonsterDeath";
+    killmonster "025-4", "#StartCaveFight3::OnMonsterDeath";
     stopnpctimer;
     setnpctimer 0;
     return;
 
 L_BadAir:
-    warp "025-3.gat", 71, 85;
+    warp "025-3", 71, 85;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
     callsub S_Cleaning;
     end;
 
 L_Cleaning:
-    warp "025-3.gat", 71, 85;
+    warp "025-3", 71, 85;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    warp "025-3.gat", 71, 85;
+    warp "025-3", 71, 85;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     callsub S_Cleaning;
     end;
@@ -369,7 +369,7 @@ OnNoRid:
 OnGetout:
     if (attachrid(getcharid(3,$@cave3fighter$)) == 0)
         goto OnNoRid;
-    warp "025-3.gat", 71, 85;
+    warp "025-3", 71, 85;
     callsub S_Cleaning;
     end;
 
@@ -381,11 +381,11 @@ L_AlreadyClean:
 
 // --------------------------- Warp to Cave 4 --------------------------------------
 
-025-3.gat,80,83,0|script|#WarpBattleCave4|45,1,1
+025-3,80,83,0|script|#WarpBattleCave4|45,1,1
 {
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
         goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 28, 124, 57, 156) >= 1 || $@battlecave4 > 0)
+    if (getareausers("025-4", 28, 124, 57, 156) >= 1 || $@battlecave4 > 0)
         goto L_SomeoneInside;
     if (cavefights & BATTLE_CAVE4)
         goto L_AlreadyDone;
@@ -395,7 +395,7 @@ L_AlreadyClean:
 
 L_StartFight:
     set $@battlecave4, 1;
-    warp "025-4.gat", 32, 154;
+    warp "025-4", 32, 154;
     set $@cave4fighter$, strcharinfo(0);
     set $@cave4fighterdeaths, PC_DIE_COUNTER;
     set $@cave4start, gettimetick(2);
@@ -429,7 +429,7 @@ OnTimer5000:
         goto L_AlreadyClean;
     if (attachrid(getcharid(3,$@cave4fighter$))==0)
         goto OnNoRid;
-    if (getareausers("025-4.gat", 28, 124, 57, 156) < 1)
+    if (getareausers("025-4", 28, 124, 57, 156) < 1)
         goto OnNoRid;
     if (PC_DIE_COUNTER > $@cave4fighterdeaths)
         goto L_CleaningDead;
@@ -465,25 +465,25 @@ S_Cleaning:
     cleararray $@cave4_monsters_QTY[0], 0, 3;
     set $@cave4_waves, 0;
     set $@cave4_time, 0;
-    killmonster "025-4.gat", "#StartCaveFight4::OnMonsterDeath";
+    killmonster "025-4", "#StartCaveFight4::OnMonsterDeath";
     stopnpctimer;
     setnpctimer 0;
     return;
 
 L_BadAir:
-    warp "025-3.gat", 80, 85;
+    warp "025-3", 80, 85;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
     callsub S_Cleaning;
     end;
 
 L_Cleaning:
-    warp "025-3.gat", 80, 85;
+    warp "025-3", 80, 85;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    warp "025-3.gat", 80, 85;
+    warp "025-3", 80, 85;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     callsub S_Cleaning;
     end;
@@ -495,7 +495,7 @@ OnNoRid:
 OnGetout:
     if (attachrid(getcharid(3,$@cave4fighter$)) == 0)
         goto OnNoRid;
-    warp "025-3.gat", 80, 85;
+    warp "025-3", 80, 85;
     callsub S_Cleaning;
     end;
 
@@ -507,11 +507,11 @@ L_AlreadyClean:
 
 // --------------------------- Warp to Cave 5 ----------------------------------------
 
-025-3.gat,71,30,0|script|#WarpBattleCave5|45,1,1
+025-3,71,30,0|script|#WarpBattleCave5|45,1,1
 {
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
         goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 91, 131, 124, 160) >= 1 || $@battlecave5 > 0)
+    if (getareausers("025-4", 91, 131, 124, 160) >= 1 || $@battlecave5 > 0)
         goto L_SomeoneInside;
     if (cavefights & BATTLE_CAVE5)
         goto L_AlreadyDone;
@@ -521,7 +521,7 @@ L_AlreadyClean:
 
 L_StartFight:
     set $@battlecave5, 1;
-    warp "025-4.gat", 100, 158;
+    warp "025-4", 100, 158;
     set $@cave5fighter$, strcharinfo(0);
     set $@cave5fighterdeaths, PC_DIE_COUNTER;
     set $@cave5start, gettimetick(2);
@@ -555,7 +555,7 @@ OnTimer5000:
         goto L_AlreadyClean;
     if (attachrid(getcharid(3,$@cave5fighter$))==0)
         goto OnNoRid;
-    if (getareausers("025-4.gat", 91, 131, 124, 160) < 1)
+    if (getareausers("025-4", 91, 131, 124, 160) < 1)
         goto OnNoRid;
     if (PC_DIE_COUNTER > $@cave5fighterdeaths)
         goto L_CleaningDead;
@@ -591,25 +591,25 @@ S_Cleaning:
     cleararray $@cave5_monsters_QTY[0], 0, 3;
     set $@cave5_waves, 0;
     set $@cave5_time, 0;
-    killmonster "025-4.gat", "#StartCaveFight5::OnMonsterDeath";
+    killmonster "025-4", "#StartCaveFight5::OnMonsterDeath";
     stopnpctimer;
     setnpctimer 0;
     return;
 
 L_BadAir:
-    warp "025-3.gat", 71, 32;
+    warp "025-3", 71, 32;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
     callsub S_Cleaning;
     end;
 
 L_Cleaning:
-    warp "025-3.gat", 71, 32;
+    warp "025-3", 71, 32;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    warp "025-3.gat", 71, 32;
+    warp "025-3", 71, 32;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     callsub S_Cleaning;
     end;
@@ -621,7 +621,7 @@ OnNoRid:
 OnGetout:
     if (attachrid(getcharid(3,$@cave5fighter$)) == 0)
         goto OnNoRid;
-    warp "025-3.gat", 71, 32;
+    warp "025-3", 71, 32;
     callsub S_Cleaning;
     end;
 
@@ -633,11 +633,11 @@ L_AlreadyClean:
 
 // -------------------------------- Warp to Cave 6 -----------------------------------------
 
-025-3.gat,128,35,0|script|#WarpBattleCave6|45,1,1
+025-3,128,35,0|script|#WarpBattleCave6|45,1,1
 {
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
         goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 153, 143, 178, 174) >= 1 || $@battlecave6 > 0)
+    if (getareausers("025-4", 153, 143, 178, 174) >= 1 || $@battlecave6 > 0)
         goto L_SomeoneInside;
     if (cavefights & BATTLE_CAVE6)
         goto L_AlreadyDone;
@@ -647,7 +647,7 @@ L_AlreadyClean:
 
 L_StartFight:
     set $@battlecave6, 1;
-    warp "025-4.gat", 159, 172;
+    warp "025-4", 159, 172;
     set $@cave6fighter$, strcharinfo(0);
     set $@cave6fighterdeaths, PC_DIE_COUNTER;
     set $@cave6start, gettimetick(2);
@@ -681,7 +681,7 @@ OnTimer5000:
         goto L_AlreadyClean;
     if (attachrid(getcharid(3,$@cave6fighter$))==0)
         goto OnNoRid;
-    if (getareausers("025-4.gat", 153, 143, 178, 174) < 1)
+    if (getareausers("025-4", 153, 143, 178, 174) < 1)
         goto OnNoRid;
     if (PC_DIE_COUNTER > $@cave6fighterdeaths)
         goto L_CleaningDead;
@@ -717,25 +717,25 @@ S_Cleaning:
     cleararray $@cave6_monsters_QTY[0], 0, 3;
     set $@cave6_waves, 0;
     set $@cave6_time, 0;
-    killmonster "025-4.gat", "#StartCaveFight6::OnMonsterDeath";
+    killmonster "025-4", "#StartCaveFight6::OnMonsterDeath";
     stopnpctimer;
     setnpctimer 0;
     return;
 
 L_BadAir:
-    warp "025-3.gat", 128, 37;
+    warp "025-3", 128, 37;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
     callsub S_Cleaning;
     end;
 
 L_Cleaning:
-    warp "025-3.gat", 128, 37;
+    warp "025-3", 128, 37;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    warp "025-3.gat", 128, 37;
+    warp "025-3", 128, 37;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     callsub S_Cleaning;
     end;
@@ -747,7 +747,7 @@ OnNoRid:
 OnGetout:
     if (attachrid(getcharid(3,$@cave6fighter$)) == 0)
         goto OnNoRid;
-    warp "025-3.gat", 128, 37;
+    warp "025-3", 128, 37;
     callsub S_Cleaning;
     end;
 
@@ -759,11 +759,11 @@ L_AlreadyClean:
 
 // ---------------------------- Warp to Cave 7 ------------------------------------------
 
-025-3.gat,70,57,0|script|#WarpBattleCave7|45,1,1
+025-3,70,57,0|script|#WarpBattleCave7|45,1,1
 {
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
         goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 27, 185, 61, 219) >= 1 || $@battlecave7 > 0)
+    if (getareausers("025-4", 27, 185, 61, 219) >= 1 || $@battlecave7 > 0)
         goto L_SomeoneInside;
     if (cavefights & BATTLE_CAVE7)
         goto L_AlreadyDone;
@@ -773,7 +773,7 @@ L_AlreadyClean:
 
 L_StartFight:
     set $@battlecave7, 1;
-    warp "025-4.gat", 42, 217;
+    warp "025-4", 42, 217;
     set $@cave7fighter$, strcharinfo(0);
     set $@cave7fighterdeaths, PC_DIE_COUNTER;
     set $@cave7start, gettimetick(2);
@@ -807,7 +807,7 @@ OnTimer5000:
         goto L_AlreadyClean;
     if (attachrid(getcharid(3,$@cave7fighter$))==0)
         goto OnNoRid;
-    if (getareausers("025-4.gat", 27, 185, 61, 219) < 1)
+    if (getareausers("025-4", 27, 185, 61, 219) < 1)
         goto OnNoRid;
     if (PC_DIE_COUNTER > $@cave7fighterdeaths)
         goto L_CleaningDead;
@@ -843,25 +843,25 @@ S_Cleaning:
     cleararray $@cave7_monsters_QTY[0], 0, 4;
     set $@cave7_waves, 0;
     set $@cave7_time, 0;
-    killmonster "025-4.gat", "#StartCaveFight7::OnMonsterDeath";
+    killmonster "025-4", "#StartCaveFight7::OnMonsterDeath";
     stopnpctimer;
     setnpctimer 0;
     return;
 
 L_BadAir:
-    warp "025-3.gat", 70, 59;
+    warp "025-3", 70, 59;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
     callsub S_Cleaning;
     end;
 
 L_Cleaning:
-    warp "025-3.gat", 70, 59;
+    warp "025-3", 70, 59;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    warp "025-3.gat", 70, 59;
+    warp "025-3", 70, 59;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     callsub S_Cleaning;
     end;
@@ -873,7 +873,7 @@ OnNoRid:
 OnGetout:
     if (attachrid(getcharid(3,$@cave7fighter$)) == 0)
         goto OnNoRid;
-    warp "025-3.gat", 70, 59;
+    warp "025-3", 70, 59;
     callsub S_Cleaning;
     end;
 
@@ -885,11 +885,11 @@ L_AlreadyClean:
 
 // -----------------------------------------------Warp to Cave 8-------------------------------------------------------------
 
-025-3.gat,138,92,0|script|#WarpBattleCave8|45,1,1
+025-3,138,92,0|script|#WarpBattleCave8|45,1,1
 {
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
         goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 90, 193, 119, 216) >= 1 || $@battlecave8 > 0)
+    if (getareausers("025-4", 90, 193, 119, 216) >= 1 || $@battlecave8 > 0)
         goto L_SomeoneInside;
     if (cavefights & BATTLE_CAVE8)
         goto L_AlreadyDone;
@@ -899,7 +899,7 @@ L_AlreadyClean:
 
 L_StartFight:
     set $@battlecave8, 1;
-    warp "025-4.gat", 105, 214;
+    warp "025-4", 105, 214;
     set $@cave8fighter$, strcharinfo(0);
     set $@cave8fighterdeaths, PC_DIE_COUNTER;
     set $@cave8start, gettimetick(2);
@@ -933,7 +933,7 @@ OnTimer5000:
         goto L_AlreadyClean;
     if (attachrid(getcharid(3,$@cave8fighter$))==0)
         goto OnNoRid;
-    if (getareausers("025-4.gat", 90, 193, 119, 216) < 1)
+    if (getareausers("025-4", 90, 193, 119, 216) < 1)
         goto OnNoRid;
     if (PC_DIE_COUNTER > $@cave8fighterdeaths)
         goto L_CleaningDead;
@@ -969,25 +969,25 @@ S_Cleaning:
     cleararray $@cave8_monsters_QTY[0], 0, 4;
     set $@cave8_waves, 0;
     set $@cave8_time, 0;
-    killmonster "025-4.gat", "#StartCaveFight8::OnMonsterDeath";
+    killmonster "025-4", "#StartCaveFight8::OnMonsterDeath";
     stopnpctimer;
     setnpctimer 0;
     return;
 
 L_BadAir:
-    warp "025-3.gat", 138, 94;
+    warp "025-3", 138, 94;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
     callsub S_Cleaning;
     end;
 
 L_Cleaning:
-    warp "025-3.gat", 138, 94;
+    warp "025-3", 138, 94;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    warp "025-3.gat", 138, 94;
+    warp "025-3", 138, 94;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     callsub S_Cleaning;
     end;
@@ -999,7 +999,7 @@ OnNoRid:
 OnGetout:
     if (attachrid(getcharid(3,$@cave8fighter$)) == 0)
         goto OnNoRid;
-    warp "025-3.gat", 138, 94;
+    warp "025-3", 138, 94;
     callsub S_Cleaning;
     end;
 
@@ -1011,11 +1011,11 @@ L_AlreadyClean:
 
 // ------------------------------ Warp to Cave 9 ----------------------------------------
 
-025-3.gat,138,160,0|script|#WarpBattleCave9|45,1,1
+025-3,138,160,0|script|#WarpBattleCave9|45,1,1
 {
     if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
         goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 144, 192, 173, 226) >= 1 || $@battlecave9 > 0)
+    if (getareausers("025-4", 144, 192, 173, 226) >= 1 || $@battlecave9 > 0)
         goto L_SomeoneInside;
     if (cavefights & BATTLE_CAVE9)
         goto L_AlreadyDone;
@@ -1025,7 +1025,7 @@ L_AlreadyClean:
 
 L_StartFight:
     set $@battlecave9, 1;
-    warp "025-4.gat", 157, 222;
+    warp "025-4", 157, 222;
     set $@cave9fighter$, strcharinfo(0);
     set $@cave9fighterdeaths, PC_DIE_COUNTER;
     set $@cave9start, gettimetick(2);
@@ -1059,7 +1059,7 @@ OnTimer5000:
         goto L_AlreadyClean;
     if (attachrid(getcharid(3,$@cave9fighter$))==0)
         goto OnNoRid;
-    if (getareausers("025-4.gat", 144, 192, 173, 226) < 1)
+    if (getareausers("025-4", 144, 192, 173, 226) < 1)
         goto OnNoRid;
     if (PC_DIE_COUNTER > $@cave9fighterdeaths)
         goto L_CleaningDead;
@@ -1095,25 +1095,25 @@ S_Cleaning:
     cleararray $@cave9_monsters_QTY[0], 0, 4;
     set $@cave9_waves, 0;
     set $@cave9_time, 0;
-    killmonster "025-4.gat", "#StartCaveFight9::OnMonsterDeath";
+    killmonster "025-4", "#StartCaveFight9::OnMonsterDeath";
     stopnpctimer;
     setnpctimer 0;
     return;
 
 L_BadAir:
-    warp "025-3.gat", 138, 158;
+    warp "025-3", 138, 158;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
     callsub S_Cleaning;
     end;
 
 L_Cleaning:
-    warp "025-3.gat", 138, 158;
+    warp "025-3", 138, 158;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    warp "025-3.gat", 138, 158;
+    warp "025-3", 138, 158;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     callsub S_Cleaning;
     end;
@@ -1125,7 +1125,7 @@ OnNoRid:
 OnGetout:
     if (attachrid(getcharid(3,$@cave9fighter$)) == 0)
         goto OnNoRid;
-    warp "025-3.gat", 138, 158;
+    warp "025-3", 138, 158;
     callsub S_Cleaning;
     end;
 
@@ -1137,7 +1137,7 @@ L_AlreadyClean:
 
 // ----------------------------- Warp to Boss Cave -------------------------------
 
-025-3.gat,77,170,0|script|#WarpBossCave|45,1,1
+025-3,77,170,0|script|#WarpBossCave|45,1,1
 {
     if (Rossy_Quest > 16 || FLAGS & FLAG_ROSSI_COMPLETED)
         end;
@@ -1164,7 +1164,7 @@ L_AlreadyClean:
         set @barrier_force, @barrier_force + 1;
     if (@barrier_force != 0)
         goto L_Hurt;
-    if (getareausers("025-4.gat", 142, 24, 172, 48) >= 1 || $@battlecave10 > 0)
+    if (getareausers("025-4", 142, 24, 172, 48) >= 1 || $@battlecave10 > 0)
         goto L_SomeoneInside;
     if (@barrier_force == 0)
         goto L_StartFight;
@@ -1173,13 +1173,13 @@ L_AlreadyClean:
 L_Hurt:
     message strcharinfo(0), "As you try to enter, you bump into a magic barrier. Its force pushes you back, hurting you badly.";
     percentheal @barrier_force * 10, 0;
-    warp "025-3.gat", 77, 164;
+    warp "025-3", 77, 164;
     end;
 
 L_StartFight:
     message strcharinfo(0), "You go through the magic barrier without problems... you can hear screams that seem to be very close.";
     set $@battlecave10, 1;
-    warp "025-4.gat", 157, 44;
+    warp "025-4", 157, 44;
     set $@cave10fighter$, strcharinfo(0);
     set $@cave10fighterdeaths, PC_DIE_COUNTER;
     set $@cave10start, gettimetick(2);
@@ -1198,7 +1198,7 @@ L_SomeoneInside:
 
 L_AlreadyHelped:
     message strcharinfo(0), "There is nothing more than corpses in this cave. You close your eyes and go straight to the place where Julia is hidden.";
-    warp "025-4.gat", 93, 33;
+    warp "025-4", 93, 33;
     end;
 
 OnTimer5000:
@@ -1206,7 +1206,7 @@ OnTimer5000:
         goto L_AlreadyClean;
     if (attachrid(getcharid(3,$@cave10fighter$))==0)
         goto OnNoRid;
-    if (getareausers("025-4.gat", 142, 24, 172, 48) < 1)
+    if (getareausers("025-4", 142, 24, 172, 48) < 1)
         goto OnNoRid;
     if (PC_DIE_COUNTER > $@cave10fighterdeaths)
         goto L_CleaningDead;
@@ -1243,26 +1243,26 @@ S_Cleaning:
     set $@cave10_boss_ID, 0;
     set $@cave10_waves, 0;
     set $@cave10_time, 0;
-    killmonster "025-4.gat", "#StartBossCaveFight::OnMonsterDeath";
-    killmonster "025-4.gat", "#StartBossCaveFight::OnBossDeath";
+    killmonster "025-4", "#StartBossCaveFight::OnMonsterDeath";
+    killmonster "025-4", "#StartBossCaveFight::OnBossDeath";
     stopnpctimer;
     setnpctimer 0;
     return;
 
 L_BadAir:
-    warp "025-4.gat", 93, 33;
+    warp "025-4", 93, 33;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run as fast as you can to save Julia!";
     callsub S_Cleaning;
     end;
 
 L_Cleaning:
-    warp "025-3.gat", 77, 168;
+    warp "025-3", 77, 168;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    warp "025-3.gat", 77, 168;
+    warp "025-3", 77, 168;
     if ($@wave_cave10 < 5)
         message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     if ($@wave_cave10 == 5)
@@ -1277,14 +1277,14 @@ OnNoRid:
 OnGetout:
     if (attachrid(getcharid(3,$@cave10fighter$)) == 0)
         goto OnNoRid;
-    warp "025-3.gat", 77, 168;
+    warp "025-3", 77, 168;
     callsub S_Cleaning;
     end;
 
 OnWin:
     if (attachrid(getcharid(3,$@cave10fighter$)) == 0)
         goto OnNoRid;
-    warp "025-4.gat", 93, 33;
+    warp "025-4", 93, 33;
     callsub S_Cleaning;
     end;
 
diff --git a/world/map/npc/025-3/mapflags.txt b/world/map/npc/025-3/mapflags.txt
index aba49653..58e68ca5 100644
--- a/world/map/npc/025-3/mapflags.txt
+++ b/world/map/npc/025-3/mapflags.txt
@@ -1 +1 @@
-025-3.gat|mapflag|resave|025-1,33,50
+025-3|mapflag|resave|025-1,33,50