Add the two hand weapons and update JSaves Grimorium

3 files changed, 90 insertions, 2 deletions

diff --git a/db/craft_db.conf b/db/craft_db.conf
index 195015cf8..36e590933 100644
--- a/db/craft_db.conf
+++ b/db/craft_db.conf
@@ -809,6 +809,70 @@ craft_db: (
 	Priority: 40
 },
 /****************************************************************************/
+// 61~71 two hand swords I guess
+{
+	Id: 61
+	Name: "CraftMiereCleaver"
+	Flag: 16
+	ReturnCode: 3523
+    //MiereCleaver
+	SourceItems:
+	(
+		{
+			SilverIngot: 12
+			TinIngot: 1
+			Coal: 8
+			EverburnPowder: 1
+		},
+	)
+	CreateItems:
+	(
+		{
+			PileOfAsh: 1
+		},
+		{
+			TinIngot: 1
+			PileOfAsh: 1
+		},
+		{
+			PileOfAsh: 2
+		},
+	)
+	Priority: 10
+},
+/****************************************************************************/
+{
+	Id: 62
+	Name: "CraftBroadsword"
+	Flag: 16
+	ReturnCode: 3524
+    //Broadsword
+	SourceItems:
+	(
+		{
+			SilverIngot: 27
+			TinIngot: 1
+			Coal: 20
+			EverburnPowder: 1
+		},
+	)
+	CreateItems:
+	(
+		{
+			PileOfAsh: 2
+		},
+		{
+			TinIngot: 1
+			PileOfAsh: 1
+		},
+		{
+			PileOfAsh: 3
+		},
+	)
+	Priority: 20
+},
+/****************************************************************************/
+
 // 51~71 → Swords
 // 72~76 → Bows
 // 77~81 → Wands
diff --git a/npc/craft/recipes.txt b/npc/craft/recipes.txt
index 0f97f92e5..ded8fd226 100644
--- a/npc/craft/recipes.txt
+++ b/npc/craft/recipes.txt
@@ -157,8 +157,8 @@ function readCrafting {
     next;
     mesc l("List of known crafting recipes:");
     mes "";
-    // Melee Weapons: Never use Titanium nor Lead
-    mesc "----------"+l("Melee Weapon Recipes")+"----------", 2;
+    // Melee Weapons: Never use Titanium nor Lead. Iron-based, no silver
+    mesc "----------"+l("One Hand Weapon Recipes")+"----------", 2;
     showRecipe(CraftWoodenSword, WoodenSword,
                 20, WoodenLog,
                  5, RawLog,
@@ -182,6 +182,19 @@ function readCrafting {
                 24, Coal,
                  1, EverburnPowder);
     next;
+    // Two Hands Melee Weapons: Never use Titanium nor Lead. Silver-based.
+    mesc "----------"+l("Two Hands Weapon Recipes")+"----------", 2;
+    showRecipe(CraftMiereCleaver, MiereCleaver,
+                12, SilverIngot,
+                 1, TinIngot,
+                 8, Coal,
+                 1, EverburnPowder);
+    showRecipe(CraftBroadsword, Broadsword,
+                27, SilverIngot,
+                 1, TinIngot,
+                20, Coal,
+                 1, EverburnPowder);
+    next;
     // Magical Weapons: Wood + powders
     mesc "----------"+l("Magical Weapon Recipes")+"----------", 2;
     showRecipe(CraftTrainingWand, TrainingWand,
@@ -338,11 +351,13 @@ function	script	MakeBlueprint	{
             if (.@rarity & CRAFT_ADVANCED) {
                 array_push(.@recipes, CraftBacksword);
                 array_push(.@recipes, CraftShortsword);
+                array_push(.@recipes, CraftMiereCleaver);
                 array_push(.@recipes, CraftPynRevolver);
                 array_push(.@recipes, CraftApprenticeWand);
             }
             if (.@rarity & CRAFT_EXPERT) {
                 array_push(.@recipes, CraftGoldenRing);
+                array_push(.@recipes, CraftBroadsword);
                 array_push(.@recipes, CraftPynRifle);
                 array_push(.@recipes, CraftPynGatling);
                 array_push(.@recipes, CraftLeaderWand);
diff --git a/npc/items/books.txt b/npc/items/books.txt
index 07bdf5cd8..ce8ed1441 100644
--- a/npc/items/books.txt
+++ b/npc/items/books.txt
@@ -212,6 +212,15 @@ OnInit:
                         mesc l("Summon Yetis - @sk-frozenheart");
                     if (getskilllv(TMW2_STONEHEART))
                         mesc l("Summon Terranites - @sk-stoneheart");
+                    if (getskilllv(TMW2_KALBOO))
+                        mesc l("Summon Mouboo - @sk-kalboo");
+                    if (getskilllv(TMW2_KALSPIKE))
+                        mesc l("Summon P. Spiky Mushroom - @sk-kalspike");
+                    if (getskilllv(TMW2_CUTEHEART))
+                        mesc l("Summon Fluffies - @sk-cuteheart");
+                    if (getskilllv(TMW2_PLANTKINGDOM))
+                        mesc l("Summon Plants - @sk-plantkingdom");
+
                     next;
                     mesn l("Current Magic Control");
                     .@val=MAGIC_EXP+rand(-MAGIC_LVL*5, MAGIC_LVL*5);