Add the two items which will be required for the puzzles

2 files changed, 62 insertions, 2 deletions

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index a037f0cd..6d13b7e2 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -1112,6 +1112,7 @@ item_db: (
 		Id5260: 1
 	}
 },
+/* Rings & Accessories */
 {
 	Id: 702
 	AegisName: "WeddingRing"
@@ -1517,6 +1518,7 @@ item_db: (
 		bonus bHit, 25;
 	">
 },
+/* Boots */
 {
 	Id: 528
 	AegisName: "Boots"
@@ -4794,6 +4796,26 @@ item_db: (
 	ViewSprite: 5265
 },
 {
+	Id: 5276
+	AegisName: "ThermalNapalm"
+	Name: "Thermal Napalm"
+	Type: "IT_ETC"
+	Buy: 9999
+	Sell: 0
+	Weight: 1
+	ViewSprite: 5276
+	Trade: {
+		partneroverride: true
+		notrade: true
+		nodrop: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+		noselltonpc: true
+	}
+},
+/* Chest Armor */
+{
 	Id: 523
 	AegisName: "LeatherShirt"
 	Name: "LeatherShirt"
@@ -12074,6 +12096,7 @@ item_db: (
 		bonus bMatkRate, -5;
 	">
 },
+/* Usable items */
 {
 	Id: 501
 	AegisName: "CactusDrink"
@@ -13738,6 +13761,29 @@ item_db: (
 	">
 },
 {
+	Id: 5277
+	AegisName: "XmasSeeds"
+	Name: "Christmas Seeds"
+	Type: "IT_USABLE"
+	Buy: 9999
+	Sell: 0
+	Weight: 1
+	ViewSprite: 5277
+	Trade: {
+		partneroverride: true
+		notrade: true
+		nodrop: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+		noselltonpc: true
+	}
+	Script: <"
+		callfunc "X21_SEEDS";
+	">
+},
+/* Legs Armor */
+{
 	Id: 586
 	AegisName: "CottonShorts"
 	Name: "CottonShorts"
diff --git a/npc/annuals/xmas/2021.txt b/npc/annuals/xmas/2021.txt
index 2888c879..95a2c2fb 100644
--- a/npc/annuals/xmas/2021.txt
+++ b/npc/annuals/xmas/2021.txt
@@ -33,6 +33,20 @@ function	script	X21ED1_DOCLEAR	{
     return;
 }
 
+function	script	X21_SEEDS	{
+    getmapxy(.@m$, .@x, .@y, 0);
+    // If planted in the wrong region, vanish without effect
+    if (.@m$ != "0812@"+X21ID2())
+        return;
+    if (.@x < 107 || .@x > 126)
+        return;
+    if (.@y < 159 || .@y > 177)
+        return;
+    // TODO: Sprout a Christmas Tree IF position is not filled
+    // TODO: Record the position filled
+    return;
+}
+
 function	script	X21QUESTON	{
     // Create and setup the challenge. Allow to reset quest.
     XMAS2021 = X21_ACCEPTED;
@@ -174,7 +188,7 @@ OnX1081:
     .@y2=.@y+1;
     .@x=cap_value(rand2(.@x1, .@x2), 47, 65);
     .@y=cap_value(rand2(.@y1, .@y2), 191, 212);
-    //makeitem(ChristmasSeeds, 1, .@m$, .@x, .@y);
+    makeitem(XmasSeeds, rand2(1, 3), .@m$, .@x, .@y);
     end;
 // Mini-Boss Chamberlain, drops candle
 OnX1146:
@@ -188,7 +202,7 @@ OnX1147:
     .@y2=.@y+1;
     .@x=cap_value(rand2(.@x1, .@x2), 70, 99);
     .@y=cap_value(rand2(.@y1, .@y2), 250, 265);
-    //makeitem(FuelPotion, rand2(3, 5), .@m$, .@x, .@y);
+    makeitem(ThermalNapalm, rand2(3, 5), .@m$, .@x, .@y);
     end;
 
 /* Experimental */