From 22cfbc011ce19e96767861b60473fa3136177f10 Mon Sep 17 00:00:00 2001 From: mekolat Date: Sun, 1 Feb 2015 14:11:22 -0500 Subject: remove .gat from npcs --- world/map/npc/functions/debug.txt | 12 ++++++------ world/map/npc/functions/default_npc_checks.txt | 2 +- world/map/npc/functions/ferry.txt | 2 +- world/map/npc/functions/global_event_handler.txt | 2 +- world/map/npc/functions/gm_island.txt | 8 ++++---- world/map/npc/functions/travelers.txt | 24 ++++++++++++------------ world/map/npc/functions/undead_debug.txt | 6 +++--- 7 files changed, 28 insertions(+), 28 deletions(-) (limited to 'world/map/npc/functions') diff --git a/world/map/npc/functions/debug.txt b/world/map/npc/functions/debug.txt index 384805b1..be8d4fb4 100755 --- a/world/map/npc/functions/debug.txt +++ b/world/map/npc/functions/debug.txt @@ -916,7 +916,7 @@ L_Close: } -029-2.gat,30,26,0|script|Debug#0|154 +029-2,30,26,0|script|Debug#0|154 { callfunc "Debug"; end; @@ -926,7 +926,7 @@ OnInit: end; } -001-1.gat,53,47,0|script|Debug#1|154 +001-1,53,47,0|script|Debug#1|154 { callfunc "Debug"; end; @@ -936,7 +936,7 @@ OnInit: end; } -009-1.gat,52,33,0|script|Debug#2|154 +009-1,52,33,0|script|Debug#2|154 { callfunc "Debug"; end; @@ -946,7 +946,7 @@ OnInit: end; } -020-1.gat,75,85,0|script|Debug#3|154 +020-1,75,85,0|script|Debug#3|154 { callfunc "Debug"; end; @@ -956,7 +956,7 @@ OnInit: end; } -017-9.gat,21,24,0|script|Debug#4|154 +017-9,21,24,0|script|Debug#4|154 { callfunc "Debug"; end; @@ -966,7 +966,7 @@ OnInit: end; } -027-2.gat,125,103,0|script|Debug#5|154 +027-2,125,103,0|script|Debug#5|154 { callfunc "Debug"; end; diff --git a/world/map/npc/functions/default_npc_checks.txt b/world/map/npc/functions/default_npc_checks.txt index 67815ab1..446cf961 100644 --- a/world/map/npc/functions/default_npc_checks.txt +++ b/world/map/npc/functions/default_npc_checks.txt @@ -7,7 +7,7 @@ function|script|PCtoNPCRange { set @npc_check, 0; - set @Nmap$, getmap() + ".gat"; + set @Nmap$, getmap() + ""; set @Nx1, (@npc_loc[0] - @npc_loc[2]); set @Ny1, (@npc_loc[1] - @npc_loc[2]); set @Nx2, (@npc_loc[0] + @npc_loc[2]); diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt index 48372f56..54c79aa2 100644 --- a/world/map/npc/functions/ferry.txt +++ b/world/map/npc/functions/ferry.txt @@ -1,6 +1,6 @@ // The ferry system -017-9.gat,27,28,0|script|#FerryConfig|-1 +017-9,27,28,0|script|#FerryConfig|-1 { end; diff --git a/world/map/npc/functions/global_event_handler.txt b/world/map/npc/functions/global_event_handler.txt index f05e3b62..cf331060 100644 --- a/world/map/npc/functions/global_event_handler.txt +++ b/world/map/npc/functions/global_event_handler.txt @@ -1,4 +1,4 @@ -017-9.gat,0,0,0|script|#GlobalHandler|-1 +017-9,0,0,0|script|#GlobalHandler|-1 { end; diff --git a/world/map/npc/functions/gm_island.txt b/world/map/npc/functions/gm_island.txt index 7d3954e1..5efe105e 100644 --- a/world/map/npc/functions/gm_island.txt +++ b/world/map/npc/functions/gm_island.txt @@ -42,22 +42,22 @@ L_GmStop: L_Return: return; } -017-9.gat,32,21,0|script|Gm Event Debug|368 +017-9,32,21,0|script|Gm Event Debug|368 { callfunc "GmDebug"; close; } -001-1.gat,49,68,0|script|Gm Event#1|368,0,0 +001-1,49,68,0|script|Gm Event#1|368,0,0 { callfunc "GmWarp"; end; } -009-1.gat,46,30,0|script|Gm Event#2|368,0,0 +009-1,46,30,0|script|Gm Event#2|368,0,0 { callfunc "GmWarp"; end; } -020-1.gat,67,89,0|script|Gm Event#3|368,0,0 +020-1,67,89,0|script|Gm Event#3|368,0,0 { callfunc "GmWarp"; end; diff --git a/world/map/npc/functions/travelers.txt b/world/map/npc/functions/travelers.txt index f8ce6bf7..a1db712e 100644 --- a/world/map/npc/functions/travelers.txt +++ b/world/map/npc/functions/travelers.txt @@ -6,7 +6,7 @@ // Costs Zeny // Contains all warp points to find -017-9.gat,27,28,0|script|#TravelConfig|-1 +017-9,27,28,0|script|#TravelConfig|-1 { end; @@ -130,7 +130,7 @@ L_TravelPlayer: L_TravelGraveyard: set @NextLocationBit, $@graveyard_bit; set @NextLocationCost, (@Cost * $@graveyard_cost); - set @NextLocationMap$, "027-1.gat"; + set @NextLocationMap$, "027-1"; set @NextLocationX, 84; set @NextLocationY, 86; goto L_TravelChecks; @@ -138,7 +138,7 @@ L_TravelGraveyard: L_TravelMagicHouse: set @NextLocationBit, $@magic_house_bit; set @NextLocationCost, (@Cost * $@magic_house_cost); - set @NextLocationMap$, "013-1.gat"; + set @NextLocationMap$, "013-1"; set @NextLocationX, 120; set @NextLocationY, 93; goto L_TravelChecks; @@ -146,7 +146,7 @@ L_TravelMagicHouse: L_TravelTerranite: set @NextLocationBit, $@terranite_cave_bit; set @NextLocationCost, (@Cost * $@terranite_cave_cost); - set @NextLocationMap$, "012-3.gat"; + set @NextLocationMap$, "012-3"; set @NextLocationX, 445; set @NextLocationY, 65; goto L_TravelChecks; @@ -154,7 +154,7 @@ L_TravelTerranite: L_TravelTulimshar: set @NextLocationBit, $@tulimshar_bit; set @NextLocationCost, (@Cost * $@tulimshar_cost); - set @NextLocationMap$, "002-1.gat"; + set @NextLocationMap$, "002-1"; set @NextLocationX, 60; set @NextLocationY, 42; goto L_TravelChecks; @@ -162,7 +162,7 @@ L_TravelTulimshar: L_TravelBlueSage: set @NextLocationBit, $@blue_sage_bit; set @NextLocationCost, (@Cost * $@blue_sage_cost); - set @NextLocationMap$, "048-2.gat"; + set @NextLocationMap$, "048-2"; set @NextLocationX, 26; set @NextLocationY, 47; goto L_TravelChecks; @@ -170,7 +170,7 @@ L_TravelBlueSage: L_TravelHurnscald: set @NextLocationBit, $@hurnscald_bit; set @NextLocationCost, (@Cost * $@hurnscald_cost); - set @NextLocationMap$, "008-1.gat"; + set @NextLocationMap$, "008-1"; set @NextLocationX, 79; set @NextLocationY, 84; goto L_TravelChecks; @@ -178,7 +178,7 @@ L_TravelHurnscald: L_TravelNivalis: set @NextLocationBit, $@nivalis_bit; set @NextLocationCost, (@Cost * $@nivalis_cost); - set @NextLocationMap$, "020-1.gat"; + set @NextLocationMap$, "020-1"; set @NextLocationX, 53; set @NextLocationY, 122; goto L_TravelChecks; @@ -186,7 +186,7 @@ L_TravelNivalis: L_TravelPachua: set @NextLocationBit, $@pachua_bit; set @NextLocationCost, (@Cost * $@pachua_cost); - set @NextLocationMap$, "006-1.gat"; + set @NextLocationMap$, "006-1"; set @NextLocationX, 28; set @NextLocationY, 97; goto L_TravelChecks; @@ -194,7 +194,7 @@ L_TravelPachua: L_TravelBarbarians: set @NextLocationBit, $@barbarians_bit; set @NextLocationCost, (@Cost * $@barbarians_cost); - set @NextLocationMap$, "033-1.gat"; + set @NextLocationMap$, "033-1"; set @NextLocationX, 66; set @NextLocationY, 33; goto L_TravelChecks; @@ -202,7 +202,7 @@ L_TravelBarbarians: L_TravelHurnsFarms: set @NextLocationBit, $@hurns_farms_bit; set @NextLocationCost, (@Cost * $@hurns_farms_cost); - set @NextLocationMap$, "055-1.gat"; + set @NextLocationMap$, "055-1"; set @NextLocationX, 135; set @NextLocationY, 60; goto L_TravelChecks; @@ -210,7 +210,7 @@ L_TravelHurnsFarms: L_TravelCandor: set @NextLocationBit, $@candor_bit; set @NextLocationCost, (@Cost * $@candor_cost); - set @NextLocationMap$, "029-1.gat"; + set @NextLocationMap$, "029-1"; set @NextLocationX, 69; set @NextLocationY, 69; goto L_TravelChecks; diff --git a/world/map/npc/functions/undead_debug.txt b/world/map/npc/functions/undead_debug.txt index 992cbc97..b0466f65 100644 --- a/world/map/npc/functions/undead_debug.txt +++ b/world/map/npc/functions/undead_debug.txt @@ -82,7 +82,7 @@ L_Close: } // Debug for Krukan -027-3.gat,84,89,0|script|UndeadDebug3|155 +027-3,84,89,0|script|UndeadDebug3|155 { set @undeaddebug, 3; callfunc "UndeadDebug"; @@ -94,7 +94,7 @@ OnInit: } // Debug for Razha -027-4.gat,76,79,0|script|UndeadDebug4|155 +027-4,76,79,0|script|UndeadDebug4|155 { set @undeaddebug, 4; callfunc "UndeadDebug"; @@ -106,7 +106,7 @@ OnInit: } // Debug for Terogan -027-5.gat,72,26,0|script|UndeadDebug5|155 +027-5,72,26,0|script|UndeadDebug5|155 { set @undeaddebug, 5; callfunc "UndeadDebug"; -- cgit v1.2.3-60-g2f50