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/jobs/2-2/crusader.txt | 14 +++++++------- npc/jobs/2-2/dancer.txt | 4 ++-- npc/jobs/2-2/monk.txt | 4 ++-- npc/jobs/2-2/rogue.txt | 2 +- npc/jobs/2-2/sage.txt | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) (limited to 'npc/jobs/2-2') diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt index fc97351d5..b0854689c 100644 --- a/npc/jobs/2-2/crusader.txt +++ b/npc/jobs/2-2/crusader.txt @@ -978,7 +978,7 @@ prt_castle,35,151,5 script Patron Knight 4_M_CRU,{ //== Actual tests ========================================== //- Endurance Test - -job_cru,1,1,1 script Summoner#cr1 -1,{ +job_cru,1,1,1 script Summoner#cr1 FAKE_NPC,{ OnTimer300000: donpcevent "Summoner#cr1::OnReset"; end; @@ -1039,7 +1039,7 @@ OnDead: end; } -job_cru,1,2,1 script Summoner#cr2 -1,{ +job_cru,1,2,1 script Summoner#cr2 FAKE_NPC,{ OnTimer345000: donpcevent "Summoner#cr2::OnReset"; end; @@ -1090,7 +1090,7 @@ OnDead: end; } -job_cru,1,3,1 script Summoner#cr3 -1,{ +job_cru,1,3,1 script Summoner#cr3 FAKE_NPC,{ OnTimer345000: donpcevent "Summoner#cr3::OnReset"; end; @@ -1143,7 +1143,7 @@ OnDead: end; } -job_cru,1,4,1 script Summoner#cr4 -1,{ +job_cru,1,4,1 script Summoner#cr4 FAKE_NPC,{ OnTimer345000: donpcevent "Summoner#cr4::OnReset"; end; @@ -1263,7 +1263,7 @@ OnTouch: close; } -job_cru,2,1,1 script Monster Summon#cr0 -1,{ +job_cru,2,1,1 script Monster Summon#cr0 FAKE_NPC,{ OnInit: disablenpc "Monster Summon#cr0"; end; @@ -1400,7 +1400,7 @@ OnEnd: } -job_cru,168,150,0 script Monster Summon#cr4-a -1,{ +job_cru,168,150,0 script Monster Summon#cr4-a FAKE_NPC,{ OnDead: donpcevent "Monster Summon#cr5::OnStart"; end; @@ -1432,7 +1432,7 @@ OnEnd: end; } -job_cru,2,2,1 script Monster Summon#cr6 -1,{ +job_cru,2,2,1 script Monster Summon#cr6 FAKE_NPC,{ OnTimer241000: areawarp "job_cru",160,14,175,178,"job_cru",24,169; donpcevent "Monster Summon#cr0::OnReset"; diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt index 4ceb4ca99..3714e9e1a 100644 --- a/npc/jobs/2-2/dancer.txt +++ b/npc/jobs/2-2/dancer.txt @@ -955,7 +955,7 @@ job_duncer,32,154,1 script Waiting Room#click 1_F_01,{ } //== Dance Timer =========================================== -job_duncer,69,105,0 script Bijou#dance_timer -1,{ +job_duncer,69,105,0 script Bijou#dance_timer FAKE_NPC,{ OnEnable: initnpctimer; end; @@ -1324,7 +1324,7 @@ job_duncer,66,110,0 duplicate(StepTrigger) dance#left -1,1,1 job_duncer,72,110,0 duplicate(StepTrigger) dance#right -1,1,1 job_duncer,69,110,0 duplicate(StepTrigger) dance#cen -1,1,1 -job_duncer,10,10,0 script dance#poring -1,{ +job_duncer,10,10,0 script dance#poring FAKE_NPC,{ OnEnable: monster "job_duncer",69,106,"Poring",1002,1,"dance#poring::OnMyMobDead"; end; diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt index b7ec9ffaa..a9be752a6 100644 --- a/npc/jobs/2-2/monk.txt +++ b/npc/jobs/2-2/monk.txt @@ -2015,7 +2015,7 @@ OnTouch: } } -monk_test,82,384,0 script Trap#t_monk1_1::MonkTrap -1,{ +monk_test,82,384,0 script Trap#t_monk1_1::MonkTrap FAKE_NPC,{ OnTouch: mapannounce "monk_test",""+ strcharinfo(0) + ", you're trapped. You will be returned.",bc_map; warp "monk_test",387,387; @@ -2573,7 +2573,7 @@ OnTouch: end; } -monk_test,3,3,0 script resetter#monk -1,{ +monk_test,3,3,0 script resetter#monk FAKE_NPC,{ OnTimer500000: donpcevent "mob_monk#1_1::OnDisable"; donpcevent "mob_monk#1_2::OnDisable"; diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt index 9181492cc..4239d9f29 100644 --- a/npc/jobs/2-2/rogue.txt +++ b/npc/jobs/2-2/rogue.txt @@ -1980,7 +1980,7 @@ OnTouch: end; } -in_rogue,3,3,0 script resetter#rogue -1,{ +in_rogue,3,3,0 script resetter#rogue FAKE_NPC,{ OnTimer500000: donpcevent "mob_rogue#1::OnDisable"; donpcevent "mob_rogue#2::OnDisable"; diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt index b3a7ac4b7..32c4d172e 100644 --- a/npc/jobs/2-2/sage.txt +++ b/npc/jobs/2-2/sage.txt @@ -2686,7 +2686,7 @@ OnTimer186000: end; } -- script Arena#2 -1,{ +- script Arena#2 FAKE_NPC,{ OnInit: disablenpc "Arena#2"; end; @@ -2789,7 +2789,7 @@ OnTimer186000: end; } -- script Arena#Doorkeeper -1,{ +- script Arena#Doorkeeper FAKE_NPC,{ OnInit: disablenpc "Arena#Doorkeeper"; end; @@ -2855,7 +2855,7 @@ OnTimer63000: end; } -- script Arena#3 -1,{ +- script Arena#3 FAKE_NPC,{ OnInit: disablenpc "Arena#3"; end; @@ -2872,7 +2872,7 @@ OnDisable: end; } -- script Test Helper#sg -1,{ +- script Test Helper#sg FAKE_NPC,{ OnInit: disablenpc "Test Helper#sg"; end; -- cgit v1.2.3-70-g09d2