summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2018-11-13 17:16:11 +0100
committerGitHub <noreply@github.com>2018-11-13 17:16:11 +0100
commit1e5df06b8a23ea13c3fc1b07339c261a77600bae (patch)
tree1d6811001638da46108a3e74601e9ff980090f85
parentd564cdaabdb9f1929e58cd68c1208f89100acf90 (diff)
parent7b45d05bd8e3f476f1d801203f2968993b52a31f (diff)
downloadhercules-1e5df06b8a23ea13c3fc1b07339c261a77600bae.tar.gz
hercules-1e5df06b8a23ea13c3fc1b07339c261a77600bae.tar.bz2
hercules-1e5df06b8a23ea13c3fc1b07339c261a77600bae.tar.xz
hercules-1e5df06b8a23ea13c3fc1b07339c261a77600bae.zip
Merge pull request #2289 from EyesOfAHawk/buildin_getnpcid
Remove type argument from buildin_getnpcid.
-rw-r--r--doc/script_commands.txt9
-rw-r--r--npc/cities/jawaii.txt4
-rw-r--r--npc/cities/morocc.txt2
-rw-r--r--npc/events/gdevent_aru.txt36
-rw-r--r--npc/events/gdevent_sch.txt36
-rw-r--r--npc/jobs/2-2e/SoulLinker.txt2
-rw-r--r--npc/other/poring_war.txt4
-rw-r--r--npc/quests/kiel_hyre_quest.txt12
-rw-r--r--npc/quests/newgears/2004_headgears.txt16
-rw-r--r--npc/quests/quests_13_1.txt50
-rw-r--r--npc/quests/quests_airship.txt134
-rw-r--r--npc/quests/quests_hugel.txt4
-rw-r--r--npc/quests/quests_louyang.txt2
-rw-r--r--npc/quests/quests_moscovia.txt14
-rw-r--r--npc/quests/quests_rachel.txt8
-rw-r--r--npc/quests/seals/brisingamen_seal.txt4
-rw-r--r--npc/quests/thana_quest.txt14
-rw-r--r--npc/re/cities/dewata.txt8
-rw-r--r--npc/re/events/halloween_2014.txt18
-rw-r--r--npc/re/instances/BangungotHospital.txt10
-rw-r--r--npc/re/instances/WolfchevLaboratory.txt54
-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
-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
-rw-r--r--src/map/script.c33
30 files changed, 269 insertions, 281 deletions
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 219c71205..90d4d77cc 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -2579,15 +2579,12 @@ playerattached() to check for the character attached to the script.
---------------------------------------
-*getnpcid(<type>{, "<npc name>"})
+*getnpcid({"<npc name>"})
Retrieves IDs of the currently invoked NPC. If a unique npc name is given,
-IDs of that NPC are retrieved instead. Type specifies what ID to retrieve
-and can be one of the following:
+IDs of that NPC are retrieved instead.
- 0 - Unit ID (GID)
-
-If an invalid type is given or the NPC does not exist, 0 is returned.
+If the NPC does not exist, 0 is returned.
---------------------------------------
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index b48b960d2..71ec8264f 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -1271,7 +1271,7 @@ prt_in,173,13,4 script Customer#SoloHan 4_M_04,{
next;
mes "[Bachewcca]";
mes "^666666*Grunt!*^000000";
- specialeffect(EF_TALK_SCREAM, AREA, getnpcid(0, "Customer#Bachewcca"));
+ specialeffect(EF_TALK_SCREAM, AREA, getnpcid("Customer#Bachewcca"));
next;
mes "[SoloHan]";
mes "To...";
@@ -1377,7 +1377,7 @@ prt_in,173,13,4 script Customer#SoloHan 4_M_04,{
next;
mes "[Bachewcca]";
mes "^666666*Grrr...!*^000000";
- specialeffect(EF_THROWITEM, AREA, getnpcid(0, "Customer#Bachewcca"));
+ specialeffect(EF_THROWITEM, AREA, getnpcid("Customer#Bachewcca"));
close;
}
mes "Oh man...";
diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt
index a79148fbf..e4400e7af 100644
--- a/npc/cities/morocc.txt
+++ b/npc/cities/morocc.txt
@@ -138,7 +138,7 @@ morocc,223,102,0 script Volunteer - Morroc#06::MocVolunteer 2_M_BARD_ORIENT,{
next;
mes "[Ringing Voice]";
mes "Be quiet! Can't you see what's going on?!";
- specialeffect(EF_HIT2, AREA, getnpcid(0, "Volunteer - Morroc#06"));
+ specialeffect(EF_HIT2, AREA, getnpcid("Volunteer - Morroc#06"));
next;
mes "[Morroc Volunteer]";
mes "Heyyy, you're being too harsh, Senyorita. Your fist may be as fragile as you are, but it sure can hurt somebody.";
diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt
index 4e8a3c6e8..0a3eef0b1 100644
--- a/npc/events/gdevent_aru.txt
+++ b/npc/events/gdevent_aru.txt
@@ -1351,33 +1351,33 @@ OnMVP:
end;
OnTimer1000:
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_1_a"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_3_a"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_5_a"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_7_a"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_9_a"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_1_a"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_3_a"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_5_a"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_7_a"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_9_a"));
end;
OnTimer2000:
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_2_a"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_4_a"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_6_a"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_8_a"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_2_a"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_4_a"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_6_a"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_8_a"));
end;
OnTimer3000:
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_1_a"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_3_a"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_5_a"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_7_a"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_9_a"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_1_a"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_3_a"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_5_a"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_7_a"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_9_a"));
end;
OnTimer4000:
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_2_a"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_4_a"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_6_a"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_8_a"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_2_a"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_4_a"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_6_a"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_8_a"));
stopnpctimer;
end;
}
diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt
index 1b55f8492..add37bcb9 100644
--- a/npc/events/gdevent_sch.txt
+++ b/npc/events/gdevent_sch.txt
@@ -1348,33 +1348,33 @@ OnMVP:
end;
OnTimer1000:
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_1_s"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_3_s"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_5_s"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_7_s"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_9_s"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_1_s"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_3_s"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_5_s"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_7_s"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_9_s"));
end;
OnTimer2000:
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_2_s"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_4_s"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_6_s"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_8_s"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_2_s"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_4_s"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_6_s"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_8_s"));
end;
OnTimer3000:
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_1_s"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_3_s"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_5_s"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_7_s"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_9_s"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_1_s"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_3_s"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_5_s"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_7_s"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_9_s"));
end;
OnTimer4000:
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_2_s"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_4_s"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_6_s"));
- specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_8_s"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_2_s"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_4_s"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_6_s"));
+ specialeffect(EF_MVP, AREA, getnpcid("paper_sp_8_s"));
stopnpctimer;
end;
}
diff --git a/npc/jobs/2-2e/SoulLinker.txt b/npc/jobs/2-2e/SoulLinker.txt
index db916fc35..6fc4e3aaa 100644
--- a/npc/jobs/2-2e/SoulLinker.txt
+++ b/npc/jobs/2-2e/SoulLinker.txt
@@ -434,7 +434,7 @@ OnTouch:
mes "[Maia]";
mes "This Witherless Rose will";
mes "wither away instead of you...";
- specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, "Maia#link2"));
+ specialeffect(EF_MAPPILLAR2, AREA, getnpcid("Maia#link2"));
next;
mes "[Maia]";
mes "This Witherless Rose will";
diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt
index d89bb3fed..326c601be 100644
--- a/npc/other/poring_war.txt
+++ b/npc/other/poring_war.txt
@@ -1052,7 +1052,7 @@ OnInit:
OnEnable:
enablenpc "#wop_warp_a";
- specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, "#wop_warp_a"));
+ specialeffect(EF_MAPPILLAR2, AREA, getnpcid("#wop_warp_a"));
end;
OnDisable:
@@ -1074,7 +1074,7 @@ OnInit:
OnEnable:
enablenpc "#wop_warp_d";
- specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, "#wop_warp_d"));
+ specialeffect(EF_MAPPILLAR2, AREA, getnpcid("#wop_warp_d"));
end;
OnDisable:
diff --git a/npc/quests/kiel_hyre_quest.txt b/npc/quests/kiel_hyre_quest.txt
index b51207737..677a81f8d 100644
--- a/npc/quests/kiel_hyre_quest.txt
+++ b/npc/quests/kiel_hyre_quest.txt
@@ -1967,7 +1967,7 @@ kh_vila,184,20,0 script Book#kh1::BookKHQ1 HIDDEN_NPC,{
mes "wall slides opens open";
mes "to reveal a secret path.^000000";
KielHyreQuest = 28;
- specialeffect(EF_READYPORTAL2, AREA, getnpcid(0, "Wall#kh"));
+ specialeffect(EF_READYPORTAL2, AREA, getnpcid("Wall#kh"));
close;
}
else {
@@ -6393,11 +6393,11 @@ kh_kiehl02,50,52,4 script Kiehl#Original 4_M_KHKIEL,{
next;
mes "[Mitchell]";
mes "Nooooo!";
- specialeffect(PF_FOGWALL, AREA, getnpcid(0, "Mitchell#KiehlRoom"));
- specialeffect(PF_FOGWALL, AREA, getnpcid(0, "Agent#KHAgent1"));
- specialeffect(PF_FOGWALL, AREA, getnpcid(0, "Agent#KHAgent2"));
- specialeffect(PF_FOGWALL, AREA, getnpcid(0, "Agent#KHAgent3"));
- specialeffect(PF_FOGWALL, AREA, getnpcid(0, "Agent#KHAgent4"));
+ specialeffect(PF_FOGWALL, AREA, getnpcid("Mitchell#KiehlRoom"));
+ specialeffect(PF_FOGWALL, AREA, getnpcid("Agent#KHAgent1"));
+ specialeffect(PF_FOGWALL, AREA, getnpcid("Agent#KHAgent2"));
+ specialeffect(PF_FOGWALL, AREA, getnpcid("Agent#KHAgent3"));
+ specialeffect(PF_FOGWALL, AREA, getnpcid("Agent#KHAgent4"));
next;
cutin "kh_kiel03",2;
mes "[Kiehl]";
diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt
index eb07fb029..9e1728c65 100644
--- a/npc/quests/newgears/2004_headgears.txt
+++ b/npc/quests/newgears/2004_headgears.txt
@@ -1927,10 +1927,10 @@ alde_alche,88,180,0 script Muscle Man#Alarm Mask 4_M_ALCHE_A,{
enablenpc " #Alarm Mask Man2";
enablenpc " #Alarm Mask Man3";
enablenpc " #Alarm Mask Man4";
- specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man1"));
- specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man2"));
- specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man3"));
- specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man4"));
+ specialeffect(EF_CLAYMORE, AREA, getnpcid(" #Alarm Mask Man1"));
+ specialeffect(EF_CLAYMORE, AREA, getnpcid(" #Alarm Mask Man2"));
+ specialeffect(EF_CLAYMORE, AREA, getnpcid(" #Alarm Mask Man3"));
+ specialeffect(EF_CLAYMORE, AREA, getnpcid(" #Alarm Mask Man4"));
initnpctimer;
if (countitem(Needle_Of_Alarm) > 2999 && countitem(Mr_Scream) > 0) {
if (select("Give him items", "Cancel") == 1) {
@@ -2042,10 +2042,10 @@ OnTimer4000:
disablenpc " #Alarm Mask Man2";
disablenpc " #Alarm Mask Man3";
disablenpc " #Alarm Mask Man4";
- specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man1"));
- specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man2"));
- specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man3"));
- specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man4"));
+ specialeffect(EF_CLAYMORE, AREA, getnpcid(" #Alarm Mask Man1"));
+ specialeffect(EF_CLAYMORE, AREA, getnpcid(" #Alarm Mask Man2"));
+ specialeffect(EF_CLAYMORE, AREA, getnpcid(" #Alarm Mask Man3"));
+ specialeffect(EF_CLAYMORE, AREA, getnpcid(" #Alarm Mask Man4"));
stopnpctimer;
end;
}
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index 17cacaff6..b1e4f90b3 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -9844,7 +9844,7 @@ mid_camp,206,286,3 script Expedition Messenger 4_M_MOCASS1,{
next;
mes "[Expedition Messenger]";
mes "What's up? Why haven't you left...?";
- specialeffect(EF_SOULBREAKER, AREA, getnpcid(0, "Expedition Messenger"));
+ specialeffect(EF_SOULBREAKER, AREA, getnpcid("Expedition Messenger"));
next;
mes "[Expedition Messenger]";
mes "Argh... Why are you doing this?!";
@@ -9871,8 +9871,8 @@ mid_camp,206,286,3 script Expedition Messenger 4_M_MOCASS1,{
mes "[???]";
mes "Argh...";
next;
- specialeffect(EF_SOULBREAKER, AREA, getnpcid(0, "Expedition Messenger#3"));
- specialeffect(EF_SOULBREAKER, AREA, getnpcid(0, "Expedition Messenger#3"));
+ specialeffect(EF_SOULBREAKER, AREA, getnpcid("Expedition Messenger#3"));
+ specialeffect(EF_SOULBREAKER, AREA, getnpcid("Expedition Messenger#3"));
mes "[???]";
mes "Argh... You...";
next;
@@ -9924,8 +9924,8 @@ mid_camp,206,286,3 script Expedition Messenger 4_M_MOCASS1,{
mes "[???]";
mes "Argh!";
next;
- specialeffect(EF_SOULBREAKER, AREA, getnpcid(0, "Expedition Messenger#3"));
- specialeffect(EF_SOULBREAKER, AREA, getnpcid(0, "Expedition Messenger#3"));
+ specialeffect(EF_SOULBREAKER, AREA, getnpcid("Expedition Messenger#3"));
+ specialeffect(EF_SOULBREAKER, AREA, getnpcid("Expedition Messenger#3"));
mes "[???]";
mes "Argh... You...";
next;
@@ -11548,7 +11548,7 @@ mid_camp,256,272,3 script Defaria#moc2 4_M_HUGRANFA,{
specialeffect EF_BEGINSPELL2;
next;
mes "- The fire sparked, but then it immediatly blew out. -";
- specialeffect(EF_FIREARROW, AREA, getnpcid(0, "Wet Firewood#moc2"));
+ specialeffect(EF_FIREARROW, AREA, getnpcid("Wet Firewood#moc2"));
next;
mes "[Defaria]";
mes "...............";
@@ -11567,7 +11567,7 @@ mid_camp,256,272,3 script Defaria#moc2 4_M_HUGRANFA,{
specialeffect EF_BEGINSPELL2;
next;
mes "- The fire sparked, but then it immediately blew out.-";
- specialeffect(EF_FIREARROW, AREA, getnpcid(0, "Wet Firewood#moc2"));
+ specialeffect(EF_FIREARROW, AREA, getnpcid("Wet Firewood#moc2"));
next;
mes "[Defaria]";
mes "...............";
@@ -11804,8 +11804,8 @@ mid_camp,256,272,3 script Defaria#moc2 4_M_HUGRANFA,{
mes "Hopefully I can make a fire with your nice logs....";
specialeffect EF_BEGINSPELL2;
next;
- specialeffect(EF_FIREWALL, AREA, getnpcid(0, "Wet Firewood#moc2"));
- specialeffect(EF_TORCH, AREA, getnpcid(0, "Wet Firewood#moc2"));
+ specialeffect(EF_FIREWALL, AREA, getnpcid("Wet Firewood#moc2"));
+ specialeffect(EF_TORCH, AREA, getnpcid("Wet Firewood#moc2"));
mes "[Defaria]";
mes "Oh, this is as great as I'd hoped!";
mes "I guess my magic hasn't gotten that rusty after all..";
@@ -13096,17 +13096,17 @@ que_job01,144,54,3 script Rin#moc_room2_2 4_F_ACROSS,{
cutin "moc2_dan02",255;
switch(select("Smack his head.", "Punch his stomach.", "Slap his face.")) {
case 1:
- specialeffect(EF_HIT2, AREA, getnpcid(0, "Rayan#moc_room2_2"));
+ specialeffect(EF_HIT2, AREA, getnpcid("Rayan#moc_room2_2"));
mes "- Wanting to stop Rayan from going berserk, you smacked the back of his head with the journal. Rayan staggered and then fell to the ground. Nice job! -";
next;
break;
case 2:
- specialeffect(EF_HIT4, AREA, getnpcid(0, "Rayan#moc_room2_2"));
+ specialeffect(EF_HIT4, AREA, getnpcid("Rayan#moc_room2_2"));
mes "- Wanting to stop Rayan from going berserk, you sucker punched him in the 'ole bread basket. Rayan staggered and then fell to the ground...! -";
next;
break;
case 3:
- specialeffect(EF_HIT1, AREA, getnpcid(0, "Rayan#moc_room2_2"));
+ specialeffect(EF_HIT1, AREA, getnpcid("Rayan#moc_room2_2"));
mes "- Wanting to stop Rayan from going berserk, you slapped his face with the journal. Rayan staggered and then fell onto the ground. Wah! -";
next;
break;
@@ -13117,7 +13117,7 @@ que_job01,144,54,3 script Rin#moc_room2_2 4_F_ACROSS,{
mes "[Rayan]";
mes "Ahh....";
mes "....? Isn't.. Isn't this?!....";
- specialeffect(EF_POISON, AREA, getnpcid(0, "Rayan#moc_room2_2"));
+ specialeffect(EF_POISON, AREA, getnpcid("Rayan#moc_room2_2"));
next;
mes "[Rin]";
mes "Wah! What's going on?";
@@ -13159,7 +13159,7 @@ que_job01,144,54,3 script Rin#moc_room2_2 4_F_ACROSS,{
mes "You're Rin, right?";
mes "This is the last time you'll ever see me.";
mes "Haha... Muhahahahaha!!";
- specialeffect(EF_ENTRY, AREA, getnpcid(0, "Rayan#moc_room2_2"));
+ specialeffect(EF_ENTRY, AREA, getnpcid("Rayan#moc_room2_2"));
donpcevent "Rayan#moc_room2_2::OnDisable";
next;
cutin "moc2_rin03",2;
@@ -13533,8 +13533,8 @@ OnTouch:
mes "Why? Why is Rin here? Wait, where am I?";
mes "Argh.. I can't move at all...";
next;
- specialeffect(EF_BEGINSPELL2, AREA, getnpcid(0, "Dandelion Member#moc2_1"));
- specialeffect(EF_BEGINSPELL2, AREA, getnpcid(0, "Dandelion Member#moc2_2"));
+ specialeffect(EF_BEGINSPELL2, AREA, getnpcid("Dandelion Member#moc2_1"));
+ specialeffect(EF_BEGINSPELL2, AREA, getnpcid("Dandelion Member#moc2_2"));
emotion e_gasp,"Rin#moc2_bt_rin01";
emotion e_gasp,1;
mes "[Rin]";
@@ -13543,8 +13543,8 @@ OnTouch:
next;
donpcevent "Rin#moc2_bt_rin01::OnDisable";
donpcevent "Rin#moc2_bt_rin02::OnEnable";
- specialeffect(EF_ICECRASH, AREA, getnpcid(0, "Rin#moc2_bt_rin01"));
- specialeffect(EF_METEORSTORM, AREA, getnpcid(0, "Rin#moc2_bt_rin01"));
+ specialeffect(EF_ICECRASH, AREA, getnpcid("Rin#moc2_bt_rin01"));
+ specialeffect(EF_METEORSTORM, AREA, getnpcid("Rin#moc2_bt_rin01"));
mes "[Rayan]";
mes "Hah, how impressive! You run like a rabbit!";
mes "I should have you killed you when I had the chance.";
@@ -13561,16 +13561,16 @@ OnTouch:
donpcevent "Dandelion Member#moc2_4::OnEnable";
donpcevent "Dandelion Member#moc2_5::OnEnable";
next;
- specialeffect(EF_FREEZED, AREA, getnpcid(0, "Rin#moc2_bt_rin02"));
+ specialeffect(EF_FREEZED, AREA, getnpcid("Rin#moc2_bt_rin02"));
emotion e_gasp;
mapannounce "que_dan01", "Rin: When.. When did you...!?!",bc_map,"0x7b68ee";
mes "[Rayan]";
mes "I'm sorry that I have to do this.";
mes "...";
mes "Kill her.";
- specialeffect(EF_BEGINSPELL2, AREA, getnpcid(0, "Dandelion Member#moc2_3"));
- specialeffect(EF_BEGINSPELL2, AREA, getnpcid(0, "Dandelion Member#moc2_4"));
- specialeffect(EF_BEGINSPELL2, AREA, getnpcid(0, "Dandelion Member#moc2_5"));
+ specialeffect(EF_BEGINSPELL2, AREA, getnpcid("Dandelion Member#moc2_3"));
+ specialeffect(EF_BEGINSPELL2, AREA, getnpcid("Dandelion Member#moc2_4"));
+ specialeffect(EF_BEGINSPELL2, AREA, getnpcid("Dandelion Member#moc2_5"));
next;
mapannounce "que_dan01", "Rayan: Follow me as soon as you take care of her. Our next meeting place is the usual place. I'm leaving.",bc_map,"0xA8A8A8";
donpcevent "Rayan#moc2_bt_r01::OnDisable";
@@ -13578,9 +13578,9 @@ OnTouch:
donpcevent "Dandelion Member#moc2_2::OnDisable";
mes "[" + strcharinfo(PC_NAME) + "]";
mes "Rin-!!!";
- specialeffect(EF_LIGHTBOLT, AREA, getnpcid(0, "Rin#moc2_bt_rin02"));
- specialeffect(EF_FIREPILLARBOMB, AREA, getnpcid(0, "Rin#moc2_bt_rin02"));
- specialeffect(EF_METEORSTORM, AREA, getnpcid(0, "Rin#moc2_bt_rin02"));
+ specialeffect(EF_LIGHTBOLT, AREA, getnpcid("Rin#moc2_bt_rin02"));
+ specialeffect(EF_FIREPILLARBOMB, AREA, getnpcid("Rin#moc2_bt_rin02"));
+ specialeffect(EF_METEORSTORM, AREA, getnpcid("Rin#moc2_bt_rin02"));
donpcevent "Rin#moc2_bt_rin02::OnDisable";
next;
mes "You feel helpless: you can do nothing but watch her slowly get overpowered..";
diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt
index 9c096c83e..bc6d73fad 100644
--- a/npc/quests/quests_airship.txt
+++ b/npc/quests/quests_airship.txt
@@ -1038,23 +1038,23 @@ ein_in01,125,99,3 script Tarsha Cherno 4_F_EINWOMAN,{
ein_in01,127,94,3 script #exp_ein HIDDEN_NPC,{ end; }
function script F_Cherno {
- specialeffect(EF_COMBOATTACK1, AREA, getnpcid(0, "#exp_ein"));
+ specialeffect(EF_COMBOATTACK1, AREA, getnpcid("#exp_ein"));
mes("^33355F*Bang*^000000");
next();
- specialeffect(EF_COMBOATTACK2, AREA, getnpcid(0, "#exp_ein"));
+ specialeffect(EF_COMBOATTACK2, AREA, getnpcid("#exp_ein"));
mes("^3355FF*Bang*^000000");
if (getarg(0) == true) {
mes("^3355FF*Beeeeeep*^000000");
}
next();
- specialeffect(EF_COMBOATTACK3, AREA, getnpcid(0, "#exp_ein"));
+ specialeffect(EF_COMBOATTACK3, AREA, getnpcid("#exp_ein"));
mes("^3355FF*Bang*^000000");
if (getarg(0) == true) {
mes("^3355FF*Beeeeeep*^000000");
mes("^3355FF*Boop Boop Boop*^000000");
}
next();
- specialeffect(EF_POISONATTACK, AREA, getnpcid(0, "#exp_ein"));
+ specialeffect(EF_POISONATTACK, AREA, getnpcid("#exp_ein"));
mes("^33355F*Crash!*^000000");
mes(".....");
emotion(e_swt, false, "Theo Cherno");
@@ -1717,65 +1717,65 @@ OnTimer68000:
end;
OnTimer73000:
mapannounce("airplane_01", _("*Kzzz...Drrrr...Boom! CRASH!*"), bc_map, C_LIME);
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom6#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom6#airplane"));
end;
OnTimer73500:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom7#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom7#airplane"));
end;
OnTimer74000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom8#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom8#airplane"));
end;
OnTimer74500:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom9#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom9#airplane"));
end;
OnTimer75000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom10#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom10#airplane"));
end;
OnTimer75500:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom6#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom6#airplane"));
end;
OnTimer76000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom7#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom7#airplane"));
end;
OnTimer76500:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom8#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom8#airplane"));
end;
OnTimer77000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom9#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom9#airplane"));
end;
OnTimer77500:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom10#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom10#airplane"));
end;
OnTimer78000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom6#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom6#airplane"));
mapannounce("airplane_01", _("Engineer: Oh no! We've got a problem with the Number One Rear Engine!"), bc_map, C_LIME);
end;
OnTimer79000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom7#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom7#airplane"));
end;
OnTimer80000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom8#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom8#airplane"));
end;
OnTimer81000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom9#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom9#airplane"));
end;
OnTimer82000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom10#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom10#airplane"));
end;
OnTimer83000:
mapannounce("airplane_01", _("Pilot: Hurry! Get the women, old people and children somewhere safe first! Hurry!"), bc_map, C_LIME);
end;
OnTimer84000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom6#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom6#airplane"));
end;
OnTimer85000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom7#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom7#airplane"));
end;
OnTimer86000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom8#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom8#airplane"));
end;
OnTimer87000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom7#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom7#airplane"));
end;
OnTimer88000:
emotion(e_ag, false, "Airship Captain#02");
@@ -1791,46 +1791,46 @@ OnTimer98000:
end;
OnTimer103000:
mapannounce("airplane_01", _("*Bang! Bang Bang! Bang Bang! Bang Bang Bang!*"), bc_map, C_LIME);
- specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
+ specialeffect(EF_HIT5, AREA, getnpcid("Airship Captain#02"));
end;
OnTimer103500:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom1#airplane"));
- specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom1#airplane"));
+ specialeffect(EF_HIT5, AREA, getnpcid("Airship Captain#02"));
end;
OnTimer104000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom2#airplane"));
- specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom2#airplane"));
+ specialeffect(EF_HIT5, AREA, getnpcid("Airship Captain#02"));
end;
OnTimer104500:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom3#airplane"));
- specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom3#airplane"));
+ specialeffect(EF_HIT5, AREA, getnpcid("Airship Captain#02"));
end;
OnTimer105000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom4#airplane"));
- specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom4#airplane"));
+ specialeffect(EF_HIT5, AREA, getnpcid("Airship Captain#02"));
end;
OnTimer105500:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom5#airplane"));
- specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom5#airplane"));
+ specialeffect(EF_HIT5, AREA, getnpcid("Airship Captain#02"));
end;
OnTimer106000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom0#airplane"));
- specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom0#airplane"));
+ specialeffect(EF_HIT5, AREA, getnpcid("Airship Captain#02"));
end;
OnTimer106500:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom1#airplane"));
- specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom1#airplane"));
+ specialeffect(EF_HIT5, AREA, getnpcid("Airship Captain#02"));
end;
OnTimer107000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom2#airplane"));
- specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom2#airplane"));
+ specialeffect(EF_HIT5, AREA, getnpcid("Airship Captain#02"));
end;
OnTimer107500:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom4#airplane"));
- specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom4#airplane"));
+ specialeffect(EF_HIT5, AREA, getnpcid("Airship Captain#02"));
end;
OnTimer108000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom5#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom5#airplane"));
killmonster "airplane_01","Airship#airplane02::OnCaptainMobDead";
end;
OnTimer113000:
@@ -1839,59 +1839,59 @@ OnTimer113000:
end;
OnTimer118000:
mapannounce("airplane_01", _("*Bang! Bang Bang! Bang Bang! Bang Bang Bang!*"), bc_map, C_LIME);
- specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
+ specialeffect(EF_HIT5, AREA, getnpcid("Airship Captain#02"));
end;
OnTimer118500:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom6#airplane"));
- specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom6#airplane"));
+ specialeffect(EF_HIT5, AREA, getnpcid("Airship Captain#02"));
end;
OnTimer119000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom7#airplane"));
- specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom7#airplane"));
+ specialeffect(EF_HIT5, AREA, getnpcid("Airship Captain#02"));
end;
OnTimer119500:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom8#airplane"));
- specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom8#airplane"));
+ specialeffect(EF_HIT5, AREA, getnpcid("Airship Captain#02"));
end;
OnTimer120000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom9#airplane"));
- specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom9#airplane"));
+ specialeffect(EF_HIT5, AREA, getnpcid("Airship Captain#02"));
end;
OnTimer120500:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom10#airplane"));
- specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom10#airplane"));
+ specialeffect(EF_HIT5, AREA, getnpcid("Airship Captain#02"));
end;
OnTimer121000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom6#airplane"));
- specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom6#airplane"));
+ specialeffect(EF_HIT5, AREA, getnpcid("Airship Captain#02"));
end;
OnTimer121500:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom7#airplane"));
- specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom7#airplane"));
+ specialeffect(EF_HIT5, AREA, getnpcid("Airship Captain#02"));
end;
OnTimer122000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom8#airplane"));
- specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom8#airplane"));
+ specialeffect(EF_HIT5, AREA, getnpcid("Airship Captain#02"));
end;
OnTimer122500:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom9#airplane"));
- specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom9#airplane"));
+ specialeffect(EF_HIT5, AREA, getnpcid("Airship Captain#02"));
end;
OnTimer123000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom8#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom8#airplane"));
mapannounce("airplane_01", _("*Boom! Boom Boom! Boom Boom! Boom!*"), bc_map, C_LIME);
end;
OnTimer124000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom9#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom9#airplane"));
end;
OnTimer125000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom10#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom10#airplane"));
end;
OnTimer126000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom6#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom6#airplane"));
end;
OnTimer127000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom7#airplane"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("boom7#airplane"));
end;
OnTimer128000:
emotion(e_an, false, "Airship Captain#02");
diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt
index 415d37d5b..9af2ab5fc 100644
--- a/npc/quests/quests_hugel.txt
+++ b/npc/quests/quests_hugel.txt
@@ -297,7 +297,7 @@ hu_in01,387,245,0 script Allen Schuwell 4_M_DIEMAN,2,2,{
mes "medicine you're";
mes "supposed to";
mes "need so badly.";
- specialeffect(EF_CHANGECOLD, AREA, getnpcid(0, "Postell Schuwell#D"));
+ specialeffect(EF_CHANGECOLD, AREA, getnpcid("Postell Schuwell#D"));
next;
mes "[Allen]";
mes "Thank goodness...";
@@ -9384,7 +9384,7 @@ OnTouch:
mes "followed. Hold on a sec";
mes "while I take care of him.";
next;
- specialeffect(EF_SONICBLOWHIT, AREA, getnpcid(0, "Hit"));
+ specialeffect(EF_SONICBLOWHIT, AREA, getnpcid("Hit"));
mes "[???]";
mes "Ha!";
next;
diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt
index 61888cab4..03816faf2 100644
--- a/npc/quests/quests_louyang.txt
+++ b/npc/quests/quests_louyang.txt
@@ -4122,7 +4122,7 @@ lou_fild01,224,348,0 script Lady#delivery 4_F_CHNDRESS3,{
Zeny -= 100;
}
close2;
- specialeffect(EF_BLASTMINEBOMB, AREA, getnpcid(0, " #fire"));
+ specialeffect(EF_BLASTMINEBOMB, AREA, getnpcid(" #fire"));
end;
}
mes "[Lady]";
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index d8f3d750f..e49886dbd 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -7096,15 +7096,15 @@ mosk_dun01,45,259,0 script Wall#rus04 HIDDEN_NPC,{
mes "- The wind disappears and -";
mes "- a very young girl appears -";
donpcevent "Maria Morebna#rus46::OnEnable";
- specialeffect(EF_FREEZED, AREA, getnpcid(0, "Maria Morebna#rus46"));
+ specialeffect(EF_FREEZED, AREA, getnpcid("Maria Morebna#rus46"));
next;
mes "[Maria Morebna]";
mes "Thank you!";
mes "I'm finally out of there! Now I can.....................aaaaak!!!....";
next;
- specialeffect(EF_HIT2, AREA, getnpcid(0, "Maria Morebna#rus46"));
- specialeffect(EF_DARKBREATH, AREA, getnpcid(0, "Maria Morebna#rus46"));
- specialeffect(EF_DEVIL, AREA, getnpcid(0, "Maria Morebna#rus46"));
+ specialeffect(EF_HIT2, AREA, getnpcid("Maria Morebna#rus46"));
+ specialeffect(EF_DARKBREATH, AREA, getnpcid("Maria Morebna#rus46"));
+ specialeffect(EF_DEVIL, AREA, getnpcid("Maria Morebna#rus46"));
mes "- Maria is attacked -";
mes "- and falls down!! -";
next;
@@ -7133,7 +7133,7 @@ mosk_dun01,45,259,0 script Wall#rus04 HIDDEN_NPC,{
mes "Gray Wolf...";
mes "You think you can fight me?!";
next;
- specialeffect(EF_FIREHIT, AREA, getnpcid(0, "Gray Wolf#rus05"));
+ specialeffect(EF_FIREHIT, AREA, getnpcid("Gray Wolf#rus05"));
mes "- Staggering from -";
mes "- Koshei's flames, -";
mes "- Gray Wolf quickly tell me -";
@@ -7261,7 +7261,7 @@ mosk_dun01,45,259,0 script Wall#rus04 HIDDEN_NPC,{
mes "- The wounds and -";
mes "- curses on her body -";
mes "- are removed !! -";
- specialeffect(EF_ABSORBSPIRITS, AREA, getnpcid(0, "Maria Morebna#rus46"));
+ specialeffect(EF_ABSORBSPIRITS, AREA, getnpcid("Maria Morebna#rus46"));
next;
mes "["+ strcharinfo(PC_NAME) +"]";
mes "Ok! Next...";
@@ -7291,7 +7291,7 @@ mosk_dun01,45,259,0 script Wall#rus04 HIDDEN_NPC,{
next;
}
mes "- !! -";
- specialeffect(EF_RESURRECTION, AREA, getnpcid(0, "Maria Morebna#rus46"));
+ specialeffect(EF_RESURRECTION, AREA, getnpcid("Maria Morebna#rus46"));
next;
mes "[Gray Wolf]";
mes "Success!!";
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index 39b3a7b97..43e4beadb 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -3722,10 +3722,10 @@ OnStart:
enablenpc "#ice_4f_2";
enablenpc "#ice_4f_3";
enablenpc "#ice_4f_4";
- specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, "#ice_4f_1"));
- specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, "#ice_4f_2"));
- specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, "#ice_4f_3"));
- specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, "#ice_4f_4"));
+ specialeffect(EF_MAPPILLAR2, AREA, getnpcid("#ice_4f_1"));
+ specialeffect(EF_MAPPILLAR2, AREA, getnpcid("#ice_4f_2"));
+ specialeffect(EF_MAPPILLAR2, AREA, getnpcid("#ice_4f_3"));
+ specialeffect(EF_MAPPILLAR2, AREA, getnpcid("#ice_4f_4"));
end;
OnTimer60000:
diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt
index 815459c41..ed63847a2 100644
--- a/npc/quests/seals/brisingamen_seal.txt
+++ b/npc/quests/seals/brisingamen_seal.txt
@@ -3226,7 +3226,7 @@ OnTouch:
mes "Go, Lowen!";
mes "Cast Grand Cross, now!^000000";
next;
- specialeffect(EF_BEGINSPELL7, AREA, getnpcid(0, "#lowen"));
+ specialeffect(EF_BEGINSPELL7, AREA, getnpcid("#lowen"));
mapannounce "que_god02","Mwahaha! Mortals are such fools...",0,0xA8A8A8;
donpcevent "#brisinsummon::OnDoppel1Off";
donpcevent "#brisinsummon::OnDoppel2On";
@@ -3237,7 +3237,7 @@ OnTouch:
mes "[" + strcharinfo(PC_NAME) + "]";
mes " ??!!!";
next;
- specialeffect(EF_BEGINSPELL7, AREA, getnpcid(0, "#doppelganger2"));
+ specialeffect(EF_BEGINSPELL7, AREA, getnpcid("#doppelganger2"));
mes "[Male Voice]";
mes "Lowen!";
mes "Noooooooooo!!!";
diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt
index 4363a6a27..ea01a926d 100644
--- a/npc/quests/thana_quest.txt
+++ b/npc/quests/thana_quest.txt
@@ -2088,11 +2088,11 @@ OnTimer1000:
OnTimer5000:
.@pillar = 1;
OnTimer3000:
- specialeffect(EF_BEGINSPELL7, AREA, getnpcid(0, "#tteffect05"));
- specialeffect(EF_BEGINSPELL3, AREA, getnpcid(0, "#tteffect04"));
- specialeffect(EF_BEGINSPELL2, AREA, getnpcid(0, "#tteffect03"));
- specialeffect(EF_BEGINSPELL4, AREA, getnpcid(0, "#tteffect02"));
- specialeffect(EF_BEGINSPELL5, AREA, getnpcid(0, "#tteffect01"));
+ specialeffect(EF_BEGINSPELL7, AREA, getnpcid("#tteffect05"));
+ specialeffect(EF_BEGINSPELL3, AREA, getnpcid("#tteffect04"));
+ specialeffect(EF_BEGINSPELL2, AREA, getnpcid("#tteffect03"));
+ specialeffect(EF_BEGINSPELL4, AREA, getnpcid("#tteffect02"));
+ specialeffect(EF_BEGINSPELL5, AREA, getnpcid("#tteffect01"));
if (.@pillar) specialeffect EF_MAPPILLAR2;
end;
}
@@ -2235,8 +2235,8 @@ OnDisable:
thana_boss,141,218,0 script #sommon_thanatos FAKE_NPC,{
OnEnable:
- specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, "#sommon_thanatos"));
- specialeffect(EF_SEISMICWEAPON, AREA, getnpcid(0, "#sommon_thanatos"));
+ specialeffect(EF_MAPPILLAR2, AREA, getnpcid("#sommon_thanatos"));
+ specialeffect(EF_SEISMICWEAPON, AREA, getnpcid("#sommon_thanatos"));
monster "thana_boss",141,218,"Thanatos Phantom",1708,1,"#sommon_thanatos::OnMyMobDead";
end;
OnMyMobDead:
diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt
index 064cdc461..d8bac5986 100644
--- a/npc/re/cities/dewata.txt
+++ b/npc/re/cities/dewata.txt
@@ -569,10 +569,10 @@ dewata,89,191,6 script Small Shrine#dew1 CLEAR_NPC,{
L_Wish:
mes "Mysterious energy comes out from the shrine.";
- specialeffect(EF_FLASHER, AREA, getnpcid(0, "Small Shrine#dew1"));
- specialeffect(EF_FLASHER, AREA, getnpcid(0, "Small Shrine#dew2"));
- specialeffect(EF_FLASHER, AREA, getnpcid(0, "Small Shrine#dew3"));
- specialeffect(EF_FLASHER, AREA, getnpcid(0, "Small Shrine#dew4"));
+ specialeffect(EF_FLASHER, AREA, getnpcid("Small Shrine#dew1"));
+ specialeffect(EF_FLASHER, AREA, getnpcid("Small Shrine#dew2"));
+ specialeffect(EF_FLASHER, AREA, getnpcid("Small Shrine#dew3"));
+ specialeffect(EF_FLASHER, AREA, getnpcid("Small Shrine#dew4"));
next;
mes "You have received the shrine's blessing.";
specialeffect(EF_BLESSING, AREA, playerattached());
diff --git a/npc/re/events/halloween_2014.txt b/npc/re/events/halloween_2014.txt
index 50786f2e9..fbfb417bb 100644
--- a/npc/re/events/halloween_2014.txt
+++ b/npc/re/events/halloween_2014.txt
@@ -170,7 +170,7 @@
mes "[Mighty Priest]";
mes "Dear Odin, show me your love!";
mes "Heal me with your love! Great!! Bam!!!!!";
- specialeffect(EF_HEAL2, AREA, getnpcid(0, "Exhausted Priest#pron14hal"));
+ specialeffect(EF_HEAL2, AREA, getnpcid("Exhausted Priest#pron14hal"));
emotion e_swt, 1;
next;
mes "[Mighty Priest]";
@@ -1373,8 +1373,8 @@ niflheim,193,186,6 script Bonfire Spirit#14hal 4_TRACE,{
OnTimer21000:
OnTimer23000:
OnTimer25000:
- specialeffect(EF_TORCH, AREA, getnpcid(0, "Bonfire Spirit#14hal"));
- specialeffect(EF_DRAGONSMOKE, AREA, getnpcid(0, "Bonfire Spirit#14hal"));
+ specialeffect(EF_TORCH, AREA, getnpcid("Bonfire Spirit#14hal"));
+ specialeffect(EF_DRAGONSMOKE, AREA, getnpcid("Bonfire Spirit#14hal"));
end;
OnTimer5000:
@@ -1383,16 +1383,16 @@ niflheim,193,186,6 script Bonfire Spirit#14hal 4_TRACE,{
OnTimer13000:
OnTimer14000:
OnTimer16000:
- specialeffect(EF_DRAGONSMOKE, AREA, getnpcid(0, "Bonfire Spirit#14hal"));
+ specialeffect(EF_DRAGONSMOKE, AREA, getnpcid("Bonfire Spirit#14hal"));
end;
OnTimer19000:
npctalk "Oh, No! The fire is dying!!!! Fire!!!!!!!!!!!!";
- specialeffect(EF_DRAGONSMOKE, AREA, getnpcid(0, "Bonfire Spirit#14hal"));
+ specialeffect(EF_DRAGONSMOKE, AREA, getnpcid("Bonfire Spirit#14hal"));
end;
OnTimer20000:
- specialeffect(EF_SIGHTRASHER, AREA, getnpcid(0, "Bonfire Spirit#14hal"));
+ specialeffect(EF_SIGHTRASHER, AREA, getnpcid("Bonfire Spirit#14hal"));
end;
OnTimer27000:
@@ -1543,7 +1543,7 @@ prt_church,96,91,4 script Spiritual Sister#14hal 1_F_PRIEST,5,5,{
mes "This is enough. I can make it soon.";
mes "Odin Crystal power! with Holy light!!!!";
next;
- specialeffect(EF_HOLYHIT, AREA, getnpcid(0, "Spiritual Sister#14hal"));
+ specialeffect(EF_HOLYHIT, AREA, getnpcid("Spiritual Sister#14hal"));
mes "[Sister Haley]";
mes "Whoa~ It's done.";
mes "Hold ^0000cd this in your pocket^000000 and go to the crowd with live and dead ones, you will see who is dead or live.";
@@ -1691,7 +1691,7 @@ xmas_in,160,175,1 script Worried Wife#14hal 4_F_05,{
mes "["+strcharinfo(PC_NAME)+"]";
mes "It's almost ran out.. Why not he wakes up..";
mes "Oh!!";
- specialeffect(EF_RESURRECTION, AREA, getnpcid(0, "Richard#14hal02"));
+ specialeffect(EF_RESURRECTION, AREA, getnpcid("Richard#14hal02"));
next;
mes "[Richard]";
mes "Uhh.. Umm..";
@@ -1726,7 +1726,7 @@ xmas_in,160,175,1 script Worried Wife#14hal 4_F_05,{
next;
mes "[Richard's Daughter]";
mes "Dad!!!";
- specialeffect(EF_SONICBLOWHIT, AREA, getnpcid(0, "Richard#14hal02"));
+ specialeffect(EF_SONICBLOWHIT, AREA, getnpcid("Richard#14hal02"));
next;
mes "[Richard]";
mes "O, Ouch!!!";
diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt
index 6972322e1..4af583879 100644
--- a/npc/re/instances/BangungotHospital.txt
+++ b/npc/re/instances/BangungotHospital.txt
@@ -404,7 +404,7 @@ OnInstanceInit:
disablenpc instance_npcname("#Memorial Start_time");
end;
OnEnable:
- specialeffect(EF_BAT2, AREA, getnpcid(0, instance_npcname("#Memorial Start")));
+ specialeffect(EF_BAT2, AREA, getnpcid(instance_npcname("#Memorial Start")));
initnpctimer;
end;
OnDisable:
@@ -890,19 +890,19 @@ OnStopTimer:
end;
OnTimer1000:
mapannounce instance_mapname("1@ma_h"),"- Bangungot's Pillar of Spirit is curing Bangungot. If you don't hunt it now, he will fully recover!! -",bc_map,"0xFF8200";
- specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, instance_npcname("#Patternwarp45")));
+ specialeffect(EF_MAPPILLAR2, AREA, getnpcid(instance_npcname("#Patternwarp45")));
end;
OnTimer7000:
mapannounce instance_mapname("1@ma_h"),"Bangungot: I never die!!!!",bc_map,"0xFF82FF";
- specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, instance_npcname("#Patternwarp45")));
+ specialeffect(EF_MAPPILLAR2, AREA, getnpcid(instance_npcname("#Patternwarp45")));
end;
OnTimer14000:
mapannounce instance_mapname("1@ma_h"),"Bangungot: If you dare, kill me!! I will revive soon!!!",bc_map,"0xFF82FF";
- specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, instance_npcname("#Patternwarp45")));
+ specialeffect(EF_MAPPILLAR2, AREA, getnpcid(instance_npcname("#Patternwarp45")));
end;
OnTimer21000:
mapannounce instance_mapname("1@ma_h"),"Bangungot: I cannot die this way...!!!!",bc_map,"0xFF82FF";
- specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, instance_npcname("#Patternwarp45")));
+ specialeffect(EF_MAPPILLAR2, AREA, getnpcid(instance_npcname("#Patternwarp45")));
end;
OnTimer30000:
donpcevent instance_npcname("#Summon Pillar")+"::OnReset";
diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt
index efb32be7e..3bbb74ad1 100644
--- a/npc/re/instances/WolfchevLaboratory.txt
+++ b/npc/re/instances/WolfchevLaboratory.txt
@@ -1108,7 +1108,7 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{
if (.@menu==2){ .@equip_card[3] = 0; }
else { .@equip_card[2] = 0; }
.@equip_item = getequipid(.@position);
- specialeffect(EF_BEGINSPELL2, AREA, getnpcid(0, "Sorcerer#Bio4Reward"));
+ specialeffect(EF_BEGINSPELL2, AREA, getnpcid("Sorcerer#Bio4Reward"));
progressbar "ffff00", 2;
specialeffect(EF_FROSTWEAPON, AREA, playerattached());
delitem Goast_Chill, 10;
@@ -1303,7 +1303,7 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{
setarray .@equip_card[0], getequipcardid(.@position,0),getequipcardid(.@position,1),getequipcardid(.@position,2),getequipcardid(.@position,3);
.@equip_card[(.@socket_type-1)] = .@enchant;
.@equip_item = getequipid(.@position);
- specialeffect(EF_BEGINSPELL3, AREA, getnpcid(0, "Sorcerer#Bio4Reward"));
+ specialeffect(EF_BEGINSPELL3, AREA, getnpcid("Sorcerer#Bio4Reward"));
progressbar "ffff00", 2;
if (.@socket_type == 3)
delitem Blood_Thirst, 10;
@@ -1608,42 +1608,42 @@ que_lhz,1,1,0 script #Eventctrl FAKE_NPC,{
end;
OnTimer1000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#01"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("#01"));
specialeffect EF_BEGINASURA, "Human Guinea pig#01";
end;
OnTimer2000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#02"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("#02"));
specialeffect EF_BEGINASURA, "Human Guinea pig#02";
end;
OnTimer3000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#03"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("#03"));
specialeffect EF_BEGINASURA, "Human Guinea pig#03";
end;
OnTimer4000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#04"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("#04"));
specialeffect EF_BEGINASURA, "Human Guinea pig#04";
end;
OnTimer5000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#05"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("#05"));
specialeffect EF_BEGINASURA, "Human Guinea pig#05";
end;
OnTimer6000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#06"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("#06"));
specialeffect EF_BEGINASURA, "Human Guinea pig#06";
end;
OnTimer7000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#07"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("#07"));
specialeffect EF_BEGINASURA, "Human Guinea pig#07";
end;
OnTimer8000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#08"));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid("#08"));
specialeffect EF_BEGINASURA, "Human Guinea pig#08";
stopnpctimer;
end;
@@ -2441,7 +2441,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{
OnTimer63000:
for(.@i = 1; .@i < 7; .@i++) {
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, instance_npcname("Valve#2_"+.@i+"")));
+ specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid( instance_npcname("Valve#2_"+.@i+"")));
disablenpc instance_npcname("Valve#2_"+.@i+"");
}
'broken_pipes += 1;
@@ -2845,73 +2845,73 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{
OnTimer1000:
mapannounce instance_mapname("1@lhz"),"Whisper: Who are you....",bc_map,"0x7DCBF0";
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Seyren Windsor#boss01")));
+ specialeffect(EF_SPHERE, AREA, getnpcid(instance_npcname("Seyren Windsor#boss01")));
end;
OnTimer2000:
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Cecile Damon#boss02")));
+ specialeffect(EF_SPHERE, AREA, getnpcid(instance_npcname("Cecile Damon#boss02")));
end;
OnTimer3000:
mapannounce instance_mapname("1@lhz"),"Whisper: Do not approach more...",bc_map,"0x7DCBF0";
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Gertie Wie#boss03")));
+ specialeffect(EF_SPHERE, AREA, getnpcid(instance_npcname("Gertie Wie#boss03")));
end;
OnTimer4000:
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Eremes Guile#boss04")));
+ specialeffect(EF_SPHERE, AREA, getnpcid(instance_npcname("Eremes Guile#boss04")));
end;
OnTimer5000:
mapannounce instance_mapname("1@lhz"),"Whisper: This is a very dangerous place..",bc_map,"0x7DCBF0";
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Trentini#boss05")));
+ specialeffect(EF_SPHERE, AREA, getnpcid(instance_npcname("Trentini#boss05")));
end;
OnTimer6000:
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Chen Liu#boss06")));
+ specialeffect(EF_SPHERE, AREA, getnpcid(instance_npcname("Chen Liu#boss06")));
end;
OnTimer7000:
mapannounce instance_mapname("1@lhz"),"Whisper: You won't go out alive....",bc_map,"0x7DCBF0";
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Alphochio Basil#boss07")));
+ specialeffect(EF_SPHERE, AREA, getnpcid(instance_npcname("Alphochio Basil#boss07")));
end;
OnTimer8000:
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Flamel Emul#boss08")));
+ specialeffect(EF_SPHERE, AREA, getnpcid(instance_npcname("Flamel Emul#boss08")));
end;
OnTimer9000:
mapannounce instance_mapname("1@lhz"),"Whisper: If you don't want to be a part of us....",bc_map,"0x7DCBF0";
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Randel Lawrence#boss09")));
+ specialeffect(EF_SPHERE, AREA, getnpcid(instance_npcname("Randel Lawrence#boss09")));
end;
OnTimer10000:
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Celia Alde#boss10")));
+ specialeffect(EF_SPHERE, AREA, getnpcid(instance_npcname("Celia Alde#boss10")));
end;
OnTimer11000:
mapannounce instance_mapname("1@lhz"),"Whisper: Leave now....",bc_map,"0x7DCBF0";
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Kathryne Keyron#boss11")));
+ specialeffect(EF_SPHERE, AREA, getnpcid(instance_npcname("Kathryne Keyron#boss11")));
end;
OnTimer12000:
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Margaretha Sorin#boss12")));
+ specialeffect(EF_SPHERE, AREA, getnpcid(instance_npcname("Margaretha Sorin#boss12")));
end;
OnTimer13000:
mapannounce instance_mapname("1@lhz"),"Whisper: Before this place is thoroughly filled with sorrow and pain....",bc_map,"0x7DCBF0";
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Howard Alt-Eisen#boss13")));
+ specialeffect(EF_SPHERE, AREA, getnpcid(instance_npcname("Howard Alt-Eisen#boss13")));
end;
OnTimer14000:
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Type_**Gren#boss14")));
+ specialeffect(EF_SPHERE, AREA, getnpcid(instance_npcname("Type_**Gren#boss14")));
end;
OnTimer15000:
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Type_**Roke#boss15")));
+ specialeffect(EF_SPHERE, AREA, getnpcid(instance_npcname("Type_**Roke#boss15")));
end;
OnTimer16000:
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Type_**Dree#boss16")));
+ specialeffect(EF_SPHERE, AREA, getnpcid(instance_npcname("Type_**Dree#boss16")));
end;
OnTimer17000:
diff --git a/npc/re/jobs/2e/kagerou_oboro.txt b/npc/re/jobs/2e/kagerou_oboro.txt
index efb1faf03..5c54a0114 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, getnpcid(0, "Crafting Tools#ko_01"));
+ specialeffect(EF_GUIDEDATTACK, AREA, getnpcid("Crafting Tools#ko_01"));
mes "[Red Leopard Joe]";
mes "Feel free to use tools from here, and...";
next;
- specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Crafting Tools#ko_02"));
+ specialeffect(EF_GUIDEDATTACK, AREA, getnpcid("Crafting Tools#ko_02"));
mes "[Red Leopard Joe]";
mes "...there...";
next;
- specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Crafting Tools#ko_03"));
+ specialeffect(EF_GUIDEDATTACK, AREA, getnpcid("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, getnpcid(0, "Crafting Tools#ko_01"));
+ specialeffect(EF_GUIDEDATTACK, AREA, getnpcid("Crafting Tools#ko_01"));
mes "[Red Leopard Joe]";
mes "Feel free to use tools from here, and...";
next;
- specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Crafting Tools#ko_02"));
+ specialeffect(EF_GUIDEDATTACK, AREA, getnpcid("Crafting Tools#ko_02"));
mes "[Red Leopard Joe]";
mes "...there...";
next;
- specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Crafting Tools#ko_03"));
+ specialeffect(EF_GUIDEDATTACK, AREA, getnpcid("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, getnpcid(0, "Drawer#ko"));
+ specialeffect(EF_GUIDEDATTACK, AREA, getnpcid("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 6b04533db..e59492ce5 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, getnpcid(0, "Valkyrie Anguhilde#end"));
+ specialeffect(EF_CLOAKING, AREA, getnpcid("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 e85819f97..d9fb1bce6 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, getnpcid(0, "#from1to2gen"));
+ specialeffect(EF_REPAIRWEAPON, AREA, getnpcid("#from1to2gen"));
mes "- (Screeching Sounds)!!! -";
mes "- (Screeching)!!! -";
next;
- specialeffect(EF_CRASHEARTH, AREA, getnpcid(0, "#from1to2gen"));
+ specialeffect(EF_CRASHEARTH, AREA, getnpcid("#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, getnpcid(0, "Super Cultivator#gen"));
- specialeffect(EF_PHARMACY_OK, AREA, getnpcid(0, "Super Cultivator#gen"));
+ specialeffect(EF_FLASHER, AREA, getnpcid("Super Cultivator#gen"));
+ specialeffect(EF_PHARMACY_OK, AREA, getnpcid("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, getnpcid(0, "Super Cultivator#gen"));
- specialeffect(EF_PHARMACY_FAIL, AREA, getnpcid(0, "Super Cultivator#gen"));
+ specialeffect(EF_SPELLBREAKER, AREA, getnpcid("Super Cultivator#gen"));
+ specialeffect(EF_PHARMACY_FAIL, AREA, getnpcid("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 567469d46..63e689acc 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, getnpcid(0, "King Crab#job_shu"));
- specialeffect(EF_FIRESPLASHHIT, AREA, getnpcid(0, "Sludge Worm#job_shu"));
+ specialeffect(EF_FIRESPLASHHIT, AREA, getnpcid("King Crab#job_shu"));
+ specialeffect(EF_FIRESPLASHHIT, AREA, getnpcid("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 a69f7008d..3b260d3db 100644
--- a/npc/re/jobs/novice/academy.txt
+++ b/npc/re/jobs/novice/academy.txt
@@ -2328,7 +2328,7 @@ izlude,140,249,7 script Academy Student#0 4_M_NOV_RUMIN,{
close();
}
if (questprogress(7478) == 1 && !questprogress(7479)) {
- specialeffect(EF_STEAL, AREA, getnpcid(0, "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN)));
+ specialeffect(EF_STEAL, AREA, getnpcid("Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN)));
donpcevent("Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnDisable");
emotion(e_gasp, 1);
emotion(e_heh);
@@ -5693,7 +5693,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, getnpcid(0, "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN)));
+ specialeffect(EF_PORTAL, AREA, getnpcid("Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN)));
mes("[Etinifni]");
mes("What's up? Where am I?");
next();
@@ -5779,7 +5779,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, getnpcid(0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN)));
+ specialeffect(EF_HEARTCASTING, AREA, getnpcid("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~");
@@ -5813,7 +5813,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, getnpcid(0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN)));
+ specialeffect(EF_HEARTCASTING, AREA, getnpcid("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!!!");
@@ -5821,7 +5821,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, getnpcid(0, "Romantic Male#"+strnpcinfo(NPC_NAME_HIDDEN)));
+ specialeffect(EF_HEARTCASTING, AREA, getnpcid("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!!!");
diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt
index 874e514a3..aae9a5566 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, getnpcid(0, "Suhnmi#eden"));
- specialeffect(EF_REFINEOK, AREA, getnpcid(0, "Mighty Hammer#ed"));
+ specialeffect(EF_REFINEOK, AREA, getnpcid("Suhnmi#eden"));
+ specialeffect(EF_REFINEOK, AREA, getnpcid("Mighty Hammer#ed"));
initnpctimer;
end;
}
diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt
index ad7aed094..4a60fd2bb 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, getnpcid(0, "Poring#bra"));
+ specialeffect(EF_POISONHIT, AREA, getnpcid("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, getnpcid(0, "Jaguar#bra"));
+ specialeffect(EF_HIT1, AREA, getnpcid("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, getnpcid(0, "Recluse#bra"));
+ specialeffect(EF_POTION7, AREA, getnpcid("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 542b7c2cd..091d8527a 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, getnpcid(0, "Bushes#ma"));
+ specialeffect(EF_STEAL, AREA, getnpcid("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, getnpcid(0, "Bushes#ma"));
+ specialeffect(EF_STEAL, AREA, getnpcid("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, 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"));
+ specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid("Ancient Grudge#01"));
+ specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid("Ancient Grudge#02"));
+ specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid("Ancient Grudge#03"));
+ specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid("Ancient Grudge#04"));
+ specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid("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, 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"));
+ specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid("Ancient Grudge#01"));
+ specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid("Ancient Grudge#02"));
+ specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid("Ancient Grudge#03"));
+ specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid("Ancient Grudge#04"));
+ specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid("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/src/map/script.c b/src/map/script.c
index fc1ece663..8c09bb8d8 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -8698,32 +8698,23 @@ static BUILDIN(getcharid)
return true;
}
+
/*==========================================
* returns the GID of an NPC
*------------------------------------------*/
static BUILDIN(getnpcid)
{
- int num = script_getnum(st,2);
- struct npc_data* nd = NULL;
-
- if( script_hasdata(st,3) )
- {// unique npc name
- if( ( nd = npc->name2id(script_getstr(st,3)) ) == NULL )
- {
- ShowError("buildin_getnpcid: No such NPC '%s'.\n", script_getstr(st,3));
- script_pushint(st,0);
- return false;
+ if (script_hasdata(st, 2)) {
+ if (script_isinttype(st, 2)) {
+ // Deprecate old form - getnpcid(<type>{, <"npc name">})
+ ShowWarning("buildin_getnpcid: Use of type is deprecated. Format - getnpcid({<\"npc name\">})\n");
+ script_pushint(st, 0);
+ } else {
+ struct npc_data *nd = npc->name2id(script_getstr(st, 2));
+ script_pushint(st, (nd != NULL) ? nd->bl.id : 0);
}
- }
-
- switch (num) {
- case 0:
- script_pushint(st,nd ? nd->bl.id : st->oid);
- break;
- default:
- ShowError("buildin_getnpcid: invalid parameter (%d).\n", num);
- script_pushint(st,0);
- return false;
+ } else {
+ script_pushint(st, st->oid);
}
return true;
@@ -25016,7 +25007,7 @@ static void script_parse_builtin(void)
BUILDIN_DEF(readparam,"i?"),
BUILDIN_DEF(setparam,"ii?"),
BUILDIN_DEF(getcharid,"i?"),
- BUILDIN_DEF(getnpcid,"i?"),
+ BUILDIN_DEF(getnpcid, "?"),
BUILDIN_DEF(getpartyname,"i"),
BUILDIN_DEF(getpartymember,"i?"),
BUILDIN_DEF(getpartyleader,"i?"),