Add the remaining Pyndragon's weapons

2 files changed, 98 insertions, 1 deletions

diff --git a/db/craft_db.conf b/db/craft_db.conf
index 3d73ad295..1bc10d9e6 100644
--- a/db/craft_db.conf
+++ b/db/craft_db.conf
@@ -1015,5 +1015,99 @@ craft_db: (
 	Priority: 10
 },
 /****************************************************************************/
+// We don't care for order here. You noticed.
+{
+	Id: 98
+	Name: "CraftPynRifle"
+	Flag: 16
+	ReturnCode: 6010
+    //PynRifle
+	SourceItems:
+	(
+		{
+			LeadIngot: 6
+			TitaniumIngot: 7
+			Coal: 14
+			EverburnPowder: 1
+		},
+	)
+	CreateItems:
+	(
+		{
+			PileOfAsh: 1
+		},
+		{
+			PileOfAsh: 1
+			LeadOre: 1
+		},
+		{
+			PileOfAsh: 2
+		},
+	)
+	Priority: 20
+},
+/****************************************************************************/
+{
+	Id: 99
+	Name: "CraftPynGatling"
+	Flag: 16
+	ReturnCode: 6020
+    //PynGatling
+	SourceItems:
+	(
+		{
+			LeadIngot: 7
+			TitaniumIngot: 7
+			Coal: 14
+			EverburnPowder: 1
+		},
+	)
+	CreateItems:
+	(
+		{
+			PileOfAsh: 1
+		},
+		{
+			PileOfAsh: 1
+			LeadOre: 1
+		},
+		{
+			PileOfAsh: 2
+		},
+	)
+	Priority: 30
+},
+/****************************************************************************/
+{
+	Id: 100
+	Name: "CraftPynShotgun"
+	Flag: 16
+	ReturnCode: 6030
+    //PynShotgun
+	SourceItems:
+	(
+		{
+			LeadIngot: 9
+			TitaniumIngot: 10
+			Coal: 16
+			EverburnPowder: 1
+		},
+	)
+	CreateItems:
+	(
+		{
+			PileOfAsh: 2
+		},
+		{
+			PileOfAsh: 1
+			LeadOre: 1
+		},
+		{
+			PileOfAsh: 3
+		},
+	)
+	Priority: 20
+},
+/****************************************************************************/
 
 )
diff --git a/npc/craft/recipes.txt b/npc/craft/recipes.txt
index 55f82dc13..74116ef45 100644
--- a/npc/craft/recipes.txt
+++ b/npc/craft/recipes.txt
@@ -265,13 +265,16 @@ function	script	MakeBlueprint	{
             if (.@rarity & CRAFT_ADVANCED) {
                 array_push(.@recipes, CraftBacksword);
                 array_push(.@recipes, CraftShortsword);
+                array_push(.@recipes, CraftPynRevolver);
                 array_push(.@recipes, CraftApprenticeWand);
             }
             if (.@rarity & CRAFT_EXPERT) {
+                array_push(.@recipes, CraftPynRifle);
+                array_push(.@recipes, CraftPynGatling);
                 array_push(.@recipes, CraftLeaderWand);
-                array_push(.@recipes, CraftPynRevolver);
             }
             if (.@rarity & CRAFT_MASTER) {
+                array_push(.@recipes, CraftPynShotgun);
                 array_push(.@recipes, CraftLegendaryWand);
             }