Okay, add two shields, but we cannot make such reuse of materials %%n

2 files changed, 85 insertions, 0 deletions

diff --git a/db/craft_db.conf b/db/craft_db.conf
index d357ea0c3..f39efd359 100644
--- a/db/craft_db.conf
+++ b/db/craft_db.conf
@@ -1119,6 +1119,76 @@ craft_db: (
 // 98, 99, 100 → Reserved for guns
 //////////////////////////////////////////////////////////////////////////////
 {
+	Id: 93
+	Name: "CraftWoodenShield"
+	Flag: 16
+	ReturnCode: 2710
+    //WoodenShield
+	SourceItems:
+	(
+		{
+			WoodenLog: 40
+			LeatherPatch: 2
+			SharpKnife: 1
+		},
+	)
+	CreateItems:
+	(
+		{
+			RawLog: 1
+		},
+		{
+			RustyKnife: 1
+			RawLog: 1
+		},
+		{
+			RustyKnife: 1
+		},
+	)
+	Priority: 10
+},
+/****************************************************************************/
+{
+	Id: 94
+	Name: "CraftBladeShield"
+	Flag: 16
+	ReturnCode: 2702
+    //BladeShield
+	SourceItems:
+	(
+		{
+			IronIngot: 14
+			TitaniumIngot: 2
+			Coal: 5
+			EverburnPowder: 1
+		},
+	)
+	CreateItems:
+	(
+		{
+			TitaniumIngot: 1
+		},
+		{
+			TitaniumIngot: 1
+			IronIngot: 1
+		},
+		{
+			IronIngot: 1
+		},
+	)
+	Priority: 10
+},
+/****************************************************************************/
+// 51~71 → Swords
+// 72~76 → Bows
+// 77~81 → Wands
+// 82 → Reserved for guns
+// 83~87 → Armor Chestplates
+// 88~92 → Armor Helmets
+// 93~97 → Shields
+// 98, 99, 100 → Reserved for guns
+//////////////////////////////////////////////////////////////////////////////
+{
 	Id: 101
 	Name: "CraftGoldenRing"
 	Flag: 16
@@ -1141,5 +1211,6 @@ craft_db: (
 	)
 	Priority: 10
 },
+/****************************************************************************/
 
 )
diff --git a/npc/craft/recipes.txt b/npc/craft/recipes.txt
index 714c77d2c..19d4e44ee 100644
--- a/npc/craft/recipes.txt
+++ b/npc/craft/recipes.txt
@@ -233,6 +233,18 @@ function readCrafting {
                 16, Coal,
                  1, EverburnPowder);
     next;
+    // Shields
+    mesc "----------"+l("Shield Recipes")+"----------", 2;
+    showRecipe(CraftWoodenShield, WoodenShield,
+                40, WoodenLog,
+                 2, LeatherPatch,
+                 1, SharpKnife);
+    showRecipe(CraftBladeShield, BladeShield,
+                14, IronIngot,
+                 2, TitaniumIngot,
+                 5, Coal,
+                 1, EverburnPowder);
+    next;
     // Misc
     mesc "----------"+l("Miscellaneous Recipes")+"----------", 2;
     showRecipe(CraftGoldenRing, GoldenRing,
@@ -314,11 +326,13 @@ function	script	MakeBlueprint	{
         case CRAFT_EQUIPMENT:
             if (.@rarity & CRAFT_BASIC) {
                 array_push(.@recipes, CraftWoodenSword);
+                array_push(.@recipes, CraftWoodenShield);
                 array_push(.@recipes, CraftTrainingWand);
             }
             if (.@rarity & CRAFT_INTERMEDIARY) {
                 array_push(.@recipes, CraftBugSlayer);
                 array_push(.@recipes, CraftShortGladius);
+                array_push(.@recipes, CraftBladeShield);
                 array_push(.@recipes, CraftNoviceWand);
             }
             if (.@rarity & CRAFT_ADVANCED) {