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/029-1/aahna.txt | 2 +- world/map/npc/029-1/barrier.txt | 6 +++--- world/map/npc/029-1/dock.txt | 6 +++--- world/map/npc/029-1/ferry_master.txt | 2 +- world/map/npc/029-1/hasan.txt | 10 +++++----- world/map/npc/029-1/hideandseek.txt | 14 +++++++------- world/map/npc/029-1/kaan.txt | 2 +- world/map/npc/029-1/liana.txt | 2 +- world/map/npc/029-1/mapflags.txt | 2 +- world/map/npc/029-1/monster_guide.txt | 2 +- world/map/npc/029-1/rewards_master.txt | 2 +- world/map/npc/029-1/soul-menhir.txt | 4 ++-- world/map/npc/029-1/traveler.txt | 2 +- world/map/npc/029-1/tutorial.txt | 6 +++--- world/map/npc/029-1/valon.txt | 4 ++-- world/map/npc/029-1/vincent.txt | 4 ++-- world/map/npc/029-1/zegas.txt | 4 ++-- 17 files changed, 37 insertions(+), 37 deletions(-) (limited to 'world/map/npc/029-1') diff --git a/world/map/npc/029-1/aahna.txt b/world/map/npc/029-1/aahna.txt index 1b1c4489..e9da0d20 100644 --- a/world/map/npc/029-1/aahna.txt +++ b/world/map/npc/029-1/aahna.txt @@ -1,7 +1,7 @@ // Aahna // Author: Wushin // Npc -029-1.gat,71,52,0|script|Aahna|404 +029-1,71,52,0|script|Aahna|404 { setarray @npc_loc, 71, 52, 3; callfunc "PCtoNPCRange"; diff --git a/world/map/npc/029-1/barrier.txt b/world/map/npc/029-1/barrier.txt index 4446ac6c..1e5281a4 100644 --- a/world/map/npc/029-1/barrier.txt +++ b/world/map/npc/029-1/barrier.txt @@ -1,8 +1,8 @@ -029-1.gat,69,61,0|script|#CandorBarrier|45,0,0 +029-1,69,61,0|script|#CandorBarrier|45,0,0 { if ($@FIGHT_CAVE_STATUS == 1) goto L_Block; if (BaseLevel < 40) goto L_Block; - warp "029-3.gat", 49, 53; + warp "029-3", 49, 53; end; L_Block: @@ -10,7 +10,7 @@ L_Block: end; } -029-1.gat,69,61,0|script|#CandorAnnouncer|127 +029-1,69,61,0|script|#CandorAnnouncer|127 { end; OnCommandTalk: diff --git a/world/map/npc/029-1/dock.txt b/world/map/npc/029-1/dock.txt index 7430971c..61f8a242 100644 --- a/world/map/npc/029-1/dock.txt +++ b/world/map/npc/029-1/dock.txt @@ -1,19 +1,19 @@ // The ferry dock // Ferry Sign -029-1.gat,43,104,0|script|Ferry Schedule#8|397 +029-1,43,104,0|script|Ferry Schedule#8|397 { callfunc "FerryManifest"; end; } -029-1.gat,51,118,0|script|Candor Koga|395,8,8 +029-1,51,118,0|script|Candor Koga|395,8,8 { callfunc "BoardCandorFerry"; close; } -029-1.gat,55,110,0|script|#CandorDock|127 +029-1,55,110,0|script|#CandorDock|127 { end; OnCommandArrive: diff --git a/world/map/npc/029-1/ferry_master.txt b/world/map/npc/029-1/ferry_master.txt index 3163e6b2..4586a3f8 100644 --- a/world/map/npc/029-1/ferry_master.txt +++ b/world/map/npc/029-1/ferry_master.txt @@ -1,6 +1,6 @@ // -029-1.gat,45,107,0|script|Ferry Master#candor|138 +029-1,45,107,0|script|Ferry Master#candor|138 { mes "[Ferry Master]"; mes "\"Hello! Do you need something?\""; diff --git a/world/map/npc/029-1/hasan.txt b/world/map/npc/029-1/hasan.txt index 6006cff3..cf5298f5 100644 --- a/world/map/npc/029-1/hasan.txt +++ b/world/map/npc/029-1/hasan.txt @@ -6,7 +6,7 @@ // They respond by asking play for help // Hasan tells them to but out of it. -029-1.gat,35,33,0|script|Scared Man|160 +029-1,35,33,0|script|Scared Man|160 { setarray @npc_loc, 35, 33, 4; callfunc "PCtoNPCRange"; @@ -24,7 +24,7 @@ L_TutDone: L_End: end; } -029-1.gat,33,33,0|script|Hasan|189,3,3 +029-1,33,33,0|script|Hasan|189,3,3 { setarray @npc_loc, 33, 33, 4; callfunc "PCtoNPCRange"; @@ -156,7 +156,7 @@ OnTouch: end; goto L_Main; } -029-1.gat,0,0,0|script|#ScorpionTrigger|35 +029-1,0,0,0|script|#ScorpionTrigger|35 { end; @@ -164,7 +164,7 @@ OnCommandHasanSpawn: goto L_Summon; L_Summon: - monster "029-1.gat",33,33,"WeakScorpion",1046,1, "#ScorpionTrigger::OnScorpionDeath"; + monster "029-1",33,33,"WeakScorpion",1046,1, "#ScorpionTrigger::OnScorpionDeath"; initnpctimer; end; @@ -203,7 +203,7 @@ L_MessageDeath: goto L_Clean; L_Clean: - killmonster "029-1.gat", "#ScorpionTrigger::OnScorpionDeath"; + killmonster "029-1", "#ScorpionTrigger::OnScorpionDeath"; set $@ScorpionFighter, 0; set $@ScorpionTimer, 0; set $@ScorpDeath, 0; diff --git a/world/map/npc/029-1/hideandseek.txt b/world/map/npc/029-1/hideandseek.txt index 4a4476ff..31653f95 100644 --- a/world/map/npc/029-1/hideandseek.txt +++ b/world/map/npc/029-1/hideandseek.txt @@ -36,7 +36,7 @@ function|script|CountHideNSeek set @hidden_kid_cnt, (@hidden_kid_cnt + 1); return; } -029-1.gat,64,90,0|script|AyashaDebug|258 +029-1,64,90,0|script|AyashaDebug|258 { mes "[Ayasha Debug]"; menu @@ -75,7 +75,7 @@ OnInit: disablenpc "AyashaDebug"; end; } -029-1.gat,62,90,0|script|Ayasha|258 +029-1,62,90,0|script|Ayasha|258 { set @child_number, 0; callfunc "XmasList"; @@ -145,7 +145,7 @@ L_Close: close; } -029-1.gat,50,105,0|script|Latif|262 +029-1,50,105,0|script|Latif|262 { set @child_number, 1; callfunc "XmasList"; @@ -208,7 +208,7 @@ L_Close: close; } -029-1.gat,48,67,0|script|Charda|260 +029-1,48,67,0|script|Charda|260 { set @child_number, 2; callfunc "XmasList"; @@ -259,7 +259,7 @@ L_Close: close; } -029-1.gat,100,36,0|script|Faris|259 +029-1,100,36,0|script|Faris|259 { set @child_number, 3; callfunc "XmasList"; @@ -311,7 +311,7 @@ L_Close: close; } -029-1.gat,28,52,0|script|Rasin|263 +029-1,28,52,0|script|Rasin|263 { set @child_number, 4; callfunc "XmasList"; @@ -354,7 +354,7 @@ L_Close: close; } -029-1.gat,79,99,0|script|Ghada|265 +029-1,79,99,0|script|Ghada|265 { set @child_number, 5; callfunc "XmasList"; diff --git a/world/map/npc/029-1/kaan.txt b/world/map/npc/029-1/kaan.txt index 0dabb802..1c3cf0bb 100644 --- a/world/map/npc/029-1/kaan.txt +++ b/world/map/npc/029-1/kaan.txt @@ -1,7 +1,7 @@ // This file is part of the Tutorial // Author: Jenalya -029-1.gat,46,95,0|script|Kaan|160 +029-1,46,95,0|script|Kaan|160 { setarray @npc_loc, 46, 97, 4; callfunc "PCtoNPCRange"; diff --git a/world/map/npc/029-1/liana.txt b/world/map/npc/029-1/liana.txt index dd95cc0c..c0eacba6 100644 --- a/world/map/npc/029-1/liana.txt +++ b/world/map/npc/029-1/liana.txt @@ -1,6 +1,6 @@ // Talk NPCs to help make trek interesting between Tutorial and Bazaar. -029-1.gat,62,96,0|script|Liana|205 +029-1,62,96,0|script|Liana|205 { setarray @npc_loc, 62, 96, 4; callfunc "PCtoNPCRange"; diff --git a/world/map/npc/029-1/mapflags.txt b/world/map/npc/029-1/mapflags.txt index 2f352ae3..3eb8d0f9 100644 --- a/world/map/npc/029-1/mapflags.txt +++ b/world/map/npc/029-1/mapflags.txt @@ -1 +1 @@ -029-1.gat|mapflag|resave|029-1,39,102 +029-1|mapflag|resave|029-1,39,102 diff --git a/world/map/npc/029-1/monster_guide.txt b/world/map/npc/029-1/monster_guide.txt index 705dce05..205ff4df 100644 --- a/world/map/npc/029-1/monster_guide.txt +++ b/world/map/npc/029-1/monster_guide.txt @@ -1,6 +1,6 @@ // -029-1.gat,45,97,0|script|Aidan|102 +029-1,45,97,0|script|Aidan|102 { if (MPQUEST == 0) goto L_Register; diff --git a/world/map/npc/029-1/rewards_master.txt b/world/map/npc/029-1/rewards_master.txt index cf8a1c1d..acfafc58 100644 --- a/world/map/npc/029-1/rewards_master.txt +++ b/world/map/npc/029-1/rewards_master.txt @@ -1,6 +1,6 @@ // -029-1.gat,47,97,0|script|Ishi|106 +029-1,47,97,0|script|Ishi|106 { if (MPQUEST == 0) goto L_Register; if (tvis == 0) set tvis, 1; diff --git a/world/map/npc/029-1/soul-menhir.txt b/world/map/npc/029-1/soul-menhir.txt index adabfff1..d38f5e85 100644 --- a/world/map/npc/029-1/soul-menhir.txt +++ b/world/map/npc/029-1/soul-menhir.txt @@ -1,9 +1,9 @@ // -029-1.gat,39,101,0|script|Soul Menhir#candor|344 +029-1,39,101,0|script|Soul Menhir#candor|344 { callfunc "ClearVariables"; - set @map$, "029-1.gat"; + set @map$, "029-1"; setarray @Xs, 38, 39, 40, 38, 40, 38, 39, 40; setarray @Ys, 100, 100, 100, 101, 101, 102, 102, 102; set @x, 0; diff --git a/world/map/npc/029-1/traveler.txt b/world/map/npc/029-1/traveler.txt index 13377fbf..1d7f354a 100644 --- a/world/map/npc/029-1/traveler.txt +++ b/world/map/npc/029-1/traveler.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -029-1.gat,69,68,0|script|Knitra the Traveler|103 +029-1,69,68,0|script|Knitra the Traveler|103 { set @NpcName$, "Knitra"; set @NpcTravelBit, $@candor_bit; diff --git a/world/map/npc/029-1/tutorial.txt b/world/map/npc/029-1/tutorial.txt index 6a3df4ff..ddaea587 100644 --- a/world/map/npc/029-1/tutorial.txt +++ b/world/map/npc/029-1/tutorial.txt @@ -25,7 +25,7 @@ function|script|SetTutorialMask set @tutorial_tmp, 0; return; } -029-2.gat,21,26,0|script|TutDebug|154 +029-2,21,26,0|script|TutDebug|154 { mes "[TutDebug]"; mes "Reset?"; @@ -57,7 +57,7 @@ OnInit: disablenpc "TutDebug"; end; } -029-1.gat,32,99,0|script|#tutorialoutside|45,0,0 +029-1,32,99,0|script|#tutorialoutside|45,0,0 { callfunc "TutorialState"; if (@tutorial >= 8) @@ -70,6 +70,6 @@ L_ResetTutorial: goto L_Warp; L_Warp: - warp "029-2.gat", 114, 92; + warp "029-2", 114, 92; end; } diff --git a/world/map/npc/029-1/valon.txt b/world/map/npc/029-1/valon.txt index 0ce62c79..49bb6c5d 100644 --- a/world/map/npc/029-1/valon.txt +++ b/world/map/npc/029-1/valon.txt @@ -47,7 +47,7 @@ function|script|ValonProgress message strcharinfo(0), $@ValonMobName$[@valon_mob] + ": " + @valon_count + "/" + $@ValonMobCnt[@valon_mob]; return; } -029-1.gat,74,86,0|script|ValonDebug|156 +029-1,74,86,0|script|ValonDebug|156 { mes "[Valon Debug]"; mes "Reset?"; @@ -69,7 +69,7 @@ OnInit: disablenpc "ValonDebug"; end; } -029-1.gat,72,86,0|script|Valon|156 +029-1,72,86,0|script|Valon|156 { setarray @npc_loc, 72, 86, 4; callfunc "PCtoNPCRange"; diff --git a/world/map/npc/029-1/vincent.txt b/world/map/npc/029-1/vincent.txt index 36ce4c2d..a9cf7291 100644 --- a/world/map/npc/029-1/vincent.txt +++ b/world/map/npc/029-1/vincent.txt @@ -1,6 +1,6 @@ // Variables used: nibble 2 of QUEST_SouthTulimshar -029-1.gat,108,108,0|script|Vincent Debug|113 +029-1,108,108,0|script|Vincent Debug|113 { mes "[Vincent Debug]"; mes "Reset?"; @@ -21,7 +21,7 @@ OnInit: disablenpc "Vincent Debug"; end; } -029-1.gat,107,110,0|script|Vincent|113 +029-1,107,110,0|script|Vincent|113 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/029-1/zegas.txt b/world/map/npc/029-1/zegas.txt index 8ecc55e4..f9cefcbd 100644 --- a/world/map/npc/029-1/zegas.txt +++ b/world/map/npc/029-1/zegas.txt @@ -1,7 +1,7 @@ // Barrels // Author: Wushin // Npc -029-1.gat,45,85,0|script|Zegas|165 +029-1,45,85,0|script|Zegas|165 { setarray @npc_loc, 45, 85, 2; callfunc "PCtoNPCRange"; @@ -77,7 +77,7 @@ L_Thanks: L_Close: close; } -029-1.gat,47,86,0|script|ZegasDebug|165 +029-1,47,86,0|script|ZegasDebug|165 { mes "[Zegas Debug]"; mes "Reset ?"; -- cgit v1.2.3-60-g2f50