Spring & Cherries, also release Pumpkin Lollipop

3 files changed, 30 insertions, 12 deletions

diff --git a/db/craft_db.conf b/db/craft_db.conf
index b098336f1..086cf85cd 100644
--- a/db/craft_db.conf
+++ b/db/craft_db.conf
@@ -4580,8 +4580,7 @@ craft_db: (
 			RedApple: 1
 			Orange: 1
 			Pear: 1
-			NPCEyes: 1
-			NPCEyes: 1
+			Cherry: 1
 		},
 	)
 	CreateItems:
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 199f72619..97146090b 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -5039,6 +5039,7 @@ mob_db: (
 	Drops: {
 		RedApple: 400
 		MoubooSteak: 215
+		Cherry: 8
 		BloodyMoubooHat: 1
 	}
 },
@@ -6088,6 +6089,7 @@ mob_db: (
 	Drops: {
 		Tomato: 350
 		Pear: 300
+		Cherry: 100
 	}
 },
 {
@@ -8724,6 +8726,7 @@ mob_db: (
 	Drops: {
 		Coal: 700
 		AnimalBones: 420
+		Cherry: 32
 	}
 },
 {
@@ -9655,6 +9658,7 @@ mob_db: (
 	Drops: {
 		Coal: 9000
 		IronIngot: 100
+		Cherry: 20
 	}
 },
 {
@@ -10350,6 +10354,7 @@ mob_db: (
 		CherryCake: 400
 		PinkieLeg: 500
 		PurificationPotion: 70
+		Cherry: 40
 		CasinoCoins: 25
 		PinkieHat: 2
 	}
@@ -11247,6 +11252,7 @@ mob_db: (
 		CherryCake: 400
 		PinkieLeg: 500
 		PurificationPotion: 70
+		Cherry: 30
 		CasinoCoins: 20
 		PinkieHat: 1
 	}
@@ -11294,6 +11300,7 @@ mob_db: (
 		PinkAntenna: 900
 		CherryCake: 1200
 		PinkieLeg: 700
+		Cherry: 300
 		PurificationPotion: 250
 		PinkieCrystal: 1
 	}
@@ -11477,6 +11484,7 @@ mob_db: (
 		ChocolateDonut: 240
 		Curshroom: 180
 		Fungus: 120
+		Cherry: 50
 	}
 },
 {
@@ -11566,6 +11574,7 @@ mob_db: (
 		ArtichokeHerb: 2800
 		ChocolateDonut: 100
 		Fungus: 50
+		Cherry: 40
 		DodgeDonut: 10
 	}
 },
@@ -12509,6 +12518,7 @@ mob_db: (
 	DamageMotion: 200
 	Drops: {
 		Brainstem: 450
+		Cherry: 5
 	}
 },
 {
@@ -12790,6 +12800,7 @@ mob_db: (
 	Drops: {
 		Coal: 300
 		ChocolateDonut: 15
+		Cherry: 5
 		TortugaShellFragment: 3
 	}
 },
@@ -13247,6 +13258,7 @@ mob_db: (
 	Drops: {
 		GuildCoin: 10
 		CottonCloth: 10
+		Cherry: 5
 		StrangeCoin: 1
 	}
 },
@@ -13290,6 +13302,7 @@ mob_db: (
 	Drops: {
 		GuildCoin: 10
 		CottonCloth: 10
+		Cherry: 5
 		StrangeCoin: 1
 	}
 },
@@ -13333,6 +13346,7 @@ mob_db: (
 	DamageMotion: 100
 	Drops: {
 		BronzeBossGift: 100
+		Cherry: 15
 		GuildCoin: 10
 		OperaMask: 1
 	}
@@ -13426,6 +13440,7 @@ mob_db: (
 		BronzeBossGift: 1000
 		SilverBossGift: 400
 		GoldenBossGift: 50
+		Cherry: 35
 		GuildCoin: 10
 		OperaMask: 1
 	}
diff --git a/npc/functions/seasons.txt b/npc/functions/seasons.txt
index 769973466..abf28ffc1 100644
--- a/npc/functions/seasons.txt
+++ b/npc/functions/seasons.txt
@@ -321,12 +321,9 @@ OnAutumnStart:
     addmonsterdrop(PanthomLord,         PumpkandySeed,      9900);
     addmonsterdrop(ShadowPixie,         PumpkandySeed,      9500);
     addmonsterdrop(BlackSkullSlime,     PumpkandySeed,      9000);
-    addmonsterdrop(EarthElemental,      PumpkandySeed,      8500);
-    addmonsterdrop(BlackMamba,          PumpkandySeed,      8000);
-    addmonsterdrop(NightmareDragon,     PumpkandySeed,      7000);
-    addmonsterdrop(EliteDuck,           PumpkandySeed,      6400);
-    addmonsterdrop(LavaSlimeMother,     PumpkandySeed,      6200);
-    addmonsterdrop(RedSlimeMother,      PumpkandySeed,      6000);
+    addmonsterdrop(EarthElement,        PumpkandySeed,      8000);
+    addmonsterdrop(BlackMamba,          PumpkandySeed,      7000);
+    addmonsterdrop(EliteDuck,           PumpkandySeed,      6000);
     addmonsterdrop(AlphaMouboo,         PumpkandySeed,      5000);
     addmonsterdrop(PoisonSpikyMushroom, PumpkandySeed,      3000);
     addmonsterdrop(Mouboo,              PumpkandySeed,      2000);
@@ -338,6 +335,10 @@ OnAutumnStart:
     addmonsterdrop(GreenSlime,          PumpkandySeed,       750);
     addmonsterdrop(Piou,                PumpkandySeed,       600);
     addmonsterdrop(Squirrel,            PumpkandySeed,       500);
+
+    addmonsterdrop(LavaSlimeMother,     PumpkinLollipop,    1200);
+    addmonsterdrop(RedSlimeMother,      PumpkinLollipop,    1100);
+    addmonsterdrop(NightmareDragon,     PumpkinLollipop,    1000);
     end;
 
 OnAutumnEnd:
@@ -352,16 +353,16 @@ OnAutumnEnd:
 
 
     removemapmask "012-1", MASK_AUTUMN;
+    delmonsterdrop(NightmareDragon,     PumpkinLollipop);
+    delmonsterdrop(LavaSlimeMother,     PumpkinLollipop);
+    delmonsterdrop(RedSlimeMother,      PumpkinLollipop);
     delmonsterdrop(FafiDragon,          PumpkandySeed);
     delmonsterdrop(PanthomLord,         PumpkandySeed);
     delmonsterdrop(ShadowPixie,         PumpkandySeed);
     delmonsterdrop(BlackSkullSlime,     PumpkandySeed);
-    delmonsterdrop(EarthElemental,      PumpkandySeed);
+    delmonsterdrop(EarthElement,        PumpkandySeed);
     delmonsterdrop(BlackMamba,          PumpkandySeed);
-    delmonsterdrop(NightmareDragon,     PumpkandySeed);
     delmonsterdrop(EliteDuck,           PumpkandySeed);
-    delmonsterdrop(LavaSlimeMother,     PumpkandySeed);
-    delmonsterdrop(RedSlimeMother,      PumpkandySeed);
     delmonsterdrop(Mouboo,              PumpkandySeed);
     delmonsterdrop(AlphaMouboo,         PumpkandySeed);
     delmonsterdrop(Fluffy,              PumpkandySeed);
@@ -542,6 +543,7 @@ OnSpringStart:
     addmonsterdrop(Piousse,             AlizarinHerb,        400);
 
     // Mystical & Fairies (Tulip)
+    addmonsterdrop(WindElement,         Tulip,              5000);
     addmonsterdrop(GreenDragon,         Tulip,              3000);
     addmonsterdrop(WindFairy,           Tulip,              1000);
     addmonsterdrop(PoisonFairy,         Tulip,              1000);
@@ -555,6 +557,7 @@ OnSpringStart:
     addmonsterdrop(ChocolateSlime,      AlizarinHerb,         50);
 
     // Snakes (Rose)
+    addmonsterdrop(Snail,               Rose,               2500);
     addmonsterdrop(BlackMamba,          Rose,               1800);
     addmonsterdrop(MountainSnake,       Rose,               1500);
     addmonsterdrop(GrassSnake,          Rose,                700);
@@ -562,6 +565,7 @@ OnSpringStart:
     // Butterflies (Blueberries)
     addmonsterdrop(CyanButterfly,       Blueberries,         400);
     addmonsterdrop(RedButterfly,        Blueberries,         400);
+    addmonsterdrop(Mandragora,          Blueberries,         300);
     addmonsterdrop(ManaBug,             Blueberries,         200);
 
     // Scorpions (Blueberries)