summaryrefslogtreecommitdiff
path: root/npc/quests/skills
diff options
context:
space:
mode:
authormekolat <mekolat@users.noreply.github.com>2017-06-03 15:34:53 -0400
committerHaru <haru@dotalux.com>2017-06-03 21:34:53 +0200
commit19883c583e5e1471c87ae80e67f34882a7e75bc6 (patch)
tree7d7e1a7a04081ce9725f771402a88a09d859f5e6 /npc/quests/skills
parent9d28c5187812e496b10d6fbaf62c642a69916021 (diff)
downloadhercules-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/quests/skills')
-rw-r--r--npc/quests/skills/assassin_skills.txt22
-rw-r--r--npc/quests/skills/bard_skills.txt4
-rw-r--r--npc/quests/skills/dancer_skills.txt22
-rw-r--r--npc/quests/skills/hunter_skills.txt2
-rw-r--r--npc/quests/skills/priest_skills.txt4
-rw-r--r--npc/quests/skills/rogue_skills.txt18
-rw-r--r--npc/quests/skills/sage_skills.txt14
-rw-r--r--npc/quests/skills/wizard_skills.txt8
8 files changed, 47 insertions, 47 deletions
diff --git a/npc/quests/skills/assassin_skills.txt b/npc/quests/skills/assassin_skills.txt
index 4c282caef..7e03eac2f 100644
--- a/npc/quests/skills/assassin_skills.txt
+++ b/npc/quests/skills/assassin_skills.txt
@@ -76,7 +76,7 @@ in_moc_16,14,27,5 script Assassin#realman 4_M_ACROSS,{
mes "you forgot how to do this";
mes "skill? I suppose that all you";
mes "needed was a quick refresher.";
- specialeffect2 EF_INVENOM;
+ specialeffect(EF_INVENOM, AREA, playerattached());
next;
mes "[Killtin]";
mes "Alright, I think it's";
@@ -245,7 +245,7 @@ in_moc_16,14,27,5 script Assassin#realman 4_M_ACROSS,{
mes "bit of credit for my excellent";
mes "instruction. Ah, very nice.";
next;
- specialeffect2 EF_INVENOM;
+ specialeffect(EF_INVENOM, AREA, playerattached());
next;
mes "[Killtin]";
mes "Alright, you may need";
@@ -357,7 +357,7 @@ in_moc_16,23,27,5 script Assassin#realgirl 4_F_ACROSS,{
mes "please try it so I can give";
mes "you feedback on your form.";
next;
- specialeffect2 EF_SONICBLOW;
+ specialeffect(EF_SONICBLOW, AREA, playerattached());
next;
mes "[Esmille]";
mes "Hmm, you're shifting";
@@ -366,7 +366,7 @@ in_moc_16,23,27,5 script Assassin#realgirl 4_F_ACROSS,{
mes "help if your center of";
mes "gravity was like this...";
next;
- specialeffect2 EF_SONICBLOW;
+ specialeffect(EF_SONICBLOW, AREA, playerattached());
next;
mes "[Esmille]";
mes "Ah, you're so very";
@@ -444,7 +444,7 @@ in_moc_16,23,27,5 script Assassin#realgirl 4_F_ACROSS,{
mes "please try it so I can give";
mes "you feedback on your form.";
next;
- specialeffect2 EF_SONICBLOW;
+ specialeffect(EF_SONICBLOW, AREA, playerattached());
next;
mes "[Esmille]";
mes "Hmm, you're shifting";
@@ -453,7 +453,7 @@ in_moc_16,23,27,5 script Assassin#realgirl 4_F_ACROSS,{
mes "help if your center of";
mes "gravity was like this...";
next;
- specialeffect2 EF_SONICBLOW;
+ specialeffect(EF_SONICBLOW, AREA, playerattached());
next;
mes "[Esmille]";
mes "That's a little better.";
@@ -462,7 +462,7 @@ in_moc_16,23,27,5 script Assassin#realgirl 4_F_ACROSS,{
mes "and follow through with";
mes "the stabbing motion.";
next;
- specialeffect2 EF_SONICBLOW;
+ specialeffect(EF_SONICBLOW, AREA, playerattached());
next;
mes "[Esmille]";
mes "Ah, you're so very";
@@ -470,7 +470,7 @@ in_moc_16,23,27,5 script Assassin#realgirl 4_F_ACROSS,{
mes "Focus more on smoothly";
mes "transitioning from your";
mes "stance to executed action.";
- specialeffect2 EF_SONICBLOW;
+ specialeffect(EF_SONICBLOW, AREA, playerattached());
next;
mes "[Esmille]";
mes "Yes, that's it...!";
@@ -535,7 +535,7 @@ in_moc_16,23,27,5 script Assassin#realgirl 4_F_ACROSS,{
mes "please try it so I can give";
mes "you feedback on your form.";
next;
- specialeffect2 EF_SONICBLOW;
+ specialeffect(EF_SONICBLOW, AREA, playerattached());
next;
mes "[Esmille]";
mes "Hmm, you're shifting";
@@ -544,7 +544,7 @@ in_moc_16,23,27,5 script Assassin#realgirl 4_F_ACROSS,{
mes "help if your center of";
mes "gravity was like this...";
next;
- specialeffect2 EF_SONICBLOW;
+ specialeffect(EF_SONICBLOW, AREA, playerattached());
next;
mes "[Esmille]";
mes "That's a little better.";
@@ -553,7 +553,7 @@ in_moc_16,23,27,5 script Assassin#realgirl 4_F_ACROSS,{
mes "and follow through with";
mes "the stabbing motion.";
next;
- specialeffect2 EF_SONICBLOW;
+ specialeffect(EF_SONICBLOW, AREA, playerattached());
next;
mes "[Esmille]";
mes "Yes, that's it...!";
diff --git a/npc/quests/skills/bard_skills.txt b/npc/quests/skills/bard_skills.txt
index 6fe904e28..6df565fb2 100644
--- a/npc/quests/skills/bard_skills.txt
+++ b/npc/quests/skills/bard_skills.txt
@@ -496,7 +496,7 @@ morocc_in,169,72,7 script Spiteful-Looking Bard#bs 2_M_BARD_ORIENT,3,3,{
mes "voices yours, is this voice";
mes "mine. Head spinning, head";
mes "spinning, head spinning...!''";
- specialeffect2 EF_TALK_FROSTJOKE;
+ specialeffect(EF_TALK_FROSTJOKE, AREA, playerattached());
delitem Munak_Doll,1;
skill "BA_PANGVOICE",1,0;
qskill_bard = 9;
@@ -578,7 +578,7 @@ morocc_in,169,72,7 script Spiteful-Looking Bard#bs 2_M_BARD_ORIENT,3,3,{
mes "voices yours, is this voice";
mes "mine. Head spinning, head";
mes "spinning, head spinning...!''";
- specialeffect2 EF_TALK_FROSTJOKE;
+ specialeffect(EF_TALK_FROSTJOKE, AREA, playerattached());
delitem Egg,5;
skill 1010,1,0;
qskill_bard = 9;
diff --git a/npc/quests/skills/dancer_skills.txt b/npc/quests/skills/dancer_skills.txt
index 82a516e5d..4da84d035 100644
--- a/npc/quests/skills/dancer_skills.txt
+++ b/npc/quests/skills/dancer_skills.txt
@@ -67,7 +67,7 @@ comodo,204,172,5 script Canell#qsk_dan01 4_F_07,{
mes "Ow...!";
mes "Th-that whip!";
mes "I-i-it huuuurts!";
- specialeffect2 EF_HIT2;
+ specialeffect(EF_HIT2, AREA, playerattached());
percentheal -5,0;
close;
}
@@ -83,7 +83,7 @@ comodo,204,172,5 script Canell#qsk_dan01 4_F_07,{
mes "What the...? Ack!";
mes "S-stop wh-whipping";
mes "me! It... It stiiings!";
- specialeffect2 EF_HIT2;
+ specialeffect(EF_HIT2, AREA, playerattached());
percentheal -10,0;
next;
mes "[Canell]";
@@ -107,7 +107,7 @@ comodo,204,172,5 script Canell#qsk_dan01 4_F_07,{
mes "Not that whip";
mes "again! Arrgh, it's--";
mes "It hurts so much!";
- specialeffect2 EF_HIT2;
+ specialeffect(EF_HIT2, AREA, playerattached());
percentheal -10,0;
close;
}
@@ -165,7 +165,7 @@ comodo,204,172,5 script Canell#qsk_dan01 4_F_07,{
mes "I am irresistable!";
mes "I am the most attractive";
mes "woman in the whole world!";
- specialeffect2 EF_FLASHER;
+ specialeffect(EF_FLASHER, AREA, playerattached());
next;
mes "^3355FFYour self esteem has";
mes "sky rocketed. Fortunately,";
@@ -251,7 +251,7 @@ comodo,204,172,5 script Canell#qsk_dan01 4_F_07,{
next;
mes "[Canell]";
mes "Bam!";
- specialeffect2 EF_HIT2;
+ specialeffect(EF_HIT2, AREA, playerattached());
percentheal -5,0;
next;
mes "["+ strcharinfo(PC_NAME) +"]";
@@ -301,14 +301,14 @@ comodo,204,172,5 script Canell#qsk_dan01 4_F_07,{
mes "O-ow!";
mes "P-please...!";
mes "Not the whip again!";
- specialeffect2 EF_HIT2;
+ specialeffect(EF_HIT2, AREA, playerattached());
percentheal -5,0;
close;
case 3:
mes "["+ strcharinfo(PC_NAME) +"]";
mes "Un, deux, trois~";
emotion e_no1,1;
- specialeffect2 EF_FLASHER;
+ specialeffect(EF_FLASHER, AREA, playerattached());
next;
mes "[Canell]";
mes "Great, that's exactly";
@@ -337,7 +337,7 @@ comodo,204,172,5 script Canell#qsk_dan01 4_F_07,{
mes "^3355FFYou have finally learned";
mes "the Charming Wink skill.^000000";
DANCER_SK = 9;
- specialeffect2 EF_ABSORBSPIRITS;
+ specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
skill "DC_WINKCHARM",1,0;
close;
}
@@ -380,7 +380,7 @@ comodo,204,172,5 script Canell#qsk_dan01 4_F_07,{
next;
mes "^3355FFYou have learned the";
mes "Charming Wink skill.^000000";
- specialeffect2 EF_ABSORBSPIRITS;
+ specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
skill "DC_WINKCHARM",1,0;
close;
}
@@ -411,7 +411,7 @@ comodo,204,172,5 script Canell#qsk_dan01 4_F_07,{
mes "handsome~";
mes "^333333*Wink~*^000000";
emotion e_kis;
- specialeffect2 EF_VALLENTINE2;
+ specialeffect(EF_VALLENTINE2, AREA, playerattached());
next;
mes "^3355FFStrangely enough,";
mes "her wink has made";
@@ -583,7 +583,7 @@ prontera,183,333,1 script Aelle#qsk_dan02 1_F_PRIEST,{
mes "her fists and laughs";
mes "maniacally to herself.^000000";
percentheal -10,0;
- specialeffect2 EF_HIT2;
+ specialeffect(EF_HIT2, AREA, playerattached());
emotion e_dots,1;
delitem Alchol,1;
delitem Apple,1;
diff --git a/npc/quests/skills/hunter_skills.txt b/npc/quests/skills/hunter_skills.txt
index 2d8aaf691..488e6eaf8 100644
--- a/npc/quests/skills/hunter_skills.txt
+++ b/npc/quests/skills/hunter_skills.txt
@@ -180,7 +180,7 @@ pay_arche,109,169,3 script Arpesto 4_M_05,{
mes "[Arpesto]";
mes "ARRRRRRRROOOOOOW~!";
specialeffect EF_FLASHER;
- specialeffect2 EF_FLASHER;
+ specialeffect(EF_FLASHER, AREA, playerattached());
next;
mes "[Arpesto]";
mes "^333333*Pant Pant*^000000";
diff --git a/npc/quests/skills/priest_skills.txt b/npc/quests/skills/priest_skills.txt
index 9a63fba52..a463686da 100644
--- a/npc/quests/skills/priest_skills.txt
+++ b/npc/quests/skills/priest_skills.txt
@@ -320,7 +320,7 @@ prt_church,111,112,1 script Sister Linus 1_F_PRIEST,{
}
if (.@success) {
- specialeffect2 EF_HEALSP;
+ specialeffect(EF_HEALSP, AREA, playerattached());
mes "[Sister Linus]";
mes "Congratulations!";
mes "You successfully";
@@ -335,7 +335,7 @@ prt_church,111,112,1 script Sister Linus 1_F_PRIEST,{
close;
}
else {
- specialeffect2 EF_POISONHIT;
+ specialeffect(EF_POISONHIT, AREA, playerattached());
mes "[Sister Linus]";
mes "Oh no! I'm sorry,";
mes "but you failed to";
diff --git a/npc/quests/skills/rogue_skills.txt b/npc/quests/skills/rogue_skills.txt
index a1c64b09f..aafa899da 100644
--- a/npc/quests/skills/rogue_skills.txt
+++ b/npc/quests/skills/rogue_skills.txt
@@ -73,9 +73,9 @@ OnInit:
OnTouch:
if (ROG_SK == 10) {
- specialeffect2 EF_CHANGECOLD;
+ specialeffect(EF_CHANGECOLD, AREA, playerattached());
specialeffect EF_CHANGEWIND;
- specialeffect2 EF_LIGHTSPHERE;
+ specialeffect(EF_LIGHTSPHERE, AREA, playerattached());
ROG_SK = 11;
mes "[Killer]";
mes "Wh-what have";
@@ -115,7 +115,7 @@ OnTouch:
mes "now, you're using the Close";
mes "Confine skill perfectly!^000000";
specialeffect EF_POTION1;
- specialeffect2 EF_POTION7;
+ specialeffect(EF_POTION7, AREA, playerattached());
}
else {
mes "^3355FFWait--!";
@@ -157,7 +157,7 @@ in_rogue,355,179,0 script Haijara Greg#rogueguild 1_ETC_01,{
mes "resulting from transcending,";
mes "eh? Then I will teach you the";
mes "Close Confine skill once again.";
- specialeffect2 EF_LIGHTSPHERE;
+ specialeffect(EF_LIGHTSPHERE, AREA, playerattached());
skill 1005,1,0;
ROG_SK = 13;
close;
@@ -309,13 +309,13 @@ in_rogue,355,179,0 script Haijara Greg#rogueguild 1_ETC_01,{
mes "that you covet so much...";
mes "^FF0000Close Confine^000000!";
specialeffect EF_CHANGECOLD;
- specialeffect2 EF_CHANGEWIND;
+ specialeffect(EF_CHANGEWIND, AREA, playerattached());
next;
mes "[Haijara Greg]";
mes "Hmpf. Now you are";
mes "helpless, allowing";
mes "me to do this: ^FF0000Back Stab^000000!";
- specialeffect2 EF_COMBOATTACK5;
+ specialeffect(EF_COMBOATTACK5, AREA, playerattached());
percentheal -95,0;
next;
mes "[Haijara Greg]";
@@ -512,7 +512,7 @@ in_rogue,355,179,0 script Haijara Greg#rogueguild 1_ETC_01,{
mes "practice, and that you become as great a legend as Chae Takbae.";
ROG_SK = 12;
skill 1005,1,0;
- specialeffect2 EF_LIGHTSPHERE;
+ specialeffect(EF_LIGHTSPHERE, AREA, playerattached());
close;
}
mes "[Haijara Greg]";
@@ -524,7 +524,7 @@ in_rogue,355,179,0 script Haijara Greg#rogueguild 1_ETC_01,{
mes "thanks again for your help.";
ROG_SK = 12;
skill 1005,1,0;
- specialeffect2 EF_LIGHTSPHERE;
+ specialeffect(EF_LIGHTSPHERE, AREA, playerattached());
close;
}
mes "[Haijara Greg]";
@@ -1205,7 +1205,7 @@ function script F_Kienna {
mes "You blocked me!";
mes "Very nice work~";
specialeffect EF_POTION1;
- specialeffect2 EF_POTION7;
+ specialeffect(EF_POTION7, AREA, playerattached());
++.@suc_1;
}
else {
diff --git a/npc/quests/skills/sage_skills.txt b/npc/quests/skills/sage_skills.txt
index 420477f4f..cb7dd81be 100644
--- a/npc/quests/skills/sage_skills.txt
+++ b/npc/quests/skills/sage_skills.txt
@@ -130,11 +130,11 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{
next;
mes "[Mishuna]";
mes "%$#@!#$% Yap~~";
- specialeffect2 EF_RUWACH;
+ specialeffect(EF_RUWACH, AREA, playerattached());
next;
mes "[Mishuna]";
mes "Yap!";
- specialeffect2 EF_BRANDISHSPEAR;
+ specialeffect(EF_BRANDISHSPEAR, AREA, playerattached());
next;
mes "^3355FFYou've successfully";
mes "learned the "+.@skill$[.@i]+" Elemental";
@@ -159,11 +159,11 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{
next;
mes "[Mishuna]";
mes "%$#@!#$% Yap~~";
- specialeffect2 EF_RUWACH;
+ specialeffect(EF_RUWACH, AREA, playerattached());
next;
mes "[Mishuna]";
mes "Yap!";
- specialeffect2 EF_BRANDISHSPEAR;
+ specialeffect(EF_BRANDISHSPEAR, AREA, playerattached());
next;
mes "^3355FFYou successfully recalled";
mes "the Elemental Coverter";
@@ -332,7 +332,7 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{
mes "Elemental Converter";
mes "Creation skill by reviewing";
mes "your copy of Barmundt's scroll.^000000";
- specialeffect2 EF_ABSORBSPIRITS;
+ specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
delitem Scorpions_Tail,10;
delitem Horn,7; // Horn
delitem Colorful_Shell,12; // Rainbow_Shell
@@ -466,11 +466,11 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{
mes "a soft blue glow surrounds";
mes "his body and slowly grows";
mes "brighter and more intense.^000000";
- specialeffect2 EF_RUWACH;
+ specialeffect(EF_RUWACH, AREA, playerattached());
next;
mes "[Mishuna]";
mes "@#$%^~ Yap!";
- specialeffect2 EF_BRANDISHSPEAR;
+ specialeffect(EF_BRANDISHSPEAR, AREA, playerattached());
delitem .@ReqItem[.@i],20;
delitem Payon_Potion,1; // Payon Potion
delitem Morocc_Potion,1; // Morocc Potion
diff --git a/npc/quests/skills/wizard_skills.txt b/npc/quests/skills/wizard_skills.txt
index fd146a94f..31a9489f0 100644
--- a/npc/quests/skills/wizard_skills.txt
+++ b/npc/quests/skills/wizard_skills.txt
@@ -49,7 +49,7 @@ gef_tower,115,36,4 script Meow#q_wiz 4_CAT,{
mes "Alright, here's your lesson!";
next;
mes "^3355FF*BAM! BOOM! CRASH!*^000000";
- specialeffect2 EF_SUI_EXPLOSION;
+ specialeffect(EF_SUI_EXPLOSION, AREA, playerattached());
next;
mes "[Meow]";
mes "Don't you dare get";
@@ -63,7 +63,7 @@ gef_tower,115,36,4 script Meow#q_wiz 4_CAT,{
mes "the Sight Blaster skill before";
mes "Meow can administer another";
mes "vicious beating to you.";
- specialeffect2 EF_ABSORBSPIRITS;
+ specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
skill "WZ_SIGHTBLASTER",1,0;
next;
mes "[Meow]";
@@ -287,7 +287,7 @@ gef_tower,115,36,4 script Meow#q_wiz 4_CAT,{
mes "you to cast Sight before you";
mes "can activate it. Now try it.";
next;
- specialeffect2 EF_SUI_EXPLOSION;
+ specialeffect(EF_SUI_EXPLOSION, AREA, playerattached());
mes "^3355FF*BAM! BOOM!*^000000";
next;
mes "[Meow]";
@@ -311,7 +311,7 @@ gef_tower,115,36,4 script Meow#q_wiz 4_CAT,{
mes "You actually learned it!";
mes "That took way too much effort,";
mes "but at least we're done here.";
- specialeffect2 EF_ABSORBSPIRITS;
+ specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
delitem Crystal_Blue,10;
delitem Yellow_Live,10;
delitem Boody_Red,10;