summaryrefslogtreecommitdiff
path: root/npc/events/xmas.txt
diff options
context:
space:
mode:
authorAtlantisRO <atlas@atlantis-ro.net>2017-01-18 00:36:32 -0700
committerAtlantisRO <atlas@atlantis-ro.net>2017-03-08 18:46:51 -0700
commit060c4ba50162363315f2f50b35cad931e2b75ec9 (patch)
tree14eea2a8bf638823be6364c494e8443cda21cba3 /npc/events/xmas.txt
parent7d7b08b52250951da969e2680d10719a686dcd3c (diff)
downloadhercules-060c4ba50162363315f2f50b35cad931e2b75ec9.tar.gz
hercules-060c4ba50162363315f2f50b35cad931e2b75ec9.tar.bz2
hercules-060c4ba50162363315f2f50b35cad931e2b75ec9.tar.xz
hercules-060c4ba50162363315f2f50b35cad931e2b75ec9.zip
Removed the usage of deprecated command goto from npc scripts (except custom folder).
Signed-off-by: Ragno <ragno@atlantis-ro.net>
Diffstat (limited to 'npc/events/xmas.txt')
-rw-r--r--npc/events/xmas.txt30
1 files changed, 14 insertions, 16 deletions
diff --git a/npc/events/xmas.txt b/npc/events/xmas.txt
index a6308b867..7419bc4bc 100644
--- a/npc/events/xmas.txt
+++ b/npc/events/xmas.txt
@@ -44,15 +44,14 @@
xmas_in,100,96,4 script Santa Claus::Santa2 4_M_SANTA,{
mes "[Santa Claus]";
if(xmas_npc==0) xmas_npc = 1; // For Lutie & Bard quest
- if(#event_xmas > 0 && #event_xmas < 30 ) goto L_Start;
- mes "Merry Christmas!";
- if(Class==0 || #event_xmas>=30 ) close; //anti exploit protection
- mes "I have a gift for you! Ho Ho Ho!";
- getitem rand(664,667),1; //gives one of 4 gift boxes
- ++#event_xmas;
- close;
-
-L_Start:
+ if(#event_xmas <= 0 || #event_xmas >= 30 ) {
+ mes "Merry Christmas!";
+ if(Class==0 || #event_xmas>=30 ) close; //anti exploit protection
+ mes "I have a gift for you! Ho Ho Ho!";
+ getitem rand(664,667),1; //gives one of 4 gift boxes
+ ++#event_xmas;
+ close;
+ }
mes "I'm having a bit of a problem...";
mes "Do you care to listen?";
next;
@@ -98,7 +97,12 @@ L_Start:
close;
case 2: // Give proof
mes "[Santa Claus]";
- if(countitem(Red_Socks_With_Holes) < 3) goto L_NotEnuf;
+ if(countitem(Red_Socks_With_Holes) < 3) {
+ mes "You don't have enough socks as proof.";
+ mes "Go take down those evil Santas";
+ mes "and get more for me and I'll reward you.";
+ close;
+ }
delitem 7034,3;
mes "Seems you've been doing a";
mes "good job of taking down those";
@@ -111,12 +115,6 @@ L_Start:
mes "If you get 3 more, I'll give you another.";
mes "Hope you get a good item.";
close;
-
- L_NotEnuf:
- mes "You don't have enough socks as proof.";
- mes "Go take down those evil Santas";
- mes "and get more for me and I'll reward you.";
- close;
default: // Cancel
mes "[Santa Claus]";
mes "I see. Well, at the very least";