Blueprint Recipe for Revolvers and reorder weapons

2 files changed, 45 insertions, 3 deletions

diff --git a/db/craft_db.conf b/db/craft_db.conf
index fe6979185..3d73ad295 100644
--- a/db/craft_db.conf
+++ b/db/craft_db.conf
@@ -975,5 +975,45 @@ craft_db: (
 	Priority: 50
 },
 /****************************************************************************/
+// 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: 82
+	Name: "CraftPynRevolver"
+	Flag: 16
+	ReturnCode: 6040
+    //PynRevolver
+	SourceItems:
+	(
+		{
+			LeadIngot: 4
+			TitaniumIngot: 5
+			Coal: 11
+			EverburnPowder: 1
+		},
+	)
+	CreateItems:
+	(
+		{
+			PileOfAsh: 1
+		},
+		{
+			PileOfAsh: 1
+			LeadOre: 1
+		},
+		{
+			PileOfAsh: 2
+		},
+	)
+	Priority: 10
+},
+/****************************************************************************/
 
 )
diff --git a/npc/craft/recipes.txt b/npc/craft/recipes.txt
index 81ffb8d94..55f82dc13 100644
--- a/npc/craft/recipes.txt
+++ b/npc/craft/recipes.txt
@@ -251,6 +251,7 @@ function	script	MakeBlueprint	{
         /////////////////////////////////////////////////////
         ///// Equipment Recipes
         /////////////////////////////////////////////////////
+//                array_push(.@recipes, Craft);
         case CRAFT_EQUIPMENT:
             if (.@rarity & CRAFT_BASIC) {
                 array_push(.@recipes, CraftWoodenSword);
@@ -258,18 +259,19 @@ function	script	MakeBlueprint	{
             }
             if (.@rarity & CRAFT_INTERMEDIARY) {
                 array_push(.@recipes, CraftBugSlayer);
+                array_push(.@recipes, CraftShortGladius);
                 array_push(.@recipes, CraftNoviceWand);
             }
             if (.@rarity & CRAFT_ADVANCED) {
-                array_push(.@recipes, CraftShortGladius);
+                array_push(.@recipes, CraftBacksword);
+                array_push(.@recipes, CraftShortsword);
                 array_push(.@recipes, CraftApprenticeWand);
             }
             if (.@rarity & CRAFT_EXPERT) {
-                array_push(.@recipes, CraftBacksword);
                 array_push(.@recipes, CraftLeaderWand);
+                array_push(.@recipes, CraftPynRevolver);
             }
             if (.@rarity & CRAFT_MASTER) {
-                array_push(.@recipes, CraftShortsword);
                 array_push(.@recipes, CraftLegendaryWand);
             }