Better pipe spear v2. (#51830)

* Re does the stuff from #51639 and adds a better pipe-spear as a second stage.
CleverRaven · Sep 24, 2021 · c6e7e6c · c6e7e6c
1 parent a021334
commit c6e7e6c
Show file tree

Hide file tree

Showing 2 changed files with 79 additions and 12 deletions.
diff --git a/data/json/items/melee/spears_and_polearms.json b/data/json/items/melee/spears_and_polearms.json
@@ -263,22 +263,60 @@
   },
   {
     "type": "GENERIC",
-    "id": "spear_pipe",
-    "//": "stats of original steel spear, after it was made into a less makeshift version",
-    "name": { "str": "pipe spear" },
-    "description": "A stout metal pole with a sharp point.",
-    "weight": "1398 g",
+    "id": "sharpened_pipe",
+    "symbol": "/",
+    "color": "light_gray",
+    "name": { "str": "sharpened pipe" },
+    "description": "A pipe with one end cut off at an angle.",
+    "material": [ "steel" ],
+    "volume": "365 ml",
+    "longest_side": "60 cm",
+    "weight": "1240 g",
+    "bashing": 8,
+    "cutting": 13,
+    "to_hit": -2,
+    "price": 200,
+    "price_postapoc": 10,
+    "flags": [ "SPEAR" ],
+    "techniques": [ "WBLOCK_1" ],
+    "qualities": [ [ "COOK", 1 ] ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "simple_spear_pipe",
+    "name": { "str": "basic pipe spear" },
+    "description": "Three pipes tightly fit together with one end cut down to a point.",
+    "weight": "3890 g",
     "to_hit": -1,
-    "price_postapoc": 50,
+    "price_postapoc": 150,
     "color": "light_gray",
     "symbol": "/",
     "material": [ "steel" ],
     "techniques": [ "WBLOCK_1", "IMPALE" ],
-    "volume": "1250 ml",
-    "longest_side": "150 cm",
+    "volume": "1130 ml",
+    "longest_side": "185 cm",
     "bashing": 6,
     "cutting": 25,
-    "flags": [ "SPEAR", "REACH_ATTACK", "SHEATH_SPEAR" ],
+    "flags": [ "SPEAR", "REACH_ATTACK", "SHEATH_SPEAR", "DURABLE_MELEE" ],
+    "price": 8000,
+    "qualities": [ [ "COOK", 1 ] ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "spear_pipe",
+    "name": { "str": "pipe spear" },
+    "description": "Three pipes tightly fit together with some wrappings for a handle around one end and a sharp tip on the other.",
+    "weight": "3890 g",
+    "price_postapoc": 250,
+    "color": "light_gray",
+    "symbol": "/",
+    "material": [ "steel" ],
+    "techniques": [ "WBLOCK_1", "IMPALE" ],
+    "volume": "1135 ml",
+    "longest_side": "184 cm",
+    "bashing": 6,
+    "cutting": 29,
+    "flags": [ "SPEAR", "REACH_ATTACK", "SHEATH_SPEAR", "DURABLE_MELEE" ],
     "price": 8000,
     "qualities": [ [ "COOK", 1 ] ]
   },

diff --git a/data/json/recipes/weapon/piercing.json b/data/json/recipes/weapon/piercing.json
@@ -197,20 +197,49 @@
     ]
   },
   {
-    "result": "spear_pipe",
+    "result": "sharpened_pipe",
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_PIERCING",
+    "skill_used": "fabrication",
+    "difficulty": 1,
+    "skills_required": [ "melee", 1 ],
+    "time": "1 m",
+    "autolearn": true,
+    "flags": [ "BLIND_EASY" ],
+    "qualities": [ { "id": "SAW_M", "level": 1 } ],
+    "components": [ [ [ "pipe", 1 ] ] ]
+  },
+  {
+    "result": "simple_spear_pipe",
     "type": "recipe",
     "activity_level": "MODERATE_EXERCISE",
     "category": "CC_WEAPON",
     "subcategory": "CSC_WEAPON_PIERCING",
     "skill_used": "fabrication",
     "difficulty": 1,
     "skills_required": [ "melee", 1 ],
+    "time": "5 m",
+    "autolearn": true,
+    "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 } ],
+    "components": [ [ [ "pipe", 3 ] ], [ [ "pipe_fittings", 1 ] ] ]
+  },
+  {
+    "result": "spear_pipe",
+    "type": "recipe",
+    "activity_level": "MODERATE_EXERCISE",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_PIERCING",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "skills_required": [ "melee", 1 ],
     "time": "60 m",
     "autolearn": true,
-    "using": [ [ "welding_standard", 2 ], [ "steel_tiny", 1 ] ],
+    "using": [ [ "welding_standard", 2 ], [ "steel_tiny", 1 ], [ "cordage_superior", 2 ] ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_welding_basic" } ],
     "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "SAW_M", "level": 1 } ],
-    "components": [ [ [ "pipe", 1 ] ] ]
+    "components": [ [ [ "simple_spear_pipe", 1 ] ] ]
   },
   {
     "result": "grip_hook",