summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/re/item_db.conf6
-rw-r--r--npc/020-1/serge.txt9
-rw-r--r--npc/functions/seasons.txt24
3 files changed, 34 insertions, 5 deletions
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index b37fd2b93..b9f63ab23 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -2278,7 +2278,11 @@ item_db: (
Delay: 1000
UseEffect: "EFFECT_HEAL"
Script: <"
- callfunc("ItHeal", 2, 70, 150);
+ if ($@SEASON == WINTER) {
+ callfunc("ItHeal", 2, 700, 1500);
+ } else {
+ callfunc("ItHeal", 2, 70, 150);
+ }
">
},
{
diff --git a/npc/020-1/serge.txt b/npc/020-1/serge.txt
index 5414591d2..1335cff0b 100644
--- a/npc/020-1/serge.txt
+++ b/npc/020-1/serge.txt
@@ -46,7 +46,8 @@ L_WinterQuest:
mes l("@@/120 @@", countitem(Snowflake), getitemlink(Snowflake));
mes l("@@/80 @@", countitem(CaramelCandy), getitemlink(CaramelCandy));
mes l("@@/40 @@", countitem(GingerBreadMan), getitemlink(GingerBreadMan));
- mes l("@@/10 @@", countitem(ChocolateBiscuit), getitemlink(ChocolateBiscuit)); // Found at Chocolate Slime: 4.00%
+ mes l("@@/10 @@", countitem(SmallChocolateBar), getitemlink(SmallChocolateBar));
+ mes l("@@/1 @@", countitem(ChocolateBiscuit), getitemlink(ChocolateBiscuit)); // Found at Chocolate Slime: 4.00%
next;
select
l("Not now, thanks"),
@@ -60,14 +61,16 @@ L_WinterQuest:
countitem(Snowflake) < 120 ||
countitem(CaramelCandy) < 80 ||
countitem(GingerBreadMan) < 40 ||
- countitem(ChocolateBiscuit) < 10
+ countitem(SmallChocolateBar)< 10 ||
+ countitem(ChocolateBiscuit) < 1
) goto L_Lying;
inventoryplace KnitHat, 1;
delitem Snowflake, 120;
delitem CaramelCandy, 80;
delitem GingerBreadMan, 40;
- delitem ChocolateBiscuit, 10;
+ delitem SmallChocolateBar, 10;
+ delitem ChocolateBiscuit, 1;
getitem KnitHat, 1;
getexp BaseLevel*267, JobLevel*80; // Level 30/20 ABSOLUTE CAP
setq1 SQuest_Winter, 1;
diff --git a/npc/functions/seasons.txt b/npc/functions/seasons.txt
index dc4112888..8743ee946 100644
--- a/npc/functions/seasons.txt
+++ b/npc/functions/seasons.txt
@@ -358,7 +358,7 @@ OnWinterStart:
// LoF Area Mobs
// ChocolateSlime Lavern ShadowPlant CyanButterfly
- // Items: Snowflake CaramelCandy GingerBreadMan ChocolateBiscuit
+ // Items: Snowflake CaramelCandy GingerBreadMan SmallChocolateBar
// Quest Requires All Of The Above
addmonsterdrop(SantaSlime, ChocolateBiscuit, 100);
@@ -398,6 +398,17 @@ OnWinterStart:
addmonsterdrop(MauvePlant, Snowflake, 90);
addmonsterdrop(AlizarinPlant, Snowflake, 90);
+ addmonsterdrop(AzulSlimeMother, SmallChocolateBar, 600);
+ addmonsterdrop(WhiteSlimeMother, SmallChocolateBar, 600);
+ addmonsterdrop(BeeHive, SmallChocolateBar, 500);
+ addmonsterdrop(Pollet, SmallChocolateBar, 320);
+ addmonsterdrop(MisterPrickel, SmallChocolateBar, 180);
+ addmonsterdrop(SnowFlower, SmallChocolateBar, 150);
+ addmonsterdrop(WhirlyBird, SmallChocolateBar, 120);
+ addmonsterdrop(ManaChest, SmallChocolateBar, 110);
+ addmonsterdrop(Maverick, SmallChocolateBar, 100);
+ addmonsterdrop(GreenDragon, SmallChocolateBar, 90);
+ addmonsterdrop(Yetifly, SmallChocolateBar, 60);
addmonsterdrop(AlphaMouboo, ReinbooWand, 3);
addmonsterdrop(BloodyMouboo, ReinbooWand, 2);
@@ -411,6 +422,17 @@ OnWinterEnd:
// Hasan's rewards can't be claimed anymore. Delete that from all players.
DelQuestFromEveryPlayer(SQuest_Autumn);
+ delmonsterdrop(AzulSlimeMother, SmallChocolateBar);
+ delmonsterdrop(WhiteSlimeMother, SmallChocolateBar);
+ delmonsterdrop(BeeHive, SmallChocolateBar);
+ delmonsterdrop(Pollet, SmallChocolateBar);
+ delmonsterdrop(MisterPrickel, SmallChocolateBar);
+ delmonsterdrop(SnowFlower, SmallChocolateBar);
+ delmonsterdrop(WhirlyBird, SmallChocolateBar);
+ delmonsterdrop(ManaChest, SmallChocolateBar);
+ delmonsterdrop(Maverick, SmallChocolateBar);
+ delmonsterdrop(GreenDragon, SmallChocolateBar);
+ delmonsterdrop(Yetifly, SmallChocolateBar);
delmonsterdrop(WaterFairy, GingerBreadMan);
delmonsterdrop(RedMushroom, GingerBreadMan);
delmonsterdrop(Duck, GingerBreadMan);