summaryrefslogtreecommitdiff
path: root/npc/re/jobs
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/jobs
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/jobs')
-rw-r--r--npc/re/jobs/2e/kagerou_oboro.txt14
-rw-r--r--npc/re/jobs/3-1/archbishop.txt2
-rw-r--r--npc/re/jobs/3-2/genetic.txt12
-rw-r--r--npc/re/jobs/3-2/sura.txt4
-rw-r--r--npc/re/jobs/novice/academy.txt10
5 files changed, 21 insertions, 21 deletions
diff --git a/npc/re/jobs/2e/kagerou_oboro.txt b/npc/re/jobs/2e/kagerou_oboro.txt
index a77ed1390..efb1faf03 100644
--- a/npc/re/jobs/2e/kagerou_oboro.txt
+++ b/npc/re/jobs/2e/kagerou_oboro.txt
@@ -1990,15 +1990,15 @@ job_ko,127,125,4 script Red Leopard Joe#ko 4_M_JOB_ASSASSIN,{
mes "[Red Leopard Joe]";
mes "Let's now create a new prototype weapon.";
next;
- specialeffect EF_GUIDEDATTACK,AREA,"Crafting Tools#ko_01";
+ specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Crafting Tools#ko_01"));
mes "[Red Leopard Joe]";
mes "Feel free to use tools from here, and...";
next;
- specialeffect EF_GUIDEDATTACK,AREA,"Crafting Tools#ko_02";
+ specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Crafting Tools#ko_02"));
mes "[Red Leopard Joe]";
mes "...there...";
next;
- specialeffect EF_GUIDEDATTACK,AREA,"Crafting Tools#ko_03";
+ specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Crafting Tools#ko_03"));
setquest 5142;
mes "[Red Leopard Joe]";
mes "...and everywhere else. Now let's begin!!";
@@ -2183,15 +2183,15 @@ L_Weapon:
next;
switch(select("Crafting tools?", "I don't have enough materials.", "How do you expect me to make a weapon?" + getarg(0))) {
case 1:
- specialeffect EF_GUIDEDATTACK,AREA,"Crafting Tools#ko_01";
+ specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Crafting Tools#ko_01"));
mes "[Red Leopard Joe]";
mes "Feel free to use tools from here, and...";
next;
- specialeffect EF_GUIDEDATTACK,AREA,"Crafting Tools#ko_02";
+ specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Crafting Tools#ko_02"));
mes "[Red Leopard Joe]";
mes "...there...";
next;
- specialeffect EF_GUIDEDATTACK,AREA,"Crafting Tools#ko_03";
+ specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Crafting Tools#ko_03"));
mes "[Red Leopard Joe]";
mes "...and everywhere else.";
close;
@@ -2199,7 +2199,7 @@ L_Weapon:
mes "[Red Leopard Joe]";
mes "You haven't brought enough materials?";
next;
- specialeffect EF_GUIDEDATTACK,AREA,"Drawer#ko";
+ specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Drawer#ko"));
mes "[Red Leopard Joe]";
mes "Then we'll have to pay a visit to the village. Try the ^FF0000drawer^000000 over there. It'll take you to the village.";
close;
diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt
index bc83b8c81..6b04533db 100644
--- a/npc/re/jobs/3-1/archbishop.txt
+++ b/npc/re/jobs/3-1/archbishop.txt
@@ -1262,7 +1262,7 @@ OnTouch:
mes "So bright and warm....";
next;
mes "- Shoooo -";
- specialeffect EF_CLOAKING,AREA,"Valkyrie Anguhilde#end";
+ specialeffect(EF_CLOAKING, AREA, getnpcid(0, "Valkyrie Anguhilde#end"));
hideonnpc "Valkyrie Anguhilde#end";
emotion e_omg,1;
next;
diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt
index cc7874f38..e85819f97 100644
--- a/npc/re/jobs/3-2/genetic.txt
+++ b/npc/re/jobs/3-2/genetic.txt
@@ -189,11 +189,11 @@ job3_gen01,25,58,3 script Devries#gen 4_LGTSCIENCE,{
mes "- Zooooooooooooooooing -";
specialeffect EF_ENDURE;
next;
- specialeffect EF_REPAIRWEAPON,AREA,"#from1to2gen";
+ specialeffect(EF_REPAIRWEAPON, AREA, getnpcid(0, "#from1to2gen"));
mes "- (Screeching Sounds)!!! -";
mes "- (Screeching)!!! -";
next;
- specialeffect EF_CRASHEARTH,AREA,"#from1to2gen";
+ specialeffect(EF_CRASHEARTH, AREA, getnpcid(0, "#from1to2gen"));
mes "- Bump! Bump! Bump! -";
next;
mes "[Devries]";
@@ -451,8 +451,8 @@ job3_gen01,25,58,3 script Devries#gen 4_LGTSCIENCE,{
mes "Damn!";
next;
if (job_gen == 60) {
- specialeffect EF_FLASHER,AREA,"Super Cultivator#gen";
- specialeffect EF_PHARMACY_OK,AREA,"Super Cultivator#gen";
+ specialeffect(EF_FLASHER, AREA, getnpcid(0, "Super Cultivator#gen"));
+ specialeffect(EF_PHARMACY_OK, AREA, getnpcid(0, "Super Cultivator#gen"));
mes "[Devries]";
mes "Popo, look at that!";
mes "That's really a mysterious plant!";
@@ -485,8 +485,8 @@ job3_gen01,25,58,3 script Devries#gen 4_LGTSCIENCE,{
job_gen = 62;
changequest 2215,2216;
} else {
- specialeffect EF_SPELLBREAKER,AREA,"Super Cultivator#gen";
- specialeffect EF_PHARMACY_FAIL,AREA,"Super Cultivator#gen";
+ specialeffect(EF_SPELLBREAKER, AREA, getnpcid(0, "Super Cultivator#gen"));
+ specialeffect(EF_PHARMACY_FAIL, AREA, getnpcid(0, "Super Cultivator#gen"));
mes "[Devries]";
mes "Uh oh! You failed, Popo.";
mes "It didn't grow at all, it's withered already.";
diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt
index 3eae13edf..567469d46 100644
--- a/npc/re/jobs/3-2/sura.txt
+++ b/npc/re/jobs/3-2/sura.txt
@@ -130,8 +130,8 @@ ve_in,237,125,0 script King Crab#job_shu 1_M_PAY_ELDER,{
next;
mes "[King Crab & Sludge Worm]";
mes "Aaaaaahhhhhhhhk!!!!!!!!";
- specialeffect EF_FIRESPLASHHIT,AREA,"King Crab#job_shu";
- specialeffect EF_FIRESPLASHHIT,AREA,"Sludge Worm#job_shu";
+ specialeffect(EF_FIRESPLASHHIT, AREA, getnpcid(0, "King Crab#job_shu"));
+ specialeffect(EF_FIRESPLASHHIT, AREA, getnpcid(0, "Sludge Worm#job_shu"));
next;
mes "- What is that amazing power? -";
mes "- I've never seen this -";
diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt
index 853c124d9..1b6576737 100644
--- a/npc/re/jobs/novice/academy.txt
+++ b/npc/re/jobs/novice/academy.txt
@@ -2317,7 +2317,7 @@ izlude,140,249,7 script Academy Student#0 4_M_NOV_RUMIN,{
close();
}
if (questprogress(7478) == 1 && !questprogress(7479)) {
- specialeffect(EF_STEAL, AREA, "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN));
+ specialeffect(EF_STEAL, AREA, getnpcid(0, "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN)));
donpcevent("Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnDisable");
emotion(e_gasp, 1);
emotion(e_heh);
@@ -5664,7 +5664,7 @@ izlude,95,146,5 script Mom#iz 4_F_CAVE1,{
mes("^0000cd[Come to me, honey~]^000000");
next();
enablenpc("Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN));
- specialeffect(EF_PORTAL, AREA, "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN));
+ specialeffect(EF_PORTAL, AREA, getnpcid(0, "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN)));
mes("[Etinifni]");
mes("What's up? Where am I?");
next();
@@ -5750,7 +5750,7 @@ izlude,99,138,3 script Romantic Male#iz 4_M_SITDOWN,{
mes("[Romantic Male]");
mes("Are you lifting up our good old memories renting my wedding dress and your tuxedo!! It will strenghthen our relationship, won't it?");
next();
- specialeffect(EF_HEARTCASTING, AREA, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN));
+ specialeffect(EF_HEARTCASTING, AREA, getnpcid(0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN)));
emotion(e_kis, 0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN));
mes("[Romantic Male]");
mes("Honey~~ I love you!! Sweetheart~");
@@ -5784,7 +5784,7 @@ izlude,97,138,5 script Romantic Female#iz 4_F_SITDOWN,{
mes("[Romantic Female]");
mes("You are tired of sitting, aren't you?");
next();
- specialeffect(EF_HEARTCASTING, AREA, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN));
+ specialeffect(EF_HEARTCASTING, AREA, getnpcid(0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN)));
emotion(e_kis, 0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN));
mes("[Romantic Female]");
mes("My sweetheart!!! I love you!!!");
@@ -5792,7 +5792,7 @@ izlude,97,138,5 script Romantic Female#iz 4_F_SITDOWN,{
mes("[Romantic Male]");
mes("Yes, thank you for sharing your SP! You are also tired, aren't you?");
next();
- specialeffect(EF_HEARTCASTING, AREA, "Romantic Male#"+strnpcinfo(NPC_NAME_HIDDEN));
+ specialeffect(EF_HEARTCASTING, AREA, getnpcid(0, "Romantic Male#"+strnpcinfo(NPC_NAME_HIDDEN)));
emotion(e_kis2, 0, "Romantic Male#"+strnpcinfo(NPC_NAME_HIDDEN));
mes("[Romantic Male]");
mes("My sweetheart!! I love you!!!");