From efaaf842dc3717e21b915edf37b3e907b02fa5a1 Mon Sep 17 00:00:00 2001 From: AnnieRuru Date: Mon, 21 Dec 2015 20:12:45 +0800 Subject: Replace -1,{ with FAKE_NPC,{ replace using Notepad++ --- npc/instances/NydhoggsNest.txt | 16 ++++++++-------- npc/instances/OrcsMemory.txt | 2 +- npc/instances/SealedShrine.txt | 34 +++++++++++++++++----------------- 3 files changed, 26 insertions(+), 26 deletions(-) (limited to 'npc/instances') diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt index a1d9de802..c3c040c5a 100644 --- a/npc/instances/NydhoggsNest.txt +++ b/npc/instances/NydhoggsNest.txt @@ -1683,7 +1683,7 @@ OnInstanceInit: // Temporary fix for @reloadscript. end; } -1@nyd,1,1,0 script nyd_call_mon_1 -1,{ +1@nyd,1,1,0 script nyd_call_mon_1 FAKE_NPC,{ OnInstanceInit: enablenpc instance_npcname("nyd_call_mon_1"); end; @@ -1722,7 +1722,7 @@ OnMyMobDead: end; } -1@nyd,1,2,0 script ins_nyd_1f_timer -1,{ +1@nyd,1,2,0 script ins_nyd_1f_timer FAKE_NPC,{ OnInstanceInit: disablenpc instance_npcname("ins_nyd_1f_timer"); end; @@ -1782,7 +1782,7 @@ OnTouch: end; } -1@nyd,1,1,0 script ins_nyd1_spawn_mobs -1,{ +1@nyd,1,1,0 script ins_nyd1_spawn_mobs FAKE_NPC,{ OnInstanceInit: .@map$ = instance_mapname("1@nyd"); monster .@map$,0,0,"Ancient Tree",2019,40,instance_npcname("ins_nyd1_spawn_mobs")+"::OnMyTreeDead"; @@ -1821,7 +1821,7 @@ OnTouch_: end; } -2@nyd,1,1,0 script nyd_2f_enter_broad -1,{ +2@nyd,1,1,0 script nyd_2f_enter_broad FAKE_NPC,{ OnInstanceInit: OnDisable: disablenpc instance_npcname("nyd_2f_enter_broad"); @@ -1868,7 +1868,7 @@ OnTouch_: end; } -2@nyd,2,2,0 script nyd_2f_boss_enter_call -1,{ +2@nyd,2,2,0 script nyd_2f_boss_enter_call FAKE_NPC,{ OnInstanceInit: disablenpc instance_npcname("nyd_2f_boss_enter_call"); end; @@ -1944,7 +1944,7 @@ OnMyMobDead: end; } -2@nyd,2,4,0 script nyd_2f_boss_enter_logic -1,{ +2@nyd,2,4,0 script nyd_2f_boss_enter_logic FAKE_NPC,{ OnInstanceInit: disablenpc instance_npcname("nyd_2f_boss_enter_logic"); end; @@ -2056,7 +2056,7 @@ OnTimer10000: end; } -2@nyd,6,6,0 script nyd_2f_red_c -1,{ +2@nyd,6,6,0 script nyd_2f_red_c FAKE_NPC,{ OnInstanceInit: disablenpc instance_npcname(strnpcinfo(0)); end; @@ -2166,7 +2166,7 @@ OnTouch: 2@nyd,260,356,0 duplicate(nyd_2f_red_warp1) nyd_2f_green_warp2 -1,6,6 2@nyd,258,368,0 duplicate(nyd_2f_red_warp1) nyd_2f_green_warp3 -1,6,6 -2@nyd,1,1,0 script ins_nyd2_spawn_mobs -1,{ +2@nyd,1,1,0 script ins_nyd2_spawn_mobs FAKE_NPC,{ OnInstanceInit: .@map$ = instance_mapname("2@nyd"); areamonster .@map$,200,92,180,80,"Rhyncho",2020,40,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyRhynDead"; diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt index 41c0d5e5d..cbf7d1a56 100644 --- a/npc/instances/OrcsMemory.txt +++ b/npc/instances/OrcsMemory.txt @@ -499,7 +499,7 @@ OnTouch: end; } -1@orcs,1,1,0 script B1 Area Mobs -1,{ +1@orcs,1,1,0 script B1 Area Mobs FAKE_NPC,{ end; OnMyMobDead: diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt index 4750f2105..e57c57624 100644 --- a/npc/instances/SealedShrine.txt +++ b/npc/instances/SealedShrine.txt @@ -437,7 +437,7 @@ prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{ } //== Sealed Shrine Interior ================================ -1@cata,1,2,0 script ins_baphomet_lotto -1,{ +1@cata,1,2,0 script ins_baphomet_lotto FAKE_NPC,{ OnInstanceInit: // Pick one "true" Gravestone and 12 "false" Gravestones. .@true = rand(1,13); @@ -448,14 +448,14 @@ OnInstanceInit: end; } -1@cata,3,2,0 script ins_baphomet_lotto2 -1,{ +1@cata,3,2,0 script ins_baphomet_lotto2 FAKE_NPC,{ OnEnable: for (.@i = 1; .@i <= 12; ++.@i) enablenpc instance_npcname("Bobbing Torch#"+.@i); end; } -1@cata,4,2,0 script ins_baphomet_lotto3 -1,{ +1@cata,4,2,0 script ins_baphomet_lotto3 FAKE_NPC,{ OnEnable: .@label$ = instance_npcname("ins_baphomet_lotto3")+"::OnMyMobDead"; .@map$ = instance_mapname("1@cata"); @@ -837,7 +837,7 @@ OnInstanceInit: } //== Gravestones =========================================== -- script Gravestone#SS1 -1,{ +- script Gravestone#SS1 FAKE_NPC,{ if ('ins_baphomet == 1) { getitem Soul_Pendant,1; 'ins_baphomet = 2; @@ -866,7 +866,7 @@ OnInstanceInit: 1@cata,127,32,0 duplicate(Gravestone#SS1) Gravestone#1F_12T CLEAR_NPC 1@cata,267,30,0 duplicate(Gravestone#SS1) Gravestone#1F_13T CLEAR_NPC -- script Gravestone#SS2 -1,{ +- script Gravestone#SS2 FAKE_NPC,{ mes "I can only feel gloom from this Gravestone."; close; } @@ -885,7 +885,7 @@ OnInstanceInit: 1@cata,267,30,0 duplicate(Gravestone#SS2) Gravestone#1F_13F CLEAR_NPC //== Bobbing Torches ======================================= -- script Bobbing Torch#SS -1,{ +- script Bobbing Torch#SS FAKE_NPC,{ .@party_id = getcharid(1); if (getpartyleader(.@party_id,2) == getcharid(0)) { if (('ins_baphomet == 3) && (countitem(Essence_Of_Fire) < 11)) { @@ -935,7 +935,7 @@ OnInstanceInit: 1@cata,71,42,0 duplicate(Bobbing Torch#SS) Bobbing Torch#11 CLEAR_NPC 1@cata,155,14,0 duplicate(Bobbing Torch#SS) Bobbing Torch#12 CLEAR_NPC -1@cata,1,1,0 script ins_baphomet_1f_timer -1,{ +1@cata,1,1,0 script ins_baphomet_1f_timer FAKE_NPC,{ OnInstanceInit: disablenpc instance_npcname("ins_baphomet_1f_timer"); end; @@ -983,7 +983,7 @@ OnTouch: end; } -2@cata,1,1,0 script ins_2f_enter_broad -1,{ +2@cata,1,1,0 script ins_2f_enter_broad FAKE_NPC,{ OnInstanceInit: OnDisable: disablenpc instance_npcname("ins_2f_enter_broad"); @@ -1086,7 +1086,7 @@ OnTouch: } //== Magical Seals ========================================= -- script Magical Seal#SS -1,{ +- script Magical Seal#SS FAKE_NPC,{ .@seal_check = questprogress(3041,PLAYTIME); if (.@seal_check == 1) { specialeffect2 EF_SILENCEATTACK; @@ -1186,7 +1186,7 @@ OnInstanceInit: end; } -2@cata,1,2,0 script ins_2f_hero_broad -1,{ +2@cata,1,2,0 script ins_2f_hero_broad FAKE_NPC,{ OnEnable: enablenpc instance_npcname("ins_2f_hero_broad"); initnpctimer; @@ -1225,7 +1225,7 @@ OnTimer17000: end; } -2@cata,3,3,0 script control_baphomet -1,{ +2@cata,3,3,0 script control_baphomet FAKE_NPC,{ OnInstanceInit: OnDisable: disablenpc instance_npcname("control_baphomet"); @@ -1260,7 +1260,7 @@ OnMyMobDead: end; } -2@cata,2,2,0 script ins_2f_hero_broad2 -1,{ +2@cata,2,2,0 script ins_2f_hero_broad2 FAKE_NPC,{ OnInstanceInit: OnDisable: disablenpc instance_npcname("ins_2f_hero_broad2"); @@ -1308,7 +1308,7 @@ OnTimer26000: end; } -2@cata,4,1,0 script 2f_callmon_pattern_c -1,{ +2@cata,4,1,0 script 2f_callmon_pattern_c FAKE_NPC,{ OnInstanceInit: disablenpc instance_npcname("2f_callmon_pattern_c"); end; @@ -1333,7 +1333,7 @@ OnTimer3600000: end; } -2@cata,4,2,0 script 2f_callmon_pattern -1,{ +2@cata,4,2,0 script 2f_callmon_pattern FAKE_NPC,{ OnInstanceInit: disablenpc instance_npcname("2f_callmon_pattern"); end; @@ -1357,7 +1357,7 @@ OnTimer300000: end; } -2@cata,3,1,0 script ins_2f_hero_pattern_c -1,{ +2@cata,3,1,0 script ins_2f_hero_pattern_c FAKE_NPC,{ OnInstanceInit: disablenpc instance_npcname("ins_2f_hero_pattern_c"); end; @@ -1393,7 +1393,7 @@ OnTimer3605000: end; } -2@cata,3,2,0 script ins_2f_hero_pattern -1,{ +2@cata,3,2,0 script ins_2f_hero_pattern FAKE_NPC,{ OnInstanceInit: disablenpc instance_npcname("ins_2f_hero_pattern"); end; @@ -1455,7 +1455,7 @@ OnTimer70000: end; } -1@cata,1,1,0 script ins_1f_spawn_mobs -1,{ +1@cata,1,1,0 script ins_1f_spawn_mobs FAKE_NPC,{ OnInstanceInit: .@map$ = instance_mapname("1@cata"); monster .@map$,0,0,"Zombie Master",1298,10; -- cgit v1.2.3-60-g2f50