summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2016-03-26 12:10:40 -0500
committerwushin <pasekei@gmail.com>2016-03-26 12:10:40 -0500
commit5c63870c5723216cc3efca7077ff4a322036de21 (patch)
tree9c00521959832466b1e4bfd93050dd154b539f45
parent278a05f28bdc2cfd0970a2e56993ac3634369374 (diff)
downloadserverdata-5c63870c5723216cc3efca7077ff4a322036de21.tar.gz
serverdata-5c63870c5723216cc3efca7077ff4a322036de21.tar.bz2
serverdata-5c63870c5723216cc3efca7077ff4a322036de21.tar.xz
serverdata-5c63870c5723216cc3efca7077ff4a322036de21.zip
Fix GreenApple Money bug
-rw-r--r--world/map/npc/008-1/annualeaster.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt
index d0898823..1030fcd3 100644
--- a/world/map/npc/008-1/annualeaster.txt
+++ b/world/map/npc/008-1/annualeaster.txt
@@ -14,12 +14,12 @@ function|script|AnnualEasterEvent
if ((gettimetick(2)-TUT_var < 5*7*86400) || (BaseLevel < 40)) //player must be created at least 5 weeks ago
goto L_EndTooYoung;
- if (@eastertimepenalty == 0)
+ if (#EASTERTIMEPENALTY == 0)
goto L_WarmUp;
// prevent clicking multiple times:
- if (gettimetick(2) < @eastertimepenalty + $@EASTER_FOUND_WAIT_TIME)
+ if (gettimetick(2) < #EASTERTIMEPENALTY + $@EASTER_FOUND_WAIT_TIME)
goto L_End2;
- set @eastertimepenalty, gettimetick(2);
+ set #EASTERTIMEPENALTY, gettimetick(2);
// global counter to determine reshuffle times of the eggs.
set $@peopleFoundEggs[@EasterEggID], $@peopleFoundEggs[@EasterEggID]+1;
@@ -91,7 +91,7 @@ L_EndTooYoung:
goto L_End1;
L_WarmUp:
- set @eastertimepenalty, gettimetick(2);
+ set #EASTERTIMEPENALTY, gettimetick(2);
getitem "GreenApple", 1;
misceffect FX_GETITEM, strcharinfo(0);
message strcharinfo(0), "Hmmm eggs! Maybe you can find something nice there!";
@@ -99,9 +99,9 @@ L_WarmUp:
L_End2:
message strcharinfo(0), "Don't be greedy! You just found something a moment ago.";
- set @eastertimepenalty, @eastertimepenalty + 5;
- if (@eastertimepenalty > gettimetick(2))
- set @eastertimepenalty, gettimetick(2);
+ set #EASTERTIMEPENALTY, #EASTERTIMEPENALTY + 5;
+ if (#EASTERTIMEPENALTY > gettimetick(2))
+ set #EASTERTIMEPENALTY, gettimetick(2);
goto L_End1;
L_End1: