summaryrefslogtreecommitdiff
path: root/world/map/npc/halloween/2008/prize_master.txt
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-07-07 12:51:32 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2013-07-07 12:51:32 +0200
commit0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch)
tree4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/halloween/2008/prize_master.txt
parenta89882b69d9f12499404ca9d471d5a735bc63988 (diff)
parent135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff)
downloadserverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz
serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2
serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz
serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip
Merge remote-tracking branch 'origin/master' into waric
Conflicts: world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/halloween/2008/prize_master.txt')
-rw-r--r--world/map/npc/halloween/2008/prize_master.txt17
1 files changed, 10 insertions, 7 deletions
diff --git a/world/map/npc/halloween/2008/prize_master.txt b/world/map/npc/halloween/2008/prize_master.txt
index d2accb34..34d4236b 100644
--- a/world/map/npc/halloween/2008/prize_master.txt
+++ b/world/map/npc/halloween/2008/prize_master.txt
@@ -3,7 +3,10 @@
010-2.gat,43,32,0 script Prize Master 150,{
if (Halloween08 == 65535) goto L_Finished;
- if (Halloween08 == 0) callsub S_Explain;
+ if (Halloween08 != 0) goto L_DidExplain;
+ callsub S_Explain;
+
+L_DidExplain:
// Get detailed info about equipment
callfunc "ProcessEquip";
@@ -59,7 +62,7 @@ L_Pumpkin_Done:
mes "[Prize Master]";
mes "\"I think I've seen this Jack O before.\"";
close;
-
+
@@ -76,7 +79,7 @@ L_Axe_Done:
mes "[Prize Master]";
mes "\"You've pulled the axe on me already.\"";
close;
-
+
@@ -197,7 +200,7 @@ L_GradCap_Done:
mes "[Prize Master]";
mes "\"Sorry, professor, but I've already seen you.\"";
close;
-
+
@@ -222,7 +225,7 @@ L_NohMask_Done:
mes "\"I've caught you trying to get another prize for the same mask.\"";
close;
-
+
@@ -366,9 +369,9 @@ L_BCowboy_BadTorso:
mes "[Prize Master]";
mes "\"Fashion doesn't seem to be your forte. Try to match that hat better.\"";
close;
-
-
+
+
L_Antler: