summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/re/item_db.conf6
-rw-r--r--npc/019-4-1/chief.txt10
2 files changed, 12 insertions, 4 deletions
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 5cd196adb..cb05ee627 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -2391,9 +2391,9 @@ item_db: (
noselltonpc: true
}
Script: <"
- setarray .@s, SantaGlobe, SnowmanGlobe, UglyChristmasSweater, MercBoxB, IceGladius;
- setarray .@r, SnowmanGlobe, UglyChristmasSweater, TneckSweater, MercBoxA, MercBoxA, MercBoxB, ElixirOfLife, NoviceWand, LeadOre, DarkDesertMushroom;
- setarray .@c, BronzeGift, IcedBottle, TneckSweater, MercBoxA, MercBoxA, ClothoLiquor, Dagger, Coal, HastePotion, HerbalTea, StrengthPotion, TrainingWand;
+ setarray .@s, SantaGlobe, SnowmanGlobe, UglyChristmasSweater, MercBoxB, IceGladius, RedStockings;
+ setarray .@r, SnowmanGlobe, UglyChristmasSweater, TneckSweater, MercBoxA, MercBoxA, MercBoxB, ElixirOfLife, NoviceWand, LeadOre, DarkDesertMushroom, ScrollSWolvern, ScrollSYeti;
+ setarray .@c, BronzeGift, IcedBottle, TneckSweater, MercBoxA, MercBoxA, ClothoLiquor, Dagger, Coal, HastePotion, HerbalTea, StrengthPotion, TrainingWand, SacredImmortalityPotion, Coffee;
.@al=rand(0,100);
// 1% super rare chance
if (.@al < 1) {
diff --git a/npc/019-4-1/chief.txt b/npc/019-4-1/chief.txt
index 47942b7f1..c9c45e8be 100644
--- a/npc/019-4-1/chief.txt
+++ b/npc/019-4-1/chief.txt
@@ -71,8 +71,14 @@ L_Reward:
/* You get Christmas Gift Box, which contain rares */
.@gifts=min(15, log2($XMAS_GIFTS/100))+1;
- if (.@q1 >= .@gifts)
+ if (.@q1 >= .@gifts) {
getitem XmasGift, .@gifts;
+ // If enough money was collected, you may claim this new year's fruit
+ if ($XMAS_MONEY >= 500000) {
+ .@Fruit=.Seasonal[gettime(7)%6];
+ getitem .@Fruit, 1;
+ }
+ }
// Top 5 rewards
if (strcharinfo(0) == $@xmas_box_name$[0])
@@ -357,6 +363,8 @@ L_Loop:
OnInit:
.sex=G_MALE;
.distance=5;
+
+ setarray .Seasonal, StrengthFruit, IntelligenceFruit, AgilityFruit, VitalityFruit, LuckFruit, DexterityFruit;
end;
}