Make piano easy-deconstructable and thus possible to move as an item (#…

…71111) * Update furniture-recreation.json * Update appliances.json * Update appliances.json * Update recipe_deconstruction.json * Update construction.json * Update construction_group.json * Update appliances.json * Update appliances.json * Update decorative.json
CleverRaven · Jan 21, 2024 · 6daf298 · 6daf298
1 parent aeeb5c8
commit 6daf298
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 11 deletions.
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -9036,5 +9036,18 @@
     "pre_terrain": "f_pipe_stack_mid",
     "post_terrain": "f_pipe_stack_tall",
     "activity_level": "EXTRA_EXERCISE"
+  },
+  {
+    "type": "construction",
+    "id": "constr_place_piano",
+    "group": "place_piano",
+    "category": "FURN",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "1 m",
+    "components": [ [ [ "piano", 1 ] ] ],
+    "pre_note": "Can be deconstructed without tools.",
+    "pre_special": "check_empty",
+    "post_terrain": "f_piano",
+    "activity_level": "LIGHT_EXERCISE"
   }
 ]
diff --git a/data/json/construction_group.json b/data/json/construction_group.json
@@ -1923,5 +1923,10 @@
     "type": "construction_group",
     "id": "pipe_bulk",
     "name": "Build a Stack of Pipes"
+  },
+  {
+    "type": "construction_group",
+    "id": "place_piano",
+    "name": "Place Piano"
   }
 ]
diff --git a/data/json/furniture_and_terrain/furniture-recreation.json b/data/json/furniture_and_terrain/furniture-recreation.json
@@ -426,18 +426,9 @@
     "coverage": 70,
     "required_str": 8,
     "//": "While heavy, most large pianos have casters for relatively easy movement.",
-    "flags": [ "FLAMMABLE", "ORGANIC", "BLOCKSDOOR", "SMALL_HIDE" ],
+    "flags": [ "FLAMMABLE", "ORGANIC", "BLOCKSDOOR", "EASY_DECONSTRUCT", "SMALL_HIDE" ],
     "examine_action": { "type": "effect_on_condition", "effect_on_conditions": [ "EOC_PLAY_PIANO" ] },
-    "deconstruct": {
-      "items": [
-        { "item": "2x4", "count": 12 },
-        { "item": "nail", "charges": [ 8, 12 ] },
-        { "item": "qt_wire", "count": [ 10, 26 ] },
-        { "item": "wheel_caster", "count": [ 0, 1 ] },
-        { "item": "steel_chunk", "count": [ 0, 3 ] },
-        { "item": "plastic_chunk", "count": [ 1, 10 ] }
-      ]
-    },
+    "deconstruct": { "items": [ { "item": "piano", "count": 1 } ] },
     "bash": {
       "str_min": 12,
       "str_max": 40,

diff --git a/data/json/items/furniture/decorative.json b/data/json/items/furniture/decorative.json
@@ -15,5 +15,19 @@
     "use_action": { "type": "deploy_furn", "furn_type": "f_bigmirror" },
     "symbol": "{",
     "color": "white"
+  },
+  {
+    "type": "GENERIC",
+    "category": "other",
+    "id": "piano",
+    "name": { "str_sp": "piano" },
+    "description": "An elegant piano, capable of producing beautiful music if used by a skilled player.  A set of off-white and black keys are linked to a set of hammers, which strike their corresponding tightly-coiled wire to produce sound.",
+    "weight": "300 kg",
+    "material": [ "wood" ],
+    "volume": "1000 L",
+    "price": 500000,
+    "price_postapoc": 1500,
+    "symbol": "P",
+    "color": "i_black"
   }
 ]
diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json
@@ -7827,5 +7827,20 @@
     "qualities": [ { "id": "HAMMER", "level": 1 } ],
     "components": [ [ [ "stick", 1 ], [ "splinter", 1 ] ] ],
     "flags": [ "BLIND_EASY" ]
+  },
+  {
+    "result": "piano",
+    "type": "uncraft",
+    "activity_level": "LIGHT_EXERCISE",
+    "time": "120 m",
+    "qualities": [ { "id": "PRY", "level": 1 }, { "id": "DRILL", "level": 1 }, { "id": "SCREW", "level": 1 } ],
+    "components": [
+      [ [ "2x4", 12 ] ],
+      [ [ "nail", 12 ] ],
+      [ [ "qt_wire", 26 ] ],
+      [ [ "wheel_caster", 1 ] ],
+      [ [ "steel_chunk", 3 ] ],
+      [ [ "plastic_chunk", 10 ] ]
+    ]
   }
 ]