summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsheraf <Asheraf@users.noreply.github.com>2019-01-13 19:56:58 +0000
committerGitHub <noreply@github.com>2019-01-13 19:56:58 +0000
commitd546553b59abf8b688b2aacb8472e5f8751da361 (patch)
treef670727c8b688a9f4fbd29ed4a970049e4fbdbe0
parent406ae363a78527fa1189cf29ab322e0a9146e330 (diff)
parentf376988cedf2da4529d95317f3b5f73a38dfa5f9 (diff)
downloadhercules-d546553b59abf8b688b2aacb8472e5f8751da361.tar.gz
hercules-d546553b59abf8b688b2aacb8472e5f8751da361.tar.bz2
hercules-d546553b59abf8b688b2aacb8472e5f8751da361.tar.xz
hercules-d546553b59abf8b688b2aacb8472e5f8751da361.zip
Merge pull request #2351 from AnnieRuru/49-disguise
Fix a bug that causes disguise event to run indefinitely
-rw-r--r--npc/custom/events/disguise.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/npc/custom/events/disguise.txt b/npc/custom/events/disguise.txt
index b9071d162..fde5e544a 100644
--- a/npc/custom/events/disguise.txt
+++ b/npc/custom/events/disguise.txt
@@ -8,6 +8,7 @@
//= Note: This script requires PCRE to run properly.
//= 5.0 Last update by GmOcean.
//= 5.1 Cleaned and standardized, mostly. [Euphy]
+//= 5.2 Fix a bug that causes this event run indefinitely [AnnieRuru]
//============================================================
prontera,160,155,4 script Disguise Event 4_M_NFDEADMAN,{
@@ -183,6 +184,15 @@ OnTimer30000:
deletepset 1;
stopnpctimer;
setnpctimer 0;
+ ++.RoundCount;
+ if (.RoundCount >= .Rounds) {
+ setnpcdisplay "Disguise Event", 4_M_NFDEADMAN;
+ .RoundCount = 0;
+ .Change = 0;
+ .EventON = 0;
+ npctalk "Thank you all for playing. That was the last round of the Disguise Event. Come play again later.";
+ end;
+ }
initnpctimer;
end;
OnTimer60000: