summaryrefslogtreecommitdiff
path: root/npc/events
diff options
context:
space:
mode:
Diffstat (limited to 'npc/events')
-rw-r--r--npc/events/gdevent_sch.txt14
-rw-r--r--npc/events/halloween_2006.txt4
2 files changed, 9 insertions, 9 deletions
diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt
index 19ef7b8c3..343c21ead 100644
--- a/npc/events/gdevent_sch.txt
+++ b/npc/events/gdevent_sch.txt
@@ -479,19 +479,19 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{
specialeffect EF_POISONHIT;
set .@sprchg_gd,rand(1,5);
if (.@sprchg_gd == 1) {
- setnpcdisplay "Pierrot Pier#sch_gd",950;
+ setnpcdisplay "Pierrot Pier#sch_gd", 4_GHOSTRING;
}
else if (.@sprchg_gd == 2) {
- setnpcdisplay "Pierrot Pier#sch_gd",715;
+ setnpcdisplay "Pierrot Pier#sch_gd", 4_M_PIERROT;
}
else if (.@sprchg_gd == 3) {
- setnpcdisplay "Pierrot Pier#sch_gd",714;
+ setnpcdisplay "Pierrot Pier#sch_gd", 4_F_06;
}
else if (.@sprchg_gd == 4) {
- setnpcdisplay "Pierrot Pier#sch_gd",785;
+ setnpcdisplay "Pierrot Pier#sch_gd", 4_M_UMDANCEKID2;
}
else {
- setnpcdisplay "Pierrot Pier#sch_gd",876;
+ setnpcdisplay "Pierrot Pier#sch_gd", 4_CAT;
}
if (checkweight(1201,1) == 0) {
mes "- Wait!! -";
@@ -505,7 +505,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{
if ($@gdeventv_s2 == 0) {
set .@que_2143,checkquest(2143,PLAYTIME);
if (.@que_2143 == -1) {
- setnpcdisplay "Pierrot Pier#sch_gd",715;
+ setnpcdisplay "Pierrot Pier#sch_gd", 4_M_PIERROT;
mes "A lonely clown is juggling.";
next;
mes "When looked at closely, the clown is just a puppet that looks like a human.";
@@ -844,7 +844,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{
}
else {
if ($@gdeventv_s2 == 0) {
- setnpcdisplay "Pierrot Pier#sch_gd",715;
+ setnpcdisplay "Pierrot Pier#sch_gd", 4_M_PIERROT;
mes "A lonely clown is juggling.";
next;
mes "When looked at closely, the clown is just a puppet that looks like a human.";
diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt
index ba603b207..5bc7c3332 100644
--- a/npc/events/halloween_2006.txt
+++ b/npc/events/halloween_2006.txt
@@ -20,7 +20,7 @@
// Pumpkin Mojo quest (Event 1)
//============================================================
-prontera,162,69,5 script Gloomy Jack#06_hw 1130,2,2,{
+prontera,162,69,5 script Gloomy Jack#06_hw JAKK,2,2,{
end;
OnTouch:
@@ -380,7 +380,7 @@ geffen,145,132,3 script Hoirin#06_hw 4_F_NOVICE,{
}
}
-nif_in,18,34,5 script Loli Ruri#06_hw 1505,2,2,{
+nif_in,18,34,5 script Loli Ruri#06_hw LOLI_RURI,2,2,{
end;
OnTouch: