diff options
author | mekolat <mekolat@users.noreply.github.com> | 2017-06-03 15:34:53 -0400 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2017-06-03 21:34:53 +0200 |
commit | 19883c583e5e1471c87ae80e67f34882a7e75bc6 (patch) | |
tree | 7d7e1a7a04081ce9725f771402a88a09d859f5e6 /npc/re/quests | |
parent | 9d28c5187812e496b10d6fbaf62c642a69916021 (diff) | |
download | hercules-19883c583e5e1471c87ae80e67f34882a7e75bc6.tar.gz hercules-19883c583e5e1471c87ae80e67f34882a7e75bc6.tar.bz2 hercules-19883c583e5e1471c87ae80e67f34882a7e75bc6.tar.xz hercules-19883c583e5e1471c87ae80e67f34882a7e75bc6.zip |
Unify specialeffect, convert legacy scripts (#1746)
* allow to use specialeffect() on any unit, and to send to any player
* update the documentation for specialeffect()
* remove specialeffect2 from databases
* remove specialeffect2 from npcs
* remove misceffect from npcs
* convert specialeffect calls with strings to use GID
* add missing constants to specialeffect calls
* flag specialeffect2() as deprecated
* flag misceffect() as deprecated
Diffstat (limited to 'npc/re/quests')
-rw-r--r-- | npc/re/quests/eden/41-55.txt | 2 | ||||
-rw-r--r-- | npc/re/quests/eden/eden_iro.txt | 10 | ||||
-rw-r--r-- | npc/re/quests/eden/eden_quests.txt | 2 | ||||
-rw-r--r-- | npc/re/quests/homun_s.txt | 22 | ||||
-rw-r--r-- | npc/re/quests/magic_books.txt | 22 | ||||
-rw-r--r-- | npc/re/quests/newgears/2012_headgears.txt | 4 | ||||
-rw-r--r-- | npc/re/quests/quests_brasilis.txt | 24 | ||||
-rw-r--r-- | npc/re/quests/quests_dewata.txt | 14 | ||||
-rw-r--r-- | npc/re/quests/quests_dicastes.txt | 26 | ||||
-rw-r--r-- | npc/re/quests/quests_eclage.txt | 8 | ||||
-rw-r--r-- | npc/re/quests/quests_malangdo.txt | 8 | ||||
-rw-r--r-- | npc/re/quests/quests_malaya.txt | 30 | ||||
-rw-r--r-- | npc/re/quests/quests_mora.txt | 40 |
13 files changed, 106 insertions, 106 deletions
diff --git a/npc/re/quests/eden/41-55.txt b/npc/re/quests/eden/41-55.txt index b7d95aa71..ee32d4306 100644 --- a/npc/re/quests/eden/41-55.txt +++ b/npc/re/quests/eden/41-55.txt @@ -84,7 +84,7 @@ moc_para01,40,38,3 script Mission [41 - 55] 4_BOARD3,{ mes "Here is your reward."; erasequest 12088; erasequest 12072+.@i; - specialeffect2 EF_STEAL; + specialeffect(EF_STEAL, AREA, playerattached()); getexp .@exp[.@i],0; close; } diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt index 2d72b3541..874e514a3 100644 --- a/npc/re/quests/eden/eden_iro.txt +++ b/npc/re/quests/eden/eden_iro.txt @@ -81,9 +81,9 @@ moc_para01,14,32,5 script Aperture#acolytewarp 4_F_01,{ mes "to "+.@towns$[.@i]+" is "+.@cost[.@i]+" zeny."; close; } - specialeffect2 EF_READYPORTAL; - specialeffect2 EF_TELEPORTATION; - specialeffect2 EF_PORTAL; + specialeffect(EF_READYPORTAL, AREA, playerattached()); + specialeffect(EF_TELEPORTATION, AREA, playerattached()); + specialeffect(EF_PORTAL, AREA, playerattached()); next; Zeny -= .@cost[.@i]; switch(.@i) { @@ -835,8 +835,8 @@ OnInit: initnpctimer; end; OnTimer5000: - specialeffect EF_REFINEOK,AREA,"Suhnmi#eden"; - specialeffect EF_REFINEOK,AREA,"Mighty Hammer#ed"; + specialeffect(EF_REFINEOK, AREA, getnpcid(0, "Suhnmi#eden")); + specialeffect(EF_REFINEOK, AREA, getnpcid(0, "Mighty Hammer#ed")); initnpctimer; end; } diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt index 9e49a415b..a0f4fa922 100644 --- a/npc/re/quests/eden/eden_quests.txt +++ b/npc/re/quests/eden/eden_quests.txt @@ -116,7 +116,7 @@ moc_para01,25,35,4 script Instructor Boya#para01 4_M_KNIGHT_GOLD,{ callsub S_Quest3; case 2: mes "You are so rude!"; - specialeffect2 EF_HIT1; + specialeffect(EF_HIT1, AREA, playerattached()); percentheal -50, 0; next; mes "-Beats quickly and this shining Rune Knight turns invisible."; diff --git a/npc/re/quests/homun_s.txt b/npc/re/quests/homun_s.txt index 92849c7a5..c1ee52d52 100644 --- a/npc/re/quests/homun_s.txt +++ b/npc/re/quests/homun_s.txt @@ -518,17 +518,17 @@ que_house_s,24,47,3 script Viorel#homun_s 4_M_ALCHE_E,{ mes "Excellent!"; mes "Let's get on with it."; next; - specialeffect2 EF_BASH; + specialeffect(EF_BASH, AREA, playerattached()); mes "[Viorel]"; mes "Now focus~!"; mes "You... need..."; mes "... concentration."; next; - specialeffect2 EF_PROVIDENCE; + specialeffect(EF_PROVIDENCE, AREA, playerattached()); mes "[Viorel]"; mes "Good. Almost done!"; next; - specialeffect2 EF_SUI_EXPLOSION; + specialeffect(EF_SUI_EXPLOSION, AREA, playerattached()); Zeny -= 50000; hommutate .@Homunculus; break; @@ -561,21 +561,21 @@ que_house_s,24,47,3 script Viorel#homun_s 4_M_ALCHE_E,{ mes "Hey, I feel like a Blacksmith!"; mes "Now let's get on with it."; next; - specialeffect2 EF_BASH; + specialeffect(EF_BASH, AREA, playerattached()); mes "[Viorel]"; mes "Now focus~!"; mes "You... need..."; mes "... concentration."; next; - specialeffect2 EF_PRESSURE; + specialeffect(EF_PRESSURE, AREA, playerattached()); mes "[Viorel]"; mes "Concentrate a little more!"; next; - specialeffect2 EF_PROVIDENCE; + specialeffect(EF_PROVIDENCE, AREA, playerattached()); mes "[Viorel]"; mes "Good. Almost done!"; next; - specialeffect2 EF_SUI_EXPLOSION; + specialeffect(EF_SUI_EXPLOSION, AREA, playerattached()); hommutate; break; } @@ -746,22 +746,22 @@ que_house_s,80,42,3 script Jeyna#homun_s 4_F_ALCHE_A,{ mes "[Jeyna]"; mes "Now I need you to focus."; next; - specialeffect2 EF_ABSORBSPIRITS; + specialeffect(EF_ABSORBSPIRITS, AREA, playerattached()); mes "[Jeyna]"; mes "We need to..."; mes "Stabilize a little more."; mes "......."; next; - specialeffect2 EF_CURE; + specialeffect(EF_CURE, AREA, playerattached()); mes "[Jeyna]"; mes "In a few moments, the ^FF4800Homunculus^000000 will return to its embryo state."; next; - specialeffect2 EF_HOLYHIT; + specialeffect(EF_HOLYHIT, AREA, playerattached()); mes "[Jeyna]"; mes "Into a special embryo..."; next; callsub L_CheckHomunculus; - specialeffect2 EF_BLESSING; + specialeffect(EF_BLESSING, AREA, playerattached()); morphembryo; setquest 4159; erasequest 4158; diff --git a/npc/re/quests/magic_books.txt b/npc/re/quests/magic_books.txt index 3ffac3243..bcf94c4a0 100644 --- a/npc/re/quests/magic_books.txt +++ b/npc/re/quests/magic_books.txt @@ -664,9 +664,9 @@ mid_camp,255,244,4 script Galfos 4_M_JOB_WIZARD,{ if (Zeny >= 1000000) { mes "Alright then, let's get started!"; next; - specialeffect2 EF_DISPELL; + specialeffect(EF_DISPELL, AREA, playerattached()); progressbar "ffff00",4; - specialeffect2 EF_LORD; + specialeffect(EF_LORD, AREA, playerattached()); Zeny -= 1000000; getitem 6194+.@i,1; //Magic_Book_CM, Magic_Book_TV mes "[Galfos]"; @@ -709,7 +709,7 @@ dic_in01,25,190,0 script Mysterious Documents CLEAR_NPC,{ mes "The documents in this container aren't legible. It's no use trying to read them."; close; } - specialeffect2 EF_DISPELL; + specialeffect(EF_DISPELL, AREA, playerattached()); progressbar "ffff00",4; if (mac_book < 3) { mes "You have discovered records about magic, acceleration, and particle waves."; @@ -731,7 +731,7 @@ dic_in01,25,190,0 script Mysterious Documents CLEAR_NPC,{ mes "^660066You must do this by using the greatest power in that place. The Humans have used this method to study the acceleration of magic particles since ancient times.^000000"; next; mes "You have discovered the ^990099Lava Essence Creation Method^000000. Please check your Quest window for more details."; - specialeffect2 EF_STEAL; + specialeffect(EF_STEAL, AREA, playerattached()); close2; setquest 12218; end; @@ -749,7 +749,7 @@ dic_in01,25,190,0 script Mysterious Documents CLEAR_NPC,{ mes "^660066According to Humans' information, this essence constitutes one of the four natural elements.^000000"; next; mes "You have discovered the ^990099Flame Essence Creation Method^000000. Please check your Quest window for more details."; - specialeffect2 EF_STEAL; + specialeffect(EF_STEAL, AREA, playerattached()); close2; setquest 12219; end; @@ -766,7 +766,7 @@ dic_in01,25,190,0 script Mysterious Documents CLEAR_NPC,{ mes "^660066I succeeded in refining the essence of glacier deep inside the 3rd floor of the Ice Cave. If you'd like to try, prepare 10 Ice Hearts and go to the following location.^000000"; next; mes "You have discovered the ^990099Glacier Essence Creation Method^000000. Please check your Quest window for more details."; - specialeffect2 EF_STEAL; + specialeffect(EF_STEAL, AREA, playerattached()); close2; setquest 12220; end; @@ -784,7 +784,7 @@ dic_in01,25,190,0 script Mysterious Documents CLEAR_NPC,{ mes "If you'd like to try, prepare 10 Jubilees and go to the dungeon. Good luck.^000000"; next; mes "You have discovered the ^990099Fossil Essence Creation Method^000000. Please check your Quest window for more details."; - specialeffect2 EF_STEAL; + specialeffect(EF_STEAL, AREA, playerattached()); close2; setquest 12221; end; @@ -802,7 +802,7 @@ dic_in01,25,190,0 script Mysterious Documents CLEAR_NPC,{ mes "The refining process was easy, but I had a hard time finding the catalyst, Dragon Teeth.^000000"; next; mes "You have discovered the ^990099Storm Essence Creation Method^000000. Please check your Quest window for more details."; - specialeffect2 EF_STEAL; + specialeffect(EF_STEAL, AREA, playerattached()); close2; setquest 12222; end; @@ -828,8 +828,8 @@ function script Magic_Book_Essence { close; } if (questprogress(getarg(0)) == 1 && countitem(getarg(1)) >= getarg(2)) { - specialeffect2 EF_BLIND; - specialeffect2 EF_BEGINSPELL; + specialeffect(EF_BLIND, AREA, playerattached()); + specialeffect(EF_BEGINSPELL, AREA, playerattached()); progressbar "ffff00",4; delitem getarg(1),getarg(2); if (rand(2)) { @@ -837,7 +837,7 @@ function script Magic_Book_Essence { next; mes "^008800The "+getarg(3)+" Essence will last permanently, unless there's a problem.^000000"; completequest getarg(0); - specialeffect2 EF_LORD; + specialeffect(EF_LORD, AREA, playerattached()); close; } mes "^008888You have failed to refine the essence using "+getarg(2)+" "+getitemname(getarg(1))+"s.^000000"; diff --git a/npc/re/quests/newgears/2012_headgears.txt b/npc/re/quests/newgears/2012_headgears.txt index e243300d5..80df8d650 100644 --- a/npc/re/quests/newgears/2012_headgears.txt +++ b/npc/re/quests/newgears/2012_headgears.txt @@ -339,7 +339,7 @@ moc_para01,41,169,3 script Reno#2012hat 1_M_WIZARD,{ mes "[Reno]"; mes "You might feel a slight tingle."; next; - specialeffect2 EF_BASH3D; + specialeffect(EF_BASH3D, AREA, playerattached()); percentheal .@rate * -5,0; //consumeitem ??; //Keep_Connection_[.@rate] sc_start .@buffs[.@choice], 10800000, .@rate; // Atk/Matk + 5*rate (+5, +10, +15) @@ -573,7 +573,7 @@ moc_para01,41,169,3 script Reno#2012hat 1_M_WIZARD,{ close; } } - specialeffect2 EF_REPAIRWEAPON; + specialeffect(EF_REPAIRWEAPON, AREA, playerattached()); progressbar "ffff00",2; delitem .@material,1; if (.@material == Safety_Ring) { diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt index ff8038166..ad7aed094 100644 --- a/npc/re/quests/quests_brasilis.txt +++ b/npc/re/quests/quests_brasilis.txt @@ -72,7 +72,7 @@ brasilis,297,307,5 script Angelo#br 1_M_04,{ getexp .@randexp,0; erasequest 9031; setquest 9032; - specialeffect2 EF_ASSUMPTIO; + specialeffect(EF_ASSUMPTIO, AREA, playerattached()); consumeitem 607; //Yggdrasilberry .@rand = rand(1,10); if (.@rand > 4 && .@rand < 9) getitem White_Potion,2; @@ -828,7 +828,7 @@ brasilis,203,64,3 script Strange Kid#bra 4_M_KID1,{ brasilis,56,224,7 script Mage Paje#bra 4_M_BIBI,{ mes "[Mage Paje]"; mes "Abracadabra~"; - specialeffect EF_POISONHIT,AREA,"Poring#bra"; + specialeffect(EF_POISONHIT, AREA, getnpcid(0, "Poring#bra")); setarray .@display[0], 4_NFCOCK, 4_CAT, 4_PORING; setnpcdisplay "Poring#bra",.@display[rand(3)]; if (brazil_gua != 5) close; @@ -868,7 +868,7 @@ brasilis,56,224,7 script Mage Paje#bra 4_M_BIBI,{ mes "Good luck~!"; brazil_gua = 6; changequest 2195,2196; - specialeffect2 EF_ASSUMPTIO; + specialeffect(EF_ASSUMPTIO, AREA, playerattached()); close; } @@ -925,7 +925,7 @@ OnTouch: mes "Fly fly far away. bbaaaeeeccckkk--!"; brazil_gua = 7; changequest 2196,2197; - specialeffect2 EF_SEISMICWEAPON; + specialeffect(EF_SEISMICWEAPON, AREA, playerattached()); close2; warp "bra_fild01",68,146; end; @@ -950,7 +950,7 @@ OnTouch_: mes "Smelling! This smell is from a human!"; mes "Somewhere, a human!"; mes "I got it. You are!!!"; - specialeffect EF_HIT1,AREA,"Jaguar#bra"; + specialeffect(EF_HIT1, AREA, getnpcid(0, "Jaguar#bra")); emotion e_omg,1; next; mes "[Jaguar]"; @@ -1875,7 +1875,7 @@ bra_dun02,71,200,3 script Water lily#bra HIDDEN_NPC,{ next; mes "- munch -"; mes "- mumble mumble mumble -"; - specialeffect EF_POTION7,AREA,"Recluse#bra"; + specialeffect(EF_POTION7, AREA, getnpcid(0, "Recluse#bra")); next; mes "[Jasi]"; mes "Uh, this taste... is!"; @@ -2281,7 +2281,7 @@ bra_in01,149,184,3 script Door#bra CLEAR_NPC,{ mes "^FF0000kkkkhee- hihihihi!!!^000000"; mes "You hear water flushing."; next; - specialeffect2 EF_VENOMDUST; + specialeffect(EF_VENOMDUST, AREA, playerattached()); mes "Faint laughing can be heard off in the direction of the toilet."; brazil_ghost = 3; changequest 2208,60351; @@ -2327,7 +2327,7 @@ bra_in01,144,187,3 script Toilet#bra CLEAR_NPC,{ switch(select("Flush the toilet.", "Doing nothing.")) { case 1: mes "After flushing the toilet, you suddenly feel dizzy and are suddenly swept away somewhere."; - specialeffect2 EF_WATERFALL_SMALL_T2_90; + specialeffect(EF_WATERFALL_SMALL_T2_90, AREA, playerattached()); close2; warp "bra_in01",206,102; end; @@ -2371,7 +2371,7 @@ bra_in01,144,187,3 script Toilet#bra CLEAR_NPC,{ mes "^FF0000kkkkhee- hihihihi!!!^000000"; mes "Suddenly the sink sounds like water is flowing freely from it."; next; - specialeffect2 EF_VENOMDUST; + specialeffect(EF_VENOMDUST, AREA, playerattached()); mes "Faint laughing can be heard off in the direction of the faucet."; brazil_ghost = 4; changequest 60351,60352; @@ -2450,7 +2450,7 @@ bra_in01,134,189,3 script Faucet#bra CLEAR_NPC,{ mes "^FF0000kkkkhee- hihihihi!!!^000000"; mes "You see the carpet move."; next; - specialeffect2 EF_VENOMDUST; + specialeffect(EF_VENOMDUST, AREA, playerattached()); mes "Faint laughing can be heard off in the direction of the carpet."; brazil_ghost = 5; changequest 60352,60353; @@ -2532,7 +2532,7 @@ bra_in01,138,184,3 script Carpet#bra CLEAR_NPC,{ mes "[Distant Sound]"; mes "^FF0000kkkkhee- hihihihi!!!^000000"; next; - specialeffect2 EF_VENOMDUST; + specialeffect(EF_VENOMDUST, AREA, playerattached()); mes "Faint laughing can be heard off in the direction of the mirror."; brazil_ghost = 6; changequest 60353,60354; @@ -2628,7 +2628,7 @@ bra_in01,151,180,3 script Mirror#bra CLEAR_NPC,{ } } if (.@cpudice > .@pcdice) { - specialeffect2 EF_DEVIL; + specialeffect(EF_DEVIL, AREA, playerattached()); mes "[Ghost]"; mes "^FF0000Go away!^000000"; brazil_ghost = 1; diff --git a/npc/re/quests/quests_dewata.txt b/npc/re/quests/quests_dewata.txt index 52a604278..ef1352e1e 100644 --- a/npc/re/quests/quests_dewata.txt +++ b/npc/re/quests/quests_dewata.txt @@ -135,7 +135,7 @@ dew_in01,22,48,3 script Sage Kasyapa#dew 4_M_DEWZATIMAN,{ mes "that you are a trustworthy sort... but..."; next; mes "There is a brief twinkling of light ^0000FFKasyapa^000000 all of sudden seems to be taken aback."; - specialeffect2 EF_PNEUMA; + specialeffect(EF_PNEUMA, AREA, playerattached()); next; mes "[Sage Kasyapa]"; mes "Ah, the feather......!"; @@ -210,7 +210,7 @@ dew_in01,22,48,3 script Sage Kasyapa#dew 4_M_DEWZATIMAN,{ mes "[Sage Kasyapa]"; mes "The reason I asked you to embark on this important mission is because of this feather."; mes "Handed down from generation to generation the legendary origin of the crown is this feather..."; - specialeffect2 EF_PNEUMA; + specialeffect(EF_PNEUMA, AREA, playerattached()); next; mes "[Sage Kasyapa]"; mes "I saw this feather begin to shine when you came here."; @@ -338,7 +338,7 @@ dew_in01,15,49,4 script Tribal Chief Paiko#dew 4_M_DEWZATICHIEF,{ mes "Alright, let me begin crafting the ^006400Jaty Crown^000000 I feel that I am ready."; next; mes "Suddenly, a large noise begins to boom as you and ^0000FFPaiko^000000 are surrounded by warm and bright sparkling energy like a thousand tinkling fireflies."; - specialeffect2 EF_BASH3D2; + specialeffect(EF_BASH3D2, AREA, playerattached()); close; } else if (dew_legend == 6) { mes "[Tribal Chief Paiko]"; @@ -1587,7 +1587,7 @@ dew_fild01,259,48,4 script Poby#dew_drink 4_M_DEWBOY,{ case 14: case 16: case 20: - specialeffect2 EF_BASH; + specialeffect(EF_BASH, AREA, playerattached()); if (isequipped(5009)) { //Safety_Helmet mes "something falls on your head, but since you're wearing a Safety Helmet you're safe and sound."; emotion e_no1,1; @@ -2002,7 +2002,7 @@ dew_fild01,127,240,4 script Gatti#weapon 2_M_OLDBLSMITH,{ mes "[Gatti]"; mes "Great! We have enough. Wait a little."; next; - specialeffect2 EF_REPAIRWEAPON; + specialeffect(EF_REPAIRWEAPON, AREA, playerattached()); next; emotion e_swt2; next; @@ -2046,7 +2046,7 @@ dew_fild01,127,240,4 script Gatti#weapon 2_M_OLDBLSMITH,{ mes "[Gatti]"; mes "You have all the materials. Wait just a little."; next; - specialeffect2 EF_REPAIRWEAPON; + specialeffect(EF_REPAIRWEAPON, AREA, playerattached()); next; emotion e_swt2; next; @@ -2113,7 +2113,7 @@ dew_fild01,127,240,4 script Gatti#weapon 2_M_OLDBLSMITH,{ mes "You don't have all the materials. It's impossible to reinforce if you don't have them all. If you want to reinforce, bring 100,000 zeny and 1 Caress."; close; } - specialeffect2 EF_REPAIRWEAPON; + specialeffect(EF_REPAIRWEAPON, AREA, playerattached()); progressbar "0xFFFF00",3; Zeny -= 100000; diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index 0aa4ffa1a..817b4780d 100644 --- a/npc/re/quests/quests_dicastes.txt +++ b/npc/re/quests/quests_dicastes.txt @@ -487,7 +487,7 @@ function script que_dic { } getexp getarg(2),0; erasequest getarg(1); - specialeffect2 EF_STEAL; + specialeffect(EF_STEAL, AREA, playerattached()); getitem 6304,1; close; } @@ -1043,7 +1043,7 @@ dic_in01,40,193,1 script Papyrus#0001 4_MAN_NITT,{ mes "Ugh... feel dizzy from simply staring at the document. Will come back after cooling down"; close; } - specialeffect2 EF_DISPELL; + specialeffect(EF_DISPELL, AREA, playerattached()); progressbar "ffff00",4; .@doc = rand(1,70); if (.@doc > 50 && .@doc <= 60) { @@ -1115,7 +1115,7 @@ dic_in01,40,193,1 script Papyrus#0001 4_MAN_NITT,{ mes "^660066"+getarg(3)+"^000000"; next; mes "You've found a document about ^990099"+getarg(1)+"^000000. Check for details in the ^800080Quest Window^000000."; - specialeffect2 EF_STEAL; + specialeffect(EF_STEAL, AREA, playerattached()); setquest getarg(0); close; } @@ -1131,17 +1131,17 @@ function script unknown_d { mes "You see some traces of digging."; close; } - specialeffect2 EF_SPRINKLESAND; - specialeffect2 EF_BEGINSPELL_N1; + specialeffect(EF_SPRINKLESAND, AREA, playerattached()); + specialeffect(EF_BEGINSPELL_N1, AREA, playerattached()); progressbar "ffff00",4; erasequest getarg(0); mes "You were able to find information on the "+getitemname(getarg(1))+"."; - specialeffect2 EF_STEAL; + specialeffect(EF_STEAL, AREA, playerattached()); getitem getarg(1),rand(1,4); if (!rand(2)) { next; mes "In addition, you've obtained an unknown relic to report back to the Saphas."; - specialeffect2 EF_STEAL; + specialeffect(EF_STEAL, AREA, playerattached()); getitem Unidentified_Relic,1; } close; @@ -3901,8 +3901,8 @@ dic_in01,245,119,4 script Shay#ep133_13 4_M_ACROSS,{ next; mes "[Shay]"; mes "Stop!!!!!!!!!!!!!"; - specialeffect2 EF_HIT1; - specialeffect2 EF_HIT2; + specialeffect(EF_HIT1, AREA, playerattached()); + specialeffect(EF_HIT2, AREA, playerattached()); percentheal -30,0; next; mes "-Shay got all upset and threw something sticky and smelly."; @@ -6990,7 +6990,7 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 4_MAN_NITT,{ mes "Ok, let's get this started."; mes "I'm going to remove all enchantments from your Light of El Dicastes."; mes "Haaap--!"; - specialeffect2 EF_REPAIRWEAPON; + specialeffect(EF_REPAIRWEAPON, AREA, playerattached()); progressbar "ffff00",3; delitem Sapa_Feat_Cert,6; delitem El_Dicastes_Light,1; @@ -7169,7 +7169,7 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 4_MAN_NITT,{ mes "Then, take the equipment off first."; close; } - specialeffect2 EF_OVERTHRUST; + specialeffect(EF_OVERTHRUST, AREA, playerattached()); mes .@n$; if (.@re$ == "Brare") mes "I've collected all equipment and erased all records as you requested. Now all your equipment and records are clean."; else mes "I only do what I'm asked to do. I've retrieved all equipment and cancelled all records."; @@ -7248,7 +7248,7 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 4_MAN_NITT,{ mes "Please come back again"; close; } - specialeffect2 EF_OVERTHRUST; + specialeffect(EF_OVERTHRUST, AREA, playerattached()); mes .@n$; mes "I have erased all previous records"; mes "of upgrades to start all over with"; @@ -7280,7 +7280,7 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 4_MAN_NITT,{ mes .@n$; mes "Then let's start."; next; - specialeffect2 EF_REPAIRWEAPON; + specialeffect(EF_REPAIRWEAPON, AREA, playerattached()); progressbar "ffff00",3; delitem 6304,.@req; if (getd("ep13_3_"+.@v$) == 0) { diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt index d669d0d46..ac6717529 100644 --- a/npc/re/quests/quests_eclage.txt +++ b/npc/re/quests/quests_eclage.txt @@ -5029,7 +5029,7 @@ OnTouch: mes "- Something hits you"; mes "over the head really hard."; mes "Your body loses its strength and your vision goes blurry -"; - specialeffect2 EF_HIT1; + specialeffect(EF_HIT1, AREA, playerattached()); sc_start SC_BLIND,30000,0; next; mes "- Oh, I can't lose my consciousness like this -"; @@ -6496,7 +6496,7 @@ eclage,222,131,3 script Wandering Merchant#ecl 1_M_SIGNMCNT,{ } progressbar "0xFFFF00",3; .@nRand = rand(1,10); - specialeffect2 EF_ENHANCE; + specialeffect(EF_ENHANCE, AREA, playerattached()); Zeny -= 10000; if ((.@nRand > 0) && (.@nRand < 5)) { getitem Center_Potion,1; //Center_Potion @@ -17001,7 +17001,7 @@ ecl_in03,41,90,3 script Mayor Jun Kardui#tl01 4_M_FARIYKING,{ mes strcharinfo(PC_NAME) + "."; mes "This is a present for you."; mes "I hope my magical powers help you improve."; - specialeffect2 EF_FORESTLIGHT4; + specialeffect(EF_FORESTLIGHT4, AREA, playerattached()); delitem Avant_Research_Data,1; //Avant_Research_Data if (ep14_2_mylord == 23) { getexp 400000,300000; @@ -17444,7 +17444,7 @@ ecl_in03,41,90,3 script Mayor Jun Kardui#tl01 4_M_FARIYKING,{ mes "You've been a great help all this time."; mes "Will you stay as my friend now and forever?"; mes "May the blessing of Yggdrasil be upon you..."; - specialeffect2 EF_FORESTLIGHT4; + specialeffect(EF_FORESTLIGHT4, AREA, playerattached()); npcskill AL_BLESSING,1,0,0; ep14_2_mylord = 33; completequest 7453; diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt index 9a67c4af8..786aeccb1 100644 --- a/npc/re/quests/quests_malangdo.txt +++ b/npc/re/quests/quests_malangdo.txt @@ -9704,7 +9704,7 @@ mal_in01,134,221,4 script KungKung#gamer 4_M_BABYCAT,{ if (.@cat_hand <= 5) { --.@pc_hp0; cutin "cat_g_05",4; - specialeffect2 EF_BASH; + specialeffect(EF_BASH, AREA, playerattached()); mes "Defending has failed."; mes "KungKung attacks the back of your hand with its sharp claw."; next; @@ -9729,7 +9729,7 @@ mal_in01,134,221,4 script KungKung#gamer 4_M_BABYCAT,{ } else { .@pc_hp -= 10; cutin "cat_g_08",4; - specialeffect2 EF_BASH; + specialeffect(EF_BASH, AREA, playerattached()); mes "Defending has failed."; mes "KungKung attacks the back of your hand with its sharp claw."; next; @@ -10579,7 +10579,7 @@ mal_in01,15,16,3 script Fallen Angel#mal 4_F_VALKYRIE2,{ mes "Ok! Take your time to consider!"; close; } - specialeffect2 EF_REPAIRWEAPON; + specialeffect(EF_REPAIRWEAPON, AREA, playerattached()); progressbar "ffff00",2; if (getequipisequiped(EQI_GARMENT) == 0) { mes "[Fallen Angel]"; @@ -10666,7 +10666,7 @@ mal_in01,15,16,3 script Fallen Angel#mal 4_F_VALKYRIE2,{ mes "Ok! Take your time to consider!"; close; } - specialeffect2 EF_REPAIRWEAPON; + specialeffect(EF_REPAIRWEAPON, AREA, playerattached()); progressbar "ffff00",2; if (getequipisequiped(EQI_GARMENT) == 0) { mes "[Fallen Angel]"; diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index 8c47fb2ed..542b7c2cd 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -3370,7 +3370,7 @@ ma_fild01,166,214,6 script Old Man in Dilemma#GA 4_F_BARYO_OLD,{ next; if(select("Create.", "No, thank you.") == 1) { if (countitem(Lesser_Agimat) >= 3 && Zeny >= 1000) { - specialeffect2 EF_CONE; + specialeffect(EF_CONE, AREA, playerattached()); specialeffect EF_FORESTLIGHT2; Zeny -= 1000; getitem Ancient_Spirit_Agimat,1; @@ -3824,7 +3824,7 @@ ma_fild01,158,243,6 script Tribe Blacksmith#malaya 4_M_MALAYA,{ mes "[Bayani]"; mes "Pow!! Wow!! Flip... flop!"; next; - specialeffect2 EF_TRIPLEATTACK; + specialeffect(EF_TRIPLEATTACK, AREA, playerattached()); mes "[Bayani]"; mes "BAM!!"; next; @@ -4786,7 +4786,7 @@ ma_fild02,312,259,3 script Dog#buwaya 4_DOG01,{ next; mes "^FF0000- Shoook-^000000"; enablenpc "Guard#buwayacave"; - specialeffect2 EF_MVP; + specialeffect(EF_MVP, AREA, playerattached()); next; mes "[Guard]"; mes "Job well done!"; @@ -7330,14 +7330,14 @@ malaya,55,72,4 script Nurse#ma_n1 4_F_NURSE,{ close; } mes "The voice seems to be coming from the bushes near the entrance of the hospital."; - specialeffect EF_STEAL,AREA,"Bushes#ma"; + specialeffect(EF_STEAL, AREA, getnpcid(0, "Bushes#ma")); malaya_bang = 13; changequest 11293,11294; close; } else if (malaya_bang == 13) { mes "The voice seems to be coming from the bushes near the entrance of the hospital."; mes "Let's check around."; - specialeffect EF_STEAL,AREA,"Bushes#ma"; + specialeffect(EF_STEAL, AREA, getnpcid(0, "Bushes#ma")); close; } else if (malaya_bang == 14) { mes "[Nurse Las]"; @@ -8789,11 +8789,11 @@ ma_fild01,172,223,6 script Tattooist#pin 4_M_BARYO_OLD,{ next; mes "The Tattooist placed the Ancient Grudges around the workplace."; next; - specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#01"; - specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#02"; - specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#03"; - specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#04"; - specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#05"; + specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#01")); + specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#02")); + specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#03")); + specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#04")); + specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#05")); mes "The Ancient Grudge lit up and tools starts to glow. He smiled satisfyingly at the glowing tools and materials."; next; mes "And then "+.@name$+" stared intensely at the doll as if to remember every detail of it in his head."; @@ -8903,11 +8903,11 @@ ma_fild01,172,223,6 script Tattooist#pin 4_M_BARYO_OLD,{ } mes "He held up the powder in both hands and then blew it onto the drawing."; next; - specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#01"; - specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#02"; - specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#03"; - specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#04"; - specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#05"; + specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#01")); + specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#02")); + specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#03")); + specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#04")); + specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#05")); mes "All Ancient Grudges started to burn and then the glowing light from the "+.@name$+" drawing faded away."; next; specialeffect EF_LIGHTSPHERE; diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt index 39ca8649c..34293d200 100644 --- a/npc/re/quests/quests_mora.txt +++ b/npc/re/quests/quests_mora.txt @@ -3719,7 +3719,7 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ } else { mes "When you attempt to run away, the unidentified creature sees you and attacks. You fail to escape."; next; - specialeffect2 EF_HIT1; + specialeffect(EF_HIT1, AREA, playerattached()); mes "The creature slams you with its tail. It's so painful that a tear rolls out of your eyes. ^FF000010^000000 damaged received."; .@pc_hp -= 10; next; @@ -3839,15 +3839,15 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ case 1: switch(.@npc_attack) { case 1: - specialeffect2 EF_ICEARROW; + specialeffect(EF_ICEARROW, AREA, playerattached()); mes "You stand still. The stream of water hits your face squarely. Your mind is clear in an instant. ^FF0000["+.@n_damage+"]^000000 damage received."; break; case 2: - specialeffect2 EF_BASH; + specialeffect(EF_BASH, AREA, playerattached()); mes "You stand still. The creature headbutts you squarely. Your mind is clear in an instant. ^FF0000["+.@n_damage+"]^000000 damage received."; break; case 3: - specialeffect2 EF_HIT1; + specialeffect(EF_HIT1, AREA, playerattached()); mes "You stand still. While you were standing stupidly, the creature comes near and bites you mercilessly. Your mind is clear in an instant. ^FF0000["+.@n_damage+"]^000000 damage received."; break; } @@ -3869,7 +3869,7 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ break; // Hit. default: - specialeffect2 EF_ICEARROW; + specialeffect(EF_ICEARROW, AREA, playerattached()); .@pc_hp -= .@n_damage; switch(.@miss) { case 2: .@str$ = "face"; break; @@ -3900,7 +3900,7 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ break; // Hit. default: - specialeffect2 EF_BASH; + specialeffect(EF_BASH, AREA, playerattached()); .@pc_hp -= .@n_damage; switch(.@miss) { case 2: .@str$ = "With a thud, you can feel intense pain."; break; @@ -3940,7 +3940,7 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ break; // Hit. default: - specialeffect2 EF_HIT1; + specialeffect(EF_HIT1, AREA, playerattached()); .@pc_hp -= .@n_damage; switch(.@miss) { case 2: .@str$ = "leg. Its sharp teeth penetrate your legs."; break; @@ -3961,9 +3961,9 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ case 1: if (.@defend == 3 || .@defend == 6) { .@n_damage /= 2; - specialeffect2 EF_GUARD; + specialeffect(EF_GUARD, AREA, playerattached()); } else - specialeffect2 EF_ICEARROW; + specialeffect(EF_ICEARROW, AREA, playerattached()); .@pc_hp -= .@n_damage; mes "[Defense of "+strcharinfo(PC_NAME)+"]"; switch(.@defend) { @@ -3986,9 +3986,9 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ case 2: if (.@defend == 1 || .@defend == 3 || .@defend == 5 || .@defend == 7) { .@n_damage /= 2; - specialeffect2 EF_GUARD; + specialeffect(EF_GUARD, AREA, playerattached()); } else - specialeffect2 EF_BASH; + specialeffect(EF_BASH, AREA, playerattached()); .@pc_hp -= .@n_damage; mes "[Defense of "+strcharinfo(PC_NAME)+"]"; switch(.@defend) { @@ -4011,7 +4011,7 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ case 3: if (.@defend == 2 || .@defend == 4 || .@defend == 6 || .@defend == 8) { .@n_damage /= 2; - specialeffect2 EF_GUARD; + specialeffect(EF_GUARD, AREA, playerattached()); } .@pc_hp -= .@n_damage; mes "[Defense of "+strcharinfo(PC_NAME)+"]"; @@ -4544,7 +4544,7 @@ mora,115,98,0 script Hotcha#pa0829 4_ELEPHANT,{ mes "[Hotcha]"; mes "Yes, I see you've completed the task. It has been confirmed as completed."; erasequest .@i; - specialeffect2 EF_STEAL; + specialeffect(EF_STEAL, AREA, playerattached()); if (BaseLevel > 99) getexp 0, ((JobLevel < 50)?JobLevel * JobLevel * (110/100) * 50:0); else @@ -4745,7 +4745,7 @@ L_CheckQuest: mes "I've received the items all right. It will be some time before I have another task for you, so why don't you visit the hot spring and relax?"; delitem getarg(1),getarg(2); erasequest getarg(0); - specialeffect2 EF_STEAL; + specialeffect(EF_STEAL, AREA, playerattached()); if (BaseLevel > 99) getexp 0, ((JobLevel < 50)?JobLevel * JobLevel * (110/100) * 50:0); else @@ -4941,7 +4941,7 @@ L_CheckQuest: mes "I've received the items all right. I look forward to working with you again."; delitem getarg(1),getarg(2); erasequest getarg(0); - specialeffect2 EF_STEAL; + specialeffect(EF_STEAL, AREA, playerattached()); if (BaseLevel > 99) getexp 0, ((JobLevel < 50)?JobLevel * JobLevel * (110/100) * 50:0); else @@ -5073,7 +5073,7 @@ mora,170,101,4 script Soul Guide#pa0829 4_F_DOGTRAVELER,{ } next; mes "^990099Information on missing person "+.@n$+"^000000 has been found. Check your Quest Window for further information."; - specialeffect2 EF_STEAL; + specialeffect(EF_STEAL, AREA, playerattached()); close; } @@ -5125,17 +5125,17 @@ function script mora_remains { close; } if (questprogress(getarg(0))) { - specialeffect2 EF_BLIND; - specialeffect2 EF_BEGINSPELL; + specialeffect(EF_BLIND, AREA, playerattached()); + specialeffect(EF_BEGINSPELL, AREA, playerattached()); progressbar "ffff00",4; erasequest getarg(0); mes "These must be ["+getarg(1)+"]'s Remains. So carefully gather his remains."; - specialeffect2 EF_STEAL; + specialeffect(EF_STEAL, AREA, playerattached()); getitem getarg(3), rand(1,getarg(4)); if (rand(10)) { next; mes "You picked up "+getarg(2)+" Mora Coins next to the remains."; - specialeffect2 EF_STEAL; + specialeffect(EF_STEAL, AREA, playerattached()); getitem Mora_Coin,getarg(2); } close; |