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/052-2/chest.txt | 6 +++--- world/map/npc/052-2/janitor.txt | 14 +++++++------- world/map/npc/052-2/lobby.txt | 38 +++++++++++++++++++------------------- world/map/npc/052-2/mapflags.txt | 4 ++-- world/map/npc/052-2/partyroom.txt | 30 +++++++++++++++--------------- world/map/npc/052-2/storage.txt | 30 +++++++++++++++--------------- 6 files changed, 61 insertions(+), 61 deletions(-) (limited to 'world/map/npc/052-2') diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt index 1297e5c0..7ba0d2df 100644 --- a/world/map/npc/052-2/chest.txt +++ b/world/map/npc/052-2/chest.txt @@ -12,7 +12,7 @@ // 3: player choosed to leave the room //----------------------------------------------------------------------------- -052-2.gat,136,73,0|script|Chest#illia|111 +052-2,136,73,0|script|Chest#illia|111 { set @step, 8; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -117,7 +117,7 @@ L_AskLeaving: next; // Force the hero to leave last, as this event triggers the end of the quest // as well as some dialogs from Valia, when the hero returns. - if (strcharinfo(0) == $@ILLIA_HERO$ && getareausers("052-2.gat", 19, 8, 137, 88) > 1) + if (strcharinfo(0) == $@ILLIA_HERO$ && getareausers("052-2", 19, 8, 137, 88) > 1) goto L_WaitHelpersLeave; goto L_PrepareLeaving; @@ -160,7 +160,7 @@ OnFx: end; OnRing: - warp "007-1.gat", 85 + rand(0,2), 75 + rand(0,2); + warp "007-1", 85 + rand(0,2), 75 + rand(0,2); if (strcharinfo(0) == $@ILLIA_HERO$) goto L_ScheduleEnd; end; diff --git a/world/map/npc/052-2/janitor.txt b/world/map/npc/052-2/janitor.txt index d78c4bba..7435f005 100644 --- a/world/map/npc/052-2/janitor.txt +++ b/world/map/npc/052-2/janitor.txt @@ -1,36 +1,36 @@ // Lobby janitor -052-2.gat,1,1,0|script|#IlliaJanitor5|127 +052-2,1,1,0|script|#IlliaJanitor5|127 { end; OnCommandClean: // For security, kill all. - killmonster "052-2.gat", "All"; + killmonster "052-2", "All"; npcwarp 1, 1, "Luvia?"; end; } // Storage janitor -052-2.gat,1,1,0|script|#IlliaJanitor6|127 +052-2,1,1,0|script|#IlliaJanitor6|127 { end; OnCommandClean: - killmonster "052-2.gat", "#ItemsInvoker::OnDeath"; + killmonster "052-2", "#ItemsInvoker::OnDeath"; npcwarp 1, 1, "#ItemsInvoker"; end; } // Final boss janitor -052-2.gat,1,1,0|script|#IlliaJanitor7|127 +052-2,1,1,0|script|#IlliaJanitor7|127 { end; OnCommandClean: - killmonster "052-2.gat", "#LuviaDaemon::OnDeath"; - killmonster "052-2.gat", "#LuviaDaemon::OnWGD"; + killmonster "052-2", "#LuviaDaemon::OnDeath"; + killmonster "052-2", "#LuviaDaemon::OnWGD"; npcwarp 83, 28, "#LuviaDaemon"; npcwarp 88, 15, "Luvia"; end; diff --git a/world/map/npc/052-2/lobby.txt b/world/map/npc/052-2/lobby.txt index 71dde1f7..50eb472f 100644 --- a/world/map/npc/052-2/lobby.txt +++ b/world/map/npc/052-2/lobby.txt @@ -14,7 +14,7 @@ // 8: Witch guards defeated. Door is open. //----------------------------------------------------------------------------- -052-2.gat,40,19,0|script|#InnDoorTrigger|32767,2,2 +052-2,40,19,0|script|#InnDoorTrigger|32767,2,2 { set @step, 5; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -23,7 +23,7 @@ end; L_Warp: - warp "052-2.gat", 23, 71; + warp "052-2", 23, 71; message strcharinfo(0), "This place is full of dust... *coughs*"; end; @@ -33,7 +33,7 @@ L_ShouldNotBeHere: } -052-2.gat,33,40,0|script|#EntranceTrigger|32767,4,2 +052-2,33,40,0|script|#EntranceTrigger|32767,4,2 { set @step, 5; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -50,7 +50,7 @@ L_ShouldNotBeHere: end; } -052-2.gat,1,1,0|script|#LuviaShadow|127 +052-2,1,1,0|script|#LuviaShadow|127 { end; @@ -103,7 +103,7 @@ OnNN: } -052-2.gat,1,1,0|script|#MysteriousVoice|127 +052-2,1,1,0|script|#MysteriousVoice|127 { end; @@ -149,7 +149,7 @@ L_Continue: // Dummy npc to display the mysterious voice, // as a workaround to fakenpcname causing problems -052-2.gat,1,1,0|script|?|127 +052-2,1,1,0|script|?|127 { end; @@ -159,10 +159,10 @@ OnCommandTalk: } -052-2.gat,1,1,0|script|Luvia?|371,2,2 +052-2,1,1,0|script|Luvia?|371,2,2 { if ($@illia_level_5_progress != 3) end; - if (isin("052-2.gat", 37,36, 41,39)) goto L_HandleTalk; + if (isin("052-2", 37,36, 41,39)) goto L_HandleTalk; // Notify too far mes "You see a strange and frightening, yet beautiful woman."; if (strcharinfo(0) == $@ILLIA_HERO$) @@ -235,7 +235,7 @@ OnTimer24500: npctalk "Demonotis!"; misceffect FX_EVIL_SUMMON; callsub S_GetHeroRect; - areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 20 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath"; + areamonster "052-2", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 20 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath"; callsub S_ClearHeroRect; end; @@ -245,7 +245,7 @@ OnTimer44000: npctalk "Demonotis!"; misceffect FX_EVIL_SUMMON; callsub S_GetHeroRect; - areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 28 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath"; + areamonster "052-2", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 28 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath"; callsub S_ClearHeroRect; end; @@ -255,7 +255,7 @@ OnTimer77000: npctalk "Demonotis!"; misceffect FX_EVIL_SUMMON; callsub S_GetHeroRect; - areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 42 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath"; + areamonster "052-2", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 42 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath"; callsub S_ClearHeroRect; // That was the last spawn: reset the timer to start the CheckInvoke loop. set $@illia_level_5_progress, 5; @@ -288,7 +288,7 @@ OnTimer18500: misceffect FX_EVIL_SUMMON; misceffect FX_MAGIC_DARK_EXPLOSION; callsub S_GetHeroRect; - areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1103, 8 + (16 - 480/(30+$Illia_Luvia_Harvest))/3, "Luvia?::OnWGDeath"; + areamonster "052-2", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1103, 8 + (16 - 480/(30+$Illia_Luvia_Harvest))/3, "Luvia?::OnWGDeath"; callsub S_ClearHeroRect; end; @@ -308,19 +308,19 @@ OnTimer2000: end; setnpctimer 0; // Mock players randomly (more or less once every 40 secs) and if still enough mobs running after them - if ($@illia_level_5_progress == 5 && rand(20) == 0 && (mobcount("052-2.gat", "Luvia?::OnDSDeath") > 20)) + if ($@illia_level_5_progress == 5 && rand(20) == 0 && (mobcount("052-2", "Luvia?::OnDSDeath") > 20)) npctalk "Ahaha! Run... Run!"; - if ($@illia_level_5_progress == 5 && (mobcount("052-2.gat", "Luvia?::OnDSDeath") < 0)) + if ($@illia_level_5_progress == 5 && (mobcount("052-2", "Luvia?::OnDSDeath") < 0)) goto L_AllWavesClear; - if ($@illia_level_5_progress == 7 && (mobcount("052-2.gat", "Luvia?::OnWGDeath") < 0)) + if ($@illia_level_5_progress == 7 && (mobcount("052-2", "Luvia?::OnWGDeath") < 0)) goto L_AllWavesClear; end; L_Clear: stopnpctimer; setnpctimer 0; - killmonster "052-2.gat", "Luvia?::OnDSDeath"; - killmonster "052-2.gat", "Luvia?::OnWGDeath"; + killmonster "052-2", "Luvia?::OnDSDeath"; + killmonster "052-2", "Luvia?::OnWGDeath"; end; L_AllWavesClear: @@ -337,13 +337,13 @@ L_ChaseLuvia: set $@illia_progress, 6; callfunc "UpdateIlliaProgress"; set $@illia_max_time, $@illia_max_time + 360; - areatimer "052-2.gat", 19, 18, 48, 43, 2000, "#LuviaShadow::OnNN"; + areatimer "052-2", 19, 18, 48, 43, 2000, "#LuviaShadow::OnNN"; end; S_GetHeroRect: if (!(attachrid($@ILLIA_HERO_ID))) goto L_Clear; - if(!(isin("052-2.gat", 20, 21, 47, 43))) + if(!(isin("052-2", 20, 21, 47, 43))) goto L_Clear; set $@illia_lobby_x, getx(); diff --git a/world/map/npc/052-2/mapflags.txt b/world/map/npc/052-2/mapflags.txt index 2cb3e637..efccaddd 100644 --- a/world/map/npc/052-2/mapflags.txt +++ b/world/map/npc/052-2/mapflags.txt @@ -1,2 +1,2 @@ -052-2.gat|mapflag|nosave|007-1,86,76 -052-2.gat|mapflag|resave|007-1,86,76 +052-2|mapflag|nosave|007-1,86,76 +052-2|mapflag|resave|007-1,86,76 diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt index ba636c9d..ce9c9f7d 100644 --- a/world/map/npc/052-2/partyroom.txt +++ b/world/map/npc/052-2/partyroom.txt @@ -9,7 +9,7 @@ // 3: Luvia is defeated //----------------------------------------------------------------------------- -052-2.gat,88,19,0|script|#TriggerDialog|32767,3,2 +052-2,88,19,0|script|#TriggerDialog|32767,3,2 { set @step, 7; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -29,7 +29,7 @@ L_ShouldNotBeHere: // A trigger whose only purpose is to place Luvia npcs back in place. // (even though the Janitor 7 will have done this job) -052-2.gat,77,48,0|script|#TriggerPlaceLuvia|32767,1,1 +052-2,77,48,0|script|#TriggerPlaceLuvia|32767,1,1 { if (strcharinfo(0) != $@ILLIA_HERO$) end; if ($@illia_progress == 7 && $@illia_level_7_progress == 0) goto L_PlaceLuvia; @@ -42,7 +42,7 @@ L_PlaceLuvia: } -052-2.gat,88,15,0|script|Luvia|371 +052-2,88,15,0|script|Luvia|371 { set @step, 7; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -83,7 +83,7 @@ OnTimer15000: } -052-2.gat,88,15,0|script|#LuviaDaemon|127 +052-2,88,15,0|script|#LuviaDaemon|127 { end; @@ -99,7 +99,7 @@ OnTimer2000: // Kill any mob existing on the map // That's to terminate any attempt at players mass-summoning mobs // and hide in a corner of the map. - killmonster "052-2.gat", "All"; + killmonster "052-2", "All"; npcwarp 1, 1, "Luvia"; end; @@ -141,7 +141,7 @@ OnTimer5500: enablenpc "#LuviaDaemon"; misceffect FX_EVIL_SUMMON; misceffect FX_CHANNELLING_CAST; - monster "052-2.gat", $@illia_luvia_x, $@illia_luvia_y, "", 1102, 1, "#LuviaDaemon::OnDeath"; + monster "052-2", $@illia_luvia_x, $@illia_luvia_y, "", 1102, 1, "#LuviaDaemon::OnDeath"; set $@illia_luvia_x, 0; set $@illia_luvia_y, 0; end; @@ -180,9 +180,9 @@ S_SpawnWitchGuard: npcwarp getx(), gety(), "#LuviaDaemon"; misceffect FX_EVIL_SUMMON; misceffect FX_GROUND_SPAWN; - monster "052-2.gat", getx(), gety(), "", 1103, 1, "#LuviaDaemon::OnWGD"; + monster "052-2", getx(), gety(), "", 1103, 1, "#LuviaDaemon::OnWGD"; detachrid; - areatimer "052-2.gat", 73, 11, 115, 49, 0, "#LuviaDaemon::OnWGS"; + areatimer "052-2", 73, 11, 115, 49, 0, "#LuviaDaemon::OnWGS"; return; OnTimer30000: @@ -198,7 +198,7 @@ OnTimer30000: L_TriggerTrance: set $@illia_level_7_progress, 3; set $@illia_luvia_trance_delay, 0; - areatimer "052-2.gat", 73, 11, 115, 49, 0, "#LuviaDaemon::OnTT"; + areatimer "052-2", 73, 11, 115, 49, 0, "#LuviaDaemon::OnTT"; setnpctimer 0; end; @@ -213,13 +213,13 @@ OnDeath: if ($@illia_progress != 7) end; set $@illia_level_7_progress, 4; - killmonster "052-2.gat", "#LuviaDaemon::OnWGD"; - mapannounce "052-2.gat", "Luvia:* How? By mere humans! But we will see again! Enjoy your victory while it lasts, " + $@ILLIA_HERO$ + "!!", 0; + killmonster "052-2", "#LuviaDaemon::OnWGD"; + mapannounce "052-2", "Luvia:* How? By mere humans! But we will see again! Enjoy your victory while it lasts, " + $@ILLIA_HERO$ + "!!", 0; set $@illia_bp, $Illia_Luvia_Harvest * 16 / 10 + 120; - areatimer "052-2.gat", 73, 11, 115, 49, 0, "#LuviaDaemon::OnBP"; + areatimer "052-2", 73, 11, 115, 49, 0, "#LuviaDaemon::OnBP"; - areatimer "052-2.gat", 73, 11, 115, 49, 2000, "#LuviaDaemon::OnW00t"; + areatimer "052-2", 73, 11, 115, 49, 2000, "#LuviaDaemon::OnW00t"; set $@illia_progress, 8; callfunc "UpdateIlliaProgress"; @@ -272,12 +272,12 @@ OnW00t: } // Warp from the party room, to the chest room -052-2.gat,88,12,0|script|#ToLuviaRoomDoor|32767,1,2 +052-2,88,12,0|script|#ToLuviaRoomDoor|32767,1,2 { set @step, 7; if ($@illia_progress < @step) goto L_ShouldNotBeHere; if ($@illia_level_7_progress < 4) end; - warp "052-2.gat", 133, 84; + warp "052-2", 133, 84; end; L_ShouldNotBeHere: diff --git a/world/map/npc/052-2/storage.txt b/world/map/npc/052-2/storage.txt index c9cdfd0f..62f9cd46 100644 --- a/world/map/npc/052-2/storage.txt +++ b/world/map/npc/052-2/storage.txt @@ -8,7 +8,7 @@ // 2: All spawns are done and the players killed all mobs //----------------------------------------------------------------------------- -052-2.gat,23,69,0|script|#TriggerItemsInvoker|32767,1,0 +052-2,23,69,0|script|#TriggerItemsInvoker|32767,1,0 { set @step, 6; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -27,7 +27,7 @@ L_StartItemInvoker: } -052-2.gat,1,1,0|script|#ItemsInvoker|127 +052-2,1,1,0|script|#ItemsInvoker|127 { end; @@ -42,7 +42,7 @@ OnCommandStart: set $@illia_storage_max_items, 20; set $@illia_storage_deviation, (8 + ($Illia_Luvia_Harvest*70)/100)*3; initnpctimer; - areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnStart"; + areatimer "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnStart"; end; OnStart: @@ -64,7 +64,7 @@ OnTimer1000: OnTimer1500: // See the note above. enablenpc "#ItemsInvoker"; - areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnItem"; + areatimer "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnItem"; misceffect FX_GROUND_SPAWN; end; @@ -102,26 +102,26 @@ L_ItemSpawn: if (@r > 98) goto L_MakeSpecialItem; // Normal item - makeitem $@illia_storage_items[rand(getarraysize($@illia_storage_items))], rand(2, 8), "052-2.gat", $@item_invoke_x, $@item_invoke_y; + makeitem $@illia_storage_items[rand(getarraysize($@illia_storage_items))], rand(2, 8), "052-2", $@item_invoke_x, $@item_invoke_y; set $@illia_storage_max_items, $@illia_storage_max_items - 1; set @r, 0; end; L_MakeSpecialMonster: - monster "052-2.gat", $@item_invoke_x, $@item_invoke_y, "", 1103, 1, "#ItemsInvoker::OnDeath"; - areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnWtf"; + monster "052-2", $@item_invoke_x, $@item_invoke_y, "", 1103, 1, "#ItemsInvoker::OnDeath"; + areatimer "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnWtf"; set $@illia_storage_max_items, $@illia_storage_max_items - 1; end; L_MakeMonster: - monster "052-2.gat", $@item_invoke_x, $@item_invoke_y, "", 1101, rand(1, 3), "#ItemsInvoker::OnDeath"; + monster "052-2", $@item_invoke_x, $@item_invoke_y, "", 1101, rand(1, 3), "#ItemsInvoker::OnDeath"; set $@illia_storage_max_items, $@illia_storage_max_items - 1; set @r, 0; end; L_MakeSpecialItem: - makeitem $@illia_storage_special_items[rand(getarraysize($@illia_storage_special_items))], rand(2, 4), "052-2.gat", $@item_invoke_x, $@item_invoke_y; - areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnWow"; + makeitem $@illia_storage_special_items[rand(getarraysize($@illia_storage_special_items))], rand(2, 4), "052-2", $@item_invoke_x, $@item_invoke_y; + areatimer "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnWow"; set $@illia_storage_max_items, $@illia_storage_max_items - 1; set @r, 0; end; @@ -129,7 +129,7 @@ L_MakeSpecialItem: L_CheckMobs: if ($@illia_progress != 6) goto L_Clear; - if (mobcount("052-2.gat", "#ItemsInvoker::OnDeath") < 0) + if (mobcount("052-2", "#ItemsInvoker::OnDeath") < 0) goto L_Stop; setnpctimer 0; end; @@ -139,7 +139,7 @@ L_Clear: setnpctimer 0; set $@illia_storage_deviation, 0; set $@illia_storage_max_items, 0; - killmonster "052-2.gat", "#ItemsInvoker::OnDeath"; + killmonster "052-2", "#ItemsInvoker::OnDeath"; end; L_Stop: @@ -152,7 +152,7 @@ L_Stop: set $@illia_progress, 7; callfunc "UpdateIlliaProgress"; set $@illia_max_time, $@illia_max_time + 900; - areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnStop"; + areatimer "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnStop"; end; OnDeath: @@ -172,7 +172,7 @@ OnWow: } -052-2.gat,35,68,0|script|#ToPartyRoom|32767,1,1 +052-2,35,68,0|script|#ToPartyRoom|32767,1,1 { set @step, 6; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -181,7 +181,7 @@ OnWow: end; L_Warp: - warp "052-2.gat", 73, 48; + warp "052-2", 73, 48; end; L_ShouldNotBeHere: -- cgit v1.2.3-70-g09d2