summaryrefslogtreecommitdiff
path: root/npc/custom/events
diff options
context:
space:
mode:
authorMysteries <mysteriousragnarok@hotmail.com>2013-02-10 22:22:23 -0500
committerMysteries <mysteriousragnarok@hotmail.com>2013-02-10 22:22:23 -0500
commit56a20bb18d6fde61bb82cf160a131eb54d464148 (patch)
tree6c3aa9dfa71e3c4e464fc86f611c40088bf8edd3 /npc/custom/events
parenta2b070b52f1a48dc83ea540fd124c4e47022624a (diff)
downloadhercules-56a20bb18d6fde61bb82cf160a131eb54d464148.tar.gz
hercules-56a20bb18d6fde61bb82cf160a131eb54d464148.tar.bz2
hercules-56a20bb18d6fde61bb82cf160a131eb54d464148.tar.xz
hercules-56a20bb18d6fde61bb82cf160a131eb54d464148.zip
Merged rAthena Changes
- Added checkidle() command that was present in rAthena since r17126 - Documented checkidle() function - More clearly defined variables in eA Job System documentation - Added missing 'stopnpctimer' in custom Cluckers script
Diffstat (limited to 'npc/custom/events')
-rw-r--r--npc/custom/events/cluckers.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/npc/custom/events/cluckers.txt b/npc/custom/events/cluckers.txt
index bc9899488..cf296cb18 100644
--- a/npc/custom/events/cluckers.txt
+++ b/npc/custom/events/cluckers.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
//= Cluck! Cluck! Boom!
//===== By: ==================================================
//= Keale
//===== Current Version: =====================================
//= 1.2a
-//===== Compatible With: =====================================
-//= rAthena SVN
//===== Description: =========================================
//= Click the chicken and try retrieve the item at a low
//= chance. If you fail he will nuke, freeze, stone,
@@ -108,8 +106,9 @@ OnTimer30000:
end;
OnTimer40000:
announce "GO! Click the chicken to get the prize!",bc_blue;
+ stopnpctimer;
if (!$cluck_item_id) set $cluck_item_id,512;
if (!$cluck_item_amount) set $cluck_item_amount,1;
set .startcluck,1;
end;
-}
+} \ No newline at end of file