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/re/cities/izlude.txt | 2 +- npc/re/cities/malangdo.txt | 4 +-- npc/re/cities/malaya.txt | 4 +-- npc/re/cities/mora.txt | 2 +- npc/re/guides/guides_izlude.txt | 2 +- npc/re/instances/BuwayaCave.txt | 2 +- npc/re/instances/MalangdoCulvert.txt | 6 ++--- npc/re/instances/OctopusCave.txt | 10 +++---- npc/re/instances/OldGlastHeim.txt | 28 +++++++++---------- npc/re/instances/WolfchevLaboratory.txt | 22 +++++++-------- npc/re/jobs/2e/kagerou_oboro.txt | 10 +++---- npc/re/jobs/3-1/archbishop.txt | 6 ++--- npc/re/jobs/3-1/guillotine_cross.txt | 2 +- npc/re/jobs/3-1/ranger.txt | 2 +- npc/re/jobs/3-1/warlock.txt | 12 ++++----- npc/re/jobs/3-2/genetic.txt | 2 +- npc/re/jobs/3-2/sorcerer.txt | 2 +- npc/re/jobs/3-2/wanderer.txt | 4 +-- npc/re/jobs/novice/academy.txt | 6 ++--- npc/re/jobs/novice/novice.txt | 48 ++++++++++++++++----------------- npc/re/jobs/repair.txt | 2 +- npc/re/merchants/3rd_trader.txt | 6 ++--- npc/re/merchants/blessed_refiner.txt | 2 +- npc/re/merchants/card_separation.txt | 2 +- npc/re/merchants/flute.txt | 2 +- npc/re/merchants/hd_refiner.txt | 4 +-- npc/re/merchants/refine.txt | 2 +- npc/re/merchants/renters.txt | 2 +- npc/re/mobs/dungeons/lhz_dun.txt | 4 +-- npc/re/mobs/fields/niflheim.txt | 2 +- npc/re/other/bulletin_boards.txt | 2 +- npc/re/quests/eden/121-130.txt | 2 +- npc/re/quests/eden/eden_common.txt | 2 +- npc/re/quests/eden/eden_iro.txt | 2 +- npc/re/quests/eden/eden_service.txt | 2 +- npc/re/quests/quests_brasilis.txt | 2 +- npc/re/quests/quests_dewata.txt | 2 +- npc/re/quests/quests_dicastes.txt | 10 +++---- npc/re/quests/quests_malangdo.txt | 12 ++++----- npc/re/quests/quests_malaya.txt | 8 +++--- npc/re/quests/quests_mora.txt | 12 ++++----- npc/re/quests/quests_morocc.txt | 2 +- npc/re/warps/cities/dicastes.txt | 2 +- npc/re/warps/fields/bif_fild.txt | 2 +- npc/re/woe-fe/invest_main.txt | 10 +++---- 45 files changed, 138 insertions(+), 138 deletions(-) (limited to 'npc/re') diff --git a/npc/re/cities/izlude.txt b/npc/re/cities/izlude.txt index accae753c..29a1a9a72 100644 --- a/npc/re/cities/izlude.txt +++ b/npc/re/cities/izlude.txt @@ -88,7 +88,7 @@ izlude_b,165,156,2 duplicate(Soldier_izlude) Soldier#izlude_b 8W_SOLDIER izlude_c,165,156,2 duplicate(Soldier_izlude) Soldier#izlude_c 8W_SOLDIER izlude_d,165,156,2 duplicate(Soldier_izlude) Soldier#izlude_d 8W_SOLDIER -- script ::Guard_izlude -1,{ +- script ::Guard_izlude FAKE_NPC,{ mes "[Izlude Guard]"; mes "Welcome to Izlude."; close; diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt index 98d0efd95..43e07d7f1 100644 --- a/npc/re/cities/malangdo.txt +++ b/npc/re/cities/malangdo.txt @@ -34,7 +34,7 @@ //========================================================================= //== Malangdo Transportation :: malangdo_go ================ -- script Dolangmal -1,{ +- script Dolangmal FAKE_NPC,{ if (!questprogress(5091)) { mes "[Dolangmal]"; mes "Hey~! Hi human~ This is Mr. Dolangmal. kakaka~"; @@ -173,7 +173,7 @@ rachel,121,126,4 duplicate(Dolangmal) Dolangmal#7 4_CAT_DOWN lighthalzen,254,83,5 duplicate(Dolangmal) Dolangmal#8 4_CAT_DOWN mora,57,150,4 duplicate(Dolangmal) Dolangmal#9 4_CAT_DOWN -- script ::Odgnalam -1,{ +- script ::Odgnalam FAKE_NPC,{ mes "This cat is sleeping in the warm "+((strnpcinfo(2) == "albe")?"Alberta":"Izlude")+" sun."; next; if(select("Let him sleep:Talk to him") == 1) close; diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt index 1577a7245..0c937607a 100644 --- a/npc/re/cities/malaya.txt +++ b/npc/re/cities/malaya.txt @@ -150,7 +150,7 @@ ma_in01,30,94,4 script Inn Keeper#ma 4_F_MALAYA,{ } } -- script Unidentified Creature#i -1,{ +- script Unidentified Creature#i FAKE_NPC,{ end; OnInit: switch(atoi(strnpcinfo(2))) { @@ -208,7 +208,7 @@ ma_fild01,74,367,6 duplicate(Unidentified Creature#i) Unidentified Creature#01 4 ma_fild02,282,41,4 duplicate(Unidentified Creature#i) Unidentified Creature#05 4_MAL_BUDIDAI,2,2 ma_scene01,195,92,4 duplicate(Unidentified Creature#i) Unidentified Creature#09 4_MAL_BUDIDAI,2,2 -- script Unidentified Creature#j -1,{ +- script Unidentified Creature#j FAKE_NPC,{ end; OnEnable: enablenpc strnpcinfo(0); diff --git a/npc/re/cities/mora.txt b/npc/re/cities/mora.txt index 1c9049795..acfc02c13 100644 --- a/npc/re/cities/mora.txt +++ b/npc/re/cities/mora.txt @@ -922,7 +922,7 @@ mora,140,186,3 script Raffle Philosopher 4_M_RAFLE_OLD,{ close; } -- script #mora_traveler -1,{ +- script #mora_traveler FAKE_NPC,{ mes "[Upset Traveler]"; mes "You... you dare play a game with me?"; emotion e_ag,0,"Traveler#ep14_1_1"; diff --git a/npc/re/guides/guides_izlude.txt b/npc/re/guides/guides_izlude.txt index fb2cb31cd..e625235bf 100644 --- a/npc/re/guides/guides_izlude.txt +++ b/npc/re/guides/guides_izlude.txt @@ -34,7 +34,7 @@ //= 1.4 //========================================================================= -- script ::GuideIzlude -1,{ +- script ::GuideIzlude FAKE_NPC,{ cutin "prt_soldier",2; mes "[Izlude Guide]"; mes "Welcome to ^8B4513Izlude^000000,"; diff --git a/npc/re/instances/BuwayaCave.txt b/npc/re/instances/BuwayaCave.txt index 008529551..139d3acc3 100644 --- a/npc/re/instances/BuwayaCave.txt +++ b/npc/re/instances/BuwayaCave.txt @@ -459,7 +459,7 @@ OnTouch: close; } -1@ma_c,1,1,0 script #buwaya_spawn_mobs -1,{ +1@ma_c,1,1,0 script #buwaya_spawn_mobs FAKE_NPC,{ OnInstanceInit: .@map$ = instance_mapname("1@ma_c"); areamonster .@map$,73,81,93,101,"Seaweed",2331,18; diff --git a/npc/re/instances/MalangdoCulvert.txt b/npc/re/instances/MalangdoCulvert.txt index bdf5c6776..30c16e9d8 100644 --- a/npc/re/instances/MalangdoCulvert.txt +++ b/npc/re/instances/MalangdoCulvert.txt @@ -707,7 +707,7 @@ OnTimer520000: end; } -1@pump,1,1,4 script Monster Hole#n -1,{ +1@pump,1,1,4 script Monster Hole#n FAKE_NPC,{ end; OnSpawn: .@i$ = charat(strnpcinfo(2),0); @@ -789,7 +789,7 @@ OnTouch: 1@pump,75,80,4 duplicate(#Culvert_n1) #Culvert_n5 CLEAR_NPC,14,14 1@pump,58,101,4 duplicate(#Culvert_n1) #Culvert_n6 CLEAR_NPC,14,14 -1@pump,1,1,4 script Boss Creation#n -1,{ +1@pump,1,1,4 script Boss Creation#n FAKE_NPC,{ end; OnInstanceInit: disablenpc instance_npcname(strnpcinfo(0)); @@ -909,7 +909,7 @@ OnTouch: } //MD_Putmob "1@pump" 0 0 0 0 20 HYDRA 0 0 2 -1@pump,1,1,4 script Hydra#n -1,{ +1@pump,1,1,4 script Hydra#n FAKE_NPC,{ OnInstanceInit: monster strnpcinfo(4),0,0,"Hydra",1068,20; end; diff --git a/npc/re/instances/OctopusCave.txt b/npc/re/instances/OctopusCave.txt index 61f3e408d..da0df4ac6 100644 --- a/npc/re/instances/OctopusCave.txt +++ b/npc/re/instances/OctopusCave.txt @@ -189,7 +189,7 @@ OnTouch: end; } -1@cash,1,1,0 script oct_enter_broad -1,{ +1@cash,1,1,0 script oct_enter_broad FAKE_NPC,{ end; OnInstanceInit: donpcevent instance_npcname("oct_enter_broad")+"::OnDisable"; @@ -216,7 +216,7 @@ OnTimer7000: end; } -1@cash,3,3,0 script oct_foot_4 -1,{ +1@cash,3,3,0 script oct_foot_4 FAKE_NPC,{ end; OnInstanceInit: donpcevent instance_npcname("oct_foot_4")+"::OnDisable"; @@ -389,7 +389,7 @@ OnTouch: 1@cash,312,214,0 duplicate(oct_foot_exit1) oct_foot_exit3 WARPNPC,2,2 1@cash,370,139,0 duplicate(oct_foot_exit1) oct_foot_exit4 WARPNPC,2,2 -1@cash,15,15,0 script oct_mob_con -1,{ +1@cash,15,15,0 script oct_mob_con FAKE_NPC,{ end; OnInstanceInit: donpcevent instance_npcname("oct_mob_con")+"::OnDisable"; @@ -579,7 +579,7 @@ OnEnable: end; } -1@cash,2,2,0 script oct_boss_con -1,{ +1@cash,2,2,0 script oct_boss_con FAKE_NPC,{ end; OnInstanceInit: donpcevent instance_npcname("oct_boss_con")+"::OnDisable"; @@ -654,7 +654,7 @@ OnMyMobDead: end; } -1@cash,4,4,0 script oct_boss_foot -1,{ +1@cash,4,4,0 script oct_boss_foot FAKE_NPC,{ end; OnInstanceInit: donpcevent instance_npcname("oct_boss_foot")+"::OnDisable"; diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt index b59d6ca36..1807efa4c 100644 --- a/npc/re/instances/OldGlastHeim.txt +++ b/npc/re/instances/OldGlastHeim.txt @@ -455,7 +455,7 @@ OnTalk8: } //== Control Timer ========================================= -1@gl_k,0,0,0 script #talkinstance1 -1,{ +1@gl_k,0,0,0 script #talkinstance1 FAKE_NPC,{ OnInstanceInit: OnDisable: disablenpc instance_npcname("#talkinstance1"); @@ -817,7 +817,7 @@ OnTouch: //== Sector 1 Mobs ========================================= -1@gl_k,0,0,0 script #ghmemorialmob01 -1,{ +1@gl_k,0,0,0 script #ghmemorialmob01 FAKE_NPC,{ OnInstanceInit: OnDisable: disablenpc instance_npcname("#ghmemorialmob01"); @@ -948,7 +948,7 @@ OnEnable: end; } -1@gl_k,0,0,0 script #ghmemorialmob02 -1,{ +1@gl_k,0,0,0 script #ghmemorialmob02 FAKE_NPC,{ OnInstanceInit: OnDisable: disablenpc instance_npcname("#ghmemorialmob02"); @@ -1036,7 +1036,7 @@ OnDisable: 2@gl_k,173,258,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp32 4_M_DIEMAN,4,4 //== Sector 3 Mobs ========================================= -1@gl_k,0,0,0 script #ghmemorialmob03 -1,{ +1@gl_k,0,0,0 script #ghmemorialmob03 FAKE_NPC,{ OnInstanceInit: OnDisable: disablenpc instance_npcname("#ghmemorialmob03"); @@ -1074,7 +1074,7 @@ OnMyMobDead: } //== 1st MVP =============================================== -1@gl_k,0,0,0 script #ghmemorialmob04 -1,{ +1@gl_k,0,0,0 script #ghmemorialmob04 FAKE_NPC,{ OnInstanceInit: OnDisable: disablenpc instance_npcname("#ghmemorialmob04"); @@ -1118,7 +1118,7 @@ OnTimer2000: end; } -1@gl_k,0,0,0 script #controlGH3 -1,{ +1@gl_k,0,0,0 script #controlGH3 FAKE_NPC,{ OnInstanceInit: OnDisable: disablenpc instance_npcname("#controlGH3"); @@ -1385,7 +1385,7 @@ OnEnable: end; } -2@gl_k,0,0,0 script #controlGH4 -1,{ +2@gl_k,0,0,0 script #controlGH4 FAKE_NPC,{ OnInstanceInit: OnDisable: disablenpc instance_npcname("#controlGH4"); @@ -1476,7 +1476,7 @@ OnTimer70000: end; } -2@gl_k,0,0,0 script #ghmemorialmob05 -1,{ +2@gl_k,0,0,0 script #ghmemorialmob05 FAKE_NPC,{ OnInstanceInit: OnDisable: disablenpc instance_npcname("#ghmemorialmob05"); @@ -1523,7 +1523,7 @@ OnMyMobDead: end; } -2@gl_k,0,0,0 script #ghmemorialmob06 -1,{ +2@gl_k,0,0,0 script #ghmemorialmob06 FAKE_NPC,{ OnInstanceInit: OnDisable: disablenpc instance_npcname("#ghmemorialmob06"); @@ -1564,7 +1564,7 @@ OnTimer92000: end; } -2@gl_k,0,0,0 script #ghmemorialmob07 -1,{ +2@gl_k,0,0,0 script #ghmemorialmob07 FAKE_NPC,{ OnInstanceInit: OnDisable: disablenpc instance_npcname("#ghmemorialmob07"); @@ -1585,7 +1585,7 @@ OnMyMobDead: end; } -2@gl_k,0,0,0 script #ghmemorialmob08 -1,{ +2@gl_k,0,0,0 script #ghmemorialmob08 FAKE_NPC,{ OnInstanceInit: OnDisable: disablenpc instance_npcname("#ghmemorialmob08"); @@ -1631,7 +1631,7 @@ OnMyMobDead: end; } -2@gl_k,0,0,0 script #ghmemorialmob09 -1,{ +2@gl_k,0,0,0 script #ghmemorialmob09 FAKE_NPC,{ OnInstanceInit: OnDisable: disablenpc instance_npcname("#ghmemorialmob09"); @@ -1652,7 +1652,7 @@ OnMyMobDead: end; } -2@gl_k,0,0,0 script #ghmemorialmob10 -1,{ +2@gl_k,0,0,0 script #ghmemorialmob10 FAKE_NPC,{ OnInstanceInit: OnDisable: disablenpc instance_npcname("#ghmemorialmob10"); @@ -1835,7 +1835,7 @@ OnEffect5: end; } -2@gl_k,0,0,0 script #controlGH5 -1,{ +2@gl_k,0,0,0 script #controlGH5 FAKE_NPC,{ OnInstanceInit: OnDisable: disablenpc instance_npcname("#controlGH5"); diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt index 7adc07995..c4ed09b19 100644 --- a/npc/re/instances/WolfchevLaboratory.txt +++ b/npc/re/instances/WolfchevLaboratory.txt @@ -1598,7 +1598,7 @@ que_lhz,148,251,0 script #Move2lab -1,12,0,{ } //== Event Controller ====================================== -que_lhz,1,1,0 script #Eventctrl -1,{ +que_lhz,1,1,0 script #Eventctrl FAKE_NPC,{ end; OnEnable: @@ -1662,14 +1662,14 @@ que_lhz,1,1,0 script #Eventctrl -1,{ killmonster "que_lhz", "#Eventctrl::OnMyMobDead"; } -que_lhz,139,232,0 script #01 -1,{ end; } -que_lhz,147,232,0 script #02 -1,{ end; } -que_lhz,156,232,0 script #03 -1,{ end; } -que_lhz,156,224,0 script #04 -1,{ end; } -que_lhz,156,215,0 script #05 -1,{ end; } -que_lhz,147,215,0 script #06 -1,{ end; } -que_lhz,139,215,0 script #07 -1,{ end; } -que_lhz,139,224,0 script #08 -1,{ end; } +que_lhz,139,232,0 script #01 FAKE_NPC,{ end; } +que_lhz,147,232,0 script #02 FAKE_NPC,{ end; } +que_lhz,156,232,0 script #03 FAKE_NPC,{ end; } +que_lhz,156,224,0 script #04 FAKE_NPC,{ end; } +que_lhz,156,215,0 script #05 FAKE_NPC,{ end; } +que_lhz,147,215,0 script #06 FAKE_NPC,{ end; } +que_lhz,139,215,0 script #07 FAKE_NPC,{ end; } +que_lhz,139,224,0 script #08 FAKE_NPC,{ end; } //== Human Guinea pigs ===================================== que_lhz,140,231,1 script Human Guinea pig#01 CHEN,{ @@ -2568,7 +2568,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ } //== The Lab No.2 Valves =================================== -- script bio4FLab2Valve -1,{ +- script bio4FLab2Valve FAKE_NPC,{ if (getpartyleader(getcharid(1),2) == getcharid(0)) { progressbar "0xffff00", 20; stopnpctimer; @@ -2989,7 +2989,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ 1@lhz,148,156,3 script Type_**Dree#boss16 4_M_DWARF,{ end; } //== Bosses ================================================ -- script bio4FBoss -1,{ +- script bio4FBoss FAKE_NPC,{ end; OnEnable: diff --git a/npc/re/jobs/2e/kagerou_oboro.txt b/npc/re/jobs/2e/kagerou_oboro.txt index 42b9b628a..f8b7803e5 100644 --- a/npc/re/jobs/2e/kagerou_oboro.txt +++ b/npc/re/jobs/2e/kagerou_oboro.txt @@ -1139,7 +1139,7 @@ function script F_KO_Survival_rps { } //- Templates - -- script Sight#ko_trap -1,{ +- script Sight#ko_trap FAKE_NPC,{ callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(2),3,4)); end; OnTouch: @@ -1160,7 +1160,7 @@ OnTouch: end; } -- script Sight#ko_trap2 -1,{ +- script Sight#ko_trap2 FAKE_NPC,{ callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(2),3,4)); end; OnTouch: @@ -1205,7 +1205,7 @@ OnTouch: end; } -- script Sight#ko_heal -1,{ +- script Sight#ko_heal FAKE_NPC,{ callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(2),3,4)); end; OnTouch: @@ -1223,7 +1223,7 @@ OnTouch: end; } -- script Sight#ko_curse -1,{ +- script Sight#ko_curse FAKE_NPC,{ callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(2),3,4)); end; OnTouch: @@ -1268,7 +1268,7 @@ OnTouch: } } -- script Sight#ko_gravity -1,{ +- script Sight#ko_gravity FAKE_NPC,{ callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(2),3,4)); end; OnTouch: diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt index f803d99f8..ee8a3872f 100644 --- a/npc/re/jobs/3-1/archbishop.txt +++ b/npc/re/jobs/3-1/archbishop.txt @@ -1001,7 +1001,7 @@ OnTouch: end; } -- script #arch_1_01_0::archbjcq -1,{ +- script #arch_1_01_0::archbjcq FAKE_NPC,{ OnTouch: if (countitem(ValkyrieA_Scroll)) { delitem ValkyrieA_Scroll,1; @@ -1048,7 +1048,7 @@ OnTouch: end; } -- script #arch_redcell -1,{ +- script #arch_redcell FAKE_NPC,{ OnInit: setcell "job3_arch02",276,290,280,294,cell_walkable,0; setcell "job3_arch02",276,290,280,294,cell_shootable,0; @@ -1350,7 +1350,7 @@ OnTouch: end; } -- script #arch_2_02_0::archbjcq2 -1,{ +- script #arch_2_02_0::archbjcq2 FAKE_NPC,{ OnTouch: if (countitem(ValkyrieB_Scroll)) { delitem ValkyrieB_Scroll,1; diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt index 88d7b9f9f..a780093f1 100644 --- a/npc/re/jobs/3-1/guillotine_cross.txt +++ b/npc/re/jobs/3-1/guillotine_cross.txt @@ -3056,7 +3056,7 @@ OnTimer5000: end; } -- script #3rdgc_guard00 -1,{ +- script #3rdgc_guard00 FAKE_NPC,{ end; OnInit: OnDisable: diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt index dd26786d2..e7c9981a2 100644 --- a/npc/re/jobs/3-1/ranger.txt +++ b/npc/re/jobs/3-1/ranger.txt @@ -1582,7 +1582,7 @@ OnTimer133000: end; } -- script Egg Bomb#0 -1,{ +- script Egg Bomb#0 FAKE_NPC,{ OnInit: disablenpc strnpcinfo(0); end; diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt index 981503f84..cc9970c88 100644 --- a/npc/re/jobs/3-1/warlock.txt +++ b/npc/re/jobs/3-1/warlock.txt @@ -36,7 +36,7 @@ //= 1.4 //========================================================================= -- script #distorted_space_ -1,{ +- script #distorted_space_ FAKE_NPC,{ OnTouch: if (job_wl > 1) { mes " - There is a strange distortion here - "; @@ -799,7 +799,7 @@ OnDisable: end; } -- script The chamber of magic#2 -1,{ +- script The chamber of magic#2 FAKE_NPC,{ OnInit: disablenpc strnpcinfo(0); end; @@ -879,7 +879,7 @@ OnTimer305000: } - duplicate(The chamber of magic#2) The chamber of magic#3 -1 -- script The chamber of magic#4 -1,{ +- script The chamber of magic#4 FAKE_NPC,{ OnInit: disablenpc "The chamber of magic#4"; end; @@ -944,7 +944,7 @@ OnTimer65000: end; } -- script Hollow Stone#Warlock -1,{ +- script Hollow Stone#Warlock FAKE_NPC,{ OnInit: disablenpc "Hollow Stone#Warlock"; end; @@ -1024,7 +1024,7 @@ OnTimer607000: end; } -- script Ebein#E1 -1,{ +- script Ebein#E1 FAKE_NPC,{ OnInit: disablenpc "Ebein#E1"; end; @@ -1047,7 +1047,7 @@ OnTimer6000: end; } -- script Ebein#E2 -1,{ +- script Ebein#E2 FAKE_NPC,{ OnInit: disablenpc "Ebein#E2"; end; diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt index f74bcd31a..61d59c54a 100644 --- a/npc/re/jobs/3-2/genetic.txt +++ b/npc/re/jobs/3-2/genetic.txt @@ -963,7 +963,7 @@ job3_gen01,91,48,3 script Demi Calberine#gen 4_F_SCIENCE,{ } } -- script Scattered Stuff#gen -1,{ +- script Scattered Stuff#gen FAKE_NPC,{ if (job_gen > 62 && job_gen < 74) { mes "- There are so many scattered things on the floor that the lab is in chaos. -"; next; diff --git a/npc/re/jobs/3-2/sorcerer.txt b/npc/re/jobs/3-2/sorcerer.txt index ba278fbd7..0c12d82f0 100644 --- a/npc/re/jobs/3-2/sorcerer.txt +++ b/npc/re/jobs/3-2/sorcerer.txt @@ -390,7 +390,7 @@ gef_tower,113,161,5 script Karacas 4_M_SAGE_A,{ close; } } -- script Spirit Detecting Staff#0 -1,{ +- script Spirit Detecting Staff#0 FAKE_NPC,{ if (strnpcinfo(4) == "thor_v01") setarray .@id[0],990,994,6276,6278; else if (strnpcinfo(4) == "ice_dun01") setarray .@id[0],991,995,6278,6276; diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt index 24c06ed2e..105a43fd0 100644 --- a/npc/re/jobs/3-2/wanderer.txt +++ b/npc/re/jobs/3-2/wanderer.txt @@ -862,7 +862,7 @@ hu_fild05,342,130,5 script Dancer Kim#fild 4_F_CAPEGIRL,{ close; } -- script #fildshout00::wandererjcq -1,{ +- script #fildshout00::wandererjcq FAKE_NPC,{ OnTouch: if (job_wan == 7) { switch(rand(3)) { @@ -1041,7 +1041,7 @@ OnInit: end; } -- script #wander_xmas -1,{ +- script #wander_xmas FAKE_NPC,{ end; OnInit: disablenpc strnpcinfo(0); diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt index 280547487..f98363fee 100644 --- a/npc/re/jobs/novice/academy.txt +++ b/npc/re/jobs/novice/academy.txt @@ -5630,7 +5630,7 @@ izlude_c,97,138,5 duplicate(Romantic Female#iz) Romantic Female#iz_c 4_F_SITDOWN izlude_d,97,138,5 duplicate(Romantic Female#iz) Romantic Female#iz_d 4_F_SITDOWN //- Manufacturing Maniac - -izlude,93,143,3 script Manufacturing Maniac#0 -1,{ +izlude,93,143,3 script Manufacturing Maniac#0 FAKE_NPC,{ mes "[Manufacturing Maniac]"; mes "Hi~! I am an Alchemist."; mes "It's one of the second jobs after Merchant."; @@ -6424,7 +6424,7 @@ pay_fild08,153,83,1 script Lady Harvesting Herbs#2 1_F_ORIENT_02,{ } //- Signs - -- script ::ac_board -1,{ +- script ::ac_board FAKE_NPC,{ end; } @@ -12620,7 +12620,7 @@ izlude_c,153,126,1 duplicate(Refinery Owner Han#iz) Refinery Owner Han#iz_c 4_M_ izlude_d,153,126,1 duplicate(Refinery Owner Han#iz) Refinery Owner Han#iz_d 4_M_02 //- Refining Machine Wagjak - -- script ::izludeWagjak -1,{ +- script ::izludeWagjak FAKE_NPC,{ disable_items; mes "[Refining Machine Wagjak]"; mes "-Ddarritt!-"; diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt index 4d8ff77f4..e98fff417 100644 --- a/npc/re/jobs/novice/novice.txt +++ b/npc/re/jobs/novice/novice.txt @@ -36,7 +36,7 @@ //========================================================================= //== Main NPCs ============================================= -- script Sprakki#newbe01::NvSprakkiA -1,{ +- script Sprakki#newbe01::NvSprakkiA FAKE_NPC,{ if (job_novice_q == 0) { mes "[Sprakki]"; mes "Hello there! Welcome to the World of Ragnarok Online. My name is Sprakki and I'm in charge of giving you basic gameplay tips."; @@ -98,7 +98,7 @@ new_3-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv3a 4_F_01 new_4-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv4a 4_F_01 new_5-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv5a 4_F_01 -- script Sprakki#newbe05::NvSprakkiB -1,{ +- script Sprakki#newbe05::NvSprakkiB FAKE_NPC,{ if (job_novice_q == 0) { mes "[Sprakki]"; mes "Hello there! Welcome to the World of Ragnarok Online."; @@ -229,7 +229,7 @@ new_3-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv3b 4_F_01 new_4-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv4b 4_F_01 new_5-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv5b 4_F_01 -- script Brade#newbe02::NvBradeA -1,{ +- script Brade#newbe02::NvBradeA FAKE_NPC,{ if (job_novice_q < 2) { mes "[Instructor Brade]"; mes "Hello there! Welcome to the World of Ragnarok Online."; @@ -499,7 +499,7 @@ new_3-2,100,105,3 duplicate(NvBradeA) Brade#nv3a 4_M_JOB_KNIGHT1 new_4-2,100,105,3 duplicate(NvBradeA) Brade#nv4a 4_M_JOB_KNIGHT1 new_5-2,100,105,3 duplicate(NvBradeA) Brade#nv5a 4_M_JOB_KNIGHT1 -- script Jinha#newbe03::NvJinha -1,{ +- script Jinha#newbe03::NvJinha FAKE_NPC,{ if (job_novice_q < 5) { mes "[Jinha]"; mes "What can I help you with?"; @@ -595,7 +595,7 @@ new_4-2,115,120,3 duplicate(NvJinha) Jinha#nv4 1_M_ORIENT01 new_5-2,115,120,3 duplicate(NvJinha) Jinha#nv5 1_M_ORIENT01 //== People/Services in Ragnarok =========================== -- script Chocolat#newbe06::NvChocolat -1,{ +- script Chocolat#newbe06::NvChocolat FAKE_NPC,{ if (job_novice_q < 7) { mes "[Chocolat]"; mes "Hmm? Strange."; @@ -777,7 +777,7 @@ new_3-2,33,172,4 duplicate(NvChocolat) Chocolat#nv3 4W_KID new_4-2,33,172,4 duplicate(NvChocolat) Chocolat#nv4 4W_KID new_5-2,33,172,4 duplicate(NvChocolat) Chocolat#nv5 4W_KID -- script Kafra Employee#newbe07::NvKafra -1,{ +- script Kafra Employee#newbe07::NvKafra FAKE_NPC,{ if (job_novice_q < 8) { mes "[Kafra Employee]"; mes "Hello."; @@ -1021,7 +1021,7 @@ new_3-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv3 4_F_KAFRA1 new_4-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv4 4_F_KAFRA1 new_5-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv5 4_F_KAFRA1 -- script Cool Event Corp. Staff::NvCool -1,{ +- script Cool Event Corp. Staff::NvCool FAKE_NPC,{ if (job_novice_q < 9) { mes "[Cool Event Corp. Staff]"; mes "This is not my turn."; @@ -1061,7 +1061,7 @@ new_3-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool3 4_M_ZONDAMAN new_4-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool4 4_M_ZONDAMAN new_5-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool5 4_M_ZONDAMAN -- script Guide::NvGuide -1,{ +- script Guide::NvGuide FAKE_NPC,{ if (job_novice_q < 10) { mes "[Guide]"; mes "It ain't my turn yet."; @@ -1116,7 +1116,7 @@ new_4-2,36,176,4 duplicate(NvGuide) Guide#nv4 8W_SOLDIER new_5-2,36,176,4 duplicate(NvGuide) Guide#nv5 8W_SOLDIER //== Real Combat Training ================================== -- script Brade#newbe04::NvBradeB -1,{ +- script Brade#newbe04::NvBradeB FAKE_NPC,{ if (job_novice_q < 12) { if (job_novice_q < 2) { mes "[Brade]"; @@ -1328,7 +1328,7 @@ new_3-3,96,30,4 duplicate(NvBradeB) Brade#nv3b 4_M_JOB_KNIGHT1 new_4-3,96,30,4 duplicate(NvBradeB) Brade#nv4b 4_M_JOB_KNIGHT1 new_5-3,96,30,4 duplicate(NvBradeB) Brade#nv5b 4_M_JOB_KNIGHT1 -- script Swordman Guide#newbe10::NvSwordman -1,{ +- script Swordman Guide#newbe10::NvSwordman FAKE_NPC,{ if (job_novice_q < 15) { mes "[Swordman Guildsman]"; mes "I won't help you until you finish Brade's instructions."; @@ -1488,7 +1488,7 @@ new_3-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv3 4_F_JOB_KNIGHT new_4-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv4 4_F_JOB_KNIGHT new_5-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv5 4_F_JOB_KNIGHT -- script Acolyte Guide#newbe10::NvAcolyte -1,{ +- script Acolyte Guide#newbe10::NvAcolyte FAKE_NPC,{ if (job_novice_q < 15) { mes "[Prontera Acolyte]"; mes "You look like you are not done with Instructor Brade's lessons."; @@ -1578,7 +1578,7 @@ new_3-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv3 4_F_SISTER new_4-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv4 4_F_SISTER new_5-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv5 4_F_SISTER -- script Thief Guide#newbe10::NvThief -1,{ +- script Thief Guide#newbe10::NvThief FAKE_NPC,{ if (job_novice_q < 15) { mes "[Thief Guild Member]"; mes "You look like you are not done with Instructor Brade's lessons."; @@ -1715,7 +1715,7 @@ new_3-3,105,41,3 duplicate(NvThief) Thief Guide#nv3 2_M_THIEFMASTER new_4-3,105,41,3 duplicate(NvThief) Thief Guide#nv4 2_M_THIEFMASTER new_5-3,105,41,3 duplicate(NvThief) Thief Guide#nv5 2_M_THIEFMASTER -- script Merchant Guide#newbe10::NvMerchant -1,{ +- script Merchant Guide#newbe10::NvMerchant FAKE_NPC,{ if (job_novice_q < 15) { mes "[Merchant Guildsman]"; mes "You are still in the process of training with sir Brad."; @@ -1871,7 +1871,7 @@ new_3-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv3 4W_M_01 new_4-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv4 4W_M_01 new_5-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv5 4W_M_01 -- script Archer Guide#newbe10::NvArcher -1,{ +- script Archer Guide#newbe10::NvArcher FAKE_NPC,{ if (job_novice_q < 15) { mes "[Archer Guildsman]"; mes "You are still in the process of training with sir Brade."; @@ -1968,7 +1968,7 @@ new_3-3,113,41,3 duplicate(NvArcher) Archer Guide#nv3 4_F_JOB_HUNTER new_4-3,113,41,3 duplicate(NvArcher) Archer Guide#nv4 4_F_JOB_HUNTER new_5-3,113,41,3 duplicate(NvArcher) Archer Guide#nv5 4_F_JOB_HUNTER -- script Mage Guide#newbe10::NvMage -1,{ +- script Mage Guide#newbe10::NvMage FAKE_NPC,{ if (job_novice_q < 15) { mes "[Mage Guild Member]"; mes "You are still in the process of training with Instructor Brade."; @@ -2118,7 +2118,7 @@ new_3-3,117,41,3 duplicate(NvMage) Mage Guide#nv3 2_F_MAGICMASTER new_4-3,117,41,3 duplicate(NvMage) Mage Guide#nv4 2_F_MAGICMASTER new_5-3,117,41,3 duplicate(NvMage) Mage Guide#nv5 2_F_MAGICMASTER -- script Bruce#nv::NvBruce -1,{ +- script Bruce#nv::NvBruce FAKE_NPC,{ mes "[Bruce]"; mes "Hello?"; mes "I'm here to guide you about extra jobs and special classes."; @@ -2183,7 +2183,7 @@ new_5-3,121,41,3 duplicate(NvBruce) Bruce#nv5 1_M_LIBRARYMASTER //== Eden Group Officer (iRO only) ========================= /* -- script Eden Group Officer::NvEden -1,{ +- script Eden Group Officer::NvEden FAKE_NPC,{ if (BaseLevel < 10) { mes "[Eden Group Officer]"; mes "Hello, I am a representative of the Eden Group."; @@ -2292,7 +2292,7 @@ new_5-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv5 4_F_NOVICE,5,5 */ //== Trainer =============================================== -- script ::NvBrutus -1,{ +- script ::NvBrutus FAKE_NPC,{ mes "[Trainer Brutus]"; mes "These monsters are all weak and easy to kill. But be careful, a lot of them are aggressive and out for blood!"; next; @@ -2389,7 +2389,7 @@ new_4-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv4 4_F_04 new_5-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv5 4_F_04 //== Random Stuff ========================================== -- script Bulletin Board::NvBulletin -1,{ +- script Bulletin Board::NvBulletin FAKE_NPC,{ mes "^FF0000================================="; mes " ^E40CAA[Welcome] ^CC0000to^FF9000Novice^7FFF00 Training^00FF00 Grounds^E40CAA [Welcome] "; mes "^FF0000=================================^000000"; @@ -2401,7 +2401,7 @@ new_3-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv3 HIDDEN_NPC new_4-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv4 HIDDEN_NPC new_5-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv5 HIDDEN_NPC -- script Guard::NvGuardA -1,{ +- script Guard::NvGuardA FAKE_NPC,{ mes "[Training Grounds Guard]"; mes "Welcome to the Training Grounds."; mes "You are now in the outer court yard. Please go inside the castle to begin your training."; @@ -2413,7 +2413,7 @@ new_3-1,144,116,2 duplicate(NvGuardA) Guard#nv3a 8W_SOLDIER new_4-1,144,116,2 duplicate(NvGuardA) Guard#nv4a 8W_SOLDIER new_5-1,144,116,2 duplicate(NvGuardA) Guard#nv5a 8W_SOLDIER -- script Guard::NvGuardB -1,{ +- script Guard::NvGuardB FAKE_NPC,{ mes "[Training Grounds Guard]"; if (rand(2)) { mes "Come in! I would like to welcome you to the Training Grounds!"; @@ -2430,7 +2430,7 @@ new_3-1,144,107,2 duplicate(NvGuardB) Guard#nv3b 8W_SOLDIER new_4-1,144,107,2 duplicate(NvGuardB) Guard#nv4b 8W_SOLDIER new_5-1,144,107,2 duplicate(NvGuardB) Guard#nv5b 8W_SOLDIER -- script Instructor#Edwin::NvEdwin -1,{ +- script Instructor#Edwin::NvEdwin FAKE_NPC,{ mes "[Edwin]"; mes "Eh? Why are you still here?"; mes "There are no more courses that you need to take."; @@ -2468,7 +2468,7 @@ function script F_NvErase { } //== Pre-Renewal Backwards Compatibility =================== -- script Final Tester::NvHanson -1,{ +- script Final Tester::NvHanson FAKE_NPC,{ if (nov_3_swordman < 40) { mes "[Hanson]"; mes "Eh? Weird?"; @@ -2667,7 +2667,7 @@ new_4-4,100,29,1 duplicate(NvHanson) Final Tester#nv4 1_ETC_01 new_5-4,100,29,1 duplicate(NvHanson) Final Tester#nv5 1_ETC_01 //== Job Test ============================================== -- script Job Guide Lark::NvLark -1,{ +- script Job Guide Lark::NvLark FAKE_NPC,{ mes "[Lark]"; mes "Have you decided what job you're going to choose?"; next; diff --git a/npc/re/jobs/repair.txt b/npc/re/jobs/repair.txt index 200fbf760..fc212aef3 100644 --- a/npc/re/jobs/repair.txt +++ b/npc/re/jobs/repair.txt @@ -225,7 +225,7 @@ L_Third: return; } -- script Valerie#sign -1,{ +- script Valerie#sign FAKE_NPC,{ mes "^ff00ffI couldn't pay the office rent so I am temporarily relocating to the building across from the Prontera Refinery.^000000"; mes " "; mes "^ff00ffValerie^000000"; diff --git a/npc/re/merchants/3rd_trader.txt b/npc/re/merchants/3rd_trader.txt index 83c73ad5b..02c4846ad 100644 --- a/npc/re/merchants/3rd_trader.txt +++ b/npc/re/merchants/3rd_trader.txt @@ -36,7 +36,7 @@ //========================================================================= //== Poison Herb Merchants (Guillotine Cross) ============== -- script ::phs -1,{ +- script ::phs FAKE_NPC,{ if (checkweight(Knife,1) == 0 || MaxWeight - Weight < 2000) { mes "- Wait a minute !! -"; mes "- Currently you're carrying -"; @@ -101,7 +101,7 @@ morocc,191,94,4 duplicate(phs) Poison Herb Merchant#moc 4_F_YUNYANG //Official: lhz_in02,16,205,4 duplicate(phs) Poison Herb Merchant#lhz 4_F_YUNYANG //== Rune Stone Merchants (Rune Knight) ==================== -- script ::runesale -1,{ +- script ::runesale FAKE_NPC,{ if (checkweight(Knife,1) == 0 || MaxWeight - Weight < 2000) { mes "- Wait a minute !! -"; mes "- Currently you're carrying -"; @@ -230,7 +230,7 @@ job3_guil01,91,93,3 script Rare Herb Collector 1_M_03,{ } //== Point Merchants (Sorcerer) ============================ -- script ::pss -1,{ +- script ::pss FAKE_NPC,{ if (checkweight(Knife,1) == 0 || MaxWeight - Weight < 2000) { mes "- Wait a minute !! -"; mes "- Currently you're carrying -"; diff --git a/npc/re/merchants/blessed_refiner.txt b/npc/re/merchants/blessed_refiner.txt index 3f609f5e7..33005dca9 100644 --- a/npc/re/merchants/blessed_refiner.txt +++ b/npc/re/merchants/blessed_refiner.txt @@ -37,7 +37,7 @@ //= 1.0 //========================================================================= -- script ::BlacksmithDister -1,{ +- script ::BlacksmithDister FAKE_NPC,{ disable_items; mes "[Blacksmith Dister]"; mes "In this highly competitive society, we must be different in order to survive!"; diff --git a/npc/re/merchants/card_separation.txt b/npc/re/merchants/card_separation.txt index ecd4f1fdd..0bf72f884 100644 --- a/npc/re/merchants/card_separation.txt +++ b/npc/re/merchants/card_separation.txt @@ -33,7 +33,7 @@ //= 1.1 //========================================================================= -- script ::CardSeparation_mal -1,{ +- script ::CardSeparation_mal FAKE_NPC,{ disable_items; if (checkweight(Knife,1) == 0) { mes "You have too many kinds of objects. Let's try to continue after reducing those objects."; diff --git a/npc/re/merchants/flute.txt b/npc/re/merchants/flute.txt index 9a2736fb1..0824515f1 100644 --- a/npc/re/merchants/flute.txt +++ b/npc/re/merchants/flute.txt @@ -35,7 +35,7 @@ //= 1.2a //========================================================================= -- script Falcon Flute Trader::fflute -1,{ +- script Falcon Flute Trader::fflute FAKE_NPC,{ mes "[Falcon Flute Trader]"; if (BaseJob == Job_Hunter) { mes "Do you need a Falcon?"; diff --git a/npc/re/merchants/hd_refiner.txt b/npc/re/merchants/hd_refiner.txt index e1a7a8b70..261093136 100644 --- a/npc/re/merchants/hd_refiner.txt +++ b/npc/re/merchants/hd_refiner.txt @@ -38,7 +38,7 @@ //========================================================================= //== Blacksmith Mighty Hammer (+7~9) ======================= -- script ::MightyHammer -1,{ +- script ::MightyHammer FAKE_NPC,{ disable_items; mes "[Blacksmith Mighty Hammer]"; mes "Unlike others, I am a blacksmith who refines a very limited number of items."; @@ -173,7 +173,7 @@ lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 4_M_DWARF //payon,174,133,4 duplicate(MightyHammer) Mighty Hammer#im 4_M_DWARF //== Basta (+10 and up) ==================================== -- script ::Basta -1,{ +- script ::Basta FAKE_NPC,{ disable_items; mes "[Basta]"; mes "I'm the best Blacksmith in the whole world, Basta."; diff --git a/npc/re/merchants/refine.txt b/npc/re/merchants/refine.txt index db42f01cf..6014d2a85 100644 --- a/npc/re/merchants/refine.txt +++ b/npc/re/merchants/refine.txt @@ -348,7 +348,7 @@ function script refinenew { } //== Ori/Elu to Carnium/Bradium Refiners =================== -- script Austri#ref -1,{ +- script Austri#ref FAKE_NPC,{ if (checkweight(Knife,1) == 0) { mes "- Wait a minute !! -"; mes "- Currently you're carrying -"; diff --git a/npc/re/merchants/renters.txt b/npc/re/merchants/renters.txt index f0d308f1e..a8df22079 100644 --- a/npc/re/merchants/renters.txt +++ b/npc/re/merchants/renters.txt @@ -167,7 +167,7 @@ prontera,125,208,5 script Peco Peco Remover 8W_SOLDIER,{ } //== Magic Gear Renter ===================================== -- script ::mgm -1,{ +- script ::mgm FAKE_NPC,{ mes "[Magic Gear Master]"; if (Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) { mes "Welcome, Mechanic."; diff --git a/npc/re/mobs/dungeons/lhz_dun.txt b/npc/re/mobs/dungeons/lhz_dun.txt index 0594f1030..7ec6e6c49 100644 --- a/npc/re/mobs/dungeons/lhz_dun.txt +++ b/npc/re/mobs/dungeons/lhz_dun.txt @@ -79,7 +79,7 @@ lhz_dun03,139,117,20,11 monster Sniper Cecil 1644,1,2700000,2500000,1 lhz_dun03,163,138,12,16 monster Whitesmith Howard 1642,1,3000000,2700000,1 lhz_dun03,138,138,36,34 monster High Priest Margaretha 1643,1,3300000,3000000,1 -lhz_dun03,0,0,0 script mvp_lhz_dun03 -1,{ +lhz_dun03,0,0,0 script mvp_lhz_dun03 FAKE_NPC,{ OnTimer6000000: // delay1 = 6000000 ms (100 min) stopnpctimer; sleep rand(0,30)*60000; // 0 to 30 minutes @@ -132,7 +132,7 @@ lhz_dun04,0,0,0,0 monster Stalker Gertie 2232,1,3300000,3000000,1 lhz_dun04,0,0,0,0 monster Clown Alphoccio 2233,1,3300000,3000000,1 lhz_dun04,0,0,0,0 monster Gypsy Trentini 2234,1,3300000,3000000,1 -lhz_dun04,0,0,0 script mvp_lhz_dun04 -1,{ +lhz_dun04,0,0,0 script mvp_lhz_dun04 FAKE_NPC,{ OnTimer6000000: // delay1 = 6000000 ms (100 min) stopnpctimer; sleep rand(0,30)*60000; // 0 to 30 minutes diff --git a/npc/re/mobs/fields/niflheim.txt b/npc/re/mobs/fields/niflheim.txt index bca2b94c1..d47248a8c 100644 --- a/npc/re/mobs/fields/niflheim.txt +++ b/npc/re/mobs/fields/niflheim.txt @@ -60,7 +60,7 @@ nif_fild02,0,0,0,0 monster Dullahan 1504,10,5000,0,0 nif_fild02,0,0,0,0 monster Lude 1509,10,5000,0,0 nif_fild02,0,0,0,0 monster Heirozoist 1510,10,5000,0,0 -niflheim,0,0,0 script mvp_niflheim -1,{ +niflheim,0,0,0 script mvp_niflheim FAKE_NPC,{ OnTimer7980000: // delay1 = 7980000 ms (133 min) stopnpctimer; OnInit: diff --git a/npc/re/other/bulletin_boards.txt b/npc/re/other/bulletin_boards.txt index eba89e06a..78f887e8f 100644 --- a/npc/re/other/bulletin_boards.txt +++ b/npc/re/other/bulletin_boards.txt @@ -33,7 +33,7 @@ //========================================================================= /* -- script ::BulletinBoard_iz -1,{ +- script ::BulletinBoard_iz FAKE_NPC,{ mes "[Izlude: The Satellite City]"; mes "Welcome to Izlude, the satellite of Prontera. Izlude was built to support Prontera's defense and to accomodate its burgeoning population."; next; diff --git a/npc/re/quests/eden/121-130.txt b/npc/re/quests/eden/121-130.txt index 1e98a5130..77b7c26b2 100644 --- a/npc/re/quests/eden/121-130.txt +++ b/npc/re/quests/eden/121-130.txt @@ -778,7 +778,7 @@ S_Erasequest2: return; } -- script Trace of an adventurer -1,{ +- script Trace of an adventurer FAKE_NPC,{ .@quest = 13106 + atoi(strnpcinfo(2)); .@delay = 13110 + atoi(strnpcinfo(2)); if (questprogress(.@quest) == 1) { diff --git a/npc/re/quests/eden/eden_common.txt b/npc/re/quests/eden/eden_common.txt index da3974cd7..14649eea6 100644 --- a/npc/re/quests/eden/eden_common.txt +++ b/npc/re/quests/eden/eden_common.txt @@ -203,7 +203,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ close; } -- script Eden Teleport Officer#0::eto -1,{ +- script Eden Teleport Officer#0::eto FAKE_NPC,{ mes "[Eden Teleport Officer]"; mes "Those who are wandering around this strange world with aimless eyes listen up and come to me!"; mes "Eden group is here to help you and will show you the great future."; diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt index 062c05d9c..d54b0631b 100644 --- a/npc/re/quests/eden/eden_iro.txt +++ b/npc/re/quests/eden/eden_iro.txt @@ -830,7 +830,7 @@ moc_para01,26,185,4 duplicate(Suhnbi#cash) Suhnmi#eden 4_M_03 moc_para01,38,185,4 duplicate(MightyHammer) Mighty Hammer#ed 4_M_DWARF //- Refiner Effect - -- script #eden_refine_effect -1,{ +- script #eden_refine_effect FAKE_NPC,{ OnInit: initnpctimer; end; diff --git a/npc/re/quests/eden/eden_service.txt b/npc/re/quests/eden/eden_service.txt index a4b1a8439..c6f6c4a41 100644 --- a/npc/re/quests/eden/eden_service.txt +++ b/npc/re/quests/eden/eden_service.txt @@ -33,7 +33,7 @@ //= 1.1 //========================================================================= -- script Goods Cabinet#00::pggc -1,{ +- script Goods Cabinet#00::pggc FAKE_NPC,{ mes "It is a Goods Storage Cabinet."; mes "A message is written on a piece of paper."; next; diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt index a8f576741..bed124f0c 100644 --- a/npc/re/quests/quests_brasilis.txt +++ b/npc/re/quests/quests_brasilis.txt @@ -105,7 +105,7 @@ OnGo: end; } -- script Puppy#bra -1,{ +- script Puppy#bra FAKE_NPC,{ if (questprogress(9030) == 1) { if (brazil_kid < 3) { mes "[Puppy]"; diff --git a/npc/re/quests/quests_dewata.txt b/npc/re/quests/quests_dewata.txt index d29a7dffa..5ec38165d 100644 --- a/npc/re/quests/quests_dewata.txt +++ b/npc/re/quests/quests_dewata.txt @@ -1514,7 +1514,7 @@ dew_fild01,259,48,4 script Poby#dew_drink 4_M_DEWBOY,{ close; } -- script ::DewataPalm -1,{ +- script ::DewataPalm FAKE_NPC,{ if (checkweight(Knife,1) == 0 || MaxWeight - Weight < 5000) { mes "You are carrying too much."; close; diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index 1e8811752..3c348aff0 100644 --- a/npc/re/quests/quests_dicastes.txt +++ b/npc/re/quests/quests_dicastes.txt @@ -203,7 +203,7 @@ sec_in02,16,43,5 script Scaraba Dungeon Entrance 4_MAN_BENKUNI,{ } //== Vigilantes ============================================ -- script Vigilante#main -1,{ +- script Vigilante#main FAKE_NPC,{ if (compare(strnpcinfo(0),"ep133_26")) { if (!isequipped(2782)) { mes "[Vigilante]"; @@ -1020,7 +1020,7 @@ dic_in01,40,193,1 script Papyrus#0001 4_MAN_NITT,{ } //== Document Packages ===================================== -- script Document Package#main -1,{ +- script Document Package#main FAKE_NPC,{ function eldicastes_dp; if (isequipped(2782) < 1) { mes "You can't make sense of the writing."; @@ -4792,7 +4792,7 @@ dic_fild01,231,174,5 script BK#ep133_18 4_M_MERCAT2,{ close; } -- script ep133_crack#main -1,{ +- script ep133_crack#main FAKE_NPC,{ // if ((GetInventoryRemainCount 1301 3 == 2) || (GetInventoryRemainCount 1301 3 == 3)) { if ((MaxWeight - Weight) < 1000) { mes "- You can too many items to proceed with the quest. -"; @@ -6102,7 +6102,7 @@ dic_in01,349,129,5 script Bouy#13_3 4_MAN_BENKUNI,{ } //== Sapha's Visit ========================================= -- script Expedition#ep133_is -1,{ +- script Expedition#ep133_is FAKE_NPC,{ if (ep13_3_invite) { if (compare(strnpcinfo(1),"Maha")) { mes "[Maha]"; @@ -6949,7 +6949,7 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 4_MAN_NITT,{ } } //== Enchantment NPCs ====================================== -- script dic_enc#main -1,{ +- script dic_enc#main FAKE_NPC,{ .@re$ = strnpcinfo(1); .@n$ = "["+.@re$+"]"; if (!checkweight (1201,1)) { diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt index 54883bed7..1d3ac1594 100644 --- a/npc/re/quests/quests_malangdo.txt +++ b/npc/re/quests/quests_malangdo.txt @@ -1321,7 +1321,7 @@ mal_in02,140,94,0 script Bob#mal 4_CAT_DOWN,{ close; } -- script Crack#mal0 -1,{ +- script Crack#mal0 FAKE_NPC,{ if (.off) end; // Official script uses a 1-second timer to disable cracks. Added to prevent abuse. if (ma_tomas == 15 || questprogress(11241)) { if (countitem(Fix_Kit) < 1) { @@ -1416,7 +1416,7 @@ malangdo,221,155,0 duplicate(Crack#mal0) Crack#mal8 4_CRACK malangdo,217,109,0 duplicate(Crack#mal0) Crack#mal9 4_CRACK malangdo,162,183,0 duplicate(Crack#mal0) Crack#mal10 4_CRACK -- script Crackt0#mal -1,{ +- script Crackt0#mal FAKE_NPC,{ end; OnInit: disablenpc strnpcinfo(0); @@ -1906,7 +1906,7 @@ mal_in01,116,168,0 script Dry Machine#mal 2_SLOT_MACHINE,{ close; } -- script Suspicious Sand Pile#0 -1,{ +- script Suspicious Sand Pile#0 FAKE_NPC,{ if (.off) end; // Official script uses a 1-second timer to disable sand piles. Added to prevent abuse. if (MaxWeight - Weight < 1000) { mes "Your inventory is too heavy to proceed. Come back after lightening your load."; @@ -1954,7 +1954,7 @@ malangdo,136,122,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#8 4_SO malangdo,152,143,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#9 4_SOIL malangdo,242,175,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#10 4_SOIL -- script Water Sand0#mal -1,{ +- script Water Sand0#mal FAKE_NPC,{ OnInit: disablenpc strnpcinfo(0); end; @@ -2602,7 +2602,7 @@ mal_dun01,133,125,5 script Star Candy#mal 4_F_STARFISHGIRL,{ close; } -- script #skin_mal -1,{ +- script #skin_mal FAKE_NPC,{ .@index = atoi(strnpcinfo(2)); switch(.@index) { case 29: .@str$ = "dry"; break; @@ -5481,7 +5481,7 @@ L_Viewpoint: return; } -- script #malangdo_compass -1,{ +- script #malangdo_compass FAKE_NPC,{ if (countitem(Bravery_Card_A) == 0) { mes "There is a strange machine."; mes "This is the Duruduru compass from the Meow Bravery Team."; diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index b125b4e3a..a7b815d23 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -4529,7 +4529,7 @@ OnInit: end; } -- script Unknown Trace#buwaya -1,{ +- script Unknown Trace#buwaya FAKE_NPC,{ if (checkweight(Knife,1) == 0 || MaxWeight - Weight < 2000) { mes "- Wait!! -"; mes "- You have too many items on you. -"; @@ -5881,7 +5881,7 @@ malaya,283,265,4 script Village Chief#bako2 4_BARYO_CHIEF,{ } } -ma_fild01,1,1,0 script malaya_ma_fild01_mon -1,{ +ma_fild01,1,1,0 script malaya_ma_fild01_mon FAKE_NPC,{ OnInit: enablenpc "malaya_ma_fild01_mon"; donpcevent "malaya_ma_fild01_mon::OnEnable"; @@ -7915,7 +7915,7 @@ malaya,53,68,4 script Bushes#ma CLEAR_NPC,{ } } -- script Suspicious Wooden Stick::MalayaStick -1,{ +- script Suspicious Wooden Stick::MalayaStick FAKE_NPC,{ if (checkweight(Knife,1) == 0) { mes "- Wait !! -"; mes "- You have too many items. -"; @@ -7986,7 +7986,7 @@ malaya,48,79,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick8 4_BU malaya,50,46,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick9 4_BULLETIN_BOARD2 malaya,59,84,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick10 4_BULLETIN_BOARD2 -- script Tent#ma -1,{ //557 +- script Tent#ma FAKE_NPC,{ //557 end; OnInit: disablenpc strnpcinfo(0); diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt index d89333583..cdd405363 100644 --- a/npc/re/quests/quests_mora.txt +++ b/npc/re/quests/quests_mora.txt @@ -377,7 +377,7 @@ OnTouch: end; } -- script #mora_bush -1,{ +- script #mora_bush FAKE_NPC,{ if (ep14_1_bs != 3 || rand(5)) { mes "- It's just an ordinary bush. -"; close; @@ -409,7 +409,7 @@ OnDisable: end; } -- script #mora_pouch -1,{ +- script #mora_pouch FAKE_NPC,{ end; OnTouch: .@i = atoi(charat(strnpcinfo(2),9)); @@ -449,7 +449,7 @@ OnTouch: end; } -- script #mora_fairy -1,{ +- script #mora_fairy FAKE_NPC,{ end; OnInit: disablenpc strnpcinfo(0); @@ -504,7 +504,7 @@ spl_fild02,186,260,6 duplicate(#mora_fairy) Fairy#cmd61 4_F_FAIRYKID5 spl_fild02,186,260,6 duplicate(#mora_fairy) Fairy#cmd62 4_M_FAIRYKID4 spl_fild02,186,260,6 duplicate(#mora_fairy) Fairy#cmd63 4_F_FAIRYKID4 -- script #mora_bush_timer -1,{ +- script #mora_bush_timer FAKE_NPC,{ end; OnInit: disablenpc strnpcinfo(0); @@ -4094,7 +4094,7 @@ OnFullon: end; } -- script ???#mora -1,{ +- script ???#mora FAKE_NPC,{ if (questprogress(5019)) { mes "You find an area emitting a distinct aura."; mes "You may be able to collect bath water samples."; @@ -4236,7 +4236,7 @@ mora,113,84,0 duplicate(???#mora) ???#ep14_muk03 CLEAR_NPC,2,2 mora,116,81,0 duplicate(???#mora) ???#ep14_muk04 CLEAR_NPC,2,2 mora,118,86,0 duplicate(???#mora) ???#ep14_muk05 CLEAR_NPC,2,2 -- script #mora_puddle -1,{ +- script #mora_puddle FAKE_NPC,{ .@i = atoi(charat(strnpcinfo(2),9)); // This script has a lot of checks, diff --git a/npc/re/quests/quests_morocc.txt b/npc/re/quests/quests_morocc.txt index 1ca46c5d9..eb5b8f27c 100644 --- a/npc/re/quests/quests_morocc.txt +++ b/npc/re/quests/quests_morocc.txt @@ -33,7 +33,7 @@ //========================================================================= //== Resurrection of Satan Morroc ========================== -- script Continental Guard#man -1,{ +- script Continental Guard#man FAKE_NPC,{ mes "[Continental Guard]"; mes "We've received orders from Headquarters to block access to this area since an unusual space-time phenomenon has been detected."; next; diff --git a/npc/re/warps/cities/dicastes.txt b/npc/re/warps/cities/dicastes.txt index 5d0388b1c..0d8922e51 100644 --- a/npc/re/warps/cities/dicastes.txt +++ b/npc/re/warps/cities/dicastes.txt @@ -65,7 +65,7 @@ dic_in01,242,182,0 script #eldicastes0016 CLEAR_NPC,{ } // Elevators -- script Elevator#main -1,{ +- script Elevator#main FAKE_NPC,{ .@n = atoi(strnpcinfo(2)); .@eq = (isequipped(2782))?1:0; if (.@n <= 4) { diff --git a/npc/re/warps/fields/bif_fild.txt b/npc/re/warps/fields/bif_fild.txt index ccf245994..581cceb62 100644 --- a/npc/re/warps/fields/bif_fild.txt +++ b/npc/re/warps/fields/bif_fild.txt @@ -39,7 +39,7 @@ mora,182,74,0 warp bifrost_field0003 1,1,bif_fild02,286,327 mora,20,159,0 warp bifrost_field0004 1,1,bif_fild02,99,308 mora,56,25,0 warp bifrost_field0005 1,1,bif_fild02,176,162 -- script bifrost_field0000 -1,{ +- script bifrost_field0000 FAKE_NPC,{ mes "At the end of the small path through the bright flower garden"; mes "is an entrance to something that looks like a small hill."; next; diff --git a/npc/re/woe-fe/invest_main.txt b/npc/re/woe-fe/invest_main.txt index ed02b7d9a..534c3ddef 100644 --- a/npc/re/woe-fe/invest_main.txt +++ b/npc/re/woe-fe/invest_main.txt @@ -74,7 +74,7 @@ //== Investment Functions & Controller ===================== // Note: The times in this section are almost entirely custom. -- script #invest_timer -1,{ +- script #invest_timer FAKE_NPC,{ OnClock0000: // Open investments on Wed (1 hour after WoE) if (gettime(GETTIME_WEEKDAY) == WEDNESDAY && !agitcheck()) { $2011_agit_invest = 1; @@ -705,7 +705,7 @@ OnAgitInvest: */ //== Realms - Merchant Guilds, Gate Managers, Status Boards = -- script Cat Paw Merchant Guild -1,{ +- script Cat Paw Merchant Guild FAKE_NPC,{ if (compare(strnpcinfo(4),"alde")) { .@npc$ = "alde"; @@ -947,7 +947,7 @@ OnAgitInvest: } } -- script Gate Manager#realm -1,{ +- script Gate Manager#realm FAKE_NPC,{ if (compare(strnpcinfo(4),"alde")) { .@npc$ = "alde"; @@ -1028,7 +1028,7 @@ OnAgitInvest: end; } -- script Investment Status Board -1,{ +- script Investment Status Board FAKE_NPC,{ .@invest_status = callfunc("F_Invest_Status"); if (.@invest_status == 1) { if (compare(strnpcinfo(4),"alde")) { @@ -1096,7 +1096,7 @@ OnAgitInvest: } //== Inside Castles - Gate Managers ======================== -- script Gate Manager#castle -1,{ +- script Gate Manager#castle FAKE_NPC,{ .@id = atoi(charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1)); if (compare(strnpcinfo(2),"alde")) { -- cgit v1.2.3-60-g2f50