summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/001-1/eventmaster.txt1
-rw-r--r--npc/functions/event.txt11
2 files changed, 7 insertions, 5 deletions
diff --git a/npc/001-1/eventmaster.txt b/npc/001-1/eventmaster.txt
index dfa17978c..92719d77f 100644
--- a/npc/001-1/eventmaster.txt
+++ b/npc/001-1/eventmaster.txt
@@ -726,6 +726,7 @@ OnAutoSched:
freeloop(true);
for (.@i = 0; .@i < ($@AEROS_AUTOSPAWN * 5); .@i++) {
.@r=rand2(5, 12);
+ // FIXME: Use TOP3AVERAGELVL() instead of a full list
.@m=any(Piou, Piousse, Ratto, LittleBlub, Croc, PlushroomField,
Tipiu, CaveMaggot, Bat, Scorpion, Duck, Maggot, RedScorpion,
ManaBug, ManaGhost, HouseMaggot, RedSlime, WhiteSlime,
diff --git a/npc/functions/event.txt b/npc/functions/event.txt
index 6d73389d4..33bc9cc61 100644
--- a/npc/functions/event.txt
+++ b/npc/functions/event.txt
@@ -474,31 +474,32 @@ function script sThanksgiving {
}
// Switch the reward
+ .@blv = BaseLevel + TOP3AVERAGELVL() / 2;
switch (.@luck) {
case 0: // EXP
- .@p=BaseLevel*#THANKS_STREAK;
+ .@p=.@blv*#THANKS_STREAK;
.@p*=3;
getexp .@p, 0;
mes l("You got %d EXP!", .@p);
break;
case 1: // JEXP
- .@p=BaseLevel*#THANKS_STREAK;
+ .@p=.@blv*#THANKS_STREAK;
.@p=.@p*15/10;
getexp 0, .@p;
mes l("You got %d JEXP!", .@p);
break;
case 2: // GP
- .@p=BaseLevel*#THANKS_STREAK;
+ .@p=.@blv*#THANKS_STREAK;
Zeny+=.@p;
mes l("You got %d GP!", .@p);
break;
case 3: // MOBPT
- .@p=BaseLevel*#THANKS_STREAK;
+ .@p=.@blv*#THANKS_STREAK;
Mobpt+=.@p;
mes l("You got %d Monster Points!", .@p);
break;
case 4: // RES
- .@p=BaseLevel*#THANKS_STREAK;
+ .@p=.@blv*#THANKS_STREAK;
.@p*=3;
REAL_ESTATE_CREDITS+=.@p;
mes l("You got %d Real Estate Credits!", .@p);