(done) Migrate some terrains that should be furnitures into furniture (…

…CleverRaven#41731)

* migrate gas_tank and diesel_tank to furniture, update palettes

* continue migration

generator_broken, and begin groundwork for machinery_light, machinery_heavy, machinery_old, machinery_electronic, console, console_broken, and plut_generator (that will become f_kilopower)

* replace all t_machinery variants and also t_plut_generator

* Begin converting t_console and t_console_broken

Lots of maps left to update
Also doing a fair bit of region terrain switches while I'm in here because that's a heck of a job too.

* consoles and consoles and linting

* still more consoles and regional terrains

* Complete t_console replacement

* first playtest error catch list

* errors caught on playtest

* fix a few hard coded instances of t_console overwriting any furniture options

* allow electronics xp gain for dismantling furniture consoles and electronic machinery

* Update mapdata.h

* linting + mapdata

needed to update mapdata.h to make the f_console fixes work

* update furniture strings to proper references

* The last remnants of the Old Republic have been swept away.

t_console seems to finally be dead.

* astyle

* connects_to doesn't work for furniture yet

* can't do furn_set in terrain

This points to an obsolete terran - but these terrains should all be furniture eventually anyway and it can be fixed then.

* accidentally deleted sewage

* Restore a few furnitures to palettes (#20)

Co-authored-by: Eric Pierce <[email protected]>

data/json/emit.json

@@ -338,5 +338,20 @@
     "field": "fd_extinguisher",
     "intensity": 1,
     "qty": 10
+  },
+  {
+    "id": "emit_rad_leak",
+    "type": "emit",
+    "field": "fd_nuke_gas",
+    "intensity": 1,
+    "qty": 1
+  },
+  {
+    "id": "emit_rad_cloud",
+    "//": "Negative, negative, it's a large reactor leak, very dangerous",
+    "type": "emit",
+    "field": "fd_nuke_gas",
+    "intensity": 3,
+    "qty": 100
   }
 ]

data/json/furniture_and_terrain/furniture-appliances.json

@@ -3,7 +3,7 @@
     "type": "furniture",
     "id": "f_air_conditioner",
     "name": "cooling unit",
-    "looks_like": "t_machinery_light",
+    "looks_like": "f_machinery_light",
     "description": "A large, blocky appliance encased in sheet metal.  This commonplace fixture is used for cooling large indoor areas.",
     "symbol": "{",
     "bgcolor": "white",
@@ -397,7 +397,7 @@
     "symbol": "#",
     "description": "An old device for pushing air into a blacksmith's forge to strengthen the fire and maintain a high temperature.  Useless in its current state, but good for parts.",
     "color": "dark_gray",
-    "looks_like": "t_machinery_old",
+    "looks_like": "f_machinery_old",
     "move_cost_mod": 2,
     "coverage": 60,
     "required_str": 10,
@@ -431,7 +431,7 @@
     "symbol": "#",
     "description": "An anvil with a large metal hammer suspended above it in a metal framework.  If it were working, it would be useful for shaping softened metal plates, though now it is only useful for parts.",
     "color": "white",
-    "looks_like": "t_machinery_old",
+    "looks_like": "f_machinery_old",
     "move_cost_mod": 2,
     "coverage": 60,
     "required_str": 10,

data/json/furniture_and_terrain/furniture-industrial.json

@@ -78,6 +78,302 @@
       ]
     }
   },
+  {
+    "type": "furniture",
+    "id": "f_generator_broken",
+    "name": "broken generator",
+    "description": "This generator is broken and will not help you produce usable electricity.",
+    "symbol": "&",
+    "color": "light_gray",
+    "looks_like": "f_machinery_old",
+    "move_cost_mod": -1,
+    "coverage": 30,
+    "required_str": 16,
+    "flags": [ "TRANSPARENT", "NOITEM", "REDUCE_SCENT", "MOUNTABLE", "PERMEABLE", "BLOCKS_DOOR" ],
+    "bash": {
+      "str_min": 20,
+      "str_max": 150,
+      "sound": "metal screeching!",
+      "sound_fail": "clang!",
+      "items": [
+        { "item": "steel_lump", "prob": 50 },
+        { "item": "steel_chunk", "count": [ 1, 4 ] },
+        { "item": "scrap", "count": [ 3, 7 ] },
+        { "item": "pipe", "count": [ 0, 1 ] }
+      ]
+    },
+    "deconstruct": {
+      "items": [
+        { "item": "cable", "charges": [ 1, 2 ] },
+        { "item": "steel_chunk", "count": [ 1, 2 ] },
+        { "item": "scrap", "count": [ 4, 6 ] },
+        { "item": "motor_small", "count": [ 0, 1 ] },
+        { "item": "jerrycan", "count": [ 0, 1 ] },
+        { "item": "pipe", "count": [ 0, 1 ] },
+        { "item": "pipe_fittings", "count": [ 0, 1 ] },
+        { "item": "frame", "count": [ 0, 1 ] }
+      ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_compact_ASRG_containment",
+    "name": "Compact Advanced Sterling Radioisotope Generator",
+    "description": "This hefty lump of steel and lead is the housing unit for a small nuclear reactor.  It is plastered with warning signs.  You could probably ignore those and salvage the steel and lead shielding, what could possibly go wrong?",
+    "symbol": "0",
+    "color": "green_white",
+    "looks_like": "f_machinery_electronic",
+    "move_cost_mod": -1,
+    "coverage": 80,
+    "required_str": -1,
+    "flags": [ "NOITEM", "SEALED", "REDUCE_SCENT", "PERMEABLE" ],
+    "bash": {
+      "str_min": 70,
+      "str_max": 400,
+      "explosive": 100,
+      "sound": "metal screeching!",
+      "sound_fail": "clang!",
+      "furn_set": "f_reactor_meltdown",
+      "items": [
+        { "item": "scrap", "count": [ 4, 16 ] },
+        { "item": "steel_chunk", "count": [ 1, 6 ] },
+        { "item": "plutonium", "charges": [ 0, 3 ] },
+        { "item": "lead", "charges": [ 12, 18 ] }
+      ]
+    },
+    "deconstruct": {
+      "furn_set": "f_compact_ASRG",
+      "items": [
+        { "item": "lead", "count": [ 40, 80 ] },
+        { "item": "cable", "charges": [ 8, 16 ] },
+        { "item": "steel_plate", "count": [ 2, 4 ] },
+        { "item": "mil_plate", "count": [ 2, 4 ] },
+        { "item": "large_lcd_screen", "count": 1 },
+        { "item": "scrap", "count": [ 8, 16 ] }
+      ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_compact_ASRG",
+    "name": "Compact Advanced Sterling Radioisotope Generator",
+    "description": "Some insane fool has removed the outer containment on this small-scale nuclear reactor.  It is still fairly safe as it is: the reactor has considerable built-in containment as well.  Nevertheless, you probably don't want to stand too close for too long.",
+    "symbol": "0",
+    "color": "green",
+    "looks_like": "f_machinery_electronic",
+    "move_cost_mod": -1,
+    "coverage": 50,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "NOITEM", "SEALED", "REDUCE_SCENT", "PERMEABLE" ],
+    "emissions": [ "emit_rad_leak" ],
+    "bash": {
+      "str_min": 20,
+      "str_max": 400,
+      "explosive": 100,
+      "sound": "metal screeching!",
+      "sound_fail": "clang!",
+      "furn_set": "f_reactor_meltdown",
+      "items": [
+        { "item": "scrap", "count": [ 4, 16 ] },
+        { "item": "steel_chunk", "count": [ 1, 6 ] },
+        { "item": "plutonium", "charges": [ 0, 3 ] },
+        { "item": "lead", "charges": [ 12, 18 ] }
+      ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_machinery_light",
+    "name": "light machinery",
+    "description": "Assorted light machinery.  You could scavenge it for parts.",
+    "symbol": "$",
+    "color": "dark_gray",
+    "move_cost_mod": 10,
+    "coverage": 65,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "BASHABLE", "CONTAINER", "FLAMMABLE", "PLACE_ITEM" ],
+    "deconstruct": {
+      "items": [
+        { "item": "wire", "count": [ 1, 3 ] },
+        { "item": "pipe", "count": [ 1, 2 ] },
+        { "item": "chain", "prob": 40 },
+        { "item": "cu_pipe", "prob": 40 },
+        { "item": "scrap", "count": [ 1, 4 ] },
+        { "item": "hose", "count": 1 },
+        { "item": "steel_chunk", "count": [ 1, 5 ] },
+        { "item": "bearing", "charges": [ 4, 12 ] },
+        { "item": "frame", "prob": 50 },
+        { "item": "motor", "prob": 50 }
+      ]
+    },
+    "bash": {
+      "str_min": 16,
+      "str_max": 80,
+      "sound": "clang!",
+      "sound_fail": "ting.",
+      "items": [
+        { "item": "wire", "count": 1 },
+        { "item": "pipe", "count": 2, "prob": 40 },
+        { "item": "chain", "prob": 20 },
+        { "item": "cu_pipe", "prob": 10 },
+        { "item": "scrap", "count": [ 3, 8 ] },
+        { "item": "steel_chunk", "count": [ 1, 4 ] },
+        { "item": "bearing", "charges": [ 2, 8 ] },
+        { "item": "frame", "prob": 20 },
+        { "item": "motor", "prob": 10 }
+      ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_machinery_heavy",
+    "name": "heavy machinery",
+    "description": "Assorted heavy machinery.  You could scavenge it for parts.",
+    "symbol": "%",
+    "color": "light_gray",
+    "move_cost_mod": 10,
+    "coverage": 75,
+    "required_str": -1,
+    "flags": [ "BASHABLE", "CONTAINER", "SEALED", "PLACE_ITEM" ],
+    "deconstruct": {
+      "items": [
+        { "item": "wire", "count": [ 1, 3 ] },
+        { "item": "pipe", "count": [ 1, 2 ] },
+        { "item": "chain", "prob": 60 },
+        { "item": "cu_pipe", "prob": 20 },
+        { "item": "steel_lump", "count": [ 1, 2 ] },
+        { "item": "hose", "count": 1 },
+        { "item": "sheet_metal", "count": [ 1, 3 ] },
+        { "item": "steel_chunk", "count": [ 1, 3 ] },
+        { "item": "bearing", "charges": [ 4, 12 ] },
+        { "item": "frame", "prob": 60 },
+        { "item": "motor", "prob": 30 },
+        { "item": "metal_tank", "prob": 30 },
+        { "item": "motor_large", "prob": 10 }
+      ]
+    },
+    "bash": {
+      "str_min": 18,
+      "str_max": 80,
+      "sound": "clang!",
+      "sound_fail": "ting.",
+      "items": [
+        { "item": "wire", "count": 1 },
+        { "item": "pipe", "count": 1 },
+        { "item": "chain", "prob": 20 },
+        { "item": "steel_lump", "count": 1 },
+        { "item": "scrap", "count": [ 1, 5 ] },
+        { "item": "sheet_metal", "count": 2 },
+        { "item": "steel_chunk", "count": [ 1, 2 ] },
+        { "item": "bearing", "charges": [ 2, 8 ] },
+        { "item": "frame", "prob": 30 },
+        { "item": "motor", "prob": 10 },
+        { "item": "metal_tank", "prob": 20 },
+        { "item": "motor_large", "prob": 5 }
+      ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_machinery_old",
+    "name": "old machinery",
+    "description": "Assorted old, rusty machinery.  You could scavenge it for parts.",
+    "symbol": "&",
+    "color": "brown",
+    "move_cost_mod": 4,
+    "coverage": 55,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "BASHABLE", "CONTAINER", "FLAMMABLE", "PLACE_ITEM" ],
+    "deconstruct": {
+      "items": [
+        { "item": "wire", "count": 1 },
+        { "item": "pipe", "count": [ 1, 2 ] },
+        { "item": "chain", "prob": 40 },
+        { "item": "cu_pipe", "prob": 60 },
+        { "item": "scrap", "count": [ 1, 3 ] },
+        { "item": "hose", "count": 1 },
+        { "item": "steel_chunk", "count": [ 1, 3 ] },
+        { "item": "bearing", "charges": [ 1, 5 ] },
+        { "item": "frame", "prob": 30 },
+        { "item": "motor", "prob": 30 },
+        { "item": "splinter", "count": 3, "prob": 30 },
+        { "item": "2x4", "count": [ 1, 4 ] },
+        { "item": "nail", "charges": [ 3, 10 ] }
+      ]
+    },
+    "bash": {
+      "str_min": 10,
+      "str_max": 80,
+      "sound": "clang!",
+      "sound_fail": "ting.",
+      "items": [
+        { "item": "wire", "count": 1 },
+        { "item": "pipe", "count": [ 1, 2 ] },
+        { "item": "chain", "prob": 20 },
+        { "item": "cu_pipe", "prob": 10 },
+        { "item": "scrap", "count": [ 1, 5 ] },
+        { "item": "steel_chunk", "count": [ 1, 2 ] },
+        { "item": "motor", "prob": 10 },
+        { "item": "splinter", "count": [ 4, 8 ] },
+        { "item": "2x4", "count": 2 },
+        { "item": "nail", "charges": [ 2, 5 ] }
+      ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_machinery_electronic",
+    "name": "electronic machinery",
+    "description": "Assorted electronic machinery.  You could scavenge it for parts.",
+    "symbol": "$",
+    "color": "yellow",
+    "move_cost_mod": 8,
+    "coverage": 55,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "BASHABLE", "CONTAINER", "SEALED", "FLAMMABLE", "PLACE_ITEM" ],
+    "deconstruct": {
+      "items": [
+        { "item": "wire", "count": [ 1, 3 ] },
+        { "item": "pipe", "count": [ 1, 2 ] },
+        { "item": "steel_chunk", "count": [ 1, 4 ] },
+        { "item": "bearing", "charges": [ 2, 6 ] },
+        { "item": "motor", "prob": 40 },
+        { "item": "processor", "count": 1 },
+        { "item": "RAM", "count": [ 1, 4 ] },
+        { "item": "cable", "charges": [ 1, 4 ] },
+        { "item": "small_lcd_screen", "count": 1 },
+        { "item": "e_scrap", "count": [ 5, 10 ] },
+        { "item": "circuit", "count": [ 3, 8 ] },
+        { "item": "power_supply", "count": [ 1, 3 ] },
+        { "item": "amplifier", "count": [ 1, 3 ] },
+        { "item": "plastic_chunk", "count": [ 2, 8 ] },
+        { "item": "scrap", "count": [ 1, 5 ] }
+      ]
+    },
+    "bash": {
+      "str_min": 10,
+      "str_max": 80,
+      "sound": "clang!",
+      "sound_fail": "ting.",
+      "items": [
+        { "item": "wire", "prob": 40 },
+        { "item": "pipe", "prob": 40 },
+        { "item": "steel_chunk", "prob": 40 },
+        { "item": "bearing", "charges": [ 2, 4 ] },
+        { "item": "motor", "prob": 10 },
+        { "item": "processor", "prob": 40 },
+        { "item": "RAM", "count": [ 1, 2 ] },
+        { "item": "cable", "charges": [ 1, 2 ] },
+        { "item": "small_lcd_screen", "prob": 40 },
+        { "item": "e_scrap", "count": [ 3, 8 ] },
+        { "item": "circuit", "count": [ 1, 3 ] },
+        { "item": "power_supply", "prob": 40 },
+        { "item": "amplifier", "prob": 40 },
+        { "item": "plastic_chunk", "count": [ 2, 8 ] },
+        { "item": "scrap", "count": [ 3, 8 ] }
+      ]
+    }
+  },
   {
     "type": "furniture",
     "id": "f_robotic_arm",