summaryrefslogtreecommitdiff
path: root/npc/cities
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 /npc/cities
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.
Diffstat (limited to 'npc/cities')
-rw-r--r--npc/cities/jawaii.txt4
-rw-r--r--npc/cities/morocc.txt2
2 files changed, 3 insertions, 3 deletions
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.";