From 68059ee62a223edb323abba0bc980faab8ed4b52 Mon Sep 17 00:00:00 2001 From: Haru Date: Sat, 3 Jun 2017 22:47:54 +0200 Subject: Revert "Unify specialeffect, convert legacy scripts (#1746)" This reverts commit 19883c583e5e1471c87ae80e67f34882a7e75bc6. The commit was squashed by accident, my fault. I'm merging the PR again, this time preserving the indivisual commits. --- npc/custom/battleground/bg_flavius_01.txt | 8 ++++---- npc/custom/battleground/bg_flavius_02.txt | 8 ++++---- npc/custom/battleground/bg_kvm01.txt | 10 +++++----- npc/custom/battleground/bg_kvm02.txt | 10 +++++----- npc/custom/battleground/bg_kvm03.txt | 10 +++++----- npc/custom/battleground/bg_tierra_01.txt | 12 ++++++------ npc/custom/battleground/bg_tierra_02.txt | 12 ++++++------ npc/custom/bgqueue/flavius.txt | 4 ++-- npc/custom/breeder.txt | 6 +++--- npc/custom/etc/airplane.txt | 4 ++-- npc/custom/etc/monster_arena.txt | 2 +- npc/custom/etc/mvp_arena.txt | 4 ++-- npc/custom/events/cluckers.txt | 4 ++-- npc/custom/events/disguise.txt | 2 +- npc/custom/events/valentinesdayexp.txt | 6 +++--- npc/custom/events/xmas_rings_event.txt | 2 +- npc/custom/healer.txt | 6 +++--- npc/custom/jobmaster.txt | 4 ++-- npc/custom/quests/hunting_missions.txt | 6 +++--- npc/custom/quests/may_hats.txt | 2 +- npc/custom/quests/quest_shop.txt | 2 +- npc/custom/woe_controller.txt | 2 +- 22 files changed, 63 insertions(+), 63 deletions(-) (limited to 'npc/custom') diff --git a/npc/custom/battleground/bg_flavius_01.txt b/npc/custom/battleground/bg_flavius_01.txt index 73ab603c9..0520902ba 100644 --- a/npc/custom/battleground/bg_flavius_01.txt +++ b/npc/custom/battleground/bg_flavius_01.txt @@ -333,7 +333,7 @@ bat_b01,390,13,5 script Therapist in battle#fl12 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(EF_HEAL, AREA, playerattached()); + specialeffect2 312; close; } @@ -341,7 +341,7 @@ bat_b01,10,293,5 script Therapist in battle#fl11 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(EF_HEAL, AREA, playerattached()); + specialeffect2 312; close; } @@ -360,7 +360,7 @@ OnBGStop: end; OnTimer24000: - specialeffect(EF_SANCTUARY); + misceffect 83; end; OnTimer25000: @@ -382,7 +382,7 @@ OnBGStop: end; OnTimer24000: - specialeffect(EF_SANCTUARY); + misceffect 83; end; OnTimer25000: diff --git a/npc/custom/battleground/bg_flavius_02.txt b/npc/custom/battleground/bg_flavius_02.txt index e970a0711..da6c9cfef 100644 --- a/npc/custom/battleground/bg_flavius_02.txt +++ b/npc/custom/battleground/bg_flavius_02.txt @@ -333,7 +333,7 @@ bat_b02,390,13,5 script Therapist in battle#fl22 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(EF_HEAL, AREA, playerattached()); + specialeffect2 312; close; } @@ -341,7 +341,7 @@ bat_b02,10,293,5 script Therapist in battle#fl21 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(EF_HEAL, AREA, playerattached()); + specialeffect2 312; close; } @@ -360,7 +360,7 @@ OnBGStop: end; OnTimer24000: - specialeffect(EF_SANCTUARY); + misceffect 83; end; OnTimer25000: @@ -382,7 +382,7 @@ OnBGStop: end; OnTimer24000: - specialeffect(EF_SANCTUARY); + misceffect 83; end; OnTimer25000: diff --git a/npc/custom/battleground/bg_kvm01.txt b/npc/custom/battleground/bg_kvm01.txt index a66e202e3..c27e042a2 100644 --- a/npc/custom/battleground/bg_kvm01.txt +++ b/npc/custom/battleground/bg_kvm01.txt @@ -35,9 +35,9 @@ OnEnterBG: bat_c01,54,123,0 script #bat_c01a HIDDEN_NPC,{ end; -OnKvM01LightA: specialeffect(EF_BEGINSPELL2); end; -OnKvM01LightB: specialeffect(EF_BEGINSPELL3); end; -OnKvM01LightC: specialeffect(EF_BEGINSPELL4); end; +OnKvM01LightA: misceffect 54; end; +OnKvM01LightB: misceffect 55; end; +OnKvM01LightC: misceffect 56; end; } bat_c01,56,125,0 duplicate(#bat_c01a) #bat_c01b HIDDEN_NPC @@ -286,7 +286,7 @@ bat_c01,51,130,5 script Therapist in battle::TherapistKvM01a 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(EF_HEAL, AREA, playerattached()); + specialeffect2 312; close; } @@ -294,7 +294,7 @@ bat_c01,148,53,1 script Therapist in battle::TherapistKvM01b 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(EF_HEAL, AREA, playerattached()); + specialeffect2 312; close; } diff --git a/npc/custom/battleground/bg_kvm02.txt b/npc/custom/battleground/bg_kvm02.txt index f1637069a..cd13241cb 100644 --- a/npc/custom/battleground/bg_kvm02.txt +++ b/npc/custom/battleground/bg_kvm02.txt @@ -35,9 +35,9 @@ OnEnterBG: bat_c02,54,123,0 script #bat_c02a HIDDEN_NPC,{ end; -OnKvM02LightA: specialeffect(EF_BEGINSPELL2); end; -OnKvM02LightB: specialeffect(EF_BEGINSPELL3); end; -OnKvM02LightC: specialeffect(EF_BEGINSPELL4); end; +OnKvM02LightA: misceffect 54; end; +OnKvM02LightB: misceffect 55; end; +OnKvM02LightC: misceffect 56; end; } bat_c02,56,125,0 duplicate(#bat_c02a) #bat_c02b HIDDEN_NPC @@ -286,7 +286,7 @@ bat_c02,51,130,5 script Therapist in battle::TherapistKvM02a 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(EF_HEAL, AREA, playerattached()); + specialeffect2 312; close; } @@ -294,7 +294,7 @@ bat_c02,148,53,1 script Therapist in battle::TherapistKvM02b 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(EF_HEAL, AREA, playerattached()); + specialeffect2 312; close; } diff --git a/npc/custom/battleground/bg_kvm03.txt b/npc/custom/battleground/bg_kvm03.txt index 612047dcb..3ec87355e 100644 --- a/npc/custom/battleground/bg_kvm03.txt +++ b/npc/custom/battleground/bg_kvm03.txt @@ -35,9 +35,9 @@ OnEnterBG: bat_c03,54,123,0 script #bat_c03a HIDDEN_NPC,{ end; -OnKvM03LightA: specialeffect(EF_BEGINSPELL2); end; -OnKvM03LightB: specialeffect(EF_BEGINSPELL3); end; -OnKvM03LightC: specialeffect(EF_BEGINSPELL4); end; +OnKvM03LightA: misceffect 54; end; +OnKvM03LightB: misceffect 55; end; +OnKvM03LightC: misceffect 56; end; } bat_c03,56,125,0 duplicate(#bat_c03a) #bat_c03b HIDDEN_NPC @@ -286,7 +286,7 @@ bat_c03,51,130,5 script Therapist in battle::TherapistKvM03a 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(EF_HEAL, AREA, playerattached()); + specialeffect2 312; close; } @@ -294,7 +294,7 @@ bat_c03,148,53,1 script Therapist in battle::TherapistKvM03b 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(EF_HEAL, AREA, playerattached()); + specialeffect2 312; close; } diff --git a/npc/custom/battleground/bg_tierra_01.txt b/npc/custom/battleground/bg_tierra_01.txt index 2640723b3..56a505356 100644 --- a/npc/custom/battleground/bg_tierra_01.txt +++ b/npc/custom/battleground/bg_tierra_01.txt @@ -381,7 +381,7 @@ bat_a01,53,377,3 script Guillaume Vintenar#tv1 4_M_KY_HEAD,{ bat_a01,60,216,3 script Ghost#tv13 4_GHOSTRING,{ mes "[Ghost in valley]"; mes "Boo...Boo..."; - specialeffect(EF_HEAL, AREA, playerattached()); + specialeffect2 312; close; } @@ -389,7 +389,7 @@ bat_a01,53,377,3 script Therapist in battle#tv12 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(EF_HEAL, AREA, playerattached()); + specialeffect2 312; close; } @@ -397,7 +397,7 @@ bat_a01,45,18,3 script Therapist in battle#tv11 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(EF_HEAL, AREA, playerattached()); + specialeffect2 312; close; } @@ -416,7 +416,7 @@ OnBGStop: end; OnTimer19000: - specialeffect(EF_SANCTUARY); + misceffect 83; end; OnTimer20000: @@ -438,7 +438,7 @@ OnBGStop: end; OnTimer24000: - specialeffect(EF_SANCTUARY); + misceffect 83; end; OnTimer25000: @@ -460,7 +460,7 @@ OnBGStop: end; OnTimer24000: - specialeffect(EF_SANCTUARY); + misceffect 83; end; OnTimer25000: diff --git a/npc/custom/battleground/bg_tierra_02.txt b/npc/custom/battleground/bg_tierra_02.txt index 98b604fd7..e0f1b402a 100644 --- a/npc/custom/battleground/bg_tierra_02.txt +++ b/npc/custom/battleground/bg_tierra_02.txt @@ -381,7 +381,7 @@ bat_a02,53,377,3 script Guillaume Vintenar#tv2 4_M_KY_HEAD,{ bat_a02,60,216,3 script Ghost#tv23 4_GHOSTRING,{ mes "[Ghost in valley]"; mes "Boo...Boo..."; - specialeffect(EF_HEAL, AREA, playerattached()); + specialeffect2 312; close; } @@ -389,7 +389,7 @@ bat_a02,53,377,3 script Therapist in battle#tv22 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(EF_HEAL, AREA, playerattached()); + specialeffect2 312; close; } @@ -397,7 +397,7 @@ bat_a02,45,18,3 script Therapist in battle#tv21 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(EF_HEAL, AREA, playerattached()); + specialeffect2 312; close; } @@ -416,7 +416,7 @@ OnBGStop: end; OnTimer19000: - specialeffect(EF_SANCTUARY); + misceffect 83; end; OnTimer20000: @@ -438,7 +438,7 @@ OnBGStop: end; OnTimer24000: - specialeffect(EF_SANCTUARY); + misceffect 83; end; OnTimer25000: @@ -460,7 +460,7 @@ OnBGStop: end; OnTimer24000: - specialeffect(EF_SANCTUARY); + misceffect 83; end; OnTimer25000: diff --git a/npc/custom/bgqueue/flavius.txt b/npc/custom/bgqueue/flavius.txt index 21c79f48f..d959253f3 100644 --- a/npc/custom/bgqueue/flavius.txt +++ b/npc/custom/bgqueue/flavius.txt @@ -333,7 +333,7 @@ OnStop: } bat_b01,10,294,3 script Battle Therapist#b01_a 4_F_SISTER,{ - specialeffect(EF_HEAL, AREA, playerattached()); + specialeffect2 EF_HEAL; mes "[Battle Therapist]"; mes "Just close your eyes,"; mes "and take a deep breath."; @@ -378,7 +378,7 @@ OnTouch: } bat_b01,389,14,3 script Battle Therapist#b01_b 4_F_SISTER,{ - specialeffect(EF_HEAL, AREA, playerattached()); + specialeffect2 EF_HEAL; mes "[Battle Therapist]"; mes "Just close your eyes,"; mes "and take a deep breath."; diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt index 9efb73ac6..555fd4c93 100644 --- a/npc/custom/breeder.txt +++ b/npc/custom/breeder.txt @@ -22,7 +22,7 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{ setfalcon; else getitem Wolfs_Flute, 1; - specialeffect(EF_TEIHIT3, AREA, playerattached()); + specialeffect2 EF_TEIHIT3; close; } else { getitem Wolfs_Flute,1; @@ -34,7 +34,7 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{ } else { setmount(MOUNT_MADO); } - specialeffect(EF_TEIHIT3, AREA, playerattached()); + specialeffect2 EF_TEIHIT3; close; } else { setcart; @@ -51,7 +51,7 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{ message strcharinfo(PC_NAME),"You do not meet requirements to rent."; end; } - specialeffect(EF_TEIHIT3, AREA, playerattached()); + specialeffect2 EF_TEIHIT3; end; } diff --git a/npc/custom/etc/airplane.txt b/npc/custom/etc/airplane.txt index 2487acb1f..6fd500a41 100644 --- a/npc/custom/etc/airplane.txt +++ b/npc/custom/etc/airplane.txt @@ -244,7 +244,7 @@ Board: L_Yes: if($destination!=getarg(0))goto Notime; warp "airplane", 105, 72; - specialeffect(EF_CASTSPIN, AREA, playerattached()); + specialeffect2 501; L_Nope: mes "^FF0000[Porter]^000000"; mes "Have a good day. Thank you for traveling with Airship."; @@ -356,7 +356,7 @@ Lyes: if($destination == 250)goto Notime; if($destination != @dockky)goto Notime; warp $locationsmap$[$destination], $locationsx[$destination], $locationsy[$destination]; - specialeffect(EF_CASTSPIN, AREA, playerattached()); + specialeffect2 501; Lnope: mes "^FF0000[Airplane Attendant]^000000"; diff --git a/npc/custom/etc/monster_arena.txt b/npc/custom/etc/monster_arena.txt index 8420cd544..db4c37b73 100644 --- a/npc/custom/etc/monster_arena.txt +++ b/npc/custom/etc/monster_arena.txt @@ -736,7 +736,7 @@ gon_test,55,103,6 script Nurse 4_F_01,{ set @fighting,0; set #heal,0; set @healing,0; - specialeffect(EF_VALLENTINE2, AREA, playerattached()); + specialeffect2 EF_VALLENTINE2; announce "Your monster has healed.",19; end; diff --git a/npc/custom/etc/mvp_arena.txt b/npc/custom/etc/mvp_arena.txt index a86e64aae..d4205456e 100644 --- a/npc/custom/etc/mvp_arena.txt +++ b/npc/custom/etc/mvp_arena.txt @@ -36,7 +36,7 @@ quiz_00,49,31,4 script MVP Arena Guide 4_M_TWTEAMAN,{ mes "There are eight rooms per Keeper, and sixteen MVPs in total."; close; case 2: - specialeffect(EF_HEAL2, AREA, playerattached()); + specialeffect2 313; percentheal 100,100; close; case 3: @@ -77,7 +77,7 @@ function script Protector { warp getarg(0),102,102; end; case 2: - specialeffect(EF_HEAL2, AREA, playerattached()); + specialeffect2 313; percentheal 100,100; close; case 3: diff --git a/npc/custom/events/cluckers.txt b/npc/custom/events/cluckers.txt index 7047ca00e..fbdbbed3f 100644 --- a/npc/custom/events/cluckers.txt +++ b/npc/custom/events/cluckers.txt @@ -21,7 +21,7 @@ prontera,156,219,4 script Cluckers 4_NFCOCK,{ set .@GMAccess,80; // GM level required to access NPC if (.startcluck) { - specialeffect(EF_HIT3, AREA, playerattached()); + specialeffect2 2; switch(rand(15)) { case 0: npctalk "CLUUUUUUCK!!!"; unitskilluseid getcharid(CHAR_ID_ACCOUNT),"NPC_SELFDESTRUCTION",1; emotion 23; break; case 1: npctalk "Cluuuuuck!~"; break; @@ -40,7 +40,7 @@ prontera,156,219,4 script Cluckers 4_NFCOCK,{ default: if (rand(50) < 4) { npctalk "WOOF!..........."; - specialeffect(EF_SPHERE, AREA, playerattached()); + specialeffect2 72; announce "[Cluck! Cluck! Boom!] " + strcharinfo(PC_NAME) + " squeezed out the prize! Well done!",0; getitem $cluck_item_id,$cluck_item_amount; set .startcluck,0; diff --git a/npc/custom/events/disguise.txt b/npc/custom/events/disguise.txt index b9071d162..cd44d1767 100644 --- a/npc/custom/events/disguise.txt +++ b/npc/custom/events/disguise.txt @@ -178,7 +178,7 @@ OnTimer30000: set .Change,0; setnpcdisplay "Disguise Event", 4_M_NFDEADMAN; npctalk "You took too long to guess what I was. Please wait 10 seconds while I disguise again."; - specialeffect EF_DETECT2; + specialeffect 725; set $MonsterName$,""; deletepset 1; stopnpctimer; diff --git a/npc/custom/events/valentinesdayexp.txt b/npc/custom/events/valentinesdayexp.txt index 33339dcd9..5119a119f 100644 --- a/npc/custom/events/valentinesdayexp.txt +++ b/npc/custom/events/valentinesdayexp.txt @@ -25,7 +25,7 @@ prontera,156,172,4 script Tine 1_M_MERCHANT,{ mes "The legend says that on 14th February... on the Day of Saint Valentine..."; mes "Only in Run-Midgard kingdom..."; next; - specialeffect EF_HITBODY; + specialeffect 417; mes "[Tine]"; mes "Some married chocolate lovers almost double their experience at trainings!"; mes "But everything isn't so simply..."; @@ -58,9 +58,9 @@ prontera,156,172,4 script Tine 1_M_MERCHANT,{ OnInit: //559,Hand-made_Chocolate - setitemscript 559,"{ itemheal 50,50; if(Sex==0 || @dsv == gettime(GETTIME_HOUR)+1 || ispartneron()==0)end; set @dsv,gettime(GETTIME_HOUR)+1; specialeffect(EF_MAGNUS, AREA, playerattached()); }"; + setitemscript 559,"{ itemheal 50,50; if(Sex==0 || @dsv == gettime(GETTIME_HOUR)+1 || ispartneron()==0)end; set @dsv,gettime(GETTIME_HOUR)+1; misceffect 113; }"; //560,Hand-made_White_Chocolate - setitemscript 560,"{ itemheal 50,50; if(Sex || @dsv == gettime(GETTIME_HOUR)+1 || ispartneron()==0)end; set @dsv,gettime(GETTIME_HOUR)+1; specialeffect(EF_MAGNUS, AREA, playerattached()); }"; + setitemscript 560,"{ itemheal 50,50; if(Sex || @dsv == gettime(GETTIME_HOUR)+1 || ispartneron()==0)end; set @dsv,gettime(GETTIME_HOUR)+1; misceffect 113; }"; //2634,Wedding_Ring_M,Wedding Ring,5,,10,0,,0,,0,127918079,7,1,136,,0,0,0,{ skill 334,1; skill 335,1; skill 336,1; } setitemscript 2634,"{ skill 334,1; skill 335,1; skill 336,1; if(@dsv == gettime(GETTIME_HOUR)+1 && ispartneron()){ bonus2 bExpAddRace,5,50; bonus2 bExpAddRace,6,50; bonus2 bExpAddRace,7,50; bonus2 bExpAddRace,8,50; bonus2 bExpAddRace,1,50; } }"; diff --git a/npc/custom/events/xmas_rings_event.txt b/npc/custom/events/xmas_rings_event.txt index 633f09cf7..05e4f40f6 100644 --- a/npc/custom/events/xmas_rings_event.txt +++ b/npc/custom/events/xmas_rings_event.txt @@ -91,7 +91,7 @@ prontera,156,174,4 script Snower 4_M_06,{ OnInit: //Santa's Hat - setitemscript 2236,"{ bonus bMdef,1; bonus bLuk,1; if(isequipped(2636,2637)){if(@xmr == gettime(GETTIME_MINUTE))end; set @xmr,gettime(GETTIME_MINUTE); specialeffect(EF_RAINBOW, AREA, playerattached()); end;} if(isequipped(2636)){if(@xmr == gettime(GETTIME_MINUTE))end; set @xmr,gettime(GETTIME_MINUTE); specialeffect(EF_SPHERE, AREA, playerattached());} if(isequipped(2637)){if(@xmr == gettime(GETTIME_MINUTE))end; set @xmr,gettime(GETTIME_MINUTE); specialeffect(EF_ANGEL2, AREA, playerattached());}}"; + setitemscript 2236,"{ bonus bMdef,1; bonus bLuk,1; if(isequipped(2636,2637)){if(@xmr == gettime(GETTIME_MINUTE))end; set @xmr,gettime(GETTIME_MINUTE); misceffect 410; end;} if(isequipped(2636)){if(@xmr == gettime(GETTIME_MINUTE))end; set @xmr,gettime(GETTIME_MINUTE); misceffect 72;} if(isequipped(2637)){if(@xmr == gettime(GETTIME_MINUTE))end; set @xmr,gettime(GETTIME_MINUTE); misceffect 338;}}"; //Gold Xmas Ring setitemscript 2636,"{ bonus bLoseSPWhenUnequip,30; if(isequipped(2236)==0)end; if(getskilllv(\"AL_HEAL\")){skill \"TF_HIDING\",4+isequipped(2637);}else{skill \"AL_HEAL\",1+4*isequipped(2637);} }"; //Silver Xmas Ring diff --git a/npc/custom/healer.txt b/npc/custom/healer.txt index 9e0d4abe4..97c4e7284 100644 --- a/npc/custom/healer.txt +++ b/npc/custom/healer.txt @@ -25,10 +25,10 @@ if(select("^0055FFHeal^000000", "^777777Cancel^000000") == 2) close; Zeny -= .@price; } - specialeffect(EF_HEAL2, AREA, playerattached()); percentheal 100,100; + specialeffect2 EF_HEAL2; percentheal 100,100; if (.@Buffs) { - specialeffect(EF_INCAGILITY, AREA, playerattached()); sc_start SC_INC_AGI,240000,10; - specialeffect(EF_BLESSING, AREA, playerattached()); sc_start SC_BLESSING,240000,10; + specialeffect2 EF_INCAGILITY; sc_start SC_INC_AGI,240000,10; + specialeffect2 EF_BLESSING; sc_start SC_BLESSING,240000,10; } if (.@Delay) @HD = gettimetick(2)+.@Delay; end; diff --git a/npc/custom/jobmaster.txt b/npc/custom/jobmaster.txt index 4b56a36e5..cc09055a4 100644 --- a/npc/custom/jobmaster.txt +++ b/npc/custom/jobmaster.txt @@ -162,8 +162,8 @@ function Job_Menu { resetlvl(4); SkillPoint = 0; } - specialeffect(EF_ANGEL2, AREA, playerattached()); - specialeffect(EF_ELECTRIC, AREA, playerattached()); + specialeffect2 EF_ANGEL2; + specialeffect2 EF_ELECTRIC; if (.platinum) callsub Get_Platinum; close; diff --git a/npc/custom/quests/hunting_missions.txt b/npc/custom/quests/hunting_missions.txt index 5ba860ed4..611bdd480 100644 --- a/npc/custom/quests/hunting_missions.txt +++ b/npc/custom/quests/hunting_missions.txt @@ -115,7 +115,7 @@ function Chk; function Cm; mes "[Hunting Missions]"; mes "Alright, I've dropped"; mes "your current mission."; - specialeffect(EF_STORMKICK4, AREA, playerattached()); + specialeffect2 EF_STORMKICK4; for(set .@i,0; .@i<.Quests; set .@i,.@i+1) { setd "Mission"+.@i,0; setd "Mission"+.@i+"_",0; @@ -185,8 +185,8 @@ Mission_Status: mes "Good work."; mes "Here's your reward."; emotion e_no1; - specialeffect(EF_ANGEL, AREA, playerattached()); - specialeffect(EF_TRUESIGHT, AREA, playerattached()); + specialeffect2 EF_ANGEL; + specialeffect2 EF_TRUESIGHT; set #Mission_Points, #Mission_Points+.@Mission_Points; set BaseExp, BaseExp+.@Base_Exp; set JobExp, JobExp+.@Job_Exp; diff --git a/npc/custom/quests/may_hats.txt b/npc/custom/quests/may_hats.txt index d4103874f..a1864f96f 100644 --- a/npc/custom/quests/may_hats.txt +++ b/npc/custom/quests/may_hats.txt @@ -17,7 +17,7 @@ gonryun,187,140,4 script Yakima 4_F_EINWOMAN,{ mes callfunc("F_Hi"); mes "I can make some items for you."; mes "They are quite rare novadays..."; - specialeffect EF_HITBODY; + specialeffect 417; next; switch (select("Bird Nest", "Lion Mask", "Skeleton Manteau", "Fashion Hip Sack", "Sales Banner", "Leave")) { case 1: diff --git a/npc/custom/quests/quest_shop.txt b/npc/custom/quests/quest_shop.txt index 6805220f7..f96b4cb75 100644 --- a/npc/custom/quests/quest_shop.txt +++ b/npc/custom/quests/quest_shop.txt @@ -144,7 +144,7 @@ OnBuyItem: delitem .@q[.@i],.@q[.@i+1]*.@q[1]; getitem .@q[0],.@q[2]; if (.Announce) announce strcharinfo(PC_NAME)+" has created "+((.@q[2] > 1)?.@q[2]+"x "+getitemname(.@q[0]):A_An(getitemname(.@q[0])))+"!",0; - specialeffect(EF_FLOWERLEAF, AREA, playerattached()); + specialeffect2 EF_FLOWERLEAF; close; case 2: setarray @qe[3], getlook(LOOK_HEAD_BOTTOM), getlook(LOOK_HEAD_TOP), getlook(LOOK_HEAD_MID), getlook(LOOK_ROBE), 1; diff --git a/npc/custom/woe_controller.txt b/npc/custom/woe_controller.txt index 5f619c1db..14e288be7 100644 --- a/npc/custom/woe_controller.txt +++ b/npc/custom/woe_controller.txt @@ -22,7 +22,7 @@ prontera,149,193,4 script WOE Information 2_BOARD1,{ end; OnAgitStart: while(agitcheck()) { - specialeffect(EF_BEGINSPELL6); + misceffect EF_BEGINSPELL6; sleep 425; } end; -- cgit v1.2.3-70-g09d2