diff options
author | jtoelke <jtoelke@gmx.de> | 2013-06-28 13:18:17 -0700 |
---|---|---|
committer | jtoelke <jtoelke@gmx.de> | 2013-06-28 13:18:17 -0700 |
commit | e8a4dddb3b54814713c411a094fc1a9b90492962 (patch) | |
tree | 3856e10b80ae965d42b477354a3e5d79c3b04cfb /world/map/npc/halloween/2008/prize_master.txt | |
parent | d6d562b4a7bf157a36c0560be4ec14f9f463aa86 (diff) | |
parent | bc66a98377575c7c8e9592e50cbdcf083d6ecaff (diff) | |
download | serverdata-e8a4dddb3b54814713c411a094fc1a9b90492962.tar.gz serverdata-e8a4dddb3b54814713c411a094fc1a9b90492962.tar.bz2 serverdata-e8a4dddb3b54814713c411a094fc1a9b90492962.tar.xz serverdata-e8a4dddb3b54814713c411a094fc1a9b90492962.zip |
Merge pull request #20 from o11c/master
Refactor callfunc and callsub out of if statements
Diffstat (limited to 'world/map/npc/halloween/2008/prize_master.txt')
-rw-r--r-- | world/map/npc/halloween/2008/prize_master.txt | 17 |
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: |