summaryrefslogtreecommitdiff
path: root/npc/re/quests
diff options
context:
space:
mode:
authorgumi <mekolat@users.noreply.github.com>2017-05-27 17:00:28 -0400
committergumi <mekolat@users.noreply.github.com>2017-06-03 12:57:33 -0400
commitb0b071305f967ae836722e7518455ee06089de01 (patch)
tree4f8da981a8fff79abb1d61be1bae6c46cb33add9 /npc/re/quests
parent7a538d27ee8f9194a9fc4988197d90b51e23f32b (diff)
downloadhercules-b0b071305f967ae836722e7518455ee06089de01.tar.gz
hercules-b0b071305f967ae836722e7518455ee06089de01.tar.bz2
hercules-b0b071305f967ae836722e7518455ee06089de01.tar.xz
hercules-b0b071305f967ae836722e7518455ee06089de01.zip
convert specialeffect calls with strings to use GID
Diffstat (limited to 'npc/re/quests')
-rw-r--r--npc/re/quests/eden/eden_iro.txt4
-rw-r--r--npc/re/quests/quests_brasilis.txt6
-rw-r--r--npc/re/quests/quests_malaya.txt24
3 files changed, 17 insertions, 17 deletions
diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt
index 9c6148736..874e514a3 100644
--- a/npc/re/quests/eden/eden_iro.txt
+++ b/npc/re/quests/eden/eden_iro.txt
@@ -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/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt
index 8597f056e..ad7aed094 100644
--- a/npc/re/quests/quests_brasilis.txt
+++ b/npc/re/quests/quests_brasilis.txt
@@ -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;
@@ -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!";
diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt
index 12c5cc2ca..542b7c2cd 100644
--- a/npc/re/quests/quests_malaya.txt
+++ b/npc/re/quests/quests_malaya.txt
@@ -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;