summaryrefslogtreecommitdiff
path: root/npc/events/xmas.txt
diff options
context:
space:
mode:
authorHappy <markaizer@gmail.com>2014-08-21 04:50:46 +0800
committerHappy <markaizer@gmail.com>2014-08-21 04:50:46 +0800
commitf52e1007fe08c67003c0bc4c78231904dd3fd5cc (patch)
tree99907d827264e501774e58ab4630e41fa7103c02 /npc/events/xmas.txt
parent2410110dece79b4598c12f1c953219f1d0d1904a (diff)
parent769b1d05aa5cfa8cddfe7d21b35d5c5e4da3bbd6 (diff)
downloadhercules-f52e1007fe08c67003c0bc4c78231904dd3fd5cc.tar.gz
hercules-f52e1007fe08c67003c0bc4c78231904dd3fd5cc.tar.bz2
hercules-f52e1007fe08c67003c0bc4c78231904dd3fd5cc.tar.xz
hercules-f52e1007fe08c67003c0bc4c78231904dd3fd5cc.zip
Merge pull request #1 from HerculesWS/master
Update from original
Diffstat (limited to 'npc/events/xmas.txt')
-rw-r--r--npc/events/xmas.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/events/xmas.txt b/npc/events/xmas.txt
index 99b3fdec9..d8423dda7 100644
--- a/npc/events/xmas.txt
+++ b/npc/events/xmas.txt
@@ -20,7 +20,7 @@
//= 1.4 Added a fix to make Lutie & Bard quests passable during this event [Lupus]
//============================================================
-xmas_in,100,96,4 script Father Christmas::Santa2 718,{
+xmas_in,100,96,4 script Santa Claus::Santa2 4_M_SANTA,{
mes "[Santa Claus]";
if(xmas_npc==0) set xmas_npc, 1; // For Lutie & Bard quest
if(#event_xmas > 0 && #event_xmas < 30 ) goto L_Start;
@@ -104,7 +104,7 @@ L_Start:
close;
OnInit:
- disablenpc "Santa1";
+ disablenpc "Santa Claus";
end;
}