diff options
author | shennetsind <ind@henn.et> | 2013-11-07 17:06:41 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-11-07 17:06:41 -0200 |
commit | 951b18c97a09426e2f14801263c2fd07efbd46bb (patch) | |
tree | 94303465410557176454305aeeab76a13ca8514d /npc/custom/events/disguise.txt | |
parent | 8083daec0d94f78510411c9b225abcfa7e829e95 (diff) | |
parent | 9f32aa958f86a228290c43544c8b9bbf3f1c2cc0 (diff) | |
download | hercules-951b18c97a09426e2f14801263c2fd07efbd46bb.tar.gz hercules-951b18c97a09426e2f14801263c2fd07efbd46bb.tar.bz2 hercules-951b18c97a09426e2f14801263c2fd07efbd46bb.tar.xz hercules-951b18c97a09426e2f14801263c2fd07efbd46bb.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'npc/custom/events/disguise.txt')
-rw-r--r-- | npc/custom/events/disguise.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/custom/events/disguise.txt b/npc/custom/events/disguise.txt index 1b46e9b16..a1d8c11c3 100644 --- a/npc/custom/events/disguise.txt +++ b/npc/custom/events/disguise.txt @@ -38,7 +38,7 @@ prontera,160,155,4 script Disguise Event 4_M_NFDEADMAN,{ setnpctimer 0; stopnpctimer; announce "A GM has decided to turn the Disguise Event off. As a result no further prizes will be given.",bc_map | bc_blue; deletepset 1; - setnpcdisplay "Disguise Event",795; + setnpcdisplay "Disguise Event", 4_M_NFDEADMAN; close; } set .EventON,1; set .Timer,1; setnpctimer 0; initnpctimer; @@ -171,7 +171,7 @@ OnTimer10000: OnTimer30000: if (.Timer) end; set .Change,0; - setnpcdisplay "Disguise Event",795; + setnpcdisplay "Disguise Event", 4_M_NFDEADMAN; npctalk "You took too long to guess what I was. Please wait 10 seconds while I disguise again."; specialeffect 725; set $MonsterName$,""; @@ -230,13 +230,13 @@ iCorrect: getitem .Prize,.PrizeAmt; announce strcharinfo(0)+" is correct! I was disguised as: "+$MonsterName$+"",bc_map | bc_blue; if (.RoundCount>=.Rounds) { - setnpcdisplay "Disguise Event",795; + setnpcdisplay "Disguise Event", 4_M_NFDEADMAN; set .RoundCount,0; set .Change,0; set .EventON,0; setnpctimer 0; stopnpctimer; npctalk "Thank you all for playing. That was the last round of the Disguise Event. Come play again later."; end; } - setnpcdisplay "Disguise Event",795; + setnpcdisplay "Disguise Event", 4_M_NFDEADMAN; set .Change,0; setnpctimer 0; end; |