From 5c63870c5723216cc3efca7077ff4a322036de21 Mon Sep 17 00:00:00 2001 From: wushin Date: Sat, 26 Mar 2016 12:10:40 -0500 Subject: Fix GreenApple Money bug --- world/map/npc/008-1/annualeaster.txt | 14 +++++++------- 1 file 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: -- cgit v1.2.3-60-g2f50 From d374cb9af05ebc44bb6ff66e9fbc024c90345a0d Mon Sep 17 00:00:00 2001 From: wushin Date: Sat, 26 Mar 2016 12:32:33 -0500 Subject: Add range check --- world/map/npc/008-1/annualeaster.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt index 1030fcd3..6af6f8d0 100644 --- a/world/map/npc/008-1/annualeaster.txt +++ b/world/map/npc/008-1/annualeaster.txt @@ -115,6 +115,9 @@ L_End1: 008-1,65,40,0|script|#TestEgg0|375 { + callfunc "PCtoNPCRange"; + if(@npc_check) end; + set @EasterEggID, 0; callfunc("AnnualEasterEvent"); end; @@ -122,6 +125,9 @@ L_End1: 008-1,65,40,0|script|#TestEgg1|375 { + callfunc "PCtoNPCRange"; + if(@npc_check) end; + set @EasterEggID, 1; callfunc("AnnualEasterEvent"); end; @@ -129,6 +135,9 @@ L_End1: 008-1,65,40,0|script|#TestEgg2|375 { + callfunc "PCtoNPCRange"; + if(@npc_check) end; + set @EasterEggID, 2; callfunc("AnnualEasterEvent"); end; -- cgit v1.2.3-60-g2f50 From fc1dfa51d222308b12411a75f8533f356b5b7d56 Mon Sep 17 00:00:00 2001 From: wushin Date: Sat, 26 Mar 2016 21:16:29 -0500 Subject: Make the First Item "Neat" but 0gp --- world/map/npc/008-1/annualeaster.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt index 6af6f8d0..5e723e98 100644 --- a/world/map/npc/008-1/annualeaster.txt +++ b/world/map/npc/008-1/annualeaster.txt @@ -92,7 +92,7 @@ L_EndTooYoung: L_WarmUp: set #EASTERTIMEPENALTY, gettimetick(2); - getitem "GreenApple", 1; + getitem "MoubooFigurine", 1; misceffect FX_GETITEM, strcharinfo(0); message strcharinfo(0), "Hmmm eggs! Maybe you can find something nice there!"; goto L_End1; @@ -115,6 +115,7 @@ L_End1: 008-1,65,40,0|script|#TestEgg0|375 { + set @npc_distance, 1; callfunc "PCtoNPCRange"; if(@npc_check) end; @@ -125,6 +126,7 @@ L_End1: 008-1,65,40,0|script|#TestEgg1|375 { + set @npc_distance, 1; callfunc "PCtoNPCRange"; if(@npc_check) end; @@ -135,6 +137,7 @@ L_End1: 008-1,65,40,0|script|#TestEgg2|375 { + set @npc_distance, 1; callfunc "PCtoNPCRange"; if(@npc_check) end; -- cgit v1.2.3-60-g2f50 From c55002cfda7af27b14d4eaace4d0b8df36133f60 Mon Sep 17 00:00:00 2001 From: wushin Date: Sat, 26 Mar 2016 21:46:40 -0500 Subject: Limit prizes --- world/map/npc/008-1/annualeaster.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt index 5e723e98..b38aaa0a 100644 --- a/world/map/npc/008-1/annualeaster.txt +++ b/world/map/npc/008-1/annualeaster.txt @@ -14,11 +14,14 @@ 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; + callsub S_Read_Annual_Quest; if (#EASTERTIMEPENALTY == 0) goto L_WarmUp; // prevent clicking multiple times: if (gettimetick(2) < #EASTERTIMEPENALTY + $@EASTER_FOUND_WAIT_TIME) goto L_End2; + if (@easter_year > gettime(7) - 2000) + goto L_End3; set #EASTERTIMEPENALTY, gettimetick(2); // global counter to determine reshuffle times of the eggs. @@ -97,6 +100,10 @@ L_WarmUp: message strcharinfo(0), "Hmmm eggs! Maybe you can find something nice there!"; goto L_End1; +L_End3: + message strcharinfo(0), "Don't be greedy! You already found something nice."; + goto L_End1; + L_End2: message strcharinfo(0), "Don't be greedy! You just found something a moment ago."; set #EASTERTIMEPENALTY, #EASTERTIMEPENALTY + 5; -- cgit v1.2.3-60-g2f50