Adds new wood and copper pikes with recipes. (#39861)

CleverRaven · Apr 26, 2020 · cddfa7b · cddfa7b
1 parent 7c00e2a
commit cddfa7b
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 5 deletions.
diff --git a/data/json/items/melee/spears_and_polearms.json b/data/json/items/melee/spears_and_polearms.json
@@ -432,6 +432,46 @@
     "price_postapoc": 500,
     "qualities": [ [ "COOK", 1 ] ]
   },
+  {
+    "id": "pike_wood",
+    "type": "GENERIC",
+    "category": "weapons",
+    "name": { "ctxt": "weapon", "str": "wooden pike" },
+    "description": "This is a medieval weapon consisting of a wood shaft with a fire hardened point.",
+    "weight": "2300 g",
+    "volume": "3500 ml",
+    "price": 10000,
+    "price_postapoc": 750,
+    "bashing": 9,
+    "cutting": 16,
+    "material": [ "wood" ],
+    "symbol": "/",
+    "color": "brown",
+    "looks_like": "pike",
+    "techniques": [ "IMPALE", "WBLOCK_1" ],
+    "qualities": [ [ "COOK", 1 ] ],
+    "flags": [ "DURABLE_MELEE", "POLEARM", "SPEAR", "REACH_ATTACK", "REACH3", "NONCONDUCTIVE", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ]
+  },
+  {
+    "id": "pike_copper",
+    "type": "GENERIC",
+    "category": "weapons",
+    "name": { "ctxt": "weapon", "str": "copper pike" },
+    "description": "This is a medieval weapon consisting of a wood shaft tipped with a copper spearhead.",
+    "weight": "2500 g",
+    "volume": "3500 ml",
+    "price": 15000,
+    "price_postapoc": 1000,
+    "bashing": 9,
+    "cutting": 23,
+    "material": [ "copper", "wood" ],
+    "symbol": "/",
+    "color": "brown",
+    "looks_like": "pike",
+    "techniques": [ "IMPALE", "WBLOCK_1" ],
+    "qualities": [ [ "COOK", 1 ] ],
+    "flags": [ "DURABLE_MELEE", "POLEARM", "SPEAR", "REACH_ATTACK", "REACH3", "NONCONDUCTIVE", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ]
+  },
   {
     "id": "pike",
     "type": "GENERIC",
@@ -447,7 +487,7 @@
     "material": [ "iron", "wood" ],
     "symbol": "/",
     "color": "brown",
-    "techniques": [ "IMPALE", "WBLOCK_2" ],
+    "techniques": [ "IMPALE", "WBLOCK_1" ],
     "qualities": [ [ "COOK", 1 ] ],
     "flags": [ "DURABLE_MELEE", "POLEARM", "SPEAR", "REACH_ATTACK", "REACH3", "NONCONDUCTIVE", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ]
   },
@@ -468,7 +508,7 @@
     "symbol": "/",
     "color": "brown",
     "looks_like": "pike",
-    "techniques": [ "IMPALE", "WBLOCK_2" ],
+    "techniques": [ "IMPALE", "WBLOCK_1" ],
     "qualities": [ [ "COOK", 1 ] ],
     "flags": [ "POLEARM", "SPEAR", "REACH_ATTACK", "REACH3", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ]
   },
@@ -489,7 +529,7 @@
     "symbol": "/",
     "color": "brown",
     "looks_like": "pike",
-    "techniques": [ "IMPALE", "WBLOCK_2" ],
+    "techniques": [ "IMPALE", "WBLOCK_1" ],
     "qualities": [ [ "COOK", 1 ] ],
     "flags": [ "POLEARM", "SPEAR", "REACH_ATTACK", "REACH3", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ]
   },

diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json
@@ -215,6 +215,43 @@
     "qualities": [ { "id": "CUT", "level": 1 } ],
     "components": [ [ [ "leather", 20 ] ], [ [ "rope_superior_short", 2, "LIST" ] ] ]
   },
+  {
+    "type": "recipe",
+    "result": "pike_wood",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_PIERCING",
+    "skill_used": "fabrication",
+    "skills_required": [ "survival", 1 ],
+    "difficulty": 3,
+    "time": "30 m",
+    "autolearn": true,
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "tools": [ [ [ "fire", -1 ] ] ],
+    "components": [
+      [ [ "long_pole", 1 ] ],
+      [ [ "rag", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ],
+      [ [ "duct_tape", 20 ], [ "filament", 20, "LIST" ] ]
+    ]
+  },
+  {
+    "type": "recipe",
+    "result": "pike_copper",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_PIERCING",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "time": "40 m",
+    "reversible": true,
+    "autolearn": true,
+    "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ],
+    "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
+    "components": [
+      [ [ "long_pole", 1 ] ],
+      [ [ "rag", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ],
+      [ [ "duct_tape", 20 ], [ "cordage_short", 1, "LIST" ], [ "filament", 50, "LIST" ] ],
+      [ [ "copper_scrap_equivalent", 12, "LIST" ] ]
+    ]
+  },
   {
     "type": "recipe",
     "result": "spear_wood",
@@ -228,7 +265,7 @@
     "qualities": [ { "id": "CUT", "level": 1 } ],
     "tools": [ [ [ "fire", -1 ] ] ],
     "components": [
-      [ [ "stick_long", 1 ], [ "pool_cue", 1 ] ],
+      [ [ "stick_long", 1 ] ],
       [ [ "rag", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ],
       [ [ "duct_tape", 20 ], [ "filament", 20, "LIST" ] ]
     ]
@@ -2312,7 +2349,7 @@
     "using": [ [ "blacksmithing_standard", 8 ], [ "steel_standard", 2 ] ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "swage", -1 ] ] ],
-    "components": [ [ [ "stick_long", 1 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
+    "components": [ [ [ "long_pole", 1 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
   },
   {
     "type": "recipe",