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/007-1/mapflags.txt | 2 +- world/map/npc/007-1/voltain.txt | 2 +- world/map/npc/007-1/witch.txt | 74 ++++++++++++++++++++-------------------- 3 files changed, 39 insertions(+), 39 deletions(-) (limited to 'world/map/npc/007-1') diff --git a/world/map/npc/007-1/mapflags.txt b/world/map/npc/007-1/mapflags.txt index d1d702ec..a32e6b44 100644 --- a/world/map/npc/007-1/mapflags.txt +++ b/world/map/npc/007-1/mapflags.txt @@ -1 +1 @@ -007-1.gat|mapflag|resave|009-2,149,43 +007-1|mapflag|resave|009-2,149,43 diff --git a/world/map/npc/007-1/voltain.txt b/world/map/npc/007-1/voltain.txt index ed1c3ee8..9c51fe3f 100644 --- a/world/map/npc/007-1/voltain.txt +++ b/world/map/npc/007-1/voltain.txt @@ -25,7 +25,7 @@ // # 12: bring gamboge herbs // # 13: bring chocolate cake -007-1.gat,37,21,0|script|Voltain|103 +007-1,37,21,0|script|Voltain|103 { set @BOTTLE_NEEDED, 3; set @BOTTLE_REWARD_XP, 100; diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-1/witch.txt index 97649deb..0c921e8e 100644 --- a/world/map/npc/007-1/witch.txt +++ b/world/map/npc/007-1/witch.txt @@ -14,7 +14,7 @@ // 254: Quest is being ended and cleaned: the hero logged off. // 255: Quest is being ended and cleaned: the hero died or he ran out of time -007-1.gat,77,81,0|script|Valia|370 +007-1,77,81,0|script|Valia|370 { set @illia_sapphire_powder, 3; set @illia_amethyst_powder, 1; @@ -402,22 +402,22 @@ L_AskToTeleport: // $@ILLIA_HERO$ $@ILLIA_HELPER1$ $@ILLIA_HELPER2$ $@ILLIA_HELPER3$ if (!(attachrid(getcharid(3,$@ILLIA_HELPER1$)))) goto L_NotEveryoneHere; - if (!(isin("007-1.gat", 66, 73, 92, 88))) + if (!(isin("007-1", 66, 73, 92, 88))) goto L_NotEveryoneHere; detachrid; if (!(attachrid(getcharid(3,$@ILLIA_HELPER2$)))) goto L_NotEveryoneHere; - if (!(isin("007-1.gat", 66, 73, 92, 88))) + if (!(isin("007-1", 66, 73, 92, 88))) goto L_NotEveryoneHere; detachrid; if (!(attachrid(getcharid(3,$@ILLIA_HELPER3$)))) goto L_NotEveryoneHere; - if (!(isin("007-1.gat", 66, 73, 92, 88))) + if (!(isin("007-1", 66, 73, 92, 88))) goto L_NotEveryoneHere; detachrid; if (!(attachrid(getcharid(3,$@ILLIA_HERO$)))) goto L_NotEveryoneHere; - if (!(isin("007-1.gat", 66, 73, 92, 88))) + if (!(isin("007-1", 66, 73, 92, 88))) goto L_NotEveryoneHere; mes "[Valia]"; mes "\"Everyone seems to be here. Make sure to stay close to me.\""; @@ -494,7 +494,7 @@ L_Warp: end; OnRealWarp: - warp "051-1.gat", 23 + rand(2), 24 + rand(3); + warp "051-1", 23 + rand(2), 24 + rand(3); if (strcharinfo(0) == $@ILLIA_HERO$) goto L_InitVars; end; @@ -639,10 +639,10 @@ OnTimer34000: end; // Trigger 4 areatimers to show the teleport spell // This is better looking than a basic areawarp - areatimer "007-1.gat", 66, 73, 92, 88, 3000, "Valia::OnWarpHero"; - areatimer "007-1.gat", 66, 73, 92, 88, 3500, "Valia::OnWarpHelper1"; - areatimer "007-1.gat", 66, 73, 92, 88, 4000, "Valia::OnWarpHelper2"; - areatimer "007-1.gat", 66, 73, 92, 88, 4500, "Valia::OnWarpHelper3"; + areatimer "007-1", 66, 73, 92, 88, 3000, "Valia::OnWarpHero"; + areatimer "007-1", 66, 73, 92, 88, 3500, "Valia::OnWarpHelper1"; + areatimer "007-1", 66, 73, 92, 88, 4000, "Valia::OnWarpHelper2"; + areatimer "007-1", 66, 73, 92, 88, 4500, "Valia::OnWarpHelper3"; npctalk "Spiralis Major!"; misceffect FX_BLUE_MAGIC_CAST; end; @@ -686,7 +686,7 @@ L_KillHero: } -007-1.gat,128,100,0|script|#IlliaDaemon|127 +007-1,128,100,0|script|#IlliaDaemon|127 { end; @@ -727,10 +727,10 @@ OnTimer4000: if (isloggedin($@ILLIA_HERO_ID) == 0) end; if ($@ILLIA_STATUS == 255 && attachrid($@ILLIA_HERO_ID) && ( - isin("051-1.gat",1,1,190,80) || - isin("051-3.gat",1,1,115,130) || - isin("052-1.gat",1,1,100,80) || - isin("052-2.gat",1,1,150,100) + isin("051-1",1,1,190,80) || + isin("051-3",1,1,115,130) || + isin("052-1",1,1,100,80) || + isin("052-2",1,1,150,100) ) ) goto L_WarpHero; detachrid; @@ -767,10 +767,10 @@ L_CheckHelperNeedNotification: if ( $@illia_helper$ != "" && attachrid(getcharid(3, $@illia_helper$)) && ( - isin("051-1.gat",1,1,190,80) || - isin("051-3.gat",1,1,115,130) || - isin("052-1.gat",1,1,100,80) || - isin("052-2.gat",1,1,150,100) + isin("051-1",1,1,190,80) || + isin("051-3",1,1,115,130) || + isin("052-1",1,1,100,80) || + isin("052-2",1,1,150,100) ) ) goto L_NotifyHelperFail; detachrid; @@ -825,10 +825,10 @@ L_CleanHelpersWarps: L_WarpHelper: // Proceed only if the helper is still on one of the quest's maps if ( - isin("051-1.gat",1,1,190,80 ) || - isin("051-3.gat",1,1,115,130) || - isin("052-1.gat",1,1,100,80 ) || - isin("052-2.gat",1,1,150,100) + isin("051-1",1,1,190,80 ) || + isin("051-3",1,1,115,130) || + isin("052-1",1,1,100,80 ) || + isin("052-2",1,1,150,100) ) goto L_DoWarpHelper; detachrid; goto L_NextHelperToWarp; @@ -837,7 +837,7 @@ L_DoWarpHelper: // At this point, the player has been attached if ($@illia_progress >= 5) message strcharinfo(0), "You feel dizzy, and that your memory is being rewritten... Who is Luvia? Something isn't right."; - warp "007-1.gat",85 + rand(0,2),75 + rand(0,2); + warp "007-1",85 + rand(0,2),75 + rand(0,2); detachrid; goto L_NextHelperToWarp; @@ -846,10 +846,10 @@ L_Check: if (isloggedin($@ILLIA_HERO_ID) == 0) goto L_HeroLogOff; if (attachrid($@ILLIA_HERO_ID) && - (isin("051-1.gat",1,1,190,80 ) == 0) && - (isin("051-3.gat",1,1,115,130) == 0) && - (isin("052-1.gat",1,1,100,80 ) == 0) && - (isin("052-2.gat",1,1,150,100) == 0) + (isin("051-1",1,1,190,80 ) == 0) && + (isin("051-3",1,1,115,130) == 0) && + (isin("052-1",1,1,100,80 ) == 0) && + (isin("052-2",1,1,150,100) == 0) ) goto L_HeroEscape; if (isdead()) goto L_HeroDead; @@ -892,7 +892,7 @@ L_WarpHero: // At this point, the player has been attached if ($@illia_progress >= 5) message strcharinfo(0), "You feel dizzy, and that your memory is being rewritten... Who is Luvia? Something isn't right."; - warp "007-1.gat",85 + rand(0,2),75 + rand(0,2); + warp "007-1",85 + rand(0,2),75 + rand(0,2); detachrid; end; @@ -981,42 +981,42 @@ L_Torch1: return; } -007-1.gat,72,88,0|script|#IlliaTorch1|374 +007-1,72,88,0|script|#IlliaTorch1|374 { end; } -007-1.gat,71,85,0|script|#IlliaTorch2|374 +007-1,71,85,0|script|#IlliaTorch2|374 { end; } -007-1.gat,75,70,0|script|#IlliaTorch3|374 +007-1,75,70,0|script|#IlliaTorch3|374 { end; } -007-1.gat,85,71,0|script|#IlliaTorch4|374 +007-1,85,71,0|script|#IlliaTorch4|374 { end; } -007-1.gat,88,69,0|script|#IlliaTorch5|374 +007-1,88,69,0|script|#IlliaTorch5|374 { end; } -007-1.gat,86,68,0|script|#IlliaTorch6|374 +007-1,86,68,0|script|#IlliaTorch6|374 { end; } -007-1.gat,87,68,0|script|#IlliaTorch7|374 +007-1,87,68,0|script|#IlliaTorch7|374 { end; } -007-1.gat,88,67,0|script|#IlliaTorch8|374 +007-1,88,67,0|script|#IlliaTorch8|374 { end; } -- cgit v1.2.3-60-g2f50