Halberd and Immortal Sword can be crafted - add the recipes and blueprints.

Note: Miere Cleaver and Broadsword were reclassified.

2 files changed, 85 insertions, 2 deletions

diff --git a/db/craft_db.conf b/db/craft_db.conf
index 9476c01a5..81dadb061 100644
--- a/db/craft_db.conf
+++ b/db/craft_db.conf
@@ -1074,6 +1074,74 @@ craft_db: (
 	Priority: 20
 },
 /****************************************************************************/
+// ID 63 Priority 30 reserved for Kanabo or successor
+/****************************************************************************/
+// ID 64 Priority 40 reserved for Zambacutou or successor
+/****************************************************************************/
+{
+	Id: 65
+	Name: "CraftHalberd"
+	Flag: 16
+	ReturnCode: 3534
+    //Halberd
+	SourceItems:
+	(
+		{
+			SilverIngot: 45
+			TinIngot: 5
+			Coal: 34
+			EverburnPowder: 1
+		},
+	)
+	CreateItems:
+	(
+		{
+			TinIngot: 1
+			PileOfAsh: 2
+		},
+		{
+			TinIngot: 2
+			PileOfAsh: 1
+		},
+		{
+			PileOfAsh: 3
+		},
+	)
+	Priority: 50
+},
+/****************************************************************************/
+{
+	Id: 66
+	Name: "CraftImmortalSword"
+	Flag: 16
+	ReturnCode: 3532
+    //ImmortalSword
+	SourceItems:
+	(
+		{
+			SilverIngot: 40
+			PlatinumIngot: 2
+			IridiumIngot: 3
+			BlueManaPearl: 1
+		},
+	)
+	CreateItems:
+	(
+		{
+			SilverIngot: 1
+			PileOfAsh: 2
+		},
+		{
+			SilverIngot: 2
+			PileOfAsh: 1
+		},
+		{
+			PileOfAsh: 3
+		},
+	)
+	Priority: 50
+},
+/****************************************************************************/
 
 // 51~71 → Swords
 // 72~76 → Bows
diff --git a/npc/craft/recipes.txt b/npc/craft/recipes.txt
index 2f9d7cf3b..65409aee8 100644
--- a/npc/craft/recipes.txt
+++ b/npc/craft/recipes.txt
@@ -223,6 +223,19 @@ function readCrafting {
                  1, TinIngot,
                 20, Coal,
                  1, EverburnPowder);
+    // Reserved ID 63 and 64
+    // Halberd is really cheap as it doesn't uses Platinum/Iridium :P
+    showRecipe(CraftHalberd, Halberd,
+                45, SilverIngot,
+                 5, TinIngot,
+                34, Coal,
+                 1, EverburnPowder);
+    showRecipe(CraftImmortalSword, ImmortalSword,
+                40, SilverIngot,
+                 2, PlatinumIngot,
+                 3, IridiumIngot,
+                 1, BlueManaPearl);
+
     next;
     // Archery Weapons: Always use Wood, Root and Carp.
     mesc "----------"+l("Archery Weapon Recipes")+"----------", 2;
@@ -407,6 +420,7 @@ function	script	MakeBlueprint	{
             if (.@rarity & CRAFT_INTERMEDIARY) {
                 array_push(.@recipes, CraftBugSlayer);
                 array_push(.@recipes, CraftShortGladius);
+                array_push(.@recipes, CraftMiereCleaver);
                 array_push(.@recipes, CraftBladeShield);
                 array_push(.@recipes, CraftNoviceWand);
                 array_push(.@recipes, CraftForestBow);
@@ -416,7 +430,7 @@ function	script	MakeBlueprint	{
                 array_push(.@recipes, CraftShortsword);
                 array_push(.@recipes, CraftBoneKnife);
                 array_push(.@recipes, CraftKitana);
-                array_push(.@recipes, CraftMiereCleaver);
+                array_push(.@recipes, CraftBroadsword);
                 array_push(.@recipes, CraftPynRevolver);
                 array_push(.@recipes, CraftApprenticeWand);
                 array_push(.@recipes, CraftElficBow);
@@ -425,7 +439,7 @@ function	script	MakeBlueprint	{
                 array_push(.@recipes, CraftGoldenRing);
                 array_push(.@recipes, CraftLongSword);
                 array_push(.@recipes, CraftRockKnife);
-                array_push(.@recipes, CraftBroadsword);
+                array_push(.@recipes, CraftHalberd);
                 array_push(.@recipes, CraftPynRifle);
                 array_push(.@recipes, CraftPynGatling);
                 array_push(.@recipes, CraftLeaderWand);
@@ -433,6 +447,7 @@ function	script	MakeBlueprint	{
             }
             if (.@rarity & CRAFT_MASTER) {
                 array_push(.@recipes, CraftDivineSword);
+                array_push(.@recipes, CraftImmortalSword);
                 array_push(.@recipes, CraftPynShotgun);
                 array_push(.@recipes, CraftLegendaryWand);
                 array_push(.@recipes, CraftBansheeBow);