summaryrefslogtreecommitdiff
path: root/npc/events
diff options
context:
space:
mode:
Diffstat (limited to 'npc/events')
-rw-r--r--npc/events/dumplingfestival.txt6
-rw-r--r--npc/events/whiteday.txt6
-rw-r--r--npc/events/xmas.txt4
3 files changed, 8 insertions, 8 deletions
diff --git a/npc/events/dumplingfestival.txt b/npc/events/dumplingfestival.txt
index 1c94548f9..04a8b7f4c 100644
--- a/npc/events/dumplingfestival.txt
+++ b/npc/events/dumplingfestival.txt
@@ -37,7 +37,7 @@ payon,93,81,4 script Exorcist Master Fahae 4_M_BUDDHIST,{
input @input;
if(@input==0) close;
if(@input>5) goto L_SORRY;
- if(Zeny< @input*20000) goto L_NOZENY;
+ if(Zeny< @input*20000) goto L_NoZeny;
set Zeny,Zeny-20000*@input;
getitem 682,@input;
mes "[Exorcist Master Fahae]";
@@ -64,14 +64,14 @@ M_HERB:
input @input;
if(@input==0) close;
if(@input>5) goto L_SORRY;
- if(Zeny< @input*10000) goto L_NOZENY;
+ if(Zeny< @input*10000) goto L_NoZeny;
set Zeny,Zeny-10000*@input;
getitem 683,@input;
mes "[Exorcist Master Fahae]";
mes "Here you go, I hope you may succeed in my quest.";
close;
-L_NOZENY:
+L_NoZeny:
mes "[Exorcist Master Fahae]";
mes "Money doesn't bring joy to everyone, but we need it to support the temple and myself. Please, try to kill some monsters and take their drops.";
close;
diff --git a/npc/events/whiteday.txt b/npc/events/whiteday.txt
index 7e921ed97..472f0030b 100644
--- a/npc/events/whiteday.txt
+++ b/npc/events/whiteday.txt
@@ -29,7 +29,7 @@ alberta,188,64,4 script Sugar 4_F_02,{
mes "heartfelt like";
mes "the sweetness of the present some how.";
next;
- menu "Please give me!",-,"I don't need it.",M_END,"The teacher.",M_L1;
+ menu "Please give me!",-,"I don't need it.",M_End,"The teacher.",M_L1;
mes "[Sugar]";
mes "Yes!";
@@ -69,7 +69,7 @@ L0_3:
L_INPUT:
input @maplenum;
if (@maplenum > 5) goto L_ERROR;
- if (@maplenum == 0) goto M_END;
+ if (@maplenum == 0) goto M_End;
set @maplePriceT,@maplePrice*@maplenum;
if (Zeny < @maplePriceT) goto L_ERROR2;
set Zeny,Zeny- @maplePriceT;
@@ -115,7 +115,7 @@ L_ERROR2:
mes "I will ask you to check your money first.";
close;
-M_END:
+M_End:
mes "[Sugar]";
mes "Really .... You might regret it..";
mes "If you change your mind.";
diff --git a/npc/events/xmas.txt b/npc/events/xmas.txt
index 37b91e6e0..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 4_M_SANTA,{
+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;
}