Merge pull request #61603 from ashGlaw/Heavy-Punching-Bag

Heavy punching bag construction
CleverRaven · Oct 12, 2022 · 26e35a7 · 26e35a7
2 parents 297840d + 4dc0171
commit 26e35a7
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 3 deletions.
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -6722,6 +6722,27 @@
     "pre_special": "check_support",
     "post_terrain": "t_door_glass_c"
   },
+  {
+    "type": "construction",
+    "id": "hang_heavy_punching_bag",
+    "description": "A hefty leather bag in an oblong shape, suspended from a ceiling mount with a steel chain.  It can be used for exercise and combat training, with the notable advantage that it doesn't fight back.",
+    "group": "hang_heavy_punching_bag",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 1 ] ],
+    "time": "60 m",
+    "qualities": [ [ { "id": "DRILL", "level": 1 } ], [ { "id": "WRENCH_FINE", "level": 1 } ] ],
+    "components": [
+      [ [ "nuts_bolts", 4 ] ],
+      [ [ "chain", 4 ] ],
+      [ [ "blanket", 6 ] ],
+      [ [ "material_sand", 4000 ] ],
+      [ [ "bag_plastic", 4 ] ],
+      [ [ "duct_tape", 20 ] ]
+    ],
+    "pre_flags": [ "INDOORS" ],
+    "pre_special": "check_empty",
+    "post_terrain": "f_punching_bag"
+  },
   {
     "type": "construction",
     "id": "constr_training_dummy_light",

diff --git a/data/json/construction_group.json b/data/json/construction_group.json
@@ -1629,6 +1629,11 @@
     "id": "remove_glass_door",
     "name": "Remove glass door"
   },
+  {
+    "type": "construction_group",
+    "id": "hang_heavy_punching_bag",
+    "name": "Hang a Heavy Punching Bag"
+  },
   {
     "type": "construction_group",
     "id": "build_training_dummy_light",

diff --git a/data/json/furniture_and_terrain/furniture-recreation.json b/data/json/furniture_and_terrain/furniture-recreation.json
@@ -387,19 +387,31 @@
     "color": "dark_gray",
     "move_cost_mod": -1,
     "coverage": 65,
-    "required_str": 10,
+    "required_str": -1,
     "flags": [ "BLOCKSDOOR", "PLACE_ITEM", "ORGANIC", "WORKOUT_ARMS" ],
     "crafting_pseudo_item": "pseudo_punching_bag",
     "examine_action": "workout",
+    "deconstruct": {
+      "items": [
+        { "item": "heavy_punching_bag_sack", "count": 1 },
+        { "item": "nuts_bolts", "charges": 4 },
+        { "item": "chain", "count": 4 },
+        { "item": "blanket", "count": 6 },
+        { "item": "material_sand", "charges": 4000 },
+        { "item": "bag_plastic", "count": 4 }
+      ]
+    },
     "bash": {
       "str_min": 15,
       "str_max": 20,
       "sound": "whack!",
       "sound_fail": "whud.",
       "items": [
         { "item": "chain", "count": [ 1, 3 ] },
-        { "item": "leather", "count": [ 4, 12 ] },
-        { "item": "cotton_patchwork", "count": [ 4, 18 ] }
+        { "item": "leather", "count": [ 16, 32 ] },
+        { "item": "tanned_hide", "count": [ 0, 4 ] },
+        { "item": "material_sand", "charges": 4000 },
+        { "item": "cotton_patchwork", "count": [ 33, 66 ] }
       ]
     }
   },

diff --git a/data/json/items/containers.json b/data/json/items/containers.json
@@ -284,6 +284,32 @@
     ],
     "color": "dark_gray"
   },
+  {
+    "id": "heavy_punching_bag_sack",
+    "type": "GENERIC",
+    "category": "container",
+    "name": { "str": "heavy punching bag sack" },
+    "looks_like": "bag_canvas",
+    "description": "A nigh five foot long cylindrical leather sack, a foot in diameter, with attachment points at the top.  With some bags of sand, some chains and a bunch of blankets you could hang it from the ceiling as a heavy punching bag.",
+    "weight": "2400g",
+    "volume": "2260 ml",
+    "longest_side": "150 cm",
+    "price": 0,
+    "price_postapoc": 10,
+    "to_hit": -5,
+    "material": [ "leather" ],
+    "symbol": ")",
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "110 L",
+        "max_contains_weight": "100 kg",
+        "max_item_length": "150 cm",
+        "moves": 400
+      }
+    ],
+    "color": "dark_gray"
+  },
   {
     "id": "bag_iv",
     "type": "GENERIC",

diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json
@@ -6427,6 +6427,14 @@
     "components": [ [ [ "leather", 12 ] ] ],
     "qualities": [ { "id": "CUT", "level": 1 } ]
   },
+  {
+    "result": "heavy_punching_bag_sack",
+    "type": "uncraft",
+    "activity_level": "LIGHT_EXERCISE",
+    "time": "30 m",
+    "components": [ [ [ "leather", 16 ] ], [ [ "tanned_hide", 8 ] ] ],
+    "qualities": [ { "id": "CUT", "level": 1 } ]
+  },
   {
     "result": "sleeping_bag_fur_roll",
     "type": "uncraft",

diff --git a/data/json/recipes/tools/containers.json b/data/json/recipes/tools/containers.json
@@ -1172,6 +1172,21 @@
     "proficiencies": [ { "proficiency": "prof_leatherworking_basic", "time_multiplier": 2 } ],
     "components": [ [ [ "leather", 3 ], [ "tanned_hide", 1 ], [ "tanned_pelt", 1 ] ], [ [ "filament", 35, "LIST" ] ] ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "heavy_punching_bag_sack",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_CONTAINERS",
+    "skill_used": "tailor",
+    "skills_required": [ "survival", 1 ],
+    "difficulty": 2,
+    "time": "240 m",
+    "autolearn": true,
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "LEATHER_AWL", "level": 1 }, { "id": "CUT", "level": 2 } ],
+    "proficiencies": [ { "proficiency": "prof_leatherworking_basic", "time_multiplier": 2 } ],
+    "components": [ [ [ "tanned_hide", 9 ] ], [ [ "filament", 80, "LIST" ] ] ]
+  },
   {
     "type": "recipe",
     "activity_level": "BRISK_EXERCISE",