Merge pull request CleverRaven#54144 from LovamKicsiGazsii/cathedral

Redesigned Cathedral

data/json/furniture_and_terrain/furniture-recreation.json

@@ -548,5 +548,46 @@
         { "item": "scrap", "count": [ 0, 1 ] }
       ]
     }
+  },
+  {
+    "type": "furniture",
+    "id": "f_organ",
+    "name": "pipe organ",
+    "description": "A majestic pipe organ.  Dubbed \"the king of instruments\", it is capable of producing powerful sound harmonies if used by a skilled player.  Rows of off-white and black keys all linked to a set of iron pipes, which resonate at a specific pitch when pressurized air is driven through them.",
+    "symbol": "P",
+    "color": "i_brown",
+    "move_cost_mod": -1,
+    "coverage": 100,
+    "required_str": -1,
+    "flags": [ "FLAMMABLE", "ORGANIC", "NOITEM" ],
+    "looks_like": "f_piano",
+    "deconstruct": {
+      "items": [
+        { "item": "pipe", "count": 26 },
+        { "item": "2x4", "count": 12 },
+        { "item": "nail", "charges": [ 10, 15 ] },
+        { "item": "wire", "count": [ 4, 12 ] },
+        { "item": "plastic_chunk", "count": [ 1, 12 ] },
+        { "item": "steel_chunk", "count": [ 1, 3 ] },
+        { "item": "cable", "count": [ 1, 3 ] },
+        { "item": "motor_tiny", "count": 1 }
+      ]
+    },
+    "bash": {
+      "str_min": 16,
+      "str_max": 40,
+      "sound": "a dramatic pipe organ!",
+      "sound_fail": "kerchang.",
+      "items": [
+        { "item": "pipe", "count": [ 4, 12 ] },
+        { "item": "2x4", "count": [ 4, 8 ] },
+        { "item": "nail", "charges": [ 6, 12 ] },
+        { "item": "wire", "count": [ 0, 4 ] },
+        { "item": "splinter", "count": [ 1, 3 ] },
+        { "item": "plastic_chunk", "count": [ 1, 6 ] },
+        { "item": "steel_chunk", "count": [ 1, 4 ] },
+        { "item": "cable", "count": [ 1, 3 ] }
+      ]
+    }
   }
 ]

data/json/itemgroups/misc.json

@@ -186,5 +186,31 @@
     "type": "item_group",
     "id": "spiral",
     "items": [ [ "spiral_stone", 20 ], [ "vortex_stone", 2 ] ]
+  },
+  {
+    "type": "item_group",
+    "id": "makeshift_memorial",
+    "subtype": "collection",
+    "entries": [
+      { "item": "candle", "prob": 100, "count": [ 1, 3 ], "charges-max": 50 },
+      { "item": "candle", "prob": 33, "count": [ 1, 2 ], "charges-min": 50 },
+      { "item": "family_photo", "prob": 20, "count": [ 1, 2 ] },
+      { "item": "teddy_bear", "prob": 5 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "cathedral_archives",
+    "subtype": "collection",
+    "entries": [
+      { "item": "book_binder", "prob": 90, "charges-max": 90, "count": [ 1, 5 ] },
+      { "item": "file", "prob": 50, "count": [ 1, 15 ] },
+      { "item": "paper", "prob": 60, "count": [ 10, 125 ] },
+      { "item": "book_pieces", "prob": 20 },
+      { "item": "candle", "prob": 3, "charges": 100 },
+      { "item": "holybook_bible1", "prob": 3 },
+      { "item": "candlestick", "prob": 2 },
+      { "item": "book_ruined", "prob": 1 }
+    ]
   }
 ]