diff --git a/data/json/emit.json b/data/json/emit.json index f0053ab79d09e..ccdb67bb86dca 100644 --- a/data/json/emit.json +++ b/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 } ] diff --git a/data/json/furniture_and_terrain/furniture-appliances.json b/data/json/furniture_and_terrain/furniture-appliances.json index ec76bf4111e23..7f99d8fed25f0 100644 --- a/data/json/furniture_and_terrain/furniture-appliances.json +++ b/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, diff --git a/data/json/furniture_and_terrain/furniture-industrial.json b/data/json/furniture_and_terrain/furniture-industrial.json index 40fcf20c86d89..f993a57aab249 100644 --- a/data/json/furniture_and_terrain/furniture-industrial.json +++ b/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", diff --git a/data/json/furniture_and_terrain/furniture-medical.json b/data/json/furniture_and_terrain/furniture-medical.json index 294ffca2b19a1..660d1d9efe73c 100644 --- a/data/json/furniture_and_terrain/furniture-medical.json +++ b/data/json/furniture_and_terrain/furniture-medical.json @@ -408,7 +408,7 @@ "move_cost_mod": -1, "coverage": 40, "required_str": 12, - "looks_like": "t_machinery_light", + "looks_like": "f_machinery_light", "flags": [ "TRANSPARENT" ], "deconstruct": { "items": [ @@ -453,7 +453,7 @@ "move_cost_mod": -1, "coverage": 40, "required_str": 18, - "looks_like": "t_machinery_old", + "looks_like": "f_machinery_old", "flags": [ "BLOCKSDOOR" ], "deconstruct": { "items": [ @@ -498,7 +498,7 @@ "move_cost_mod": -1, "coverage": 45, "required_str": -1, - "looks_like": "t_machinery_heavy", + "looks_like": "f_machinery_heavy", "flags": [ "TRANSPARENT" ], "deconstruct": { "items": [ @@ -539,7 +539,7 @@ "move_cost_mod": -1, "coverage": 65, "required_str": -1, - "looks_like": "t_machinery_heavy", + "looks_like": "f_machinery_heavy", "deconstruct": { "items": [ { "item": "scrap", "count": [ 2, 6 ] }, @@ -578,7 +578,7 @@ "bgcolor": "white", "move_cost_mod": -1, "required_str": -1, - "looks_like": "t_machinery_electronic", + "looks_like": "f_machinery_electronic", "deconstruct": { "items": [ { "item": "scrap", "count": [ 2, 6 ] }, @@ -619,7 +619,7 @@ "coverage": 65, "required_str": -1, "flags": [ "PLACE_ITEM", "CONTAINER" ], - "looks_like": "t_machinery_electronic", + "looks_like": "f_machinery_electronic", "deconstruct": { "items": [ { "item": "scrap", "count": [ 2, 6 ] }, @@ -660,7 +660,7 @@ "coverage": 65, "required_str": -1, "flags": [ "PLACE_ITEM", "CONTAINER" ], - "looks_like": "t_machinery_electronic", + "looks_like": "f_machinery_electronic", "deconstruct": { "items": [ { "item": "scrap", "count": [ 2, 6 ] }, @@ -921,5 +921,45 @@ { "item": "scrap", "count": [ 2, 7 ] } ] } + }, + { + "type": "furniture", + "id": "f_centrifuge", + "name": "centrifuge", + "looks_like": "f_machinery_electronic", + "description": "This is a centrifuge, a liquid separating device with an automated analyzer unit. For some reason, this one has an attached battery pack. It could be used to analyze a medical fluid sample, such as blood, if a test tube was placed in it.", + "symbol": "{", + "color": "magenta", + "move_cost_mod": -1, + "coverage": 30, + "required_str": -1, + "flags": [ "TRANSPARENT", "PERMEABLE" ], + "deconstruct": { + "items": [ + { "item": "circuit", "count": 4 }, + { "item": "scrap", "count": 5 }, + { "item": "motor_small", "count": 1 }, + { "item": "spectrophotometer", "count": 1 }, + { "item": "storage_battery", "count": 1 }, + { "item": "betavoltaic", "count": [ 1, 4 ] }, + { "item": "steel_chunk", "count": 3 }, + { "item": "sheet_metal", "count": 3 }, + { "item": "cable", "charges": 5 } + ] + }, + "bash": { + "str_min": 3, + "str_max": 45, + "sound": "crunch!", + "sound_fail": "whack!", + "items": [ + { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 }, + { "item": "circuit", "count": [ 1, 6 ], "prob": 50 }, + { "item": "scrap", "count": [ 2, 5 ] }, + { "item": "steel_chunk", "count": [ 0, 3 ] }, + { "item": "sheet_metal", "count": [ 1, 3 ] }, + { "item": "cable", "charges": [ 1, 15 ] } + ] + } } ] diff --git a/data/json/furniture_and_terrain/furniture-plumbing.json b/data/json/furniture_and_terrain/furniture-plumbing.json index 630dbce5bc55e..b580206f2b30c 100644 --- a/data/json/furniture_and_terrain/furniture-plumbing.json +++ b/data/json/furniture_and_terrain/furniture-plumbing.json @@ -62,6 +62,7 @@ "coverage": 60, "required_str": -1, "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "CONTAINER", "PLACE_ITEM", "MOUNTABLE" ], + "//connects_to": "COUNTER", "bash": { "str_min": 8, "str_max": 30, diff --git a/data/json/furniture_and_terrain/furniture-storage.json b/data/json/furniture_and_terrain/furniture-storage.json index f031c568b8a12..120f285782beb 100644 --- a/data/json/furniture_and_terrain/furniture-storage.json +++ b/data/json/furniture_and_terrain/furniture-storage.json @@ -878,6 +878,100 @@ "items": [ { "item": "scrap", "count": [ 8, 32 ] }, { "item": "water_faucet", "prob": 50 } ] } }, + { + "type": "furniture", + "id": "f_gas_tank", + "name": "fuel tank", + "description": "A tank filled with gasoline.", + "looks_like": "f_standing_tank", + "symbol": "Q", + "color": "brown_red", + "move_cost_mod": -1, + "coverage": 70, + "required_str": -1, + "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT" ], + "bash": { + "str_min": 40, + "str_max": 100, + "explosive": 20, + "sound": "metal screeching!", + "sound_fail": "clang!", + "furn_set": "f_gas_tank_smashed" + } + }, + { + "type": "furniture", + "id": "f_gas_tank_smashed", + "name": "broken fuel tank", + "description": "A broken tank which was filled with gasoline.", + "looks_like": "f_wreckage", + "symbol": "Q", + "color": "light_red", + "move_cost_mod": 6, + "coverage": 30, + "required_str": -1, + "flags": [ "TRANSPARENT", "NOITEM", "REDUCE_SCENT" ], + "bash": { + "str_min": 40, + "str_max": 100, + "explosive": 40, + "sound": "metal screeching!", + "sound_fail": "clang!", + "items": [ + { "item": "steel_lump", "count": [ 1, 4 ] }, + { "item": "steel_chunk", "count": [ 1, 4 ] }, + { "item": "sheet_metal", "count": [ 1, 4 ] }, + { "item": "scrap", "count": [ 3, 7 ] } + ] + } + }, + { + "type": "furniture", + "id": "f_diesel_tank", + "name": "fuel tank", + "description": "A tank filled with diesel.", + "looks_like": "f_standing_tank", + "symbol": "Q", + "color": "brown_green", + "move_cost_mod": -1, + "coverage": 70, + "required_str": -1, + "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT" ], + "bash": { + "str_min": 40, + "str_max": 100, + "explosive": 20, + "sound": "metal screeching!", + "sound_fail": "clang!", + "furn_set": "f_diesel_tank_smashed" + } + }, + { + "type": "furniture", + "id": "f_diesel_tank_smashed", + "name": "broken fuel tank", + "description": "A broken tank which was filled with diesel.", + "looks_like": "f_wreckage", + "symbol": "Q", + "color": "light_green", + "move_cost_mod": 6, + "coverage": 30, + "required_str": -1, + "flags": [ "TRANSPARENT", "NOITEM", "REDUCE_SCENT" ], + "bash": { + "str_min": 40, + "str_max": 100, + "explosive": 40, + "sound": "metal screeching!", + "sound_fail": "clang!", + "items": [ + { "item": "steel_lump", "count": [ 1, 4 ] }, + { "item": "steel_chunk", "count": [ 1, 4 ] }, + { "item": "sheet_metal", "count": [ 1, 4 ] }, + { "item": "scrap", "count": [ 3, 7 ] } + ] + } + }, { "type": "furniture", "id": "f_dumpster", diff --git a/data/json/furniture_and_terrain/furniture-surfaces.json b/data/json/furniture_and_terrain/furniture-surfaces.json index 7dd6bd998b7bb..272d466d732e0 100644 --- a/data/json/furniture_and_terrain/furniture-surfaces.json +++ b/data/json/furniture_and_terrain/furniture-surfaces.json @@ -10,6 +10,7 @@ "coverage": 60, "required_str": 10, "flags": [ "TRANSPARENT", "FLAMMABLE", "ORGANIC", "MOUNTABLE", "SHORT", "FLAT_SURF" ], + "//connects_to": "COUNTER", "deconstruct": { "items": [ { "item": "2x4", "count": 4 }, { "item": "wood_panel", "count": 1 }, { "item": "nail", "charges": [ 6, 10 ] } ] }, @@ -34,6 +35,7 @@ "coverage": 55, "required_str": -1, "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "CONTAINER", "PLACE_ITEM", "ORGANIC", "MOUNTABLE", "FLAT_SURF" ], + "//connects_to": "COUNTER", "deconstruct": { "items": [ { "item": "2x4", "count": 3 }, { "item": "wood_panel", "count": 1 }, { "item": "nail", "charges": [ 6, 8 ] } ] }, diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json index e93a006ba2520..cda62fcb1c497 100644 --- a/data/json/furniture_and_terrain/furniture-terrains.json +++ b/data/json/furniture_and_terrain/furniture-terrains.json @@ -590,6 +590,33 @@ ], "examine_action": "rubble" }, + { + "type": "furniture", + "id": "f_reactor_meltdown", + "name": "radioactive slag", + "description": "A pile of melted slag from a destroyed nuclear reactor. What are you doing looking at this? Get the hell out of here, you nutcase!", + "looks_like": "f_wreckage", + "symbol": "#", + "color": "light_green", + "move_cost_mod": 6, + "max_volume": "750 L", + "required_str": -1, + "emissions": [ "emit_rad_cloud" ], + "flags": [ + "TRANSPARENT", + "UNSTABLE", + "ROUGH", + "SHARP", + "PLACE_ITEM", + "MOUNTABLE", + "CONTAINER", + "SEALED", + "ALLOW_FIELD_EFFECT", + "SHORT", + "RUBBLE", + "EMITTER" + ] + }, { "type": "furniture", "id": "f_ash", diff --git a/data/json/furniture_and_terrain/furniture-tools.json b/data/json/furniture_and_terrain/furniture-tools.json index a4d3ba80cfbf7..666b2a53540fd 100644 --- a/data/json/furniture_and_terrain/furniture-tools.json +++ b/data/json/furniture_and_terrain/furniture-tools.json @@ -1,4 +1,99 @@ [ + { + "type": "furniture", + "id": "f_console_broken", + "name": "broken console", + "description": "This is a standalone computer terminal. It doesn't seem to be working. It's the broken screen and shattered circuit boards that's telling you that.", + "symbol": "6", + "color": "light_gray", + "move_cost_mod": -1, + "coverage": 50, + "required_str": -1, + "flags": [ "TRANSPARENT", "NOITEM", "INDOORS", "SHORT", "PERMEABLE" ], + "//connects_to": "COUNTER", + "deconstruct": { + "furn_set": "f_counter", + "items": [ + { "item": "processor", "count": [ 1, 2 ] }, + { "item": "RAM", "count": [ 4, 8 ] }, + { "item": "cable", "charges": [ 4, 6 ] }, + { "item": "large_lcd_screen", "count": 1 }, + { "item": "e_scrap", "count": [ 10, 16 ] }, + { "item": "circuit", "count": [ 6, 10 ] }, + { "item": "power_supply", "count": [ 2, 4 ] }, + { "item": "amplifier", "count": [ 2, 4 ] }, + { "item": "plastic_chunk", "count": [ 10, 12 ] }, + { "item": "scrap", "count": [ 6, 8 ] } + ] + }, + "bash": { + "str_min": 16, + "str_max": 150, + "sound": "crunch!", + "sound_fail": "whack!", + "furn_set": "f_counter", + "items": [ + { "item": "processor", "prob": 25 }, + { "item": "RAM", "count": [ 0, 2 ], "prob": 50 }, + { "item": "cable", "charges": [ 1, 2 ], "prob": 50 }, + { "item": "large_lcd_screen", "prob": 25 }, + { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 }, + { "item": "circuit", "count": [ 0, 2 ], "prob": 50 }, + { "item": "power_supply", "prob": 25 }, + { "item": "amplifier", "prob": 25 }, + { "item": "plastic_chunk", "count": [ 4, 10 ], "prob": 50 }, + { "item": "scrap", "count": [ 2, 6 ], "prob": 50 } + ] + } + }, + { + "type": "furniture", + "id": "f_console", + "name": "computer console", + "description": "This is a standalone computer terminal. It can be used to view contents and perform any allowed functions. It might even be possible to hack it, given the skills.", + "symbol": "6", + "color": "blue", + "move_cost_mod": -1, + "coverage": 50, + "required_str": -1, + "light_emitted": 10, + "flags": [ "TRANSPARENT", "CONSOLE", "NOITEM", "INDOORS", "SHORT", "PERMEABLE" ], + "//connects_to": "COUNTER", + "deconstruct": { + "furn_set": "f_counter", + "items": [ + { "item": "processor", "count": [ 1, 2 ] }, + { "item": "RAM", "count": [ 4, 8 ] }, + { "item": "cable", "charges": [ 4, 6 ] }, + { "item": "large_lcd_screen", "count": 1 }, + { "item": "e_scrap", "count": [ 10, 16 ] }, + { "item": "circuit", "count": [ 6, 10 ] }, + { "item": "power_supply", "count": [ 2, 4 ] }, + { "item": "amplifier", "count": [ 2, 4 ] }, + { "item": "plastic_chunk", "count": [ 10, 12 ] }, + { "item": "scrap", "count": [ 6, 8 ] } + ] + }, + "bash": { + "str_min": 8, + "str_max": 150, + "sound": "crunch!", + "sound_fail": "whack!", + "furn_set": "f_console_broken", + "items": [ + { "item": "processor", "prob": 25 }, + { "item": "RAM", "count": [ 0, 2 ], "prob": 50 }, + { "item": "cable", "charges": [ 1, 2 ], "prob": 50 }, + { "item": "large_lcd_screen", "prob": 25 }, + { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 }, + { "item": "circuit", "count": [ 0, 2 ], "prob": 50 }, + { "item": "power_supply", "prob": 25 }, + { "item": "amplifier", "prob": 25 }, + { "item": "plastic_chunk", "count": [ 4, 10 ], "prob": 50 }, + { "item": "scrap", "count": [ 2, 6 ], "prob": 50 } + ] + } + }, { "type": "furniture", "id": "f_forge", @@ -365,7 +460,7 @@ "type": "furniture", "id": "f_arc_furnace", "name": "electric arc furnace", - "looks_like": "t_machinery_heavy", + "looks_like": "f_machinery_heavy", "description": "Not the kind of furnace you'd heat your house with, this is a device for heating things to extreme temperatures as part of industrial fabrication processes.", "symbol": "0", "color": "white_red", @@ -399,7 +494,7 @@ "type": "furniture", "id": "f_drill_press", "name": "drill press", - "looks_like": "t_machinery_light", + "looks_like": "f_machinery_light", "description": "A powerful drill mounted on a slide that lets it drop precisely down. Useful in all kinds of projects from industrial fabrication to home woodworking.", "symbol": "7", "color": "yellow_red", @@ -436,7 +531,7 @@ "type": "furniture", "id": "f_tablesaw", "name": "tablesaw", - "looks_like": "t_machinery_light", + "looks_like": "f_machinery_light", "description": "A rotating saw blade set into a large flat table, for making straight measured cuts. One of the key tools in a carpenter's arsenal.", "symbol": "7", "color": "yellow_red", @@ -474,7 +569,7 @@ "type": "furniture", "id": "f_mitresaw", "name": "mitre saw", - "looks_like": "t_machinery_light", + "looks_like": "f_machinery_light", "description": "A circular saw blade on an arm that can slide and rotate in several directions, this is a staple tool for nearly any carpentry.", "symbol": "7", "color": "yellow_cyan", @@ -512,7 +607,7 @@ "type": "furniture", "id": "f_bandsaw", "name": "bandsaw", - "looks_like": "t_machinery_light", + "looks_like": "f_machinery_light", "description": "A ribbonlike sawblade runs in a single direction in this tool, allowing precise cuts at almost any angle.", "symbol": "7", "color": "yellow_cyan", @@ -549,7 +644,7 @@ "type": "furniture", "id": "f_router", "name": "router table", - "looks_like": "t_machinery_light", + "looks_like": "f_machinery_light", "description": "This table has an inset router, a rotating motor with an exchangeable blade head for cutting specific profiles and grooves and stuff.", "symbol": "7", "color": "yellow_green", @@ -586,7 +681,7 @@ "type": "furniture", "id": "f_planer", "name": "planer", - "looks_like": "t_machinery_light", + "looks_like": "f_machinery_light", "description": "A hefty tool that will take in a board and cut it smooth and flat to a specific width. Particularly great if working with raw lumber stock, but also good just for shaving wood down to size.", "symbol": "7", "color": "yellow_white", @@ -623,7 +718,7 @@ "type": "furniture", "id": "f_jointer", "name": "jointer", - "looks_like": "t_machinery_light", + "looks_like": "f_machinery_light", "description": "A table-shaped tool with a rotating blade that will cut down, smooth out, and square off a board to make it very smooth and nice indeed.", "symbol": "7", "color": "yellow_magenta", @@ -660,7 +755,7 @@ "type": "furniture", "id": "f_hydraulic_press", "name": "hydraulic press", - "looks_like": "t_machinery_light", + "looks_like": "f_machinery_light", "description": "If you really want to squash something a lot, this would be exactly the right industrial tool for you. If, you know, it had power.", "symbol": "9", "color": "black_red", @@ -697,7 +792,7 @@ "type": "furniture", "id": "f_heavy_lathe", "name": "power lathe", - "looks_like": "t_machinery_light", + "looks_like": "f_machinery_light", "description": "An industrial-grade lathe, for turning chunks of metal and other hard things into round chunks of metal and other hard things.", "symbol": "4", "color": "cyan_red", @@ -1008,7 +1103,7 @@ "type": "furniture", "id": "f_aut_gas_console", "name": "automated gas console", - "looks_like": "t_console", + "looks_like": "f_console", "description": "Automated gas flow control console.", "symbol": "9", "color": "blue", @@ -1023,7 +1118,7 @@ "type": "furniture", "id": "f_aut_gas_console_o", "name": "broken automated gas console", - "looks_like": "t_console_broken", + "looks_like": "f_console_broken", "description": "Automated gas flow control console. Broken. This is not a good thing.", "symbol": "9", "color": "dark_gray", @@ -1075,7 +1170,7 @@ "type": "furniture", "id": "f_vending_c", "name": "vending machine", - "looks_like": "t_console", + "looks_like": "f_console", "symbol": "{", "description": "Buy stuff with a cash card.", "color": "light_cyan", @@ -1099,7 +1194,7 @@ "type": "furniture", "id": "f_vending_o", "name": "broken vending machine", - "looks_like": "t_console_broken", + "looks_like": "f_console_broken", "description": "Ponder if you could buy stuff, as it's broken. Maybe if you broke it more, you wouldn't need to pay at all!", "symbol": "{", "color": "dark_gray", diff --git a/data/json/furniture_and_terrain/terrain-manufactured.json b/data/json/furniture_and_terrain/terrain-manufactured.json index a25bb63a2cc99..1079ab1182944 100644 --- a/data/json/furniture_and_terrain/terrain-manufactured.json +++ b/data/json/furniture_and_terrain/terrain-manufactured.json @@ -4,7 +4,7 @@ "id": "t_recycler", "name": "metal compactor", "description": "A hydraulic compactor that can accept items made of various metals, and press them into basic shapes, ready for further crafting.", - "looks_like": "t_machinery_heavy", + "looks_like": "f_machinery_heavy", "symbol": "&", "color": "green", "move_cost": 0, @@ -24,56 +24,11 @@ ] } }, - { - "type": "terrain", - "id": "t_gas_tank", - "name": "fuel tank", - "description": "A tank filled with gasoline.", - "looks_like": "f_standing_tank", - "symbol": "Q", - "color": "brown_red", - "move_cost": 0, - "coverage": 50, - "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT" ], - "bash": { - "str_min": 40, - "str_max": 100, - "explosive": 40, - "sound": "metal screeching!", - "sound_fail": "clang!", - "ter_set": "t_gas_tank_smashed" - } - }, - { - "type": "terrain", - "id": "t_gas_tank_smashed", - "name": "broken fuel tank", - "description": "A broken tank which was filled with gasoline.", - "looks_like": "f_wreckage", - "symbol": "Q", - "color": "light_red", - "move_cost": 0, - "coverage": 50, - "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "REDUCE_SCENT" ], - "bash": { - "str_min": 40, - "str_max": 100, - "explosive": 40, - "sound": "metal screeching!", - "sound_fail": "clang!", - "ter_set": "t_pavement", - "items": [ - { "item": "steel_lump", "count": [ 1, 4 ] }, - { "item": "steel_chunk", "count": [ 1, 4 ] }, - { "item": "scrap", "count": [ 3, 7 ] } - ] - } - }, { "type": "terrain", "id": "t_gas_pump", "name": "gasoline pump", - "looks_like": "t_machinery_heavy", + "looks_like": "f_machinery_heavy", "description": "Precious GASOLINE. The former world bowed to their petroleum god as it led them to their ruin. There's plenty left over to fuel your inner road warrior. If this gas dispenser doesn't give up the goods for free, you may have to pay at a nearby terminal.", "symbol": "&", "color": "red", @@ -129,51 +84,6 @@ ] } }, - { - "type": "terrain", - "id": "t_diesel_tank", - "name": "fuel tank", - "description": "A tank filled with diesel.", - "looks_like": "f_standing_tank", - "symbol": "Q", - "color": "brown_green", - "move_cost": 0, - "coverage": 50, - "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT" ], - "bash": { - "str_min": 40, - "str_max": 100, - "explosive": 40, - "sound": "metal screeching!", - "sound_fail": "clang!", - "ter_set": "t_diesel_tank_smashed" - } - }, - { - "type": "terrain", - "id": "t_diesel_tank_smashed", - "name": "broken fuel tank", - "description": "A broken tank which was filled with diesel.", - "looks_like": "f_wreckage", - "symbol": "Q", - "color": "light_green", - "move_cost": 0, - "coverage": 50, - "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "REDUCE_SCENT" ], - "bash": { - "str_min": 40, - "str_max": 100, - "explosive": 40, - "sound": "metal screeching!", - "sound_fail": "clang!", - "ter_set": "t_pavement", - "items": [ - { "item": "steel_lump", "count": [ 1, 4 ] }, - { "item": "steel_chunk", "count": [ 1, 4 ] }, - { "item": "scrap", "count": [ 3, 7 ] } - ] - } - }, { "type": "terrain", "id": "t_diesel_pump", @@ -322,30 +232,6 @@ }, "deconstruct": { "ter_set": "t_metal_floor_no_roof", "items": [ { "item": "scrap", "count": [ 8, 16 ] } ] } }, - { - "type": "terrain", - "id": "t_generator_broken", - "name": "broken generator", - "description": "This generator is broken and will not help you produce usable electricity.", - "symbol": "&", - "color": "light_gray", - "looks_like": "t_machinery_old", - "move_cost": 0, - "coverage": 30, - "flags": [ "TRANSPARENT", "NOITEM", "REDUCE_SCENT", "MOUNTABLE", "PERMEABLE" ], - "bash": { - "str_min": 20, - "str_max": 150, - "sound": "metal screeching!", - "sound_fail": "clang!", - "ter_set": "t_pavement", - "items": [ - { "item": "steel_lump", "prob": 50 }, - { "item": "steel_chunk", "count": [ 1, 4 ] }, - { "item": "scrap", "count": [ 3, 7 ] } - ] - } - }, { "type": "terrain", "id": "t_missile", @@ -416,7 +302,7 @@ "description": "This console appears to control a nearby radio transmission tower. It doesn't seem to be fully operational.", "symbol": "6", "color": "green", - "looks_like": "t_console_broken", + "looks_like": "f_console_broken", "move_cost": 0, "coverage": 50, "flags": [ "TRANSPARENT", "NOITEM", "PERMEABLE" ], @@ -481,7 +367,7 @@ "description": "This unpowered pump previously would have moved fluids around in a hurry.", "symbol": "&", "color": "light_gray", - "looks_like": "t_machinery_heavy", + "looks_like": "f_machinery_heavy", "move_cost": 0, "coverage": 50, "flags": [ "NOITEM", "REDUCE_SCENT", "MOUNTABLE" ], @@ -498,32 +384,6 @@ ] } }, - { - "type": "terrain", - "id": "t_centrifuge", - "name": "centrifuge", - "description": "This is a centrifuge, a liquid separating device with an automated analyzer unit. It could be used to analyze a medical fluid sample, such as blood, if a test tube was placed in it.", - "symbol": "{", - "color": "magenta", - "move_cost": 0, - "coverage": 30, - "flags": [ "TRANSPARENT", "PERMEABLE" ], - "bash": { - "str_min": 3, - "str_max": 45, - "sound": "crunch!", - "sound_fail": "whack!", - "ter_set": "t_rock_floor", - "items": [ - { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 }, - { "item": "circuit", "count": [ 1, 6 ], "prob": 50 }, - { "item": "scrap", "count": [ 2, 5 ] }, - { "item": "steel_chunk", "count": [ 0, 3 ] }, - { "item": "sheet_metal", "count": [ 1, 3 ] }, - { "item": "cable", "charges": [ 1, 15 ] } - ] - } - }, { "type": "terrain", "id": "t_cvdbody", @@ -554,7 +414,7 @@ "description": "This is a VERY expensive-looking apparatus that's labeled 'Chemical Vapor Deposition Machine'. With the input of certain exceptionally rare chemicals and elements, one could conceivably coat one's weapon with diamond. While the process is extremely complicated, a previous user has helpfully sketched: Hydrogen + charcoal = smiley face.", "symbol": "&", "color": "cyan", - "looks_like": "t_console", + "looks_like": "f_console", "move_cost": 0, "coverage": 50, "flags": [ "TRANSPARENT", "NOITEM", "PERMEABLE" ], @@ -617,7 +477,7 @@ "symbol": "&", "description": "A small computer panel attached to a nanofabricator. It has a single slot for reading templates.", "color": "red", - "looks_like": "t_console", + "looks_like": "f_console", "move_cost": 0, "coverage": 50, "flags": [ "WALL", "NOITEM", "PERMEABLE" ], @@ -701,7 +561,7 @@ "type": "terrain", "id": "t_water_pump", "name": "water pump", - "looks_like": "t_machinery_heavy", + "looks_like": "f_machinery_heavy", "description": "Deep well collecting ground water. Installed water pump allows to draw water from it.", "symbol": "&", "color": "light_gray", @@ -748,46 +608,6 @@ }, "examine_action": "clean_water_source" }, - { - "type": "terrain", - "id": "t_plut_generator", - "name": "plutonium generator", - "description": "This imposing apparatus harnesses the power of the atom. Refined nuclear fuel is 'burned' to provide nearly limitless electrical power. It's not doing much good here though. Perhaps it could be salvaged for other purposes.", - "symbol": "0", - "color": "light_green", - "looks_like": "t_machinery_electronic", - "move_cost": 0, - "flags": [ "TRANSPARENT", "NOITEM", "SEALED", "REDUCE_SCENT", "PERMEABLE" ], - "bash": { - "str_min": 50, - "str_max": 400, - "explosive": 25, - "ter_set": "t_concrete", - "sound": "metal screeching!", - "sound_fail": "clang!", - "items": [ - { "item": "scrap", "count": [ 4, 16 ] }, - { "item": "steel_chunk", "count": [ 1, 6 ] }, - { "item": "plutonium", "charges": [ 0, 3 ] }, - { "item": "lead", "charges": [ 12, 18 ] } - ] - }, - "deconstruct": { - "ter_set": "t_concrete", - "items": [ - { "item": "RAM", "count": [ 4, 8 ] }, - { "item": "cable", "charges": [ 8, 16 ] }, - { "item": "small_lcd_screen", "count": [ 2, 4 ] }, - { "item": "large_lcd_screen", "count": 1 }, - { "item": "e_scrap", "count": [ 12, 24 ] }, - { "item": "circuit", "count": [ 6, 10 ] }, - { "item": "power_supply", "count": [ 4, 8 ] }, - { "item": "amplifier", "count": [ 3, 6 ] }, - { "item": "plutonium", "charges": [ 2, 8 ] }, - { "item": "scrap", "count": [ 8, 16 ] } - ] - } - }, { "type": "terrain", "id": "t_sai_box", @@ -795,7 +615,7 @@ "description": "A cabinet full of telecoms equipment. With the lines down, you might be able to take it apart for its useful electronics.", "symbol": "#", "color": "light_gray", - "looks_like": "t_machinery_electronic", + "looks_like": "f_machinery_electronic", "move_cost": 0, "coverage": 90, "flags": [ "NOITEM", "WALL" ], @@ -861,7 +681,7 @@ "description": "A circuit breaker that uses oil in its arc suppression chamber.", "symbol": "B", "color": "light_gray", - "looks_like": "t_machinery_electronic", + "looks_like": "f_machinery_electronic", "move_cost": 0, "coverage": 90, "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "WALL", "PERMEABLE" ], @@ -898,7 +718,7 @@ "description": "A small circuit breaker that uses oil in its arc suppression chamber.", "symbol": "b", "color": "light_gray", - "looks_like": "t_machinery_electronic", + "looks_like": "f_machinery_electronic", "move_cost": 0, "coverage": 65, "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "WALL", "PERMEABLE" ], @@ -935,7 +755,7 @@ "description": "A switchgear panel. It's covered in breaker switches, fuses, and gauges.", "symbol": "H", "color": "i_light_gray", - "looks_like": "t_machinery_electronic", + "looks_like": "f_machinery_electronic", "move_cost": 0, "coverage": 90, "flags": [ "TRANSPARENT", "NOITEM", "WALL", "PERMEABLE" ], @@ -974,7 +794,7 @@ "description": "A small switchgear panel. It's covered in breaker switches, fuses, and gauges.", "symbol": "L", "color": "i_light_gray", - "looks_like": "t_machinery_electronic", + "looks_like": "f_machinery_electronic", "move_cost": 0, "coverage": 65, "flags": [ "TRANSPARENT", "NOITEM", "WALL", "PERMEABLE" ], @@ -1017,7 +837,7 @@ "description": "A component designed to protect insulation and conductors in an electrical system by directing lightning through itself and into the ground.", "symbol": "}", "color": "i_light_gray", - "looks_like": "t_machinery_electronic", + "looks_like": "f_machinery_electronic", "move_cost": 0, "flags": [ "TRANSPARENT", "NOITEM", "WALL", "PERMEABLE" ], "bash": { @@ -1051,7 +871,7 @@ "description": "A switch used to make sure an electrical system doesn't have any current flowing through it, for maintenance periods.", "symbol": "h", "color": "light_gray", - "looks_like": "t_machinery_electronic", + "looks_like": "f_machinery_electronic", "move_cost": 0, "flags": [ "TRANSPARENT", "NOITEM", "WALL", "PERMEABLE" ], "bash": { @@ -1093,7 +913,7 @@ "description": "An electronic component used to transform the voltage of a current.", "symbol": "{", "color": "light_gray", - "looks_like": "t_machinery_electronic", + "looks_like": "f_machinery_electronic", "move_cost": 0, "coverage": 50, "flags": [ "TRANSPARENT", "NOITEM", "WALL", "PERMEABLE" ], @@ -1131,7 +951,7 @@ "description": "A specialized type of electrical transformer, ", "symbol": "8", "color": "i_light_gray", - "looks_like": "t_machinery_electronic", + "looks_like": "f_machinery_electronic", "move_cost": 0, "coverage": 50, "flags": [ "TRANSPARENT", "NOITEM", "WALL", "PERMEABLE" ], @@ -1191,203 +1011,6 @@ "items": [ { "item": "pipe", "count": [ 1, 3 ] }, { "item": "chain", "prob": 10 }, { "item": "scrap", "count": [ 1, 5 ] } ] } }, - { - "type": "terrain", - "id": "t_machinery_light", - "name": "light machinery", - "description": "Assorted light machinery. You could scavenge it for parts.", - "symbol": "$", - "color": "dark_gray", - "move_cost": 10, - "coverage": 65, - "flags": [ "TRANSPARENT", "BASHABLE", "CONTAINER", "FLAMMABLE", "PLACE_ITEM" ], - "deconstruct": { - "ter_set": "t_rock_floor", - "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.", - "ter_set": "t_rock_floor", - "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": "terrain", - "id": "t_machinery_heavy", - "name": "heavy machinery", - "description": "Assorted heavy machinery. You could scavenge it for parts.", - "symbol": "%", - "color": "light_gray", - "move_cost": 0, - "coverage": 75, - "flags": [ "BASHABLE", "CONTAINER", "SEALED", "PLACE_ITEM" ], - "deconstruct": { - "ter_set": "t_rock_floor", - "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.", - "ter_set": "t_rock_floor", - "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": "terrain", - "id": "t_machinery_old", - "name": "old machinery", - "description": "Assorted old machinery. You could scavenge it for parts.", - "symbol": "&", - "color": "brown", - "move_cost": 4, - "coverage": 55, - "flags": [ "TRANSPARENT", "BASHABLE", "CONTAINER", "FLAMMABLE", "PLACE_ITEM" ], - "deconstruct": { - "ter_set": "t_rock_floor", - "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.", - "ter_set": "t_rock_floor", - "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": "terrain", - "id": "t_machinery_electronic", - "name": "electronic machinery", - "description": "Assorted electronic machinery. You could scavenge it for parts.", - "symbol": "$", - "color": "yellow", - "move_cost": 8, - "coverage": 55, - "flags": [ "TRANSPARENT", "BASHABLE", "CONTAINER", "SEALED", "FLAMMABLE", "PLACE_ITEM" ], - "deconstruct": { - "ter_set": "t_rock_floor", - "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.", - "ter_set": "t_rock_floor", - "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 ] } - ] - } - }, { "id": "t_milking_machine", "type": "terrain", diff --git a/data/json/furniture_and_terrain/terrain-mechanisms.json b/data/json/furniture_and_terrain/terrain-mechanisms.json index 8b8f350a6fc14..fee4d9657cf33 100644 --- a/data/json/furniture_and_terrain/terrain-mechanisms.json +++ b/data/json/furniture_and_terrain/terrain-mechanisms.json @@ -1,97 +1,4 @@ [ - { - "type": "terrain", - "id": "t_console_broken", - "name": "broken console", - "description": "This is a standalone computer terminal. It doesn't seem to be working. It's the broken screen and shattered circuit boards that's telling you that.", - "symbol": "6", - "color": "light_gray", - "move_cost": 0, - "coverage": 50, - "roof": "t_flat_roof", - "flags": [ "TRANSPARENT", "NOITEM", "INDOORS", "SHORT", "PERMEABLE" ], - "deconstruct": { - "ter_set": "t_floor", - "items": [ - { "item": "processor", "count": [ 1, 2 ] }, - { "item": "RAM", "count": [ 4, 8 ] }, - { "item": "cable", "charges": [ 4, 6 ] }, - { "item": "large_lcd_screen", "count": 1 }, - { "item": "e_scrap", "count": [ 10, 16 ] }, - { "item": "circuit", "count": [ 6, 10 ] }, - { "item": "power_supply", "count": [ 2, 4 ] }, - { "item": "amplifier", "count": [ 2, 4 ] }, - { "item": "plastic_chunk", "count": [ 10, 12 ] }, - { "item": "scrap", "count": [ 6, 8 ] } - ] - }, - "bash": { - "str_min": 16, - "str_max": 150, - "sound": "crunch!", - "sound_fail": "whack!", - "ter_set": "t_floor", - "items": [ - { "item": "processor", "prob": 25 }, - { "item": "RAM", "count": [ 0, 2 ], "prob": 50 }, - { "item": "cable", "charges": [ 1, 2 ], "prob": 50 }, - { "item": "large_lcd_screen", "prob": 25 }, - { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 }, - { "item": "circuit", "count": [ 0, 2 ], "prob": 50 }, - { "item": "power_supply", "prob": 25 }, - { "item": "amplifier", "prob": 25 }, - { "item": "plastic_chunk", "count": [ 4, 10 ], "prob": 50 }, - { "item": "scrap", "count": [ 2, 6 ], "prob": 50 } - ] - } - }, - { - "type": "terrain", - "id": "t_console", - "name": "computer console", - "description": "This is a standalone computer terminal. It can be used to view contents and perform any allowed functions. It might even be possible to hack it, given the skills.", - "symbol": "6", - "color": "blue", - "move_cost": 0, - "coverage": 50, - "light_emitted": 10, - "roof": "t_flat_roof", - "flags": [ "TRANSPARENT", "CONSOLE", "NOITEM", "INDOORS", "SHORT", "PERMEABLE" ], - "deconstruct": { - "ter_set": "t_floor", - "items": [ - { "item": "processor", "count": [ 1, 2 ] }, - { "item": "RAM", "count": [ 4, 8 ] }, - { "item": "cable", "charges": [ 4, 6 ] }, - { "item": "large_lcd_screen", "count": 1 }, - { "item": "e_scrap", "count": [ 10, 16 ] }, - { "item": "circuit", "count": [ 6, 10 ] }, - { "item": "power_supply", "count": [ 2, 4 ] }, - { "item": "amplifier", "count": [ 2, 4 ] }, - { "item": "plastic_chunk", "count": [ 10, 12 ] }, - { "item": "scrap", "count": [ 6, 8 ] } - ] - }, - "bash": { - "str_min": 8, - "str_max": 150, - "sound": "crunch!", - "sound_fail": "whack!", - "ter_set": "t_console_broken", - "items": [ - { "item": "processor", "prob": 25 }, - { "item": "RAM", "count": [ 0, 2 ], "prob": 50 }, - { "item": "cable", "charges": [ 1, 2 ], "prob": 50 }, - { "item": "large_lcd_screen", "prob": 25 }, - { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 }, - { "item": "circuit", "count": [ 0, 2 ], "prob": 50 }, - { "item": "power_supply", "prob": 25 }, - { "item": "amplifier", "prob": 25 }, - { "item": "plastic_chunk", "count": [ 4, 10 ], "prob": 50 }, - { "item": "scrap", "count": [ 2, 6 ], "prob": 50 } - ] - } - }, { "type": "terrain", "id": "t_gates_mech_control", diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json index 7324786c49992..05362ab506e1a 100644 --- a/data/json/items/tool/science.json +++ b/data/json/items/tool/science.json @@ -1208,7 +1208,7 @@ "to_hit": -5, "bashing": 2, "material": [ "aluminum", "steel", "plastic" ], - "looks_like": "t_centrifuge", + "looks_like": "f_centrifuge", "symbol": "n", "color": "white", "ammo": [ "battery" ], diff --git a/data/json/mapgen/Glassblower.json b/data/json/mapgen/Glassblower.json index 420d56b1095c0..29ac505654610 100644 --- a/data/json/mapgen/Glassblower.json +++ b/data/json/mapgen/Glassblower.json @@ -35,15 +35,15 @@ "terrain": { ".": "t_floor", "s": "t_sidewalk", - "u": "t_dirt", + "u": "t_region_groundcover_barren", "_": "t_pavement", "U": "t_pavement", - " ": [ "t_grass", "t_dirt" ], - "H": "t_grass", - "1": "t_shrub_hydrangea", - "2": [ "t_tree_walnut", "t_tree_apple" ], - "4": "t_underbrush", - "5": "t_grass", + " ": "t_region_groundcover_urban", + "H": "t_region_groundcover_urban", + "1": "t_region_shrub_decorative", + "2": "t_region_tree_fruit", + "4": "t_region_shrub", + "5": "t_region_groundcover_urban", "-": "t_wall_glass", "|": "t_rock_wall", "%": "t_wall_wood", @@ -55,7 +55,6 @@ "x": "t_window_no_curtains", "v": "t_window_domestic", "c": "t_floor", - "C": "t_console_broken", "L": "t_thconc_floor", "'": "t_thconc_floor", "Q": "t_thconc_floor", @@ -76,6 +75,7 @@ "<": "t_stairs_up" }, "furniture": { + "C": "f_console_broken", "H": "f_bench", "S": "f_sink", "T": "f_stool", @@ -94,7 +94,7 @@ "q": "f_crate_c", "E": "f_displaycase", "U": "f_dumpster", - "5": [ "f_flower_tulip", "f_bluebell", "f_dandelion" ], + "5": "f_region_weed", "z": "f_cupboard", "d": "f_dresser", "@": "f_bed", diff --git a/data/json/mapgen/Metalworker.json b/data/json/mapgen/Metalworker.json index 3c21c9f55c07c..1f8f6889cc198 100644 --- a/data/json/mapgen/Metalworker.json +++ b/data/json/mapgen/Metalworker.json @@ -46,13 +46,13 @@ "U": "t_pavement", "2": "t_pavement", ".": "t_strconc_floor", - "3": "t_machinery_heavy", - "1": "t_machinery_old", "#": "t_strconc_floor", "<": "t_ladder_up", "4": "t_gutter_downspout" }, "furniture": { + "3": "f_machinery_heavy", + "1": "f_machinery_old", "H": "f_bench", "S": "f_sink", "#": "f_stool", diff --git a/data/json/mapgen/Pottery_Sewing_Shops.json b/data/json/mapgen/Pottery_Sewing_Shops.json index 3691f3f517911..b4251b73fb3ba 100644 --- a/data/json/mapgen/Pottery_Sewing_Shops.json +++ b/data/json/mapgen/Pottery_Sewing_Shops.json @@ -39,14 +39,14 @@ "_": "t_pavement", "U": "t_pavement", ",": "t_pavement_y", - ";": "t_grass", - "H": "t_grass", - "b": "t_grass", - "1": "t_shrub_hydrangea", - "2": "t_tree_walnut", - "3": "t_tree_apple", - "4": "t_underbrush", - "5": "t_grass", + ";": "t_region_groundcover_urban", + "H": "t_region_groundcover_urban", + "b": "t_region_groundcover_urban", + "1": "t_region_shrub_decorative", + "2": "t_region_tree_nut", + "3": "t_region_tree_fruit", + "4": "t_region_shrub", + "5": "t_region_groundcover_urban", "-": "t_wall_glass", "|": "t_brick_wall", "+": "t_door_glass_c", @@ -54,7 +54,6 @@ "S": "t_linoleum_gray", "w": "t_linoleum_gray", "t": "t_linoleum_gray", - "C": "t_console_broken", "*": "t_thconc_floor", "Q": "t_thconc_floor", "Y": "t_thconc_floor", @@ -66,6 +65,7 @@ "<": "t_stairs_up" }, "furniture": { + "C": "f_console_broken", "H": "f_bench", "S": "f_sink", "T": "f_stool", diff --git a/data/json/mapgen/airport/s_airport_private.json b/data/json/mapgen/airport/s_airport_private.json index 0a06dc150c0a9..b557bce2ff983 100644 --- a/data/json/mapgen/airport/s_airport_private.json +++ b/data/json/mapgen/airport/s_airport_private.json @@ -52,7 +52,6 @@ "+": "t_door_c", ")": "t_door_glass_c", "d": "t_conveyor", - "j": "t_console_broken", "c": "t_chainfence", "<": "t_stairs_up", "^": "t_gutter_downspout", @@ -60,7 +59,7 @@ "|": "t_wall_metal", "Q": "t_metal_floor", "q": "t_pavement", - "e": "t_machinery_light", + "e": "t_thconc_floor", "1": "t_gas_pump", "2": "t_water_pump", "3": "t_sewage_pipe", @@ -69,15 +68,18 @@ "f": "t_thconc_floor", "=": "t_door_metal_locked", "&": "t_gates_control_metal", - "4": "t_generator_broken" + "4": "t_region_groundcover_urban" }, "furniture": { + "4": "f_generator_broken", "q": "f_dumpster", + "e": "f_machinery_light", "f": "f_locker", "g": "f_crate_o", "h": "f_bench", "I": "f_desk", "i": "f_counter", + "j": "f_console_broken", "J": "f_counter", "k": "f_table", "l": "f_trashcan", @@ -278,11 +280,10 @@ " ": "t_open_air", "d": "t_stairs_down", ".": "t_linoleum_white", - "f": "t_console_broken", "g": "t_door_glass_c", "h": "t_metal_floor" }, - "furniture": { "e": "f_table", "E": "f_chair" }, + "furniture": { "f": "f_console_broken", "e": "f_table", "E": "f_chair" }, "place_loot": [ { "group": "office_mess", "chance": 80, "repeat": [ 5 ], "x": [ 10, 13 ], "y": [ 2, 5 ] } ] } } diff --git a/data/json/mapgen/animalpound.json b/data/json/mapgen/animalpound.json index 309f487b88a63..29bea45bf1b3d 100644 --- a/data/json/mapgen/animalpound.json +++ b/data/json/mapgen/animalpound.json @@ -63,16 +63,15 @@ "terrain": { " ": "t_pavement", ",": "t_pavement_y", - "%": "t_console_broken", - "*": "t_shrub", + "*": "t_region_shrub", "+": "t_door_c", "M": "t_door_metal_pickable", "i": "t_door_locked_interior", "-": "t_wall_w", ".": "t_floor", "<": "t_stairs_up", - "=": "t_chainfence_h", - "|": "t_chainfence_v", + "=": "t_chainfence", + "|": "t_chainfence", "a": "t_chaingate_l", "l": "t_linoleum_white", "#": "t_linoleum_white", @@ -82,11 +81,12 @@ "k": "t_linoleum_white", "F": "t_linoleum_white", "Q": "t_linoleum_white", - "'": "t_grass", + "'": "t_region_groundcover_urban", "4": "t_gutter_downspout", "~": "t_sidewalk" }, "furniture": { + "%": "f_console_broken", "#": "f_counter", "C": "f_counter", "D": "f_trashcan", diff --git a/data/json/mapgen/animalshelter.json b/data/json/mapgen/animalshelter.json index a6393053e5701..0e8a317ae1f9c 100644 --- a/data/json/mapgen/animalshelter.json +++ b/data/json/mapgen/animalshelter.json @@ -184,8 +184,7 @@ " ": "t_pavement", ",": "t_pavement_y", "g": "t_wall_glass", - "%": "t_console_broken", - "*": "t_shrub", + "*": "t_region_shrub", "+": "t_door_c", "-": "t_wall_b", ".": "t_floor", @@ -194,8 +193,8 @@ "3": "t_privacy_fencegate_c", "O": "t_window", "^": "t_chaingate_c", - "'": "t_dirt", - "G": "t_grass", + "'": "t_region_groundcover_barren", + "G": "t_region_groundcover", "M": "t_door_metal_pickable", "i": "t_door_locked_interior", "l": "t_linoleum_white", @@ -204,14 +203,15 @@ "s": "t_linoleum_white", "t": "t_linoleum_white", "F": "t_linoleum_white", - "f": "t_dirt", - "R": "t_dirt", - "Q": "t_dirt", + "f": "t_region_groundcover_barren", + "R": "t_region_groundcover_barren", + "Q": "t_region_groundcover_barren", "4": "t_gutter_downspout", "<": "t_ladder_up", "~": "t_sidewalk" }, "furniture": { + "%": "f_console_broken", "#": "f_counter", "?": "f_sofa", "Q": "f_trashcan", diff --git a/data/json/mapgen/bank.json b/data/json/mapgen/bank.json index eeeda76784284..4afd3879ba5a6 100644 --- a/data/json/mapgen/bank.json +++ b/data/json/mapgen/bank.json @@ -33,15 +33,14 @@ " " ], "terrain": { - " ": [ "t_grass", "t_grass", "t_grass", "t_dirt", "t_shrub" ], + " ": [ [ "t_region_groundcover_urban", 10 ], "t_region_shrub_decorative" ], "#": "t_wall_w", "$": "t_metal_floor", - "%": [ "t_door_c", "t_door_c", "t_door_locked_interior" ], - "*": [ "t_door_c", "t_door_c", "t_door_c", "t_door_locked_interior" ], + "%": [ [ "t_door_c", 2 ], "t_door_locked_interior" ], + "*": [ [ "t_door_c", 3 ], "t_door_locked_interior" ], "+": "t_door_c", "-": "t_window", ".": "t_floor", - "6": "t_console", "A": "t_atm", "G": "t_door_glass_c", "M": "t_door_metal_locked", @@ -53,6 +52,7 @@ "w": "t_window_alarm" }, "furniture": { + "6": "f_console", "$": "f_safe_l", "C": "f_chair", "T": "f_table", @@ -168,19 +168,17 @@ "########4 " ], "terrain": { - " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ], + " ": "t_region_groundcover_urban", "_": "t_metal_floor", - "|": [ "t_door_c", "t_wall_w", "t_wall_w", "t_wall_w", "t_wall_w", "t_wall_w", "t_wall_w", "t_wall_w", "t_wall_w" ], + "|": [ "t_door_c", [ "t_wall_w", 7 ] ], "I": "t_wall_w", "#": "t_brick_wall", "$": "t_metal_floor", - "%": [ "t_door_c", "t_door_c", "t_door_locked_interior" ], - "*": [ "t_door_c", "t_door_c", "t_door_c", "t_door_locked_interior" ], + "%": [ [ "t_door_c", 2 ], "t_door_locked_interior" ], + "*": [ [ "t_door_c", 3 ], "t_door_locked_interior" ], "+": "t_door_c", "-": "t_window", - "x": "t_console_broken", ".": "t_floor", - "6": "t_console", "A": "t_atm", "G": "t_door_glass_c", "M": "t_door_metal_locked", @@ -194,6 +192,8 @@ "w": "t_window_alarm" }, "furniture": { + "x": "f_console_broken", + "6": "f_console", "a": "f_armchair", "D": "f_sofa", "o": "f_bookcase", diff --git a/data/json/mapgen/bar.json b/data/json/mapgen/bar.json index 9dd8bbc7ff3c9..5dac3ab2e5d15 100644 --- a/data/json/mapgen/bar.json +++ b/data/json/mapgen/bar.json @@ -45,7 +45,6 @@ ",": "t_pavement_y", "-": "t_wall_g", ".": "t_floor", - "@": "t_console_broken", "D": "t_door_locked", "c": "t_linoleum_gray", "d": "t_pavement", @@ -60,6 +59,7 @@ "|": "t_wall_g" }, "furniture": { + "@": "f_console_broken", "#": "f_table", "&": "f_fridge", "B": "f_bench", @@ -195,7 +195,7 @@ "terrain": { "_": "t_pavement", "~": "t_sidewalk", - " ": [ "t_grass", "t_grass", "t_dirt", "t_shrub", "t_grass", "t_dirt" ], + " ": [ [ "t_region_groundcover_urban", 10 ], "t_region_shrub" ], "&": "t_linoleum_gray", "'": "t_window_domestic", "+": "t_door_c", @@ -203,7 +203,6 @@ "-": "t_wall_b", ".": "t_floor", "u": "t_floor", - "@": "t_console_broken", "D": "t_door_locked", "c": "t_linoleum_gray", "d": "t_pavement", @@ -222,6 +221,7 @@ "!": "t_brick_wall" }, "furniture": { + "@": "f_console_broken", "#": "f_table", "$": "f_glass_fridge", "&": "f_fridge", diff --git a/data/json/mapgen/basecamps/primitive_field.json b/data/json/mapgen/basecamps/primitive_field.json index 11b00664b0a4d..546283b93947d 100644 --- a/data/json/mapgen/basecamps/primitive_field.json +++ b/data/json/mapgen/basecamps/primitive_field.json @@ -1405,7 +1405,7 @@ "method": "json", "object": { "set": [ - { "point": "terrain", "id": "t_machinery_old", "x": 5, "y": 12 }, + { "point": "furniture", "id": "f_machinery_old", "x": 5, "y": 12 }, { "point": "furniture", "id": "f_wood_keg", "x": 14, "y": 12 }, { "point": "terrain", "id": "t_dirt", "x": 18, "y": 16 }, { "point": "furniture", "id": "f_kiln_empty", "x": 19, "y": 16 }, diff --git a/data/json/mapgen/basement/basement_chem.json b/data/json/mapgen/basement/basement_chem.json index 2d03a8496316c..f92fe66b0c711 100644 --- a/data/json/mapgen/basement/basement_chem.json +++ b/data/json/mapgen/basement/basement_chem.json @@ -46,7 +46,6 @@ "E": "t_linoleum_gray", "i": "t_linoleum_gray", "H": "t_linoleum_gray", - "4": "t_machinery_old", "R": "t_linoleum_gray", "?": "t_linoleum_gray", "h": "t_linoleum_gray", @@ -55,6 +54,7 @@ }, "liquids": { "E": { "liquid": "water_clean", "amount": [ 0, 100 ] } }, "furniture": { + "4": "f_machinery_old", "T": "f_workbench", "c": "f_counter", "h": "f_chair", @@ -147,7 +147,7 @@ "n": "t_linoleum_white", "H": "t_linoleum_white", "T": "t_linoleum_white", - "8": "t_console_broken" + "8": "t_linoleum_white" }, "liquids": { "E": { "liquid": "water_clean", "amount": [ 0, 100 ] } }, "furniture": { @@ -169,7 +169,8 @@ "f": "f_filing_cabinet", "5": "f_server", "b": "f_lab_bench", - "D": "f_fume_hood" + "D": "f_fume_hood", + "8": "f_console_broken" }, "items": { "U": [ diff --git a/data/json/mapgen/basement/basement_lab_stairs.json b/data/json/mapgen/basement/basement_lab_stairs.json index 737cd0c70ad70..c96167458cd9c 100644 --- a/data/json/mapgen/basement/basement_lab_stairs.json +++ b/data/json/mapgen/basement/basement_lab_stairs.json @@ -40,10 +40,10 @@ ",": "t_rock_floor", "6": "t_card_science", "7": "t_rock_floor", - "C": "t_centrifuge", "<": "t_stairs_up", ">": "t_stairs_down" }, + "furniture": { "C": "f_centrifuge" }, "mapping": { "c": { "items": { "item": "chem_lab", "chance": 30 } }, "d": { "items": { "item": "office", "chance": 30 } } }, "monster": { "7": { "monster": "mon_turret_rifle" } }, "place_nested": [ diff --git a/data/json/mapgen/bus_station.json b/data/json/mapgen/bus_station.json index d5fddf6d9b327..7306918e52662 100644 --- a/data/json/mapgen/bus_station.json +++ b/data/json/mapgen/bus_station.json @@ -35,21 +35,14 @@ "terrain": { " ": "t_floor", "+": "t_door_c", - ".": [ [ "t_dirt", 5 ], [ "t_grass", 16 ], [ "t_grass_long", 5 ] ], + ".": "t_region_groundcover_urban", ",": [ - [ "t_grass_long", 35 ], - [ "t_grass", 20 ], - [ "t_shrub", 20 ], - [ "t_shrub_rose", 20 ], - [ "t_shrub_lilac", 20 ], - [ "t_tree_young", 20 ], - [ "t_grass_tall", 20 ], - [ "t_grass_long", 20 ], - [ "t_underbrush", 20 ], - [ "t_shrub_hydrangea", 20 ], - [ "t_shrub_raspberry", 20 ] + [ "t_region_groundcover", 35 ], + [ "t_region_groundcover_forest", 20 ], + [ "t_region_shrub_decorative", 20 ], + [ "t_region_shrub_fruit", 10 ] ], - ";": [ [ "t_tree", 5 ], [ "t_tree_willow", 3 ], [ "t_tree_birch", 3 ], [ "t_tree_maple", 3 ], [ "t_tree_pine", 5 ] ], + ";": "t_region_tree_shade", "w": "t_window", "_": "t_pavement", "y": "t_pavement_y", @@ -64,12 +57,13 @@ "T": "t_linoleum_white", "F": "t_linoleum_white", "l": "t_linoleum_white", - "x": "t_console_broken", + "x": "t_linoleum_white", "i": "t_ladder_up", "I": "t_column", "f": "t_chainfence" }, "furniture": { + "x": "f_console_broken", "c": "f_counter", "S": "f_sink", "B": "f_bench", diff --git a/data/json/mapgen/butcher.json b/data/json/mapgen/butcher.json index 97e152a42b57e..0744d84e5efac 100644 --- a/data/json/mapgen/butcher.json +++ b/data/json/mapgen/butcher.json @@ -32,24 +32,24 @@ " " ], "terrain": { - " ": [ "t_dirt", [ "t_grass", 3 ] ], + " ": "t_region_groundcover_urban", ".": "t_floor", "a": "t_wall_w", "b": "t_sidewalk", "d": "t_wall_glass", "e": "t_door_c", "g": "t_dirt", - "j": "t_console_broken", "m": "t_dirt", "<": "t_stairs_up", "4": "t_gutter_downspout", - "o": "t_shrub" + "o": "t_region_shrub" }, "furniture": { "f": "f_table", "g": "f_dumpster", "h": "f_counter", "i": "f_fridge", + "j": "f_console_broken", "k": "f_rack", "l": "f_trashcan", "m": "f_trashcan", @@ -236,18 +236,18 @@ " " ], "terrain": { - " ": [ "t_dirt", [ "t_grass", 3 ] ], + " ": "t_region_groundcover", ".": "t_floor", "a": "t_wall_w", "b": "t_sidewalk", "d": "t_wall_glass", "e": "t_door_c", - "g": "t_dirt", + "g": "t_region_groundcover_barren", "<": "t_stairs_up", - "4": "t_gutter_downspout", - "j": "t_console_broken" + "4": "t_gutter_downspout" }, "furniture": { + "j": "f_console_broken", "c": "f_chair", "f": "f_table", "g": "f_dumpster", @@ -436,19 +436,19 @@ " " ], "terrain": { - " ": [ "t_dirt", [ "t_grass", 3 ] ], + " ": "t_region_groundcover", ".": "t_floor", "a": "t_wall_w", "b": "t_sidewalk", "d": "t_wall_glass", "e": "t_door_c", - "g": "t_dirt", - "j": "t_console_broken", + "g": "t_region_groundcover_barren", "o": "t_door_o", "<": "t_ladder_up", "4": "t_gutter_downspout" }, "furniture": { + "j": "f_console_broken", "c": "f_chair", "f": "f_table", "g": "f_dumpster", diff --git a/data/json/mapgen/cathedral.json b/data/json/mapgen/cathedral.json index 301b925fbd0cb..cab83defac573 100644 --- a/data/json/mapgen/cathedral.json +++ b/data/json/mapgen/cathedral.json @@ -146,10 +146,11 @@ "u": "t_floor", "v": "t_floor", "w": [ "t_window_stained_red", "t_window_stained_blue", "t_window_stained_green" ], - "x": "t_console_broken", + "x": "t_floor", "|": "t_wall" }, "furniture": { + "x": "f_console_broken", "7": "f_rack", "8": "f_desk", "B": "f_brazier", diff --git a/data/json/mapgen/cave.json b/data/json/mapgen/cave.json index 8b09d6ae0adc1..66f115201986e 100644 --- a/data/json/mapgen/cave.json +++ b/data/json/mapgen/cave.json @@ -576,8 +576,15 @@ "............ ....F.7J G.", "............>..........." ], - "terrain": { ".": "t_rock", " ": "t_rock_floor", ">": "t_slope_up", "7": "t_console_broken" }, - "furniture": { "f": "f_firering", "c": "f_camp_chair", "C": "f_crate_o", "W": "f_crate_c", "T": "f_tourist_table" }, + "terrain": { ".": "t_rock", " ": "t_rock_floor", ">": "t_slope_up" }, + "furniture": { + "f": "f_firering", + "c": "f_camp_chair", + "C": "f_crate_o", + "W": "f_crate_c", + "T": "f_tourist_table", + "7": "f_console_broken" + }, "traps": { "F": "tr_rollmat", "2": "tr_crossbow", diff --git a/data/json/mapgen/collapsed_tower.json b/data/json/mapgen/collapsed_tower.json index c492f621a83c9..7c197925c8fbe 100644 --- a/data/json/mapgen/collapsed_tower.json +++ b/data/json/mapgen/collapsed_tower.json @@ -176,12 +176,10 @@ { "point": "bash", "x": [ 48, 74 ], "y": [ 24, 47 ], "repeat": [ 50, 100 ] } ], "palettes": [ "collapsed_tower" ], - "furniture": { "R": "f_rack" }, + "furniture": { "C": "f_machinery_electronic", "x": "f_machinery_heavy", "R": "f_rack" }, "terrain": { "|": "t_concrete_wall_flesh", " ": "t_thconc_floor_flesh", - "C": "t_machinery_electronic", - "x": "t_machinery_heavy", "?": "t_nanofab", "r": "t_metal_floor", "/": "t_nanofab_body", diff --git a/data/json/mapgen/cs_internet_cafe.json b/data/json/mapgen/cs_internet_cafe.json index 51acdbc665084..3e95a54b9bbac 100644 --- a/data/json/mapgen/cs_internet_cafe.json +++ b/data/json/mapgen/cs_internet_cafe.json @@ -63,11 +63,10 @@ "...4...................." ], "terrain": { - ".": [ [ "t_grass", 5 ], "t_dirt" ], + ".": "t_region_groundcover_urban", ",": "t_floor", "|": "t_wall_w", "s": "t_sidewalk", - "P": "t_console_broken", "D": "t_door_c", "g": "t_wall_glass_alarm", "G": "t_door_glass_c", @@ -75,7 +74,15 @@ "4": "t_gutter_downspout", "A": "t_atm" }, - "furniture": { "c": "f_displaycase", "t": "f_toilet", "h": "f_chair", "V": "f_vending_c", "S": "f_sink", "L": "f_locker" }, + "furniture": { + "P": "f_console_broken", + "c": "f_displaycase", + "t": "f_toilet", + "h": "f_chair", + "V": "f_vending_c", + "S": "f_sink", + "L": "f_locker" + }, "toilets": { "t": { "//": "no values needed here" } }, "items": { "c": { "item": "ic_merch", "chance": 20 }, @@ -132,13 +139,12 @@ ">": "t_stairs_down", "#": "t_wall_w", ",": "t_thconc_floor", - "k": "t_generator_broken", - "P": "t_console_broken", "D": "t_door_locked", "g": "t_wall_glass_alarm", "&": "t_flat_roof", "=": "t_flat_roof" }, + "furniture": { "P": "f_console_broken", "k": "f_generator_broken" }, "place_loot": [ { "item": "television", "x": 14, "y": 9, "chance": 100 }, { "item": "stepladder", "x": 5, "y": 10, "chance": 100 } ], "items": { "c": { "item": "electronics", "chance": 40 }, diff --git a/data/json/mapgen/dojo.json b/data/json/mapgen/dojo.json index 0ff2a0941d1d0..8f3ea4d45fdd9 100644 --- a/data/json/mapgen/dojo.json +++ b/data/json/mapgen/dojo.json @@ -105,10 +105,13 @@ "#": "t_wall_b", "*": "t_thconc_floor", "S": "t_thconc_floor", - "+": "t_door_c", - "x": [ "t_machinery_light", "t_machinery_heavy", "t_machinery_old", "t_machinery_electronic" ] + "x": "t_thconc_floor", + "+": "t_door_c" + }, + "furniture": { + "S": "f_filing_cabinet", + "x": [ "f_machinery_light", "f_machinery_heavy", "f_machinery_old", "f_machinery_electronic" ] }, - "furniture": { "S": "f_filing_cabinet" }, "items": { "t": { "item": "office_paper", "chance": 25, "repeat": [ 2, 4 ] } }, "place_nested": [ { diff --git a/data/json/mapgen/dollar_store.json b/data/json/mapgen/dollar_store.json index 7a82b5db2a19e..f3a04d3a9cb89 100644 --- a/data/json/mapgen/dollar_store.json +++ b/data/json/mapgen/dollar_store.json @@ -35,13 +35,12 @@ "terrain": { "+": "t_reinforced_door_glass_c", "-": "t_wall_glass", - ".": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt" ], + ".": "t_region_groundcover_urban", "P": "t_wall_glass", "_": "t_floor", - "d": "t_dirt", - "p": "t_grass", + "d": "t_region_groundcover_urban", + "p": "t_region_groundcover_urban", "|": "t_wall_wood", - "X": "t_console_broken", "s": "t_sidewalk", "U": "t_sidewalk", "4": "t_gutter_downspout", @@ -56,7 +55,8 @@ "I": "f_desk", "S": "f_filing_cabinet", "U": "f_dumpster", - "p": [ "f_datura", "f_bluebell", "f_mutpoppy", "f_dahlia", "f_flower_tulip", "f_chamomile", "f_flower_spurge", "f_lily" ] + "X": "f_console_broken", + "p": "f_region_flower" }, "toilets": { "T": { } }, "items": { @@ -185,43 +185,18 @@ "+": "t_reinforced_door_glass_c", "-": "t_wall_glass_alarm", ".": "t_floor", - "_": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt" ], - "p": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt" ], - "d": "t_dirt", + "_": "t_region_groundcover_urban", + "p": "t_region_groundcover_urban", + "d": "t_region_groundcover_urban", "s": "t_sidewalk", "|": "t_adobe_brick_wall", - "X": "t_console_broken", "U": "t_sidewalk", "4": "t_gutter_downspout", "<": "t_ladder_up", - "9": [ - "t_tree_blackjack", - "t_tree_walnut", - "t_tree_chestnut", - "t_tree_beech", - "t_tree_hazelnut", - "t_tree_cottonwood", - "t_tree", - "t_tree_elm", - "t_tree_dead", - "t_tree_apple", - "t_tree_pear", - "t_tree_cherry", - "t_tree_peach", - "t_tree_apricot", - "t_tree_plum", - "t_tree_mulberry", - "t_tree_elderberry", - "t_tree_pine", - "t_tree_birch", - "t_tree_willow", - "t_tree_maple", - "t_tree_hickory", - "t_tree_almond", - "t_tree_pecan" - ] + "9": "t_region_tree" }, "furniture": { + "X": "f_console_broken", "#": "f_counter", "l": "f_stool", "{": "f_rack", diff --git a/data/json/mapgen/fire_station.json b/data/json/mapgen/fire_station.json index 67f08c0d32318..ec74ee6d6b0b4 100644 --- a/data/json/mapgen/fire_station.json +++ b/data/json/mapgen/fire_station.json @@ -38,17 +38,17 @@ "+": "t_door_c", ",": "t_pavement_y", "-": "t_brick_wall", - ".": "t_grass", + ".": "t_region_groundcover_urban", "L": "t_door_locked", "M": "t_door_metal_locked", "O": "t_window", "_": "t_pavement", "w": "t_gates_control_brick", - "x": "t_console_broken", "|": "t_brick_wall", "4": "t_gutter_downspout" }, "furniture": { + "x": "f_console_broken", "#": "f_counter", ":": "f_dresser", "@": "f_bed", @@ -172,13 +172,12 @@ "+": "t_door_metal_locked", ".": "t_scrap_floor", "6": "t_gates_control_brick", - "C": "t_console_broken", "D": "t_door_metal_c", "P": "t_pavement_y", - "S": "t_shrub_rose", + "S": "t_region_shrub_decorative", "T": "t_thconc_floor", - "_": "t_grass", - "a": "t_shrub_lilac", + "_": "t_region_groundcover_urban", + "a": "t_region_shrub_decorative", "d": "t_door_c", "e": "t_thconc_floor", "h": "t_curtains", @@ -193,6 +192,7 @@ "<": "t_ladder_up" }, "furniture": { + "C": "f_console_broken", "#": "f_table", "&": "f_sink", "5": [ "f_ergometer", "f_ergometer_mechanical" ], diff --git a/data/json/mapgen/garage.json b/data/json/mapgen/garage.json index 0b8dfc194b2c7..d89a575d2f5ba 100644 --- a/data/json/mapgen/garage.json +++ b/data/json/mapgen/garage.json @@ -33,21 +33,20 @@ " " ], "terrain": { - " ": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt", "t_shrub" ], + " ": [ [ "t_region_groundcover_urban", 10 ], "t_region_shrub" ], "E": "t_pavement", "U": "t_pavement", "$": "t_door_glass_c", "+": "t_door_c", "-": "t_brick_wall", ".": "t_thconc_floor", - "6": "t_console_broken", ":": "t_window", "=": "t_door_metal_locked", "A": "t_m_frame", "H": "t_wall_glass", "e": "t_gates_mech_control", "|": "t_brick_wall", - "W": "t_chainfence_h", + "W": "t_chainfence", "^": "t_chaingate_c", "M": "t_metal_floor", "#": "t_grate", @@ -55,6 +54,7 @@ "<": "t_ladder_up" }, "furniture": { + "6": "f_console_broken", "A": "f_air_conditioner", "L": "f_locker", "b": "f_bench", @@ -158,24 +158,24 @@ " " ], "terrain": { - " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ], - "~": [ "t_dirt", "t_pavement", "t_pavement", "t_pavement", "t_pavement", "t_pavement", "t_pavement" ], - "_": [ "t_dirt", "t_sidewalk", "t_sidewalk", "t_sidewalk", "t_sidewalk", "t_sidewalk", "t_sidewalk" ], - "*": [ "t_tree_pine", "t_tree", "t_shrub", "t_tree_young" ], + " ": "t_region_groundcover", + "~": [ "t_region_groundcover_barren", [ "t_pavement", 6 ] ], + "_": [ "t_region_groundcover_barren", [ "t_sidewalk", 6 ] ], + "*": [ [ "t_region_tree_shade", 3 ], "t_region_shrub" ], "J": "t_water_pump", "D": "t_door_locked", "+": "t_door_c", "w": "t_wall_log", "U": "t_brick_wall", ".": "t_floor", - "6": "t_console_broken", ":": "t_window", - "W": "t_chainfence_h", + "W": "t_chainfence", "^": "t_chaingate_c", - "z": "t_dirt", + "z": "t_region_groundcover_barren", "4": "t_gutter_downspout" }, "furniture": { + "6": "f_console_broken", "L": "f_locker", "c": "f_counter", "s": "f_sink", @@ -269,7 +269,7 @@ " " ], "terrain": { - " ": [ "t_grass", "t_grass", "t_grass", "t_dirt", "t_shrub", "t_grass", "t_grass", "t_grass", "t_dirt" ], + " ": "t_region_groundcover_urban", "E": "t_pavement", "X": "t_sidewalk", "U": "t_sidewalk", @@ -278,7 +278,6 @@ "O": "t_door_locked", "-": "t_wall_b", ".": "t_thconc_floor", - "6": "t_console_broken", ":": "t_window", "=": "t_door_metal_locked", "A": "t_m_frame", @@ -294,6 +293,7 @@ }, "toilets": { "&": { } }, "furniture": { + "6": "f_console_broken", "A": "f_air_conditioner", "L": "f_locker", "T": "f_rack", @@ -366,9 +366,14 @@ "W": "t_window_domestic", "*": "t_chainfence", "8": "t_chaingate_c", - "x": [ "t_machinery_light", "t_machinery_heavy", "t_machinery_old", "t_machinery_electronic" ] + "x": "t_thconc_floor" + }, + "furniture": { + "I": "f_desk", + "h": "f_chair", + "f": "f_filing_cabinet", + "x": [ "f_machinery_light", "f_machinery_heavy", "f_machinery_old", "f_machinery_electronic" ] }, - "furniture": { "I": "f_desk", "h": "f_chair", "f": "f_filing_cabinet" }, "items": { "I": { "item": "office", "chance": 30 }, "f": { "item": "office_paper", "chance": 30 }, diff --git a/data/json/mapgen/garage_gas.json b/data/json/mapgen/garage_gas.json index dc52df76a0989..cf875fbab7f7b 100644 --- a/data/json/mapgen/garage_gas.json +++ b/data/json/mapgen/garage_gas.json @@ -42,9 +42,8 @@ "+": "t_door_c", "-": "t_wall_w", "|": "t_wall_w", - ".": [ [ "t_grass", 3 ], [ "t_dirt", 3 ], "t_grass_long" ], + ".": "t_region_groundcover_urban", " ": "t_thconc_floor", - "6": "t_console_broken", "=": "t_door_metal_locked", "I": "t_column", "[": "t_door_glass_c", @@ -58,6 +57,7 @@ "w": "t_window" }, "furniture": { + "6": "f_console_broken", "P": "f_indoor_plant", "D": "f_trashcan", "R": "f_trashcan", diff --git a/data/json/mapgen/gardening_store.json b/data/json/mapgen/gardening_store.json index 1a3180380d4dd..edd0b8db75b55 100644 --- a/data/json/mapgen/gardening_store.json +++ b/data/json/mapgen/gardening_store.json @@ -37,21 +37,20 @@ "+": "t_door_glass_c", ",": "t_pavement_y", "-": "t_wall_g", - ".": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt" ], - "Z": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt" ], - "1": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt" ], - "2": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt" ], - "3": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt" ], - "5": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt" ], - "Q": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt" ], - "B": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt" ], - "p": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ] ], - "b": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt" ], + ".": "t_region_groundcover_urban", + "Z": "t_region_groundcover_urban", + "1": "t_region_groundcover_urban", + "2": "t_region_groundcover_urban", + "3": "t_region_groundcover_urban", + "5": "t_region_groundcover_urban", + "Q": "t_region_groundcover_urban", + "B": "t_region_groundcover_urban", + "p": "t_region_groundcover_urban", + "b": "t_region_groundcover_urban", "O": "t_window", "_": "t_pavement", "r": "t_floor", "|": "t_wall_g", - "?": "t_console_broken", "^": "t_chaingate_l", "%": "t_chainfence", "*": [ "t_door_locked", "t_door_c" ], @@ -60,6 +59,7 @@ }, "toilets": { "&": { } }, "furniture": { + "?": "f_console_broken", "#": "f_counter", "$": "f_counter_gate_c", "r": "f_rack", diff --git a/data/json/mapgen/gunsmith.json b/data/json/mapgen/gunsmith.json index 1a2c1e49e77b7..8745781a4cbf4 100644 --- a/data/json/mapgen/gunsmith.json +++ b/data/json/mapgen/gunsmith.json @@ -38,7 +38,7 @@ ], "terrain": { "#": "t_floor", - "%": "t_shrub", + "%": "t_region_shrub", "+": "t_door_metal_pickable", ",": "t_pavement_y", "-": "t_wall_w", @@ -52,12 +52,12 @@ "d": "t_pavement", "s": "t_sidewalk", "w": "t_window_bars_alarm", - "x": "t_console_broken", "|": "t_wall_w", "<": "t_stairs_up", "4": "t_gutter_downspout" }, "furniture": { + "x": "f_console_broken", "#": "f_counter", "C": "f_sofa", "E": "f_desk", diff --git a/data/json/mapgen/hazardous_waste_sarcophagus.json b/data/json/mapgen/hazardous_waste_sarcophagus.json index 12532ead88c59..bca07090420ad 100644 --- a/data/json/mapgen/hazardous_waste_sarcophagus.json +++ b/data/json/mapgen/hazardous_waste_sarcophagus.json @@ -55,16 +55,9 @@ " ffffffffffffffffffffffffffffffffffffffffffffff ", " " ], + "fill_ter": "t_linoleum_white", "terrain": { - " ": [ - [ "t_grass", 20 ], - [ "t_grass_dead", 3 ], - [ "t_grass_tall", 5 ], - [ "t_grass_long", 3 ], - [ "t_dirt", 5 ], - [ "t_shrub", 2 ], - [ "t_tree", 1 ] - ], + " ": [ [ "t_region_groundcover", 40 ], [ "t_region_shrub", 2 ], [ "t_region_tree", 1 ] ], "f": "t_chainfence", "|": "t_wall", "-": "t_wall", @@ -77,34 +70,12 @@ ",": "t_sidewalk", ":": "t_pavement", ";": "t_pavement_y", - "1": "t_floor", - "2": "t_floor", - "3": "t_floor", - "4": "t_floor", - "5": "t_console", - "6": "t_console_broken", - "7": "t_floor", - "8": "t_floor", - "9": "t_floor", - "&": "t_floor", "$": "t_sewage", - ".": "t_floor", - "a": "t_floor", - "b": "t_floor", - "r": "t_floor", - "F": "t_floor", - "c": "t_floor", - "C": "t_floor", - "d": "t_floor", - "l": "t_floor", - "p": "t_floor", - "A": "t_floor", "P": "t_sewage_pipe", "S": "t_sewage_pump", "G": "t_grate", "E": "t_elevator", "e": "t_elevator_control_off", - "s": "t_floor", "v": "t_dirt", "V": "t_vat", "L": "t_door_metal_locked", @@ -117,6 +88,8 @@ "2": "f_rack_coat", "3": "f_server", "4": "f_utility_shelf", + "5": "f_console", + "6": "f_console_broken", "7": "f_locker", "8": "f_utility_shelf", "9": "f_utility_shelf", @@ -238,20 +211,9 @@ "####################### ## ####################", "################################################" ], + "fill_ter": "t_metal_floor", "terrain": { " ": "t_rock_floor", - ".": "t_metal_floor", - "&": "t_metal_floor", - "a": "t_metal_floor", - "l": "t_metal_floor", - "s": "t_metal_floor", - "r": "t_metal_floor", - "c": "t_metal_floor", - "C": "t_metal_floor", - "d": "t_metal_floor", - "8": "t_metal_floor", - "9": "t_metal_floor", - "F": "t_metal_floor", "|": "t_concrete_wall", "-": "t_concrete_wall", "+": "t_door_metal_c", @@ -262,7 +224,6 @@ "%": "t_reinforced_glass", "E": "t_elevator", "e": "t_elevator_control_off", - "5": "t_console", "W": "t_water_dispenser", "~": [ [ "t_sewage", 55 ], [ "t_dirtfloor", 25 ], [ "t_dirtmound", 20 ] ] }, @@ -273,6 +234,7 @@ "c": "f_counter", "C": "f_chair", "l": "f_locker", + "5": "f_console", "8": "f_utility_shelf", "9": "f_utility_shelf", "a": "f_air_conditioner", diff --git a/data/json/mapgen/homeimprovement.json b/data/json/mapgen/homeimprovement.json index 916ce683426e3..f9117684e7520 100644 --- a/data/json/mapgen/homeimprovement.json +++ b/data/json/mapgen/homeimprovement.json @@ -40,11 +40,11 @@ "O": "t_window", "r": "t_carpet_red", "|": "t_wall_r", - "%": "t_console_broken", "4": "t_gutter_downspout", "<": "t_ladder_up" }, "furniture": { + "%": "f_console_broken", "A": "f_stool", "3": "f_bookcase", "U": [ "f_dumpster", "f_recycle_bin" ], diff --git a/data/json/mapgen/homeimprovement_superstore_new.json b/data/json/mapgen/homeimprovement_superstore_new.json index 9d43fc0088a3e..b565dcfddea11 100644 --- a/data/json/mapgen/homeimprovement_superstore_new.json +++ b/data/json/mapgen/homeimprovement_superstore_new.json @@ -217,10 +217,10 @@ ">": "t_stairs_down", "<": "t_stairs_up", "$": "t_atm", - "&": [ "t_grass", "t_grass", "t_grass", "t_dirt" ], - "B": [ "t_grass", "t_grass", "t_grass", "t_dirt" ], - " ": [ "t_grass_long", "t_grass_long", "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt", "t_shrub" ], - "/": [ "t_tree", "t_tree_young", "t_shrub" ], + "&": "t_region_groundcover_urban", + "B": "t_region_groundcover_urban", + " ": [ [ "t_region_groundcover_urban", 10 ], "t_region_shrub" ], + "/": [ [ "t_region_tree", 2 ], "t_region_shrub" ], "0": "t_grass_golf", "a": "t_sandmound", "A": "t_claymound", @@ -235,7 +235,6 @@ "F": "t_chaingate_c", "#": "t_door_metal_locked", "g": "t_gates_mech_control", - "x": "t_console_broken", "!": "t_door_glass_c", "+": "t_door_c", "%": "t_door_locked_interior", @@ -278,6 +277,7 @@ "Z": "t_glass_roof" }, "furniture": { + "x": "f_console_broken", "V": "f_vending_c", "C": "f_chair", "T": "f_table", @@ -316,12 +316,12 @@ "U": "f_sofa", "q": "f_bookcase", "B": "f_bench", - "&": [ "f_dahlia", "f_dandelion", "f_lily", "f_flower_tulip", "f_bluebell" ], + "&": "f_region_flower", "M": "f_fema_groundsheet", "{": "f_canvas_door", "}": "f_canvas_wall", "H": "f_camp_chair", - "X": [ "f_crate_c", "f_crate_c", "f_crate_c", "f_crate_o" ], + "X": [ [ "f_crate_c", 3 ], "f_crate_o" ], "D": "f_dumpster", "O": "f_air_conditioner", "j": "f_standing_tank", diff --git a/data/json/mapgen/homeless_shelter.json b/data/json/mapgen/homeless_shelter.json index 339384bafe6bf..a50321d4b4f47 100644 --- a/data/json/mapgen/homeless_shelter.json +++ b/data/json/mapgen/homeless_shelter.json @@ -5,25 +5,8 @@ "terrain": { "*": "t_open_air", "~": "t_open_air_rooved", - ".": [ [ "t_grass_long", 200 ], [ "t_grass", 600 ], [ "t_dirt", 200 ], [ "t_shrub", 1 ] ], - ",": [ - [ "t_grass_long", 75 ], - [ "t_grass", 50 ], - [ "t_shrub", 20 ], - [ "t_shrub_rose", 20 ], - [ "t_shrub_lilac", 20 ], - [ "t_tree_young", 20 ], - [ "t_grass_tall", 20 ], - [ "t_grass_long", 20 ], - [ "t_underbrush", 20 ], - [ "t_shrub_hydrangea", 20 ], - [ "t_shrub_raspberry", 20 ], - [ "t_tree", 10 ], - [ "t_tree_willow", 2 ], - [ "t_tree_birch", 2 ], - [ "t_tree_maple", 2 ], - [ "t_tree_pine", 2 ] - ], + ".": [ [ "t_region_groundcover_urban", 1000 ], [ "t_region_shrub", 1 ] ], + ",": [ [ "t_region_groundcover_urban", 125 ], [ "t_region_shrub", 120 ], [ "t_region_tree_shade", 40 ] ], "-": "t_door_locked_interior", "<": "t_stairs_down", "+": "t_door_c", @@ -39,7 +22,6 @@ "L": "t_thconc_floor", "R": "t_thconc_floor", "s": "t_concrete", - "x": "t_console_broken", "|": "t_brick_wall", "#": "t_ponywall", "=": "t_reinforced_glass", @@ -54,6 +36,7 @@ "n": "t_dirtmound" }, "furniture": { + "x": "f_console_broken", "3": "f_bench", "B": "f_bench", "S": "f_sink", diff --git a/data/json/mapgen/hotel_tower.json b/data/json/mapgen/hotel_tower.json index 43b1d7277c3e8..d3d7a731af066 100644 --- a/data/json/mapgen/hotel_tower.json +++ b/data/json/mapgen/hotel_tower.json @@ -76,8 +76,8 @@ " s''''%c..BB|c..BB|o..BB|c.LBB|t.........t|BB..c|BB..c|BB..o|BB..o%''''s" ], "palettes": [ "hotel_tower_palette.json" ], - "terrain": { "V": "t_pavement", "w": "t_window_domestic", "x": "t_console_broken" }, - "furniture": { "D": "f_desk" }, + "terrain": { "V": "t_pavement", "w": "t_window_domestic" }, + "furniture": { "D": "f_desk", "x": "f_console_broken" }, "items": { "B": { "item": "bed", "chance": 50 }, "L": { "item": "hotel_luggage", "chance": 100 }, @@ -130,8 +130,8 @@ "******%c..BB|c..BB|o..BBXc.LBB|t.........t|BB..cXBB..c|BB..o|BB..o%*****" ], "palettes": [ "hotel_tower_palette.json" ], - "terrain": { "w": "t_window_domestic", "x": "t_console_broken" }, - "furniture": { "D": "f_desk" }, + "terrain": { "w": "t_window_domestic" }, + "furniture": { "D": "f_desk", "x": "f_console_broken" }, "items": { "B": { "item": "bed", "chance": 50 }, "L": { "item": "hotel_luggage", "chance": 100 }, @@ -180,8 +180,8 @@ "******%c..BB|c..BB|o..BB|c.LBB|t.........t|BB..c|BB..c|BB..o|BB..o%*****" ], "palettes": [ "hotel_tower_palette.json" ], - "terrain": { "w": "t_window_domestic", "x": "t_console_broken" }, - "furniture": { "D": "f_desk" }, + "terrain": { "w": "t_window_domestic" }, + "furniture": { "D": "f_desk", "x": "f_console_broken" }, "items": { "B": { "item": "bed", "chance": 50 }, "L": { "item": "hotel_luggage", "chance": 100 }, @@ -230,8 +230,8 @@ "******%c..BB|c..BB|o..BB|c.LBB|t.........t|BB..c|BB..c|BB..o|BB..o%*****" ], "palettes": [ "hotel_tower_palette.json" ], - "terrain": { "w": "t_window_domestic", "x": "t_console_broken" }, - "furniture": { "D": "f_desk" }, + "terrain": { "w": "t_window_domestic" }, + "furniture": { "D": "f_desk", "x": "f_console_broken" }, "items": { "B": { "item": "bed", "chance": 50 }, "L": { "item": "hotel_luggage", "chance": 100 }, @@ -526,10 +526,9 @@ "_": "t_thconc_floor", "+": "t_door_metal_c", "D": "t_chaingate_l", - "%": "t_chainfence", - "H": "t_generator_broken" + "%": "t_chainfence" }, - "furniture": { "Y": "f_standing_tank", "6": "f_water_heater", "7": "f_roof_turbine_vent" }, + "furniture": { "Y": "f_standing_tank", "H": "f_generator_broken", "6": "f_water_heater", "7": "f_roof_turbine_vent" }, "liquids": { "6": { "liquid": "water_clean", "amount": [ 0, 100 ] }, "Y": { "liquid": "water_clean", "amount": [ 100, 1000 ] } }, "place_monsters": [ { "monster": "GROUP_ROOF_ZOMBIE", "x": [ 7, 23 ], "y": [ 0, 22 ], "repeat": 2 }, @@ -622,8 +621,8 @@ "%c.LBB|t.........t|BB..c" ], "palettes": [ "hotel_tower_palette.json" ], - "terrain": { "+": [ "t_door_c", "t_door_c", "t_door_o" ], "w": "t_window_domestic", "x": "t_console_broken" }, - "furniture": { "D": "f_desk" }, + "terrain": { "+": [ [ "t_door_c", 2 ], "t_door_o" ], "w": "t_window_domestic" }, + "furniture": { "D": "f_desk", "x": "f_console_broken" }, "items": { "B": { "item": "bed", "chance": 50 }, "L": { "item": "hotel_luggage", "chance": 100 }, @@ -668,8 +667,8 @@ "|c.LBB|t.........t|BB..c" ], "palettes": [ "hotel_tower_palette.json" ], - "terrain": { "+": [ "t_door_c", "t_door_c", "t_door_o" ], "w": "t_window_domestic", "x": "t_console_broken" }, - "furniture": { "D": "f_desk" }, + "terrain": { "+": [ [ "t_door_c", 2 ], "t_door_o" ], "w": "t_window_domestic" }, + "furniture": { "D": "f_desk", "x": "f_console_broken" }, "items": { "B": { "item": "bed", "chance": 50 }, "L": { "item": "hotel_luggage", "chance": 100 }, @@ -714,14 +713,8 @@ "|c.LBB|h.........h|BB..c" ], "palettes": [ "hotel_tower_palette.json" ], - "terrain": { - "+": [ "t_door_c", "t_door_c", "t_door_o" ], - "G": "t_door_glass_c", - "w": "t_window_domestic", - "V": "t_pavement", - "x": "t_console_broken" - }, - "furniture": { "D": "f_desk" }, + "terrain": { "+": [ "t_door_c", "t_door_c", "t_door_o" ], "G": "t_door_glass_c", "w": "t_window_domestic", "V": "t_pavement" }, + "furniture": { "D": "f_desk", "x": "f_console_broken" }, "items": { "B": { "item": "bed", "chance": 50 }, "L": { "item": "hotel_luggage", "chance": 100 }, @@ -767,13 +760,8 @@ "|c.LBB|t.........t|BB..c" ], "palettes": [ "hotel_tower_palette.json" ], - "terrain": { - "+": [ "t_door_c", "t_door_c", "t_door_o" ], - "G": "t_door_glass_c", - "w": "t_window_domestic", - "x": "t_console_broken" - }, - "furniture": { "D": "f_desk" }, + "terrain": { "+": [ "t_door_c", "t_door_c", "t_door_o" ], "G": "t_door_glass_c", "w": "t_window_domestic" }, + "furniture": { "D": "f_desk", "x": "f_console_broken" }, "items": { "B": { "item": "bed", "chance": 50 }, "L": { "item": "hotel_luggage", "chance": 100 }, diff --git a/data/json/mapgen/house/house_garage_prepper.json b/data/json/mapgen/house/house_garage_prepper.json index df3d8db13d2a7..8f1e3891895ea 100644 --- a/data/json/mapgen/house/house_garage_prepper.json +++ b/data/json/mapgen/house/house_garage_prepper.json @@ -60,11 +60,10 @@ "-": "t_linoleum_gray", "$": "t_window_boarded", "/": "t_window_reinforced", - ";": "t_console_broken", ",": "t_door_boarded", "(": "t_door_metal_pickable" }, - "furniture": { "!": "f_region_flower", "{": "f_table", "}": "f_chair", ")": "f_locker" }, + "furniture": { "!": "f_region_flower", ";": "f_console_broken", "{": "f_table", "}": "f_chair", ")": "f_locker" }, "set": [ { "point": "trap", "id": "tr_beartrap", "x": [ 10, 11 ], "y": 2, "repeat": [ 1, 2 ] }, { "point": "trap", "id": "tr_beartrap", "x": 2, "y": [ 7, 8 ], "repeat": [ 1, 2 ] }, diff --git a/data/json/mapgen/irradiator_1.json b/data/json/mapgen/irradiator_1.json index 331d2f6c71f4c..f858cc3a3486a 100644 --- a/data/json/mapgen/irradiator_1.json +++ b/data/json/mapgen/irradiator_1.json @@ -168,20 +168,7 @@ "[[[[L__________________LssssssssssssssssssssssssL__________________L[[[[" ], "terrain": { - "*": [ - "t_grass", - "t_grass", - "t_dirt", - "t_shrub_rose", - "t_shrub_lilac", - "t_tree_young", - "t_shrub_hydrangea", - "t_grass_long", - "t_woodchips", - "t_moss", - "t_grass_long", - "t_grass_dead" - ], + "*": [ [ "t_region_groundcover_forest", 2 ], "t_region_shrub_decorative" ], "'": [ "t_fence_barbed" ], "X": [ "t_strconc_wall" ], "+": [ "t_door_c" ], @@ -198,34 +185,32 @@ "f": [ "t_chainfence_h" ], "s": [ "t_sidewalk" ], "w": [ "t_window" ], - "x": [ "t_console_broken" ], "|": [ "t_strconc_wall" ], "U": [ "t_water_pool" ], "R": [ "t_reinforced_glass_shutter_open" ], "m": [ "t_oil_circ_brkr_s", "t_station_disc", "t_switchgear_s", "t_potential_trans", "t_current_trans", "t_lgtn_arrest" ], - "M": [ "t_machinery_heavy" ], "e": [ "t_gates_mech_control" ], "#": [ "t_sidewalk" ], - "P": [ "t_sewage_pump", "t_sewage_pipe", "t_sewage_pipe", "t_sewage_pipe" ], + "P": [ "t_sewage_pump", [ "t_sewage_pipe", 3 ] ], "Y": [ "t_door_metal_locked" ], "y": [ "t_door_metal_o" ], "N": [ "t_door_metal_locked" ], "%": [ "t_grate" ], - "/": [ "t_plut_generator" ], "}": [ "t_ladder_up" ], ")": [ "t_reinforced_glass" ], "!": [ "t_thconc_floor" ], - "0": [ "t_console" ], "1": [ "t_floor_red" ], "2": [ "t_floor_green" ], "3": [ "t_rad_platform" ], - "4": [ "t_card_industrial" ], - "5": [ "t_console" ], - "6": [ "t_console" ], - "7": [ "t_console" ] + "4": [ "t_card_industrial" ] }, "furniture": { "#": [ "f_bench" ], + "/": [ "f_compact_ASRG_containment" ], + "0": [ "f_console" ], + "5": [ "f_console" ], + "6": [ "f_console" ], + "7": [ "f_console" ], "S": [ "f_locker" ], "A": [ "f_locker" ], "j": [ "f_locker" ], @@ -236,10 +221,12 @@ "d": [ "f_desk" ], "g": [ "f_shower" ], "h": [ "f_chair" ], + "M": [ "f_machinery_heavy" ], "o": [ "f_sofa" ], "r": [ "f_rack" ], "t": [ "f_table" ], "Q": [ "f_air_filter" ], + "x": [ "f_console_broken" ], "Z": [ "f_water_purifier" ], "B": [ "f_bed", "f_dresser", "f_glass_cabinet" ], "<": [ "f_sink" ], diff --git a/data/json/mapgen/jewel_store.json b/data/json/mapgen/jewel_store.json index 0530214443a86..5dfe77f11e1ce 100644 --- a/data/json/mapgen/jewel_store.json +++ b/data/json/mapgen/jewel_store.json @@ -42,7 +42,7 @@ "+": "t_door_glass_c", ",": "t_pavement_y", "-": "t_wall_b", - ".": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt", "t_shrub" ], + ".": [ "t_region_groundcover_urban", "t_region_shrub" ], "5": "t_chainfence_h", "8": "t_chainfence_v", "F": "t_sidewalk", @@ -50,13 +50,13 @@ "_": "t_pavement", "h": "t_wall_glass_alarm", "v": "t_wall_glass_alarm", - "?": "t_console_broken", "4": "t_gutter_downspout", "|": "t_wall_b" }, "furniture": { "#": "f_counter", "%": "f_counter", + "?": "f_console_broken", "G": "f_desk", "T": "f_safe_l", "c": "f_chair", diff --git a/data/json/mapgen/lab/lab_common.json b/data/json/mapgen/lab/lab_common.json index 6ccc77eb54867..6159618dff094 100644 --- a/data/json/mapgen/lab/lab_common.json +++ b/data/json/mapgen/lab/lab_common.json @@ -3,6 +3,8 @@ "type": "palette", "id": "lab_palette", "furniture": { + "6": "f_console", + "x": "f_console_broken", "b": "f_bed", "l": "f_locker", "X": [ "f_cardboard_box", "f_crate_c" ], @@ -21,8 +23,6 @@ "^": "f_rubble_rock" }, "terrain": { - "6": "t_console", - "x": "t_console_broken", "g": "t_reinforced_glass", "G": "t_reinforced_door_glass_lab_c", ".": "t_thconc_floor", diff --git a/data/json/mapgen/lab/lab_floorplan_cross.json b/data/json/mapgen/lab/lab_floorplan_cross.json index 82c5d3af0d7d8..7fcdba5700e0e 100644 --- a/data/json/mapgen/lab/lab_floorplan_cross.json +++ b/data/json/mapgen/lab/lab_floorplan_cross.json @@ -166,18 +166,8 @@ "-----------MM----------|" ], "palettes": [ "lab_palette", "lab_loot_research" ], - "terrain": { - "?": [ "t_concrete_wall", "t_concrete_wall", "t_door_glass_frosted_lab_c" ], - "!": [ - "t_thconc_floor", - "t_thconc_floor", - "t_thconc_floor", - "t_thconc_floor", - "t_console_broken", - "t_generator_broken", - "t_centrifuge" - ] - }, + "terrain": { "?": [ "t_concrete_wall", "t_concrete_wall", "t_door_glass_frosted_lab_c" ] }, + "furniture": { "!": [ [ "f_null", 4 ], "f_console_broken", "f_generator_broken", "f_centrifuge" ] }, "place_nested": [ { "chunks": [ "lab_spawn_7x7" ], diff --git a/data/json/mapgen/lab/lab_floorplans.json b/data/json/mapgen/lab/lab_floorplans.json index 7bd70ed17d36d..62b4a723ebeba 100644 --- a/data/json/mapgen/lab/lab_floorplans.json +++ b/data/json/mapgen/lab/lab_floorplans.json @@ -141,10 +141,9 @@ "c...c|.rrr...|-|X.ccc.X|" ], "palettes": [ "lab_palette", "lab_loot_research" ], - "furniture": { "f": "f_null" }, + "furniture": { "f": "f_null", "P": "f_generator_broken" }, "terrain": { "?": [ "t_concrete_wall", "t_concrete_wall", "t_door_glass_frosted_lab_c" ], - "P": "t_generator_broken", "F": "t_chainfence_h", "f": "t_chainfence_v", "H": "t_chaingate_c", @@ -204,11 +203,8 @@ "..............l|X.ccc.X|" ], "palettes": [ "lab_palette", "lab_loot_research" ], - "terrain": { - "?": [ "t_concrete_wall", "t_concrete_wall", "t_door_glass_frosted_lab_c" ], - "=": "t_conveyor", - "%": "t_machinery_heavy" - }, + "terrain": { "?": [ "t_concrete_wall", "t_concrete_wall", "t_door_glass_frosted_lab_c" ], "=": "t_conveyor" }, + "furniture": { "%": "f_machinery_heavy" }, "mapping": { "c": { "items": [ { "item": "chem_lab", "chance": 20 }, { "item": "tools_science", "chance": 20 } ] } }, "place_nested": [ { "chunks": [ "lab_spawn_9x9_wall_sw" ], "x": 13, "y": 1 }, @@ -254,12 +250,8 @@ "rrr.....!.....l|-------|" ], "palettes": [ "lab_palette", "lab_loot_research" ], - "furniture": { "f": "f_null" }, - "terrain": { - "?": [ "t_concrete_wall", "t_concrete_wall", "t_door_glass_frosted_lab_c" ], - "!": [ "t_thconc_floor", "t_thconc_floor", "t_console_broken", "t_generator_broken" ], - "C": "t_centrifuge" - }, + "furniture": { "!": [ [ "f_null", 2 ], "f_console_broken", "f_generator_broken" ], "C": "f_centrifuge", "f": "f_null" }, + "terrain": { "?": [ "t_concrete_wall", "t_concrete_wall", "t_door_glass_frosted_lab_c" ] }, "mapping": { "c": { "items": [ { "item": "chem_lab", "chance": 10 }, { "item": "tools_science", "chance": 10 } ] }, "r": { "items": [ { "item": "cleaning", "chance": 30 } ] } @@ -533,13 +525,13 @@ "........................" ], "palettes": [ "lab_palette", "lab_loot_research" ], - "furniture": { "?": "f_autodoc", "/": "f_autodoc_couch" }, + "furniture": { "?": "f_autodoc", "/": "f_autodoc_couch", "7": "f_console", "C": "f_centrifuge" }, "terrain": { ",": "t_floor_blue", - "C": "t_centrifuge", + "C": "t_floor_blue", "?": "t_floor_blue", "/": "t_floor_blue", - "7": "t_console", + "7": "t_floor_blue", "r": "t_floor_blue" }, "place_loot": [ { "item": "anesthetic_kit", "x": 15, "y": 11, "ammo": 100 } ], @@ -613,12 +605,12 @@ ], "palettes": [ "lab_palette" ], "terrain": { - "C": "t_centrifuge", + "C": "t_floor", "?": [ "t_concrete_wall", "t_concrete_wall", "t_door_glass_frosted_lab_c" ], "7": "t_floor", "8": "t_floor" }, - "furniture": { "7": "f_autodoc", "8": "f_autodoc_couch" }, + "furniture": { "C": "f_centrifuge", "7": "f_autodoc", "8": "f_autodoc_couch" }, "items": { "b": { "item": "hospital_bed", "chance": 33 }, "l": { "item": "surgery", "chance": 50 }, @@ -683,7 +675,8 @@ "........................" ], "palettes": [ "lab_palette" ], - "terrain": { "C": "t_centrifuge", "7": "t_console", ",": "t_floor_blue" }, + "furniture": { "7": "f_console", "C": "f_centrifuge" }, + "terrain": { "C": "t_floor_blue", "7": "t_floor_blue", ",": "t_floor_blue" }, "mapping": { "c": { "items": [ { "item": "office", "chance": 30 }, { "item": "tools_science", "chance": 15 } ] }, "l": { "items": [ { "item": "science", "chance": 60 } ] } @@ -749,13 +742,12 @@ ".......|.........|......" ], "palettes": [ "lab_palette" ], - "furniture": { "S": "f_null", "^": "f_indoor_plant", "f": "f_null" }, + "furniture": { "S": "f_null", "^": "f_indoor_plant", "P": "f_generator_broken", "f": "f_null" }, "terrain": { "F": "t_chainfence_h", "f": "t_chainfence_v", "H": "t_chaingate_c", "&": "t_radio_tower", - "P": "t_generator_broken", "S": "t_sewage_pump", "p": "t_sewage_pipe", "C": "t_gates_control_concrete_lab", @@ -829,15 +821,8 @@ ".........|....|---------" ], "palettes": [ "lab_palette", "lab_loot_home_office" ], - "furniture": { "^": "f_indoor_plant" }, - "terrain": { - "E": "t_elevator", - "e": "t_elevator_control_off", - "w": "t_water_sh", - "W": "t_water_dp", - "=": "t_door_lab_c", - "C": "t_centrifuge" - }, + "furniture": { "^": "f_indoor_plant", "C": "f_centrifuge" }, + "terrain": { "E": "t_elevator", "e": "t_elevator_control_off", "w": "t_water_sh", "W": "t_water_dp", "=": "t_door_lab_c" }, "mapping": { "t": { "items": [ { "item": "vending_food_items", "chance": 20 } ] } }, "place_loot": [ { "group": "everyday_corpse", "x": 17, "y": 15 }, @@ -938,7 +923,7 @@ ], "palettes": [ "lab_palette", "lab_loot_home_office" ], "furniture": { "F": "f_sofa", "B": "f_bathtub", "C": "f_counter", "O": "f_oven", "V": "f_table" }, - "terrain": { "w": "t_window_domestic", "`": "t_grass", "+": "t_door_lab_c" }, + "terrain": { "w": "t_window_domestic", "`": "t_grass_golf", "+": "t_door_lab_c" }, "mapping": { "t": { "items": [ { "item": "livingroom", "chance": 20 } ] }, "F": { "items": [ { "item": "livingroom", "chance": 5 } ] }, diff --git a/data/json/mapgen/lab/lab_floorplans_1side.json b/data/json/mapgen/lab/lab_floorplans_1side.json index 361515eb3e588..aba5a9e3042e7 100644 --- a/data/json/mapgen/lab/lab_floorplans_1side.json +++ b/data/json/mapgen/lab/lab_floorplans_1side.json @@ -166,7 +166,7 @@ }, { "monster": [ "mon_zombie_soldier" ], "x": [ 1, 21 ], "y": [ 1, 16 ], "pack_size": [ 1, 4 ], "chance": 40 } ], - "terrain": { "7": "t_console" }, + "furniture": { "7": "f_console" }, "mapping": { "l": { "items": [ @@ -254,8 +254,7 @@ { "monster": "mon_zombie_grabber", "x": [ 1, 5 ], "y": [ 12, 15 ] }, { "monster": "mon_zombie_scientist", "x": [ 11, 12 ], "y": [ 5, 10 ], "pack_size": [ 1, 2 ], "chance": 50 } ], - "furniture": { "^": "f_indoor_plant" }, - "terrain": { "7": "t_console", "C": "t_centrifuge" }, + "furniture": { "^": "f_indoor_plant", "7": "f_console", "C": "f_centrifuge" }, "mapping": { "X": { "items": [ { "item": "softdrugs", "chance": 40 }, { "item": "harddrugs", "chance": 30 } ] }, "r": { "items": [ { "item": "softdrugs", "chance": 40 }, { "item": "harddrugs", "chance": 30 } ] }, diff --git a/data/json/mapgen/lab/lab_floorplans_finale1level.json b/data/json/mapgen/lab/lab_floorplans_finale1level.json index ec5402e4a6b58..969856ef5d252 100644 --- a/data/json/mapgen/lab/lab_floorplans_finale1level.json +++ b/data/json/mapgen/lab/lab_floorplans_finale1level.json @@ -35,13 +35,13 @@ "........................" ], "palettes": [ "lab_palette", "lab_loot_research" ], - "furniture": { "?": "f_autodoc", "/": "f_autodoc_couch" }, + "furniture": { "7": "f_console", "C": "f_centrifuge", "?": "f_autodoc", "/": "f_autodoc_couch" }, "terrain": { ",": "t_floor_blue", - "C": "t_centrifuge", + "C": "t_floor_blue", "?": "t_floor_blue", "/": "t_floor_blue", - "7": "t_console", + "7": "t_floor_blue", "r": "t_floor_blue" }, "place_loot": [ @@ -119,16 +119,8 @@ "......g..........g......" ], "palettes": [ "lab_palette", "lab_loot_research" ], - "furniture": { "R": "f_rack" }, - "terrain": { - "C": "t_machinery_electronic", - "x": "t_machinery_heavy", - "?": "t_nanofab", - "r": "t_metal_floor", - "/": "t_nanofab_body", - "Y": "t_thconc_floor_olight", - "p": "t_metal_floor" - }, + "furniture": { "C": "f_machinery_electronic", "x": "f_machinery_heavy", "R": "f_rack" }, + "terrain": { "?": "t_nanofab", "r": "t_metal_floor", "/": "t_nanofab_body", "Y": "t_thconc_floor_olight", "p": "t_metal_floor" }, "mapping": { "r": { "item": { "item": "standard_template_construct" } }, "R": { "item": { "item": "nanomaterial" } } }, "place_monster": [ { "monster": "mon_secubot", "x": [ 1, 4 ], "y": [ 20, 22 ], "chance": 90 }, @@ -174,9 +166,9 @@ ".......................-" ], "palettes": [ "lab_palette", "lab_loot_research" ], - "furniture": { "R": "f_rack", "D": "f_desk" }, + "furniture": { "C": "f_machinery_electronic", "R": "f_rack", "D": "f_desk" }, "fields": { "Q": { "field": "fd_fatigue", "intensity": 3 } }, - "terrain": { "C": "t_machinery_electronic", "r": "t_metal_floor", "Y": "t_thconc_floor_olight", "p": "t_metal_floor" }, + "terrain": { "r": "t_metal_floor", "Y": "t_thconc_floor_olight", "p": "t_metal_floor" }, "mapping": { "R": { "item": [ { "item": "dimensional_anchor" }, { "item": "phase_immersion_suit" } ] }, "D": { @@ -231,8 +223,8 @@ "........................" ], "palettes": [ "lab_palette", "lab_loot_research" ], - "furniture": { "V": "f_standing_tank" }, - "terrain": { ",": "t_floor_blue", "V": "t_floor_blue", "C": "t_centrifuge" }, + "furniture": { "V": "f_standing_tank", "C": "f_centrifuge" }, + "terrain": { ",": "t_floor_blue", "V": "t_floor_blue", "C": "t_floor_blue" }, "mapping": { "c": { "items": [ { "item": "mut_lab", "chance": 50 } ] } }, "computers": { "6": { diff --git a/data/json/mapgen/lab/lab_rooms.json b/data/json/mapgen/lab/lab_rooms.json index eb218c8ba97b0..00eb30d2923bf 100644 --- a/data/json/mapgen/lab/lab_rooms.json +++ b/data/json/mapgen/lab/lab_rooms.json @@ -267,7 +267,7 @@ "........." ], "palettes": [ "lab_palette" ], - "terrain": { "C": [ "t_centrifuge" ] } + "furniture": { "C": [ "f_centrifuge" ] } } }, { @@ -732,14 +732,15 @@ "object": { "mapgensize": [ 1, 1 ], "rows": [ "A" ], - "terrain": { + "terrain": { "A": "t_thconc_floor" }, + "furniture": { "A": [ - "t_machinery_heavy", - "t_machinery_heavy", - "t_machinery_electronic", - "t_machinery_light", - "t_centrifuge", - "t_console_broken" + "f_machinery_heavy", + "f_machinery_heavy", + "f_machinery_electronic", + "f_machinery_light", + "f_centrifuge", + "f_console_broken" ] } } diff --git a/data/json/mapgen/lab/lab_surface/lab_surface_big_z-1.json b/data/json/mapgen/lab/lab_surface/lab_surface_big_z-1.json index f838ba32b222c..1114307de4eaf 100644 --- a/data/json/mapgen/lab/lab_surface/lab_surface_big_z-1.json +++ b/data/json/mapgen/lab/lab_surface/lab_surface_big_z-1.json @@ -174,8 +174,7 @@ "*": "t_thconc_floor_olight", "e": "t_elevator", "m": "t_door_metal_c", - "w": "t_gates_control_brick", - "x": "t_console_broken" + "w": "t_gates_control_brick" }, "furniture": { "&": "f_trashcan", @@ -186,7 +185,8 @@ "f": "f_fridge", "l": "f_locker", "s": "f_stool", - "U": "f_utility_shelf" + "U": "f_utility_shelf", + "x": "f_console_broken" }, "items": { "d": { "item": "office", "chance": 60, "repeat": [ 2, 6 ] }, diff --git a/data/json/mapgen/lab/lab_surface/lab_surface_nested.json b/data/json/mapgen/lab/lab_surface/lab_surface_nested.json index 375238fd34f78..da5be15a3e112 100644 --- a/data/json/mapgen/lab/lab_surface/lab_surface_nested.json +++ b/data/json/mapgen/lab/lab_surface/lab_surface_nested.json @@ -1161,7 +1161,7 @@ "A": "t_strconc_floor", "c": "t_strconc_floor", "C": "t_strconc_floor", - "m": "t_machinery_heavy", + "m": "t_strconc_floor", "P": "t_sewage_pipe", "t": "t_strconc_floor", "S": "t_strconc_floor", @@ -1171,6 +1171,7 @@ "furniture": { "A": "f_air_filter", "C": "f_air_compressor", + "m": "f_machinery_heavy", "t": "f_standing_tank", "S": "f_standing_tank", "U": "f_utility_shelf", @@ -1224,7 +1225,7 @@ "D": "t_strconc_floor", "F": "t_strconc_floor", "L": "t_strconc_floor", - "m": "t_machinery_heavy", + "m": "t_strconc_floor", "R": "t_strconc_floor", "T": "t_strconc_floor", "u": "t_strconc_floor", @@ -1237,6 +1238,7 @@ "D": "f_drill_press", "F": "f_home_furnace", "L": "f_heavy_lathe", + "m": "f_machinery_heavy", "R": "f_router", "T": "f_tablesaw", "u": "f_utility_shelf", @@ -1873,19 +1875,34 @@ "type": "mapgen", "method": "json", "nested_mapgen_id": "surface_sub_hall_clutter", - "object": { "mapgensize": [ 1, 1 ], "rows": [ "X" ], "terrain": { "X": "t_strconc_floor" }, "furniture": { "X": "f_IV_pole" } } + "object": { + "mapgensize": [ 1, 1 ], + "rows": [ "X" ], + "terrain": { "X": "t_strconc_floor" }, + "furniture": { "X": [ "f_IV_pole", "f_desk", "f_counter" ] } + } }, { "type": "mapgen", "method": "json", "nested_mapgen_id": "surface_sub_hall_clutter", - "object": { "mapgensize": [ 1, 1 ], "rows": [ "X" ], "terrain": { "X": "t_strconc_floor" }, "furniture": { "X": "f_autoclave" } } + "object": { + "mapgensize": [ 1, 1 ], + "rows": [ "X" ], + "terrain": { "X": "t_strconc_floor" }, + "furniture": { "X": [ "f_autoclave", "f_console_broken", "f_centrifuge" ] } + } }, { "type": "mapgen", "method": "json", "nested_mapgen_id": "surface_sub_hall_clutter", - "object": { "mapgensize": [ 1, 1 ], "rows": [ "X" ], "terrain": { "X": "t_machinery_old" } } + "object": { + "mapgensize": [ 1, 1 ], + "rows": [ "X" ], + "terrain": { "X": "t_strconc_floor" }, + "furniture": { "X": [ "f_machinery_old", "f_machinery_light", "f_machinery_electronic" ] } + } }, { "type": "mapgen", diff --git a/data/json/mapgen/lab/lab_trains.json b/data/json/mapgen/lab/lab_trains.json index 64df9439a6449..4e863d34c528f 100644 --- a/data/json/mapgen/lab/lab_trains.json +++ b/data/json/mapgen/lab/lab_trains.json @@ -44,14 +44,8 @@ "failures": [ { "action": "damage" }, { "action": "alarm" }, { "action": "manhacks" } ] } }, - "terrain": { - "=": "t_chaingate_c", - "_": "t_chainfence_h", - "8": "t_potential_trans", - "P": "t_generator_broken", - "!": "t_sewage_pump", - "p": "t_sewage_pipe" - }, + "terrain": { "=": "t_chaingate_c", "_": "t_chainfence_h", "8": "t_potential_trans", "!": "t_sewage_pump", "p": "t_sewage_pipe" }, + "furniture": { "P": "f_generator_broken" }, "place_nested": [ { "chunks": [ "lab_train_subway_east" ], "x": 0, "y": 0, "neighbors": { "east": [ "subway" ] } }, { "chunks": [ "lab_train_subway_west" ], "x": 0, "y": 0, "neighbors": { "west": [ "subway" ] } }, diff --git a/data/json/mapgen/lab_subway_vent_shaft.json b/data/json/mapgen/lab_subway_vent_shaft.json index 32bb9e09bf2a2..548e622f1546a 100644 --- a/data/json/mapgen/lab_subway_vent_shaft.json +++ b/data/json/mapgen/lab_subway_vent_shaft.json @@ -4,7 +4,7 @@ "id": "lab_subway_vent_shaft", "terrain": { "2": "t_door_metal_c", - "%": "t_machinery_heavy", + "%": "t_metal_floor_no_roof", "-": "t_wall_metal", "3": "t_chaingate_c", ",": "t_region_groundcover_urban", @@ -15,10 +15,11 @@ "~": "t_water_pool_shallow", "<": "t_ladder_up", ">": "t_ladder_down", - "u": "t_chainfence_h", - "U": "t_chainfence_v", + "u": "t_chainfence", + "U": "t_chainfence", "#": "t_rock" - } + }, + "furniture": { "%": "f_machinery_heavy" } }, { "type": "mapgen", diff --git a/data/json/mapgen/lake_buildings/lighthouse.json b/data/json/mapgen/lake_buildings/lighthouse.json index 4e2a78c11c610..4f3c71aa72f79 100644 --- a/data/json/mapgen/lake_buildings/lighthouse.json +++ b/data/json/mapgen/lake_buildings/lighthouse.json @@ -336,12 +336,10 @@ "<": "t_wood_stairs_up", "Q": "t_open_air_rooved", ">": "t_wood_stairs_down", - "x": "t_generator_broken", - "y": "t_machinery_old", "#": "t_wall_wood", "0": "t_laminated_glass" }, - "furniture": { "M": [ "f_crate_c", "f_cardboard_box" ] }, + "furniture": { "M": [ "f_crate_c", "f_cardboard_box" ], "x": "f_generator_broken", "y": "f_machinery_old" }, "items": { "M": [ { "item": "fishing_items", "chance": 30, "repeat": [ 1, 2 ] }, @@ -393,11 +391,11 @@ "<": "t_wood_stairs_up", ">": "t_wood_stairs_down", "0": "t_laminated_glass", - "y": "t_machinery_old", "#": "t_grate", "+": "t_laminated_door_glass_c", "Q": "t_open_air_rooved" - } + }, + "furniture": { "y": "f_machinery_old" } } }, { diff --git a/data/json/mapgen/lan_center.json b/data/json/mapgen/lan_center.json index e5fd19f5c1abb..e4974ae70772a 100644 --- a/data/json/mapgen/lan_center.json +++ b/data/json/mapgen/lan_center.json @@ -35,44 +35,19 @@ "terrain": { "+": "t_reinforced_door_glass_c", ".": "t_floor", - "6": "t_console", - "_": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt", "t_shrub" ], - "a": "t_console_broken", - "d": "t_grass_long", + "_": [ [ "t_region_groundcover_urban", 8 ], "t_region_shrub_decorative" ], + "d": "t_region_groundcover", "s": "t_sidewalk", "w": "t_window", "|": "t_wall_w", "4": "t_gutter_downspout", "=": "t_door_locked", "U": "t_sidewalk", - "9": [ - "t_tree_blackjack", - "t_tree_walnut", - "t_tree_chestnut", - "t_tree_beech", - "t_tree_hazelnut", - "t_tree_cottonwood", - "t_tree", - "t_tree_elm", - "t_tree_dead", - "t_tree_apple", - "t_tree_pear", - "t_tree_cherry", - "t_tree_peach", - "t_tree_apricot", - "t_tree_plum", - "t_tree_mulberry", - "t_tree_elderberry", - "t_tree_pine", - "t_tree_birch", - "t_tree_willow", - "t_tree_maple", - "t_tree_hickory", - "t_tree_almond", - "t_tree_pecan" - ] + "9": [ "t_region_tree_shade", "t_region_tree_fruit" ] }, "furniture": { + "6": "f_console", + "a": "f_console_broken", "#": "f_table", "&": "f_trashcan", "C": "f_counter", @@ -85,7 +60,7 @@ "I": "f_desk", "S": "f_filing_cabinet", "U": [ "f_dumpster", "f_recycle_bin" ], - "d": [ "f_datura", "f_bluebell", "f_mutpoppy", "f_dahlia", "f_flower_tulip", "f_chamomile", "f_flower_spurge", "f_lily" ], + "d": "f_region_weed", "y": [ "f_indoor_plant_y", "f_indoor_plant" ], "R": "f_sink", "@": "f_sofa" @@ -189,10 +164,9 @@ "+": "t_reinforced_door_glass_c", "-": "t_wall_glass", ".": "t_floor", - "6": "t_console", "D": "t_door_c", "P": "t_wall_glass", - "_": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt", "t_shrub" ], + "_": [ [ "t_region_groundcover_urban", 8 ], "t_region_shrub_decorative" ], "d": "t_dirt", "p": "t_pavement", "s": "t_sidewalk", @@ -200,6 +174,7 @@ "4": "t_gutter_downspout" }, "furniture": { + "6": "f_console", "#": "f_table", "&": "f_trashcan", "C": "f_counter", diff --git a/data/json/mapgen/laundromat.json b/data/json/mapgen/laundromat.json index bd45dfd7d684c..10b291f557d46 100644 --- a/data/json/mapgen/laundromat.json +++ b/data/json/mapgen/laundromat.json @@ -39,7 +39,6 @@ ".": "t_linoleum_white", "=": "t_wall_glass", "A": "t_atm", - "C": "t_console_broken", "[": "t_door_glass_c", "_": "t_pavement", "l": "t_linoleum_gray", @@ -56,6 +55,7 @@ "&": "f_trashcan", "6": "f_arcade_machine", "B": "f_stool", + "C": "f_console_broken", "D": "f_dryer", "S": "f_sink", "T": "f_toilet", @@ -165,7 +165,7 @@ "sss4sssssssssss||||||||s" ], "terrain": { - " ": [ "t_grass", "t_grass", "t_dirt", "t_grass", "t_shrub", "t_tree_young" ], + " ": [ [ "t_region_groundcover_urban", 5 ], "t_region_shrub" ], "P": "t_floor", "p": "t_floor", ",": "t_floor", @@ -175,7 +175,6 @@ ".": "t_linoleum_white", "=": "t_wall_glass", "A": "t_atm", - "C": "t_console_broken", "[": "t_door_glass_c", "_": "t_pavement", "-": "t_pavement_y", @@ -183,10 +182,11 @@ "d": "t_sidewalk", "s": "t_sidewalk", "|": "t_wall_w", - "H": "t_grass", + "H": "t_region_groundcover_urban", "4": "t_gutter_downspout" }, "furniture": { + "C": "f_console_broken", "#": "f_counter", "}": "f_bookcase", "P": "f_desk", diff --git a/data/json/mapgen/megastore.json b/data/json/mapgen/megastore.json index 2f9ee972ad0dd..73610490cbb8d 100644 --- a/data/json/mapgen/megastore.json +++ b/data/json/mapgen/megastore.json @@ -10,7 +10,7 @@ "^": "t_glass_roof", "1": "t_metal_railing", "%": "t_grate", - ",": "t_grass", + ",": "t_region_groundcover_urban", "-": "t_concrete_wall", "|": "t_concrete_wall", "+": "t_door_glass_c", @@ -23,10 +23,10 @@ "W": "t_sidewalk", "<": "t_stairs_up", ">": "t_stairs_down", - "6": "t_console_broken", "Y": "t_switchgear_s" }, "furniture": { + "6": "f_console_broken", "a": "f_armchair", "A": "f_sofa", "b": "f_bookcase", @@ -1989,7 +1989,7 @@ ], "rotation": 1, "palettes": [ "megastore" ], - "terrain": { "%": "t_machinery_heavy" } + "furniture": { "%": "f_machinery_heavy" } } }, { diff --git a/data/json/mapgen/microlab/microlab_connector.json b/data/json/mapgen/microlab/microlab_connector.json index ea60aae01867b..180fe707cc3b6 100644 --- a/data/json/mapgen/microlab/microlab_connector.json +++ b/data/json/mapgen/microlab/microlab_connector.json @@ -227,7 +227,8 @@ " |||||| |||||||||||" ], "palettes": [ "microlab" ], - "terrain": { "p": "t_sewage_pipe", "w": "t_water_pool_shallow", "%": "t_machinery_heavy", "S": "t_sewage_pump" }, + "terrain": { "p": "t_sewage_pipe", "w": "t_water_pool_shallow", "S": "t_sewage_pump" }, + "furniture": { "%": "f_machinery_heavy" }, "items": { "l": { "item": "sewage_plant", "chance": 75 } } } }, diff --git a/data/json/mapgen/microlab/microlab_special_tiles.json b/data/json/mapgen/microlab/microlab_special_tiles.json index 02770c09f013b..2ed7e57697370 100644 --- a/data/json/mapgen/microlab/microlab_special_tiles.json +++ b/data/json/mapgen/microlab/microlab_special_tiles.json @@ -151,7 +151,7 @@ " c c|c | | |cc " ], "palettes": [ "microlab" ], - "terrain": { "A": "t_plut_generator" }, + "furniture": { "A": "f_compact_ASRG_containment" }, "item": { "u": { "item": "corpse" }, "k": { "item": "corpse" }, "T": { "item": "corpse" } }, "monster": { "T": { "monster": "mon_leech_blossom" }, diff --git a/data/json/mapgen/missile_silo.json b/data/json/mapgen/missile_silo.json index ef8648e213c7e..6c98ad3faf417 100644 --- a/data/json/mapgen/missile_silo.json +++ b/data/json/mapgen/missile_silo.json @@ -69,7 +69,7 @@ "om_terrain": [ "silo_1" ], "weight": 400, "object": { - "fill_ter": "t_rock", + "fill_ter": "t_floor", "rows": [ " ", " ", @@ -97,29 +97,13 @@ " " ], "terrain": { + " ": "t_rock", "*": "t_missile", "`": "t_hole", "|": "t_metal_railing", "-": "t_metal_railing", "~": "t_metal_floor", - ".": "t_floor", - "&": "t_floor", - "1": "t_floor", - "a": "t_floor", - "b": "t_floor", - "B": "t_floor", - "c": "t_floor", - "l": "t_floor", - "r": "t_floor", - "f": "t_floor", - "e": "t_floor", - "s": "t_floor", - "S": "t_floor", - "t": "t_floor", - "T": "t_floor", "W": "t_water_dispenser", - "C": "t_floor", - "6": "t_floor", "=": "t_door_locked", "+": "t_door_metal_locked", "?": "t_door_metal_c_peep", @@ -127,8 +111,7 @@ "$": "t_elevator", ">": "t_stairs_down", "<": "t_stairs_up", - "X": "t_card_military", - "x": "t_console_broken" + "X": "t_card_military" }, "furniture": { "d": "f_desk", @@ -146,7 +129,8 @@ "S": "f_sink", "6": "f_shower", "b": "f_bookcase", - "1": "f_speaker_cabinet" + "1": "f_speaker_cabinet", + "x": "f_console_broken" }, "items": { "r": { "item": "trash_cart", "chance": 50, "repeat": 2 }, @@ -227,16 +211,18 @@ "0": "t_reinforced_glass_shutter", "^": "t_elevator_control_off", "$": "t_elevator", - "x": "t_console_broken", + "%": "t_floor", + "x": "t_floor", "+": "t_door_metal_locked", "?": "t_door_metal_c_peep", "=": "t_door_locked", ">": "t_stairs_down", "<": "t_stairs_up", - "%": "t_machinery_electronic", "X": "t_card_military" }, "furniture": { + "%": "f_machinery_electronic", + "x": "f_console_broken", "d": "f_desk", "c": "f_chair", "a": "f_air_conditioner", @@ -323,7 +309,7 @@ "5": "t_floor", "6": "t_floor", "a": "t_floor", - "g": "t_generator_broken", + "g": "t_floor", "h": "t_switchgear_s", "i": "t_station_disc", "j": "t_current_trans", @@ -331,16 +317,24 @@ "0": "t_reinforced_glass_shutter_open", "^": "t_elevator_control_off", "$": "t_elevator", - "x": "t_console_broken", + "x": "t_floor", "+": "t_door_metal_locked", "?": "t_door_metal_c_peep", - "%": "t_machinery_electronic", + "%": "t_floor", ">": "t_stairs_down", "<": "t_stairs_up", "X": "t_mdoor_frame", "Y": "t_card_military" }, - "furniture": { "a": "f_air_conditioner", "5": "f_utility_shelf", "6": "f_locker", "4": "f_speaker_cabinet" }, + "furniture": { + "g": "f_generator_broken", + "%": "f_machinery_electronic", + "a": "f_air_conditioner", + "x": "f_console_broken", + "5": "f_utility_shelf", + "6": "f_locker", + "4": "f_speaker_cabinet" + }, "items": { "5": { "item": "radiation_meds", "chance": 60, "repeat": 2 }, "6": { "item": "radiation_equipment", "chance": 60 } }, "place_graffiti": [ { @@ -499,10 +493,17 @@ "Y": "t_card_military", "^": "t_elevator_control_off", "$": "t_elevator", - "x": "t_console_broken", - "%": "t_machinery_electronic" + "x": "t_rock_floor", + "%": "t_rock_floor" + }, + "furniture": { + "x": "f_console_broken", + "%": "f_machinery_electronic", + "1": "f_speaker_cabinet", + "4": "f_speaker_cabinet", + "a": "f_air_conditioner", + "c": "f_chair" }, - "furniture": { "1": "f_speaker_cabinet", "4": "f_speaker_cabinet", "a": "f_air_conditioner", "c": "f_chair" }, "computers": { "6": { "name": "Missile Controls", diff --git a/data/json/mapgen/movie_theater.json b/data/json/mapgen/movie_theater.json index 828860f9074b9..a12c43c19c6b2 100644 --- a/data/json/mapgen/movie_theater.json +++ b/data/json/mapgen/movie_theater.json @@ -248,16 +248,20 @@ "+": "t_door_metal_c", "D": "t_chaingate_l", "%": "t_chainfence", - "H": "t_generator_broken", "&": "t_flat_roof", "A": "t_flat_roof", ":": "t_flat_roof", "Y": "t_flat_roof", "X": "t_flat_roof", - "=": "t_flat_roof", - "p": "t_machinery_old" + "=": "t_flat_roof" + }, + "furniture": { + "H": "f_generator_broken", + "Y": "f_standing_tank", + "6": "f_water_heater", + "7": "f_roof_turbine_vent", + "p": "f_machinery_old" }, - "furniture": { "Y": "f_standing_tank", "6": "f_water_heater", "7": "f_roof_turbine_vent" }, "items": { "C": { "item": "snacks", "chance": 30, "repeat": [ 6, 12 ] } } } } diff --git a/data/json/mapgen/nested/retail_nested.json b/data/json/mapgen/nested/retail_nested.json index 48f3c48b02fe2..ea74288305067 100644 --- a/data/json/mapgen/nested/retail_nested.json +++ b/data/json/mapgen/nested/retail_nested.json @@ -18,8 +18,9 @@ " A ", " VVV " ], - "terrain": { " ": "t_floor", "?": "t_console_broken" }, + "terrain": { " ": "t_floor" }, "furniture": { + "?": "f_console_broken", "L": "f_table", "H": "f_table", "G": "f_table", @@ -88,8 +89,9 @@ " A ", " VVV " ], - "terrain": { " ": "t_floor", "L": "t_carpet_yellow", ".": "t_carpet_yellow", "?": "t_console_broken" }, + "terrain": { " ": "t_floor", "L": "t_carpet_yellow", ".": "t_carpet_yellow", "?": "t_carpet_yellow" }, "furniture": { + "?": "f_console_broken", "L": "f_table", "H": "f_table", "G": "f_table", @@ -156,9 +158,10 @@ "A": "t_linoleum_white", "y": "t_linoleum_white", "Y": "t_linoleum_white", - "?": "t_console_broken" + "?": "t_linoleum_white" }, "furniture": { + "?": "f_console_broken", "L": "f_table", "H": "f_table", "G": "f_table", @@ -225,9 +228,10 @@ "H": "t_carpet_green", "L": "t_carpet_green", ".": "t_carpet_green", - "?": "t_console_broken" + "?": "t_carpet_green" }, "furniture": { + "?": "f_console_broken", "L": "f_table", "H": "f_table", "G": "f_displaycase", @@ -290,8 +294,9 @@ " A ", "y MMMM Y" ], - "terrain": { " ": "t_floor", "G": "t_carpet_red", "L": "t_carpet_red", ".": "t_carpet_red", "?": "t_console_broken" }, + "terrain": { " ": "t_floor", "G": "t_carpet_red", "L": "t_carpet_red", ".": "t_carpet_red", "?": "t_carpet_red" }, "furniture": { + "?": "f_console_broken", "L": "f_table", "H": "f_table", "G": "f_displaycase", @@ -360,9 +365,10 @@ "L": "t_carpet_yellow", "B": "t_carpet_yellow", ".": "t_carpet_yellow", - "?": "t_console_broken" + "?": "t_carpet_yellow" }, "furniture": { + "?": "f_console_broken", "L": "f_table", "B": "f_table", "H": "f_displaycase", @@ -447,9 +453,10 @@ "A": "t_linoleum_gray", "s": "t_linoleum_gray", "i": "t_linoleum_gray", - "?": "t_console_broken" + "?": "t_linoleum_gray" }, "furniture": { + "?": "f_console_broken", "L": "f_table", "i": "f_oven", "s": "f_sink", @@ -520,8 +527,9 @@ " C QQVV ", "|| |||||" ], - "terrain": { " ": "t_floor", "?": "t_console_broken", "|": "t_brick_wall" }, + "terrain": { " ": "t_floor", "?": "t_floor", "|": "t_brick_wall" }, "furniture": { + "?": "f_console_broken", "A": "f_stool", "B": "f_counter", "C": "f_table", @@ -623,8 +631,9 @@ " b LLL ", "|| |||||" ], - "terrain": { " ": "t_floor", "?": "t_console_broken", "|": "t_brick_wall" }, + "terrain": { " ": "t_floor", "?": "t_floor", "|": "t_brick_wall" }, "furniture": { + "?": "f_console_broken", "A": "f_stool", "B": "f_counter", "C": "f_table", @@ -721,8 +730,16 @@ " ", "bb C" ], - "terrain": { " ": "t_floor", "?": "t_console_broken" }, - "furniture": { "A": "f_stool", "B": "f_workbench", "C": "f_rack_wood", "d": "f_mannequin", "e": "f_mannequin", "b": "f_bench" }, + "terrain": { " ": "t_floor", "?": "t_floor" }, + "furniture": { + "?": "f_console_broken", + "A": "f_stool", + "B": "f_workbench", + "C": "f_rack_wood", + "d": "f_mannequin", + "e": "f_mannequin", + "b": "f_bench" + }, "items": { "C": [ { "item": "SUS_tailoring_materials", "chance": 30, "repeat": [ 1, 2 ] } ], "d": [ { "item": "SUS_mannequin_formal_mens", "chance": 30 } ], @@ -752,8 +769,9 @@ " b LLL ", "|| |||||" ], - "terrain": { " ": "t_floor", "?": "t_console_broken", "|": "t_brick_wall" }, + "terrain": { " ": "t_floor", "?": "t_floor", "|": "t_brick_wall" }, "furniture": { + "?": "f_console_broken", "A": "f_stool", "B": "f_counter", "C": "f_table", @@ -843,8 +861,16 @@ "A ", "BB C" ], - "terrain": { " ": "t_floor", "?": "t_console_broken" }, - "furniture": { "A": "f_stool", "B": "f_workbench", "C": "f_rack_wood", "d": "f_mannequin", "e": "f_mannequin", "b": "f_bench" }, + "terrain": { " ": "t_floor", "?": "t_floor" }, + "furniture": { + "?": "f_console_broken", + "A": "f_stool", + "B": "f_workbench", + "C": "f_rack_wood", + "d": "f_mannequin", + "e": "f_mannequin", + "b": "f_bench" + }, "items": { "C": [ { "item": "SUS_tailoring_materials", "chance": 10, "repeat": [ 1, 2 ] }, @@ -881,8 +907,9 @@ " b QQQ ", "|| |||||" ], - "terrain": { " ": "t_floor", "?": "t_console_broken", "|": "t_brick_wall" }, + "terrain": { " ": "t_floor", "?": "t_floor", "|": "t_brick_wall" }, "furniture": { + "?": "f_console_broken", "A": "f_stool", "B": "f_counter", "C": "f_table", @@ -967,8 +994,16 @@ "A ", "BB C" ], - "terrain": { " ": "t_floor", "?": "t_console_broken" }, - "furniture": { "A": "f_stool", "B": "f_workbench", "C": "f_rack_wood", "d": "f_mannequin", "e": "f_mannequin", "b": "f_bench" }, + "terrain": { " ": "t_floor", "?": "t_floor" }, + "furniture": { + "?": "f_console_broken", + "A": "f_stool", + "B": "f_workbench", + "C": "f_rack_wood", + "d": "f_mannequin", + "e": "f_mannequin", + "b": "f_bench" + }, "items": { "C": [ { "item": "SUS_tailoring_materials", "chance": 10, "repeat": [ 1, 2 ] }, @@ -997,8 +1032,9 @@ "B zz", "Cyz " ], - "terrain": { " ": "t_floor", "?": "t_console_broken" }, + "terrain": { " ": "t_floor", "?": "t_floor" }, "furniture": { + "?": "f_console_broken", "A": "f_chair", "B": "f_desk", "C": "f_rack", @@ -1032,8 +1068,9 @@ " zz", "CDF " ], - "terrain": { " ": "t_floor", "?": "t_console_broken" }, + "terrain": { " ": "t_floor", "?": "t_floor" }, "furniture": { + "?": "f_console_broken", "A": "f_chair", "B": "f_desk", "C": "f_rack", @@ -1067,8 +1104,9 @@ "G ", "ybb " ], - "terrain": { " ": "t_floor", "?": "t_console_broken" }, + "terrain": { " ": "t_floor", "?": "t_floor" }, "furniture": { + "?": "f_console_broken", "G": "f_locker", "b": "f_bench", "d": "f_filing_cabinet", @@ -1096,14 +1134,15 @@ "G ", "y C " ], - "terrain": { " ": "t_floor", "?": "t_console_broken" }, + "terrain": { " ": "t_floor" }, "furniture": { "C": "f_rack", "G": "f_sofa", "d": "f_filing_cabinet", "D": "f_vending_c", "F": "f_vending_c", - "y": [ "f_indoor_plant", "f_indoor_plant_y" ] + "y": [ "f_indoor_plant", "f_indoor_plant_y" ], + "?": "f_console_broken" }, "vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } }, "items": { @@ -1126,8 +1165,9 @@ "BA ", "y GC" ], - "terrain": { " ": "t_floor", "?": "t_console_broken" }, + "terrain": { " ": "t_floor" }, "furniture": { + "?": "f_console_broken", "A": "f_chair", "B": "f_desk", "C": "f_rack", @@ -1158,7 +1198,7 @@ "G b ", "yz CC" ], - "terrain": { " ": "t_floor", "?": "t_console_broken" }, + "terrain": { " ": "t_floor" }, "furniture": { "A": "f_chair", "B": "f_desk", @@ -1170,7 +1210,8 @@ "D": "f_vending_c", "F": "f_vending_c", "y": [ "f_indoor_plant", "f_indoor_plant_y" ], - "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ] + "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ], + "?": "f_console_broken" }, "vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } }, "items": { @@ -1259,8 +1300,9 @@ "F * | ", "YPPQQSY| |j " ], - "terrain": { "?": "t_console_broken", "|": "t_brick_wall", "*": "t_door_c" }, + "terrain": { "|": "t_brick_wall", "*": "t_door_c" }, "furniture": { + "?": "f_console_broken", "L": "f_table", "H": "f_chair", "G": "f_sofa", diff --git a/data/json/mapgen/nested/shelter_nested.json b/data/json/mapgen/nested/shelter_nested.json index 382fffc85f165..61821048e0dc4 100644 --- a/data/json/mapgen/nested/shelter_nested.json +++ b/data/json/mapgen/nested/shelter_nested.json @@ -32,7 +32,7 @@ " " ], "terrain": { " ": "t_null" }, - "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" }, + "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan", "6": "f_console" }, "computers": { "6": { "name": "Evac shelter computer", @@ -81,10 +81,17 @@ "terrain": { ":": [ "t_window_frame", "t_window_no_curtains" ], "+": [ "t_door_c", "t_door_b" ], - "=": [ "t_door_b", "t_door_locked_interior", "t_door_c", "t_door_o" ], - "x": "t_console_broken" + "=": [ "t_door_b", "t_door_locked_interior", "t_door_c", "t_door_o" ] + }, + "furniture": { + "b": "f_bench", + "c": "f_cupboard", + "l": "f_locker", + "S": "f_sink", + "%": "f_trashcan", + "6": "f_console", + "x": "f_console_broken" }, - "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" }, "computers": { "6": { "name": "Evac shelter computer", @@ -143,10 +150,16 @@ "terrain": { ":": [ "t_window_frame", "t_window_no_curtains" ], "+": [ "t_door_c", "t_door_b" ], - "=": [ "t_door_b", "t_door_locked_interior", "t_door_c", "t_door_o" ], - "6": "t_console_broken" + "=": [ "t_door_b", "t_door_locked_interior", "t_door_c", "t_door_o" ] + }, + "furniture": { + "b": "f_bench", + "c": "f_cupboard", + "l": [ [ "f_locker", 2 ], "f_wreckage" ], + "S": "f_sink", + "%": "f_trashcan", + "6": "f_console_broken" }, - "furniture": { "b": "f_bench", "c": "f_cupboard", "l": [ [ "f_locker", 2 ], "f_wreckage" ], "S": "f_sink", "%": "f_trashcan" }, "items": { "l": { "item": "shelter_supplies", "chance": 40 }, "c": [ { "item": "trash", "chance": 1 }, { "item": "softdrugs", "chance": 2 }, { "item": "shelter_supplies", "chance": 10 } ], @@ -189,7 +202,7 @@ " " ], "terrain": { " ": "t_null" }, - "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" }, + "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan", "6": "f_console" }, "items": { "l": { "item": "SUS_evac_shelter_locker", "chance": 70 }, "c": { "item": "SUS_evac_shelter_cabinet", "chance": 50 } }, "computers": { "6": { @@ -236,12 +249,19 @@ " |||||:||+|:||||| " ], "terrain": { - "x": "t_console_broken", ":": [ "t_window_frame", "t_window" ], "+": [ "t_door_c", "t_door_b" ], "=": [ "t_door_b", "t_door_locked_interior", "t_door_c", "t_door_o" ] }, - "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" }, + "furniture": { + "x": "f_console_broken", + "b": "f_bench", + "c": "f_cupboard", + "l": "f_locker", + "S": "f_sink", + "%": "f_trashcan", + "6": "f_console" + }, "computers": { "6": { "name": "Evac shelter computer", @@ -296,10 +316,16 @@ "terrain": { ":": [ "t_window_frame", "t_window" ], "+": [ "t_door_c", "t_door_b" ], - "=": [ "t_door_b", "t_door_locked_interior", "t_door_c", "t_door_o" ], - "6": "t_console_broken" + "=": [ "t_door_b", "t_door_locked_interior", "t_door_c", "t_door_o" ] + }, + "furniture": { + "b": "f_bench", + "c": "f_cupboard", + "l": [ [ "f_locker", 2 ], "f_wreckage" ], + "S": "f_sink", + "%": "f_trashcan", + "6": "f_console_broken" }, - "furniture": { "b": "f_bench", "c": "f_cupboard", "l": [ [ "f_locker", 2 ], "f_wreckage" ], "S": "f_sink", "%": "f_trashcan" }, "items": { "l": { "item": "shelter_supplies", "chance": 40 }, "c": [ { "item": "trash", "chance": 1 }, { "item": "softdrugs", "chance": 2 }, { "item": "shelter_supplies", "chance": 10 } ], @@ -342,7 +368,7 @@ " " ], "terrain": { " ": "t_null" }, - "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" }, + "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan", "6": "f_console" }, "computers": { "6": { "name": "Evac shelter computer", @@ -392,10 +418,17 @@ ":": [ "t_window_frame", "t_window_no_curtains" ], "+": [ "t_door_c", "t_door_b" ], "=": [ "t_door_b", "t_door_locked_interior", "t_door_c", "t_door_o" ], - "*": "t_ladder_up", - "x": "t_console_broken" + "*": "t_ladder_up" + }, + "furniture": { + "b": "f_bench", + "c": "f_cupboard", + "l": "f_locker", + "S": "f_sink", + "%": "f_trashcan", + "6": "f_console", + "x": "f_console_broken" }, - "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" }, "computers": { "6": { "name": "Evac shelter computer", @@ -455,11 +488,17 @@ ":": [ "t_window_frame", "t_window" ], "+": [ "t_door_c", "t_door_b" ], "=": [ "t_door_b", "t_door_locked_interior", "t_door_c", "t_door_o" ], - "*": "t_ladder_up", - "6": [ "t_console", "t_console_broken" ], - "x": "t_console_broken" + "*": "t_ladder_up" + }, + "furniture": { + "b": "f_bench", + "c": "f_cupboard", + "l": [ [ "f_locker", 2 ], "f_wreckage" ], + "S": "f_sink", + "%": "f_trashcan", + "6": [ "f_console", "f_console_broken" ], + "x": "f_console_broken" }, - "furniture": { "b": "f_bench", "c": "f_cupboard", "l": [ [ "f_locker", 2 ], "f_wreckage" ], "S": "f_sink", "%": "f_trashcan" }, "items": { "l": { "item": "shelter_supplies", "chance": 40 }, "c": [ { "item": "trash", "chance": 1 }, { "item": "softdrugs", "chance": 2 }, { "item": "shelter_supplies", "chance": 10 } ], diff --git a/data/json/mapgen/office_cubical.json b/data/json/mapgen/office_cubical.json index 336462507c51a..8b03ed245c8b8 100644 --- a/data/json/mapgen/office_cubical.json +++ b/data/json/mapgen/office_cubical.json @@ -33,14 +33,13 @@ "ssssssssssssssssssssssss" ], "terrain": { - " ": [ "t_grass", "t_grass", "t_dirt" ], - "$": "t_shrub", + " ": "t_region_groundcover_urban", + "$": "t_region_shrub_decorative", "+": "t_door_c", "-": "t_wall_w", "D": "t_door_locked", "s": "t_sidewalk", "w": "t_window", - "x": "t_console_broken", "|": "t_wall_w", "4": "t_gutter_downspout" }, @@ -55,7 +54,8 @@ "l": "f_locker", "n": "f_safe_l", "o": "f_bookcase", - "t": "f_table" + "t": "f_table", + "x": "f_console_broken" }, "vendingmachines": { "V": { } }, "toilets": { "T": { } }, @@ -163,15 +163,14 @@ " ##############ssssssss" ], "terrain": { - " ": [ "t_grass", "t_grass", "t_dirt" ], - "$": "t_shrub", + " ": "t_region_groundcover_urban", + "$": "t_region_shrub_decorative", "+": "t_door_c", "-": "t_wall_w", "D": "t_door_locked", "s": "t_sidewalk", "W": "t_window_domestic", "w": "t_window", - "x": "t_console_broken", "|": "t_wall_w", "#": "t_brick_wall", "R": "t_sidewalk", @@ -192,7 +191,8 @@ "l": "f_locker", "n": "f_safe_l", "o": "f_bookcase", - "t": "f_table" + "t": "f_table", + "x": "f_console_broken" }, "vendingmachines": { "V": { } }, "toilets": { "T": { } }, diff --git a/data/json/mapgen/outpost.json b/data/json/mapgen/outpost.json index eb38a164cfa65..d0bc4089fb65e 100644 --- a/data/json/mapgen/outpost.json +++ b/data/json/mapgen/outpost.json @@ -31,31 +31,17 @@ "|x xx x|", "|----------++----------|" ], + "fill_ter": "t_thconc_floor", "terrain": { - " ": [ "t_grass_dead", "t_grass", "t_grass_long", "t_dirt", "t_grass_tall" ], - "x": [ "t_grass_dead", "t_grass", "t_grass_long", "t_dirt", "t_grass_tall" ], - ".": "t_floor", - "!": "t_floor", - "&": "t_floor", - "1": "t_floor", - "l": "t_floor", - "c": "t_floor", - "t": "t_floor", - "r": "t_floor", - "L": "t_floor", - "b": "t_floor", - "S": "t_floor", - "T": "t_floor", - "C": "t_floor", - "X": "t_floor", + " ": "t_region_groundcover", + "x": "t_region_groundcover", "-": "t_chainfence", "|": "t_chainfence", "/": "t_concrete_wall", "+": "t_chaingate_l", "*": "t_door_c", "=": "t_door_locked", - ";": "t_door_metal_c", - "p": "t_plut_generator" + ";": "t_door_metal_c" }, "furniture": { "t": "f_table", @@ -69,7 +55,8 @@ "l": "f_locker", "L": "f_locker", "b": "f_bunkbed", - "T": "f_trashcan" + "T": "f_trashcan", + "p": "f_compact_ASRG_containment" }, "items": { "b": { "item": "army_bed", "chance": 60 }, @@ -191,33 +178,17 @@ "|x xx x|", "|----------++----------|" ], + "fill_ter": "t_thconc_floor", "terrain": { - " ": [ "t_grass_dead", "t_grass", "t_grass_long", "t_dirt", "t_grass_tall" ], - "x": [ "t_grass_dead", "t_grass", "t_grass_long", "t_dirt", "t_grass_tall" ], - ".": "t_floor", - "!": "t_floor", - "&": "t_floor", - "1": "t_floor", - "l": "t_floor", - "c": "t_floor", - "d": "t_floor", - "t": "t_floor", - "r": "t_floor", - "f": "t_floor", - "L": "t_floor", - "b": "t_floor", - "S": "t_floor", - "T": "t_floor", - "C": "t_floor", - "X": "t_floor", + " ": "t_region_groundcover", + "x": "t_region_groundcover", "-": "t_chainfence", "|": "t_chainfence", "/": "t_concrete_wall", "+": "t_chaingate_l", "*": "t_door_c", "=": "t_door_locked", - ";": "t_door_metal_c", - "p": "t_plut_generator" + ";": "t_door_metal_c" }, "furniture": { "t": "f_table", @@ -233,7 +204,8 @@ "b": "f_bunkbed", "d": "f_desk", "f": "f_fridge", - "T": "f_trashcan" + "T": "f_trashcan", + "p": "f_compact_ASRG_containment" }, "items": { "b": { "item": "army_bed", "chance": 60 }, diff --git a/data/json/mapgen/parking_garage.json b/data/json/mapgen/parking_garage.json index e9d743f0882c8..a46fdb514db2d 100644 --- a/data/json/mapgen/parking_garage.json +++ b/data/json/mapgen/parking_garage.json @@ -15,7 +15,7 @@ "'": "t_strconc_floor", "+": "t_door_c", "!": "t_door_metal_locked", - ".": [ [ "t_dirt", 5 ], [ "t_grass", 10 ], [ "t_grass_long", 7 ], [ "t_shrub", 1 ] ], + ".": [ [ "t_region_groundcover_urban", 25 ], [ "t_region_shrub", 1 ] ], "w": "t_window", "W": "t_reinforced_glass", "_": "t_pavement", @@ -31,7 +31,6 @@ "D": "t_strconc_floor", "c": "t_linoleum_white", "r": "t_linoleum_white", - "x": "t_console_broken", ">": "t_stairs_down", "<": "t_stairs_up", "I": "t_column", @@ -39,11 +38,19 @@ "g": "t_chaingate_l", "#": "t_rock", "*": "t_open_air", - "E": "t_elevator", - "@": "t_generator_broken", - "&": "t_machinery_heavy" + "E": "t_elevator" + }, + "furniture": { + "x": "f_console_broken", + "@": "f_generator_broken", + "&": "f_machinery_heavy", + "c": "f_counter", + "d": "f_desk", + "D": "f_dumpster", + "h": "f_chair", + "F": "f_filing_cabinet", + "%": "f_solar_unit" }, - "furniture": { "c": "f_counter", "d": "f_desk", "D": "f_dumpster", "h": "f_chair", "F": "f_filing_cabinet", "%": "f_solar_unit" }, "items": { "D": { "item": "office", "chance": 45, "repeat": [ 1, 2 ] }, "Y": { "item": "jackets", "chance": 55, "repeat": [ 1, 6 ] }, diff --git a/data/json/mapgen/pawn_shop.json b/data/json/mapgen/pawn_shop.json index 40bfe2f43a618..10a7e694ed484 100644 --- a/data/json/mapgen/pawn_shop.json +++ b/data/json/mapgen/pawn_shop.json @@ -33,7 +33,7 @@ "..............'U": "t_stairs_down", - "A": "t_metal_floor", "C": "t_dirtmound", "~": "t_water_sh" }, - "furniture": { "#": "f_wreckage", "A": "f_safe_l" }, + "furniture": { "#": "f_wreckage", "6": "f_machinery_light", "e": "f_machinery_heavy", "r": "f_console_broken", "A": "f_safe_l" }, "place_loot": [ { "group": "guns_pistol_rare", "x": 0, "y": 9, "chance": 70, "ammo": 95, "magazine": 100 } ], "place_monsters": [ { "monster": "GROUP_RAZORCLAW", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.4 } ] } @@ -141,19 +125,22 @@ "........................", "........................" ], + "fill_ter": "t_metal_floor", "terrain": { " ": "t_metal_floor", - "#": "t_metal_floor", "+": "t_door_metal_c", "-": "t_wall_metal", ".": "t_rock", - "6": "t_machinery_light", "C": "t_dirtmound", - "R": "t_plut_generator", - "e": "t_machinery_heavy", "~": "t_water_sh" }, - "furniture": { "#": "f_wreckage" }, + "furniture": { + "6": "f_machinery_light", + "e": "f_machinery_heavy", + "r": "f_console_broken", + "R": "f_compact_ASRG_containment", + "#": "f_wreckage" + }, "items": { "C": { "item": "razorclaw_nest", "chance": 80 } }, "place_monsters": [ { "monster": "GROUP_RAZORCLAW", "x": [ 12, 21 ], "y": [ 9, 13 ], "density": 0.2 } ], "place_monster": [ { "monster": "mon_alpha_razorclaw", "x": 13, "y": 11 } ] @@ -190,21 +177,24 @@ "........................", "........................" ], + "fill_ter": "t_metal_floor", "terrain": { " ": "t_metal_floor", - "#": "t_metal_floor", "+": "t_door_metal_c", "-": "t_wall_metal", ".": "t_rock", - "6": "t_machinery_light", - "9": "t_metal_floor", "<": "t_stairs_up", - "A": "t_metal_floor", "C": "t_dirtmound", - "e": "t_machinery_heavy", "~": "t_water_sh" }, - "furniture": { "#": "f_wreckage", "9": "f_locker", "A": "f_standing_tank" }, + "furniture": { + "6": "f_machinery_light", + "e": "f_machinery_heavy", + "r": "f_console_broken", + "9": "f_locker", + "A": "f_standing_tank", + "#": "f_wreckage" + }, "items": { "9": { "item": "hardware_plumbing", "chance": 90 }, "C": { "item": "razorclaw_nest", "chance": 70 } }, "place_monsters": [ { "monster": "GROUP_RAZORCLAW", "x": [ 0, 9 ], "y": [ 9, 13 ], "density": 0.05 } ] } diff --git a/data/json/mapgen/robofachq_static.json b/data/json/mapgen/robofachq_static.json index 9a80c7b2bdad6..f46a4463a6431 100644 --- a/data/json/mapgen/robofachq_static.json +++ b/data/json/mapgen/robofachq_static.json @@ -179,11 +179,10 @@ "E": "t_elevator_control", "Y": "t_thconc_floor_olight", "#": "t_rock", - "6": "t_console", "R": "t_railing", "W": "t_water_dispenser" }, - "furniture": { ":": "f_server", "K": "f_counter", "H": "f_armchair", "L": "f_locker", "f": "f_filing_cabinet" }, + "furniture": { "6": "f_console", ":": "f_server", "K": "f_counter", "H": "f_armchair", "L": "f_locker", "f": "f_filing_cabinet" }, "item": { "A": { "item": "american_flag" } }, "items": { "F": { "item": "fridge", "chance": 80 }, @@ -284,11 +283,11 @@ "E": "t_elevator_control", "Y": "t_thconc_floor_olight", "#": "t_rock", - "6": "t_console", "R": "t_railing", "W": "t_water_dispenser" }, "furniture": { + "6": "f_console", "K": "f_counter", "M": "f_counter", "S": "f_table", @@ -401,14 +400,11 @@ "E": "t_elevator_control", "Y": "t_thconc_floor_olight", "#": "t_rock", - "6": "t_console", "R": "t_railing", - "9": "t_conveyor", - "7": "t_machinery_light", - "8": "t_machinery_heavy", - "&": "t_machinery_electronic" + "9": "t_conveyor" }, "furniture": { + "6": "f_console", "K": "f_counter", "S": "f_table", "A": "f_canvas_wall", @@ -417,7 +413,10 @@ "M": "f_server", "E": [ "f_ergometer", "f_ergometer_mechanical" ], "T": [ "f_treadmill", "f_treadmill_mechanical" ], - "X": "f_exercise" + "X": "f_exercise", + "7": "f_machinery_light", + "8": "f_machinery_heavy", + "&": "f_machinery_electronic" }, "items": { "S": [ @@ -537,15 +536,8 @@ "################################################################################################" ], "palettes": [ "robofachq" ], - "terrain": { - "-": "t_wall_metal", - "e": "t_elevator", - "E": "t_elevator_control", - "Y": "t_thconc_floor_olight", - "#": "t_rock", - "6": "t_console" - }, - "furniture": { ":": "f_server", "K": "f_counter" }, + "terrain": { "-": "t_wall_metal", "e": "t_elevator", "E": "t_elevator_control", "Y": "t_thconc_floor_olight", "#": "t_rock" }, + "furniture": { "6": "f_console", ":": "f_server", "K": "f_counter" }, "items": { "r": [ { "item": "electronics", "chance": 75, "repeat": [ 1, 5 ] } ] } } }, @@ -615,9 +607,9 @@ "w": "t_water_pool_shallow", "E": "t_elevator_control", "Y": "t_thconc_floor_olight", - "#": "t_rock", - "6": "t_console" + "#": "t_rock" }, + "furniture": { "6": "f_console" }, "items": { "B": [ { "item": "magazines", "chance": 75, "repeat": [ 1, 5 ] }, diff --git a/data/json/mapgen/s_bookstore.json b/data/json/mapgen/s_bookstore.json index 625a11737e3a7..6db5302096468 100644 --- a/data/json/mapgen/s_bookstore.json +++ b/data/json/mapgen/s_bookstore.json @@ -33,13 +33,10 @@ "************************" ], "terrain": { - "#": "t_floor", - "%": "t_console_broken", - "*": [ [ "t_grass", 5 ], [ "t_dirt", 2 ], [ "t_grass_long", 4 ] ], - "^": [ "t_tree_walnut", "t_tree_chestnut", "t_tree_beech", "t_tree", "t_tree_hazelnut" ], + "*": "t_region_groundcover_urban", + "^": "t_region_tree_nut", "+": "t_door_c", "-": "t_wall_w", - ".": "t_floor", ":": "t_door_glass_c", "O": "t_window", "|": "t_wall_w", @@ -48,6 +45,7 @@ "~": "t_sidewalk" }, "furniture": { + "%": "f_console_broken", "#": "f_counter", "T": "f_table", "]": "f_rack", @@ -253,8 +251,7 @@ ], "terrain": { "#": "t_floor", - "%": "t_console_broken", - "*": [ [ "t_grass", 5 ], [ "t_dirt", 2 ], [ "t_grass_long", 4 ] ], + "*": "t_region_groundcover_urban", "+": "t_door_c", "-": "t_wall_w", ".": "t_floor", @@ -262,11 +259,12 @@ "=": "t_wall_glass", ">": "t_stairs_up", "O": "t_window", - "q": "t_grass", + "q": "t_region_groundcover_urban", "|": "t_wall_w", "~": "t_sidewalk" }, "furniture": { + "%": "f_console_broken", "#": "f_counter", "T": "f_table", "[": "f_rack", @@ -459,21 +457,21 @@ "************************" ], "terrain": { - "%": "t_console_broken", - "*": [ [ "t_grass", 5 ], [ "t_dirt", 2 ], [ "t_grass_long", 4 ] ], + "*": "t_region_groundcover_urban", "+": [ "t_door_c", "t_door_locked" ], "-": "t_wall_w", ".": "t_floor", "O": "t_window", "S": "t_sidewalk", - "^": [ "t_tree_walnut", "t_tree_chestnut", "t_tree_beech", "t_tree", "t_tree_hazelnut" ], - "o": "t_dirt", - "q": "t_dirt", + "^": "t_region_tree_nut", + "o": "t_region_groundcover_barren", + "q": "t_region_groundcover_barren", "|": "t_wall_w", "4": "t_gutter_downspout", "~": "t_sidewalk" }, "furniture": { + "%": "f_console_broken", "#": "f_counter", "S": "f_statue", "T": "f_table", diff --git a/data/json/mapgen/s_clothing.json b/data/json/mapgen/s_clothing.json index f4957f0029398..62a1328d97d8a 100644 --- a/data/json/mapgen/s_clothing.json +++ b/data/json/mapgen/s_clothing.json @@ -300,8 +300,7 @@ "**********~~~***********" ], "terrain": { - "%": "t_console_broken", - "*": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt" ], + "*": "t_region_groundcover_urban", "+": "t_door_c", "-": "t_wall_w", ".": "t_floor", @@ -316,6 +315,7 @@ }, "sealed_item": { "1": { "item": { "item": "seed_rose" }, "furniture": "f_planter_harvest" } }, "furniture": { + "%": "f_console_broken", "#": "f_counter", "&": "f_counter_gate_c", "@": "f_mannequin", @@ -575,9 +575,8 @@ "************************" ], "terrain": { - "%": "t_console_broken", - "*": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt" ], - "&": "t_grass", + "*": "t_region_groundcover_urban", + "&": "t_region_groundcover_urban", "+": "t_door_c", "-": "t_brick_wall", ".": "t_floor", @@ -588,15 +587,16 @@ "H": "t_sidewalk", "O": "t_window", "T": "t_sidewalk", - "^": "t_tree", - "r": "t_grass", - "z": "t_shrub", + "^": "t_region_tree", + "r": "t_region_groundcover_urban", + "z": "t_region_shrub", "|": "t_brick_wall", "~": "t_sidewalk", - "R": "t_grass", + "R": "t_region_groundcover_urban", "4": "t_gutter_downspout" }, "furniture": { + "%": "f_console_broken", "#": "f_counter", "@": "f_mannequin", "H": "f_chair", @@ -608,7 +608,7 @@ "d": "f_desk", "f": "f_indoor_plant", "h": "f_chair", - "r": [ "f_datura", "f_bluebell", "f_mutpoppy", "f_dahlia", "f_flower_tulip", "f_chamomile", "f_flower_spurge", "f_lily" ], + "r": "f_region_flower", "s": "f_sink", "u": "f_trashcan", "y": "f_indoor_plant_y" diff --git a/data/json/mapgen/s_coffee.json b/data/json/mapgen/s_coffee.json index 6b005ff91ba5b..b90cd4db017f5 100644 --- a/data/json/mapgen/s_coffee.json +++ b/data/json/mapgen/s_coffee.json @@ -45,8 +45,8 @@ "%": "t_linoleum_white", "+": "t_door_c", ",": "t_pavement_y", - ".": "t_grass", - "/": "t_dirt", + ".": "t_region_groundcover_urban", + "/": "t_region_groundcover_barren", "3": [ "t_door_locked", "t_door_locked_alarm" ], ";": "t_linoleum_white", "=": "t_linoleum_white", @@ -56,7 +56,7 @@ "G": "t_linoleum_white", "I": "t_door_locked_interior", "L": "t_linoleum_white", - "M": "t_dirt", + "M": "t_region_groundcover_barren", "O": "t_window", "S": "t_sidewalk", "U": "t_linoleum_white", @@ -68,8 +68,7 @@ "f": "t_linoleum_white", "l": "t_linoleum_white", "w": "t_linoleum_white", - "x": "t_console_broken", - "z": "t_shrub", + "z": "t_region_shrub_decorative", "{": "t_door_glass_c", "|": "t_wall_b", "<": "t_stairs_up", @@ -77,6 +76,7 @@ "T": "t_tree_coffee" }, "furniture": { + "x": "f_console_broken", "#": "f_counter", "%": "f_trashcan", "/": "f_bluebell", @@ -91,11 +91,11 @@ "F": "f_fridge", "G": "f_oven", "L": "f_locker", - "M": "f_dahlia", + "M": "f_region_flower", "U": "f_sink", "X": "f_rack", "^": "f_indoor_plant", - "b": "f_dandelion", + "b": "f_region_weed", "f": "f_glass_fridge", "l": "f_rack", "r": "f_rack" @@ -219,7 +219,7 @@ { "line": "terrain", "id": "t_concrete", "x": 18, "x2": 18, "y": 6, "y2": 4 } ], "terrain": { - "#": "t_shrub", + "#": "t_region_shrub", "%": "t_wall_glass", "+": "t_door_glass_c", ",": "t_pavement_y", @@ -241,11 +241,11 @@ "p": "t_concrete", "r": "t_linoleum_white", "s": "t_sidewalk", - "x": "t_console_broken", "4": "t_gutter_downspout", "|": "t_wall_b" }, "furniture": { + "x": "f_console_broken", "&": "f_trashcan", "H": "f_chair", "O": "f_oven", @@ -330,53 +330,10 @@ }, { "method": "json", + "om_terrain": "s_restaurant_coffee_2", + "type": "mapgen", + "weight": 100, "object": { - "fill_ter": "t_floor", - "furniture": { - "#": "f_chair", - "&": "f_trashcan", - "+": "f_null", - "-": "f_null", - ".": "f_null", - "D": "f_null", - "S": "f_null", - "T": "f_toilet", - "^": "f_indoor_plant", - "_": "f_null", - "a": "f_sink", - "b": "f_null", - "c": "f_counter", - "d": "f_dumpster", - "l": "f_locker", - "o": "f_oven", - "p": "f_null", - "r": "f_rack", - "s": "f_null", - "t": "f_table", - "u": "f_null", - "v": "f_vending_o", - "w": "f_null", - "{": "f_fridge", - "|": "f_null" - }, - "place_items": [ - { "chance": 80, "repeat": [ 1, 8 ], "item": "coffee_freezer", "x": [ 3, 4 ], "y": 4 }, - { "chance": 70, "repeat": [ 1, 8 ], "item": "coffee_display_2", "x": 7, "y": 13 }, - { "chance": 70, "repeat": [ 1, 8 ], "item": "coffee_display_2", "x": 6, "y": 11 }, - { "chance": 75, "repeat": [ 1, 8 ], "item": "coffee_condiments", "x": [ 5, 6 ], "y": 12 }, - { "chance": 75, "repeat": [ 1, 8 ], "item": "coffee_condiments", "x": 6, "y": 9 }, - { "chance": 35, "item": "clothing_work_torso", "x": [ 7, 9 ], "y": 20 }, - { "chance": 40, "item": "coffee_trash", "x": 5, "y": 15 }, - { "chance": 75, "repeat": [ 1, 3 ], "item": "kitchen_nonfood", "x": 5, "y": [ 13, 14 ] }, - { "chance": 35, "item": "coffee_dishes", "x": 6, "y": 8 }, - { "chance": 50, "item": "fast_trash", "x": [ 15, 16 ], "y": 19 }, - { "chance": 65, "repeat": [ 1, 3 ], "item": "coffee_newsstand", "x": 15, "y": 6 } - ], - "place_monsters": [ - { "chance": 4, "density": 1, "monster": "GROUP_ZOMBIE", "x": 8, "y": 10 }, - { "chance": 3, "density": 1, "monster": "GROUP_ZOMBIE_FAT_BASE", "x": 17, "y": 11 } - ], - "place_toilets": [ { "x": 20, "y": 17 } ], "rows": [ "______________sss_______", "______u__u____sss_______", @@ -390,7 +347,7 @@ "__|...c.............^|u_", "__|...c..............|__", "__|...c..............|_u", - "__|...c......#.......|__", + "__|...x......#.......|__", "_u|..c|.....#t#......|u_", "__|..c|......#....|D||__", "__|..&|...........|..|__", @@ -403,39 +360,58 @@ "_____u_____ppppppppp____", "________________________" ], + "fill_ter": "t_floor", + "furniture": { + "#": "f_chair", + "&": "f_trashcan", + "T": "f_toilet", + "^": "f_indoor_plant", + "a": "f_sink", + "c": "f_counter", + "d": "f_dumpster", + "l": "f_locker", + "o": "f_oven", + "r": "f_rack", + "t": "f_table", + "v": "f_vending_o", + "{": "f_fridge", + "x": "f_console_broken" + }, "terrain": { - "#": "t_floor", - "&": "t_floor", "+": "t_door_glass_c", "-": "t_wall_glass", - ".": "t_floor", "D": "t_door_c", - "S": "t_shrub", - "T": "t_floor", - "^": "t_floor", - "_": "t_grass", - "a": "t_floor", + "S": "t_region_shrub_decorative", + "_": "t_region_groundcover_urban", "b": "t_door_metal_pickable", - "c": "t_floor", "d": "t_pavement", - "l": "t_floor", - "o": "t_floor", "p": "t_pavement", - "r": "t_floor", "s": "t_sidewalk", - "t": "t_floor", - "u": "t_underbrush", - "v": "t_floor", + "u": "t_region_shrub", "w": "t_window_boarded_noglass", - "{": "t_floor", "4": "t_gutter_downspout", "<": "t_ladder_up", "|": "t_wall_b" - } - }, - "om_terrain": "s_restaurant_coffee_2", - "type": "mapgen", - "weight": 100 + }, + "place_items": [ + { "chance": 80, "repeat": [ 1, 8 ], "item": "coffee_freezer", "x": [ 3, 4 ], "y": 4 }, + { "chance": 70, "repeat": [ 1, 8 ], "item": "coffee_display_2", "x": 7, "y": 13 }, + { "chance": 70, "repeat": [ 1, 8 ], "item": "coffee_display_2", "x": 6, "y": 11 }, + { "chance": 75, "repeat": [ 1, 8 ], "item": "coffee_condiments", "x": [ 5, 6 ], "y": 12 }, + { "chance": 75, "repeat": [ 1, 8 ], "item": "coffee_condiments", "x": 6, "y": 9 }, + { "chance": 35, "item": "clothing_work_torso", "x": [ 7, 9 ], "y": 20 }, + { "chance": 40, "item": "coffee_trash", "x": 5, "y": 15 }, + { "chance": 75, "repeat": [ 1, 3 ], "item": "kitchen_nonfood", "x": 5, "y": [ 13, 14 ] }, + { "chance": 35, "item": "coffee_dishes", "x": 6, "y": 8 }, + { "chance": 50, "item": "fast_trash", "x": [ 15, 16 ], "y": 19 }, + { "chance": 65, "repeat": [ 1, 3 ], "item": "coffee_newsstand", "x": 15, "y": 6 } + ], + "place_monsters": [ + { "chance": 4, "density": 1, "monster": "GROUP_ZOMBIE", "x": 8, "y": 10 }, + { "chance": 3, "density": 1, "monster": "GROUP_ZOMBIE_FAT_BASE", "x": 17, "y": 11 } + ], + "place_toilets": [ { "x": 20, "y": 17 } ] + } }, { "type": "mapgen", diff --git a/data/json/mapgen/s_electronics.json b/data/json/mapgen/s_electronics.json index 2c001e497d48e..6709748753588 100644 --- a/data/json/mapgen/s_electronics.json +++ b/data/json/mapgen/s_electronics.json @@ -34,7 +34,7 @@ "________________________" ], "terrain": { - "%": "t_shrub", + "%": "t_region_shrub_decorative", "+": "t_door_metal_pickable", ",": "t_pavement_y", "-": "t_wall_w", @@ -50,8 +50,7 @@ "_": "t_pavement", "d": "t_pavement", "s": "t_sidewalk", - "x": "t_console_broken", - "z": "t_shrub", + "z": "t_region_shrub_decorative", "|": "t_wall_w", "4": "t_gutter_downspout", "<": "t_ladder_up" @@ -70,6 +69,7 @@ "r": "f_rack", "t": "f_trashcan", "w": "f_washer", + "x": "f_console_broken", "y": "f_dryer" }, "toilets": { "T": { } }, @@ -190,42 +190,17 @@ " xUUxxxxxxx " ], "terrain": { - " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ], + " ": "t_region_groundcover_urban", ".": "t_floor", - "p": "t_grass", - "J": "t_grass", + "p": "t_region_groundcover_urban", + "J": "t_region_groundcover_urban", "+": "t_door_c", "-": "t_brick_wall", ":": "t_window", "|": "t_brick_wall", "U": "t_sidewalk", "x": "t_sidewalk", - "9": [ - "t_tree_blackjack", - "t_tree_walnut", - "t_tree_chestnut", - "t_tree_beech", - "t_tree_hazelnut", - "t_tree_cottonwood", - "t_tree", - "t_tree_elm", - "t_tree_dead", - "t_tree_apple", - "t_tree_pear", - "t_tree_cherry", - "t_tree_peach", - "t_tree_apricot", - "t_tree_plum", - "t_tree_mulberry", - "t_tree_elderberry", - "t_tree_pine", - "t_tree_birch", - "t_tree_willow", - "t_tree_maple", - "t_tree_hickory", - "t_tree_almond", - "t_tree_pecan" - ], + "9": "t_region_tree", "<": "t_ladder_up", "4": "t_gutter_downspout" }, @@ -247,7 +222,7 @@ "F": "f_filing_cabinet", "@": "f_sofa", "G": "f_workbench", - "p": [ "f_datura", "f_bluebell", "f_mutpoppy", "f_dahlia", "f_flower_tulip", "f_chamomile", "f_flower_spurge", "f_lily" ] + "p": "f_region_flower" }, "toilets": { "&": { } }, "items": { diff --git a/data/json/mapgen/s_gas.json b/data/json/mapgen/s_gas.json index 92bcc43661a40..ffb483c32a023 100644 --- a/data/json/mapgen/s_gas.json +++ b/data/json/mapgen/s_gas.json @@ -32,7 +32,7 @@ "...s9s...........s9s....", "........................" ], - "place_terrain": [ { "ter": "t_gas_tank", "x": 2, "y": 3 }, { "ter": "t_diesel_tank", "x": 4, "y": 3 } ], + "place_furniture": [ { "furn": "f_gas_tank", "x": 2, "y": 3 }, { "furn": "f_diesel_tank", "x": 4, "y": 3 } ], "terrain": { "&": "t_atm", "+": "t_chaingate_l", diff --git a/data/json/mapgen/s_grocery.json b/data/json/mapgen/s_grocery.json index a618880db0e21..6db55cc9a2e08 100644 --- a/data/json/mapgen/s_grocery.json +++ b/data/json/mapgen/s_grocery.json @@ -31,14 +31,12 @@ "___L***+**************|_", "___|------------------|_" ], + "fill_ter": "t_linoleum_white", "terrain": { " ": "t_linoleum_white", - "#": "t_linoleum_white", - "%": "t_console_broken", "*": "t_floor", "+": "t_door_c", "-": "t_wall_w", - "7": "t_linoleum_white", "=": "t_wall_glass", "A": "t_atm", "C": "t_floor", @@ -50,19 +48,15 @@ "W": "t_chainfence_h", "[": "t_door_glass_c", "]": "t_floor", - "^": "t_linoleum_white", "_": "t_pavement", - "b": "t_linoleum_white", - "f": "t_linoleum_white", "l": "t_linoleum_gray", - "r": "t_linoleum_white", "s": "t_sidewalk", - "t": "t_linoleum_white", - "w": "t_chainfence_v", + "w": "t_chainfence", "4": "t_gutter_downspout", "|": "t_wall_w" }, "furniture": { + "%": "f_console_broken", "#": "f_counter", "7": "f_bookcase", "C": "f_crate_c", @@ -213,7 +207,7 @@ " " ], "terrain": { - " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ], + " ": "t_region_groundcover_urban", "+": "t_door_c", "-": "t_wall_w", ".": "t_floor", diff --git a/data/json/mapgen/s_gun.json b/data/json/mapgen/s_gun.json index 9450d5c3f17b3..53ce1d2d7fd8e 100644 --- a/data/json/mapgen/s_gun.json +++ b/data/json/mapgen/s_gun.json @@ -37,7 +37,7 @@ { "ter": "t_door_metal_pickable", "x": [ 7, 14 ], "y": 14 } ], "terrain": { - " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ], + " ": "t_region_groundcover_urban", "*": "t_pavement_y", "+": "t_door_metal_pickable", "-": "t_wall_w", @@ -51,12 +51,12 @@ "l": "t_thconc_floor", "|": "t_wall_w", "D": "t_door_c", - "?": "t_console_broken", "<": "t_ladder_up", "4": "t_gutter_downspout" }, "toilets": { "&": { } }, "furniture": { + "?": "f_console_broken", "#": "f_counter", "H": "f_counter", "S": "f_stool", @@ -233,19 +233,18 @@ "+": "t_door_metal_pickable", ".": "t_floor", "5": "t_window_bars_alarm", - ";": "t_floor", - "@": "t_shrub", + "@": "t_region_shrub_decorative", "A": "t_atm", "D": "t_door_c", "L": "t_door_metal_locked", "_": "t_pavement", "s": "t_sidewalk", "|": "t_wall_w", - "?": "t_console_broken", "<": "t_ladder_up", "4": "t_gutter_downspout" }, "furniture": { + "?": "f_console_broken", "#": "f_counter", "a": "f_stool", "E": "f_desk", @@ -377,7 +376,7 @@ "+": "t_door_metal_pickable", ".": "t_floor", "5": "t_window_bars_alarm", - "@": "t_shrub", + "@": "t_region_shrub_decorative", "A": "t_atm", "C": "t_door_frame", "D": "t_door_o", @@ -386,7 +385,7 @@ "p": "t_door_metal_o", "s": "t_sidewalk", "|": "t_wall_w", - "x": "t_dirt", + "x": "t_region_groundcover_barren", "<": "t_ladder_up", "4": "t_gutter_downspout" }, @@ -475,22 +474,22 @@ ".d-------------------.d." ], "terrain": { - "#": "t_dirt", + "#": "t_region_groundcover_barren", "+": "t_door_metal_pickable", "-": "t_brick_wall", - ".": "t_grass", - "S": "t_grass", - "T": "t_dirt", + ".": "t_region_groundcover_urban", + "S": "t_region_groundcover_urban", + "T": "t_region_groundcover_barren", "W": "t_wall_w", "_": "t_floor", "a": "t_wall_r", - "b": "t_dirt", - "d": "t_dirt", + "b": "t_region_groundcover_barren", + "d": "t_region_groundcover_barren", "e": "t_window_boarded", "f": "t_door_boarded", "g": "t_door_c", "s": "t_sidewalk", - "u": "t_underbrush", + "u": "t_region_shrub", "w": "t_wall_b", "|": "t_wall_w", "4": "t_gutter_downspout" diff --git a/data/json/mapgen/s_hardware.json b/data/json/mapgen/s_hardware.json index b0c7b87b0108f..566a6c880cc66 100644 --- a/data/json/mapgen/s_hardware.json +++ b/data/json/mapgen/s_hardware.json @@ -33,8 +33,7 @@ "************************" ], "terrain": { - "%": "t_console_broken", - "*": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt", "t_shrub" ], + "*": [ [ "t_region_groundcover_urban", 8 ], "t_region_shrub" ], "+": "t_door_c", "-": "t_wall_w", ".": "t_floor", @@ -47,6 +46,7 @@ "4": "t_gutter_downspout" }, "furniture": { + "%": "f_console_broken", "#": "f_counter", "@": "f_locker", "[": "f_bookcase", @@ -159,11 +159,11 @@ ], "terrain": { "#": "t_wall_w", - "'": [ "t_grass", "t_grass", "t_dirt" ], + "'": "t_region_groundcover_urban", "+": "t_door_glass_c", "-": "t_wall_glass", ".": "t_floor", - "D": "t_dirt", + "D": "t_region_groundcover_barren", "=": "t_door_c", "H": "t_pavement", "M": "t_pavement", @@ -175,7 +175,6 @@ "W": "t_chainfence_h", "_": "t_floor", "p": "t_pavement", - "r": "t_console_broken", "w": "t_chainfence_v", "|": "t_chaingate_c", "~": "t_sidewalk", @@ -188,6 +187,7 @@ "M": { "item": { "item": "seed_flower" }, "furniture": "f_planter_harvest" } }, "furniture": { + "r": "f_console_broken", "D": "f_dumpster", "H": "f_warehouse_shelf", "P": "f_rack", @@ -308,8 +308,7 @@ "************************" ], "terrain": { - "%": "t_console_broken", - "*": "t_grass", + "*": "t_region_groundcover_urban", "+": "t_door_c", "-": "t_wall_w", ".": "t_floor", @@ -325,6 +324,7 @@ "4": "t_gutter_downspout" }, "furniture": { + "%": "f_console_broken", "#": "f_counter", "]": "f_rack", "l": "f_stool", @@ -442,8 +442,7 @@ "************************" ], "terrain": { - "%": "t_console_broken", - "*": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt", "t_shrub" ], + "*": [ [ "t_region_groundcover_urban", 8 ], "t_region_shrub" ], "+": "t_door_c", "-": "t_wall_w", ".": "t_floor", @@ -457,6 +456,7 @@ }, "toilets": { "&": { } }, "furniture": { + "%": "f_console_broken", "#": "f_counter", "[": "f_table", "]": "f_rack", diff --git a/data/json/mapgen/s_lightindustry.json b/data/json/mapgen/s_lightindustry.json index 99ab2feebc1fb..80220576c1964 100644 --- a/data/json/mapgen/s_lightindustry.json +++ b/data/json/mapgen/s_lightindustry.json @@ -130,13 +130,17 @@ "c": "t_gates_mech_control", "d": "t_chainfence_h", "&": "t_chaingate_l", - "5": "t_machinery_electronic", - "6": "t_machinery_light", - "7": "t_machinery_heavy", - "8": "t_machinery_old", + "5": "t_thconc_floor", + "6": "t_thconc_floor", + "7": "t_thconc_floor", + "8": "t_thconc_floor", "^": "t_gutter_downspout" }, "furniture": { + "5": "f_machinery_electronic", + "6": "f_machinery_light", + "7": "f_machinery_heavy", + "8": "f_machinery_old", "k": "f_sink", "l": "f_oven", "m": "f_fridge", diff --git a/data/json/mapgen/school_1.json b/data/json/mapgen/school_1.json index 1db692e90a8c4..69311fb9338c0 100644 --- a/data/json/mapgen/school_1.json +++ b/data/json/mapgen/school_1.json @@ -405,17 +405,10 @@ "*": "t_open_air", "~": "t_open_air_rooved", "H": "t_glass_railing", - " ": [ [ "t_dirt", 5 ], [ "t_grass", 16 ], [ "t_grass_long", 5 ] ], - "b": "t_dirt", - "$": [ - [ "t_underbrush", 10 ], - [ "t_shrub", 32 ], - [ "t_grass_tall", 10 ], - [ "t_shrub_lilac", 2 ], - [ "t_shrub_hydrangea", 2 ], - [ "t_shrub_rose", 1 ] - ], - ";": [ [ "t_tree", 10 ], [ "t_tree_willow", 3 ], [ "t_tree_birch", 3 ], [ "t_tree_maple", 3 ], [ "t_tree_pine", 5 ] ], + " ": "t_region_groundcover_urban", + "b": "t_region_groundcover_barren", + "$": "t_region_shrub_decorative", + ";": "t_region_tree_shade", "+": "t_door_c", "i": "t_linoleum_gray", "e": "t_linoleum_gray", @@ -434,7 +427,6 @@ "f": "t_chainfence_h", "s": "t_sidewalk", "w": "t_window", - "x": "t_console_broken", "|": "t_wall_y", "I": "t_column", ",": "t_floor_waxed", @@ -461,6 +453,7 @@ "j": "t_sewage_pipe" }, "furniture": { + "x": "f_console_broken", "%": "f_curtain", "@": "f_bed", "#": "f_bench", diff --git a/data/json/mapgen/sewage_treatment.json b/data/json/mapgen/sewage_treatment.json index f52478065c5da..722c050b1335a 100644 --- a/data/json/mapgen/sewage_treatment.json +++ b/data/json/mapgen/sewage_treatment.json @@ -3,8 +3,8 @@ "type": "palette", "id": "sewage_treatment_palette", "terrain": { - " ": [ "t_dirt", "t_grass" ], - "?": "t_shrub", + " ": "t_region_groundcover", + "?": "t_region_shrub", ")": "t_water_pool_shallow", ".": "t_pavement", "_": "t_sidewalk", @@ -30,25 +30,26 @@ "b": "t_door_metal_pickable", "e": "t_door_metal_locked", "D": "t_door_glass_c", - "6": "t_console_broken", "+": "t_door_c", ",": "t_floor", "M": "t_metal_floor", "<": "t_ladder_up", ">": "t_stairs_down", - "%": "t_machinery_heavy", - "$": "t_machinery_light", + "%": "t_thconc_floor", + "$": "t_thconc_floor", "{": "t_thconc_floor", "R": "t_thconc_floor", "J": "t_current_trans", "U": "t_sai_box", - "G": "t_generator_broken", "F": "t_potential_trans", "7": "t_metal_floor", "4": "t_metal_floor", "g": "t_metal_floor", - "Y": "t_switchgear_s" - } + "Y": "t_switchgear_s", + "G": "t_thconc_floor", + "6": "t_thconc_floor" + }, + "furniture": { "%": "f_machinery_heavy", "$": "f_machinery_light", "G": "f_generator_broken", "6": "f_console_broken" } }, { "type": "palette", @@ -86,7 +87,6 @@ "H": "t_sconc_wall", "2": "t_sewage_pipe", "U": "t_sai_box", - "G": "t_generator_broken", "Y": "t_switchgear_s", "&": "t_sewage_pump", "-": "t_wall_glass", @@ -94,11 +94,19 @@ "a": "t_railing_v", "|": "t_chainfence", "C": "t_chaingate_l", - "$": "t_machinery_light", - "@": "t_machinery_heavy", - "v": "t_machinery_old", + "$": "t_thconc_floor", + "@": "t_thconc_floor", + "v": "t_thconc_floor", "+": "t_door_c", - "6": "t_console_broken" + "G": "t_thconc_floor", + "6": "t_thconc_floor" + }, + "furniture": { + "$": "f_machinery_light", + "@": "f_machinery_heavy", + "v": "f_machinery_old", + "G": "f_generator_broken", + "6": "f_console_broken" } }, { diff --git a/data/json/mapgen/station_radio.json b/data/json/mapgen/station_radio.json index dda7f03f22037..50170cb0560f6 100644 --- a/data/json/mapgen/station_radio.json +++ b/data/json/mapgen/station_radio.json @@ -34,7 +34,7 @@ " " ], "terrain": { - " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ], + " ": "t_region_groundcover_urban", "+": "t_door_c", "=": "t_door_locked_alarm", "D": "t_door_locked", @@ -46,7 +46,6 @@ "_": "t_pavement", "&": "t_radio_tower", "s": "t_sidewalk", - "x": "t_console_broken", "F": "t_chainfence", "f": "t_chainfence", "G": "t_chaingate_l", @@ -54,6 +53,7 @@ "<": "t_ladder_up" }, "furniture": { + "x": "f_console_broken", "o": "f_bookcase", "d": "f_desk", "h": "f_chair", @@ -177,7 +177,7 @@ "ss " ], "terrain": { - " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ], + " ": "t_region_groundcover_urban", "+": "t_door_c", "=": "t_door_locked_alarm", "D": "t_door_locked", @@ -190,7 +190,6 @@ "R": "t_pavement", "&": "t_radio_tower", "s": "t_sidewalk", - "x": "t_console_broken", "F": "t_chainfence", "f": "t_chainfence", "G": "t_chaingate_l", @@ -199,6 +198,7 @@ "<": "t_ladder_up" }, "furniture": { + "x": "f_console_broken", "o": "f_bookcase", "d": "f_desk", "h": "f_chair", diff --git a/data/json/mapgen/store/s_camping.json b/data/json/mapgen/store/s_camping.json index ae12955f8ec7b..ecfe2d116fdcc 100644 --- a/data/json/mapgen/store/s_camping.json +++ b/data/json/mapgen/store/s_camping.json @@ -53,17 +53,11 @@ "k": "t_thconc_floor", "s": "t_linoleum_gray", "t": "t_linoleum_gray", - "u": "t_console_broken", "v": "t_pavement", "w": "t_pavement", "x": "t_pavement", "K": "t_pavement", "G": "t_pavement", - "y": "t_linoleum_gray", - "z": "t_linoleum_gray", - "A": "t_linoleum_gray", - "B": "t_linoleum_gray", - "M": "t_linoleum_gray", ";": "t_gutter_downspout" }, "furniture": { @@ -81,6 +75,7 @@ "s": "f_rack", "ƃ": "f_counter_gate_c", "t": "f_counter", + "u": "f_console_broken", "v": "f_groundsheet", "w": "f_canvas_wall", "x": "f_canvas_door", diff --git a/data/json/mapgen/store/s_diner.json b/data/json/mapgen/store/s_diner.json index 640d3bac0d122..2353caf4115aa 100644 --- a/data/json/mapgen/store/s_diner.json +++ b/data/json/mapgen/store/s_diner.json @@ -54,7 +54,6 @@ "j": "t_thconc_floor", "k": "t_thconc_floor", "m": "t_thconc_floor", - "n": "t_console_broken", "o": "t_thconc_floor", "p": "t_thconc_floor", "q": "t_thconc_floor", @@ -65,6 +64,7 @@ "<": "t_stairs_up" }, "furniture": { + "n": "f_console_broken", "e": "f_counter", "f": "f_table", "F": "f_table", diff --git a/data/json/mapgen/store/s_games.json b/data/json/mapgen/store/s_games.json index 18b62a01b3670..88192a8e45720 100644 --- a/data/json/mapgen/store/s_games.json +++ b/data/json/mapgen/store/s_games.json @@ -41,23 +41,17 @@ ".": "t_region_groundcover_urban", "f": "t_sidewalk", "g": "t_pavement_y", - "h": "t_carpet_purple", - "i": "t_carpet_purple", - "j": "t_console_broken", - "k": "t_carpet_purple", - "l": "t_carpet_purple", "n": "t_pavement", - "Y": "t_carpet_purple", ";": "t_linoleum_gray", "q": "t_linoleum_gray", "r": "t_linoleum_gray", "m": "t_linoleum_gray", - "s": "t_carpet_purple", "9": "t_gutter_downspout" }, "furniture": { "h": "f_rack_wood", "i": "f_counter", + "j": "f_console_broken", "ƃ": "f_counter_gate_c", "k": "f_table", "A": "f_stool", diff --git a/data/json/mapgen/store/s_gunstore.json b/data/json/mapgen/store/s_gunstore.json index d05cf70c65472..9dc1074866321 100644 --- a/data/json/mapgen/store/s_gunstore.json +++ b/data/json/mapgen/store/s_gunstore.json @@ -50,7 +50,6 @@ "o": "t_thconc_floor", "t": "t_thconc_floor", "^": "t_thconc_floor", - "l": "t_console_broken", "x": "t_thconc_floor", "w": "t_pavement", "_": "t_pavement", @@ -60,6 +59,7 @@ "furniture": { "j": "f_rack", "k": "f_counter", + "l": "f_console_broken", "m": "f_displaycase", "n": "f_table", "o": "f_locker", diff --git a/data/json/mapgen/store/s_hunting.json b/data/json/mapgen/store/s_hunting.json index 1194c0e643d01..c61ab25f56376 100644 --- a/data/json/mapgen/store/s_hunting.json +++ b/data/json/mapgen/store/s_hunting.json @@ -33,7 +33,7 @@ "........4..............." ], "terrain": { - ".": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ], + ".": "t_region_groundcover", " ": "t_floor", ",": "t_thconc_floor", "y": "t_thconc_floor", @@ -48,16 +48,16 @@ "|": "t_wall_w", "-": "t_wall_w", "~": "t_window_bars_alarm", - "C": "t_console_broken", "4": "t_gutter_downspout" }, "furniture": { + "C": "f_console_broken", "#": "f_counter", "%": "f_sink", "R": "f_rack", "r": "f_warehouse_shelf", - "O": [ "f_crate_c", "f_crate_c", "f_crate_c", "f_crate_o" ], - "o": [ "f_crate_c", "f_crate_c", "f_crate_c", "f_crate_o" ], + "O": [ [ "f_crate_c", 3 ], "f_crate_o" ], + "o": [ [ "f_crate_c", 3 ], "f_crate_o" ], "X": "f_safe_l", "x": "f_safe_l", "B": "f_bulletin", diff --git a/data/json/mapgen/teashop.json b/data/json/mapgen/teashop.json index 7653f3aabdaaf..1723904573bf1 100644 --- a/data/json/mapgen/teashop.json +++ b/data/json/mapgen/teashop.json @@ -33,9 +33,9 @@ "........................" ], "set": [ - { "point": "furniture", "id": "f_mutpoppy", "x": [ 0, 23 ], "y": [ 21, 23 ], "repeat": [ 4, 9 ] }, - { "point": "terrain", "id": "t_shrub", "x": [ 0, 23 ], "y": [ 21, 23 ], "repeat": [ 4, 9 ] }, - { "point": "furniture", "id": "f_chamomile", "x": [ 0, 23 ], "y": [ 21, 23 ], "repeat": [ 4, 9 ] } + { "point": "furniture", "id": "f_region_weed", "x": [ 0, 23 ], "y": [ 21, 23 ], "repeat": [ 4, 9 ] }, + { "point": "terrain", "id": "t_region_shrub_fruit", "x": [ 0, 23 ], "y": [ 21, 23 ], "repeat": [ 4, 9 ] }, + { "point": "furniture", "id": "f_region_flower", "x": [ 0, 23 ], "y": [ 21, 23 ], "repeat": [ 4, 9 ] } ], "terrain": { "#": "t_floor", @@ -43,33 +43,27 @@ "+": "t_door_c", ",": "t_floor", "-": "t_wall_w", - ".": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ], - "1": "t_grass", - "2": "t_grass", - "3": "t_grass", - "6": "t_console_broken", + ".": "t_region_groundcover_urban", + "1": "t_region_groundcover_urban", + "2": "t_region_groundcover_urban", + "3": "t_region_groundcover_urban", "C": "t_sidewalk", - "F": "t_floor", - "K": "t_floor", "O": "t_window_domestic", "S": "t_sidewalk", "T": "t_sidewalk", "_": "t_pavement", - "c": "t_floor", "o": "t_window", - "t": "t_floor", - "v": "t_floor", - "z": "t_shrub", - "{": "t_floor", + "z": "t_region_shrub_decorative", "4": "t_gutter_downspout", "|": "t_wall_w" }, "furniture": { + "6": "f_console_broken", "#": "f_counter", "&": "f_dumpster", - "1": "f_dandelion", - "2": "f_dahlia", - "3": "f_bluebell", + "1": "f_region_weed", + "2": "f_region_flower", + "3": [ "f_region_weed", "f_region_flower" ], "C": "f_chair", "F": "f_fridge", "K": "f_sink", @@ -198,48 +192,41 @@ ], "terrain": { "#": "t_linoleum_gray", - "&": "t_floor", "D": "t_door_locked", "+": "t_door_c", ";": "t_linoleum_gray", ",": "t_floor", - ".": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ], - "T": [ "t_tree", "t_tree_young", "t_shrub", "t_grass", "t_grass", "t_dirt" ], - "z": "t_shrub", - "@": "t_grass", - "1": "t_grass", - "2": "t_grass", - "3": "t_grass", - "4": "t_grass", - "^": "t_grass", - "6": "t_console_broken", - "C": "t_floor", + ".": "t_region_groundcover_urban", + "T": [ [ "t_region_groundcover_urban", 3 ], [ "t_region_tree_shade", 2 ], "t_region_shrub_decorative" ], + "z": "t_region_shrub_fruit", + "@": "t_region_groundcover_urban", + "1": "t_region_groundcover_urban", + "2": "t_region_groundcover_urban", + "3": "t_region_groundcover_urban", + "4": "t_region_groundcover_urban", + "^": "t_region_groundcover_urban", "F": "t_linoleum_gray", "K": "t_linoleum_gray", "O": "t_window_domestic", "S": "t_sidewalk", - "$": "t_floor", "_": "t_pavement", - "c": "t_floor", "o": "t_window", - "Y": "t_floor", - "t": "t_floor", - "{": "t_floor", "|": "t_wall_g", "w": "t_wall_log", - "W": "t_railing_v", + "W": "t_railing", "Q": "t_fencegate_c", "<": "t_stairs_up", - "q": "t_fence_v" + "q": "t_fence" }, "furniture": { + "6": "f_console_broken", "#": "f_counter", "Y": "f_rack_coat", "&": "f_trashcan", - "1": "f_dandelion", - "2": "f_dahlia", - "3": "f_bluebell", - "4": "f_lily", + "1": "f_region_weed", + "2": "f_region_flower", + "3": "f_region_flower", + "4": "f_region_flower", "@": "f_statue", "F": "f_fridge", "K": "f_sink", diff --git a/data/json/mapgen/town_hall.json b/data/json/mapgen/town_hall.json index 2bcbdca22308b..8c7b8a19d5ad7 100644 --- a/data/json/mapgen/town_hall.json +++ b/data/json/mapgen/town_hall.json @@ -5,8 +5,8 @@ "terrain": { "*": "t_open_air", "~": "t_open_air_rooved", - ".": [ "t_grass_long", "t_grass", "t_grass", "t_dirt", "t_grass_long", "t_grass", "t_grass", "t_dirt", "t_shrub" ], - ",": [ "t_grass_long", "t_grass_long", "t_grass_long", "t_grass", "t_tree_young", "t_tree", "t_shrub", "t_dirt" ], + ".": [ [ "t_region_groundcover_urban", 10 ], "t_region_shrub_decorative" ], + ",": [ [ "t_region_groundcover_urban", 10 ], "t_region_shrub_decorative", "t_region_shrub_fruit", "t_region_tree_shade" ], "-": "t_door_locked_interior", "<": "t_stairs_down", "+": "t_door_c", @@ -26,7 +26,6 @@ "O": "t_linoleum_white", "u": "t_linoleum_white", "s": "t_sidewalk", - "x": "t_console_broken", "|": "t_brick_wall", "!": "t_door_glass_c", "=": "t_wall_glass", @@ -34,6 +33,7 @@ "v": "t_window" }, "furniture": { + "x": "f_console_broken", "3": "f_bench", "B": "f_bench", "S": "f_sink", diff --git a/data/json/mapgen/veterinarian.json b/data/json/mapgen/veterinarian.json index b0c48efca595c..c396400784283 100644 --- a/data/json/mapgen/veterinarian.json +++ b/data/json/mapgen/veterinarian.json @@ -34,8 +34,7 @@ ], "terrain": { " ": "t_pavement", - "%": "t_console_broken", - "*": "t_shrub", + "*": "t_region_shrub", "+": "t_door_c", ",": "t_pavement_y", "-": "t_wall_w", @@ -47,7 +46,7 @@ "O": "t_window", "R": "t_linoleum_white", "^": "t_chaingate_c", - "i": [ "t_door_locked_interior", "t_door_locked_interior", "t_door_c" ], + "i": [ [ "t_door_locked_interior", 2 ], "t_door_c" ], "l": "t_linoleum_white", "s": "t_linoleum_white", "t": "t_linoleum_white", @@ -56,6 +55,7 @@ "4": "t_gutter_downspout" }, "furniture": { + "%": "f_console_broken", "#": "f_counter", "$": "f_safe_l", "?": "f_counter", diff --git a/data/json/mapgen/ws_fire_lookout_tower.json b/data/json/mapgen/ws_fire_lookout_tower.json index 1b96b3890ebba..cf73c759cc1d3 100644 --- a/data/json/mapgen/ws_fire_lookout_tower.json +++ b/data/json/mapgen/ws_fire_lookout_tower.json @@ -272,6 +272,7 @@ "om_terrain": [ "ws_fire_lookout_tower_f2" ], "weight": 1000, "object": { + "fill_ter": "t_flat_roof", "rows": [ "........................", "........................", @@ -302,17 +303,15 @@ ".": "t_open_air", ",": "t_flat_roof", "X": "t_wall_log", - "|": "t_railing_v", - "-": "t_railing_h", - "g": "t_generator_broken", + "|": "t_railing", + "-": "t_railing", "D": "t_door_c", "+": "t_floor", ">": "t_ladder_down", "f": "t_flat_roof", - "s": "t_flat_roof", - "h": "t_flat_roof" + "s": "t_flat_roof" }, - "furniture": { "h": "f_chair" }, + "furniture": { "g": "f_generator_broken", "h": "f_chair" }, "items": { "s": { "item": "flt_loot_vehicle", "chance": 50 }, "f": { "item": "trash_forest", "chance": 80 } }, "place_monsters": [ { "monster": "GROUP_ZOMBIE_FIRELOOKOUTTOWER", "x": 12, "y": 9 }, diff --git a/data/json/mapgen_palettes/abandoned_barn_p.json b/data/json/mapgen_palettes/abandoned_barn_p.json index a54fbd37524f5..3bbc8a940c997 100644 --- a/data/json/mapgen_palettes/abandoned_barn_p.json +++ b/data/json/mapgen_palettes/abandoned_barn_p.json @@ -30,11 +30,9 @@ "d": "t_region_groundcover_barren", "D": "t_door_boarded_damaged", "f": "t_region_groundcover", - "g": "t_generator_broken", "h": "t_dirtfloor", "I": "t_dirtfloor", "L": [ "t_covered_well", [ "t_water_pump", 2 ] ], - "m": "t_machinery_old", "M": "t_milking_machine", "n": "t_dirtfloor", "N": "t_dirtfloor", @@ -68,9 +66,11 @@ "c": "f_clay_kiln", "C": "f_crate_o", "f": "f_region_weed", + "g": "f_generator_broken", "h": "f_hay", "I": "f_stool", "!": "f_canvas_door_o", + "m": "f_machinery_old", "n": "f_canvas_floor", "N": "f_canvas_wall", "r": "f_rubble", diff --git a/data/json/mapgen_palettes/acidia_camp_palette.json b/data/json/mapgen_palettes/acidia_camp_palette.json index 4154eadb46866..017bd587ee107 100644 --- a/data/json/mapgen_palettes/acidia_camp_palette.json +++ b/data/json/mapgen_palettes/acidia_camp_palette.json @@ -36,7 +36,7 @@ "Q": "t_dirtfloor", "r": "t_dirtfloor", "S": "t_pit_spiked", - "T": "t_machinery_old", + "T": "t_dirtfloor", "t": "t_dirtfloor", "U": "t_pit", "u": "t_dirtfloor", @@ -47,6 +47,7 @@ "Z": "t_radio_controls" }, "furniture": { + "T": "f_machinery_old", "$": "f_crate_o", "(": "f_bench", ")": "f_standing_tank", diff --git a/data/json/mapgen_palettes/airliner_palette.json b/data/json/mapgen_palettes/airliner_palette.json index 39ba607e694ec..c9b9428afdd08 100644 --- a/data/json/mapgen_palettes/airliner_palette.json +++ b/data/json/mapgen_palettes/airliner_palette.json @@ -22,11 +22,18 @@ "D": "t_door_metal_locked", "g": "t_reinforced_glass", "s": "t_reinforced_glass_shutter", - "x": "t_console_broken", ">": "t_slope_down", "<": "t_slope_up" }, - "furniture": { "a": "f_seat_airplane", "c": "f_counter", "f": "f_fridge", "l": "f_locker", "S": "f_sink", "*": "f_wreckage" }, + "furniture": { + "a": "f_seat_airplane", + "c": "f_counter", + "f": "f_fridge", + "l": "f_locker", + "S": "f_sink", + "x": "f_console_broken", + "*": "f_wreckage" + }, "toilets": { "T": { } } } ] diff --git a/data/json/mapgen_palettes/apartment.json b/data/json/mapgen_palettes/apartment.json index ff2fcc03e34a6..4845d89ed1b7d 100644 --- a/data/json/mapgen_palettes/apartment.json +++ b/data/json/mapgen_palettes/apartment.json @@ -15,7 +15,6 @@ "W": "t_window", "s": "t_sidewalk", "w": [ [ "t_window_domestic", 3 ], "t_curtains" ], - "x": "t_console_broken", "|": "t_wall", "z": "t_flat_roof", "(": "t_flat_roof", @@ -41,8 +40,8 @@ "<": "t_stairs_up", ">": "t_stairs_down", "*": "t_open_air", - "K": "t_generator_broken", - "M": "t_machinery_heavy" + "K": "t_thconc_floor", + "M": "t_thconc_floor" }, "furniture": { "a": "f_small_satelitte_dish", @@ -57,6 +56,8 @@ "h": [ [ "f_chair", 2 ], "f_null" ], "I": "f_floor_lamp", "j": "f_trashcan", + "K": "f_generator_broken", + "M": "f_machinery_heavy", "l": [ [ "f_stool", 2 ], "f_null" ], "n": "f_table", "o": "f_bookcase", @@ -67,6 +68,7 @@ "S": "f_sink", "t": "f_table", "u": "f_cupboard", + "x": "f_console_broken", "X": [ [ "f_wardrobe", 2 ], "f_dresser" ], "Y": "f_rack_coat", "1": "f_cupboard", @@ -135,8 +137,7 @@ "p": "t_region_groundcover_urban", "s": "t_sidewalk", "w": "t_window", - "X": "t_door_locked", - "x": "t_console_broken" + "X": "t_door_locked" }, "furniture": { "A": "f_armchair", @@ -157,6 +158,7 @@ "t": "f_table", "T": "f_toilet", "u": "f_cupboard", + "x": "f_console_broken", "Y": "f_rack_coat", "1": "f_cupboard", "2": "f_cupboard", diff --git a/data/json/mapgen_palettes/basement.json b/data/json/mapgen_palettes/basement.json index 1fc892a70d705..96afa11f774aa 100644 --- a/data/json/mapgen_palettes/basement.json +++ b/data/json/mapgen_palettes/basement.json @@ -136,13 +136,13 @@ "*": "t_door_c", "^": "t_door_locked_interior", "5": "t_card_military", - "6": "t_console_broken", "<": "t_stairs_up", "M": "t_wall_metal", "|": "t_reinforced_glass", "/": "t_door_curtain_c", "W": "t_water_dispenser" }, + "furniture": { "6": "f_console_broken" }, "toilets": { "&": { } } }, { diff --git a/data/json/mapgen_palettes/bike_shop_palette.json b/data/json/mapgen_palettes/bike_shop_palette.json index c4561b91a1f0d..1299cc7fb3816 100644 --- a/data/json/mapgen_palettes/bike_shop_palette.json +++ b/data/json/mapgen_palettes/bike_shop_palette.json @@ -15,7 +15,6 @@ ";": "t_door_locked", "&": "t_floor", "^": "t_floor", - "%": "t_console_broken", "@": "t_sidewalk", "C": "t_floor", "D": "t_floor", @@ -50,6 +49,7 @@ "t": "f_table", "q": "f_stool", "B": "f_bench", + "%": "f_console_broken", "&": "f_trashcan", "@": "f_dumpster", "^": "f_indoor_plant" diff --git a/data/json/mapgen_palettes/cground.json b/data/json/mapgen_palettes/cground.json index 2e1b0c1f5c936..102d3586a44a5 100644 --- a/data/json/mapgen_palettes/cground.json +++ b/data/json/mapgen_palettes/cground.json @@ -16,7 +16,6 @@ "i": "t_pit_shallow", "v": "t_window_domestic", "+": "t_door_c", - "X": "t_console_broken", "H": "t_privacy_fence", "m": "t_privacy_fencegate_c", "F": "t_region_tree_evergreen", @@ -43,6 +42,7 @@ "'": "t_concrete" }, "furniture": { + "X": "f_console_broken", "g": "f_bulletin", "i": "f_firering", "b": "f_bench", diff --git a/data/json/mapgen_palettes/church.json b/data/json/mapgen_palettes/church.json index 53a79df26191e..79408cdd92ded 100644 --- a/data/json/mapgen_palettes/church.json +++ b/data/json/mapgen_palettes/church.json @@ -7,13 +7,12 @@ "+": "t_door_c", "-": "t_wall_w", ".": "t_floor", - "6": "t_console", "=": "t_door_locked_alarm", "D": "t_door_locked", "O": "t_column", "S": "t_floor", "T": "t_floor", - "^": "t_shrub", + "^": "t_region_shrub", "c": "t_floor", "b": "t_floor", "d": "t_floor", @@ -27,6 +26,7 @@ "|": "t_wall_w" }, "furniture": { + "6": "f_console", "#": "f_bench", "S": "f_sink", "T": "f_toilet", diff --git a/data/json/mapgen_palettes/city_block_palette.json b/data/json/mapgen_palettes/city_block_palette.json index 4b98c51e29f9c..2cb098e966a74 100644 --- a/data/json/mapgen_palettes/city_block_palette.json +++ b/data/json/mapgen_palettes/city_block_palette.json @@ -3,6 +3,7 @@ "type": "palette", "id": "city_block_foundation_palette", "furniture": { + "?": "f_console_broken", "A": "f_stool", "B": "f_beaded_door", "D": "f_chair", @@ -68,7 +69,6 @@ "M": "t_region_shrub_decorative", "S": "t_ladder_down", "V": "t_ladder_up", - "?": "t_console_broken", "$": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ] }, "toilets": { "t": { } }, diff --git a/data/json/mapgen_palettes/clothes_store_palette.json b/data/json/mapgen_palettes/clothes_store_palette.json index e11f54c1922ff..3fff3c5b628e0 100644 --- a/data/json/mapgen_palettes/clothes_store_palette.json +++ b/data/json/mapgen_palettes/clothes_store_palette.json @@ -2,8 +2,9 @@ { "type": "palette", "id": "clothes_store_palette", - "terrain": { "%": "t_console_broken", "p": "t_region_groundcover_urban" }, + "terrain": { "p": "t_region_groundcover_urban" }, "furniture": { + "%": "f_console_broken", "c": "f_counter", "C": "f_armchair", "s": "f_stool", @@ -58,14 +59,9 @@ { "type": "palette", "id": "tailor_palette", - "terrain": { - "%": "t_console_broken", - ";": "t_door_locked", - "0": "t_window_alarm", - "z": "t_region_shrub_decorative", - "p": "t_region_groundcover_urban" - }, + "terrain": { ";": "t_door_locked", "0": "t_window_alarm", "z": "t_region_shrub_decorative", "p": "t_region_groundcover_urban" }, "furniture": { + "%": "f_console_broken", "c": "f_counter", "R": "f_clothing_rail", "s": "f_stool", @@ -99,7 +95,6 @@ "type": "palette", "id": "furs_palette", "terrain": { - "%": "t_console_broken", ";": "t_door_locked", "i": "t_door_locked_interior", "0": "t_window_alarm", @@ -107,6 +102,7 @@ "p": "t_region_groundcover_urban" }, "furniture": { + "%": "f_console_broken", "c": "f_displaycase", "s": "f_stool", "d": "f_desk", diff --git a/data/json/mapgen_palettes/electronic_palette.json b/data/json/mapgen_palettes/electronic_palette.json index bbf5b8f690ebd..1bf23f1517665 100644 --- a/data/json/mapgen_palettes/electronic_palette.json +++ b/data/json/mapgen_palettes/electronic_palette.json @@ -17,7 +17,6 @@ "W": "t_wall_glass", "w": "t_window", "s": "t_sidewalk", - "x": "t_console_broken", "f": "t_chainfence_v", "g": "t_chaingate_c", "<": "t_stairs_up", @@ -26,6 +25,7 @@ "(": "t_pavement" }, "furniture": { + "x": "f_console_broken", "n": "f_displaycase", "1": "f_rack", "2": "f_rack", diff --git a/data/json/mapgen_palettes/fema.json b/data/json/mapgen_palettes/fema.json index 76cad836ff1e0..c2b9e0c85b9e8 100644 --- a/data/json/mapgen_palettes/fema.json +++ b/data/json/mapgen_palettes/fema.json @@ -7,7 +7,7 @@ "/": "t_region_groundcover_barren", "!": "t_region_groundcover_barren", "_": "t_region_groundcover_barren", - "'": "t_plut_generator", + "'": "t_floor", "?": "t_floor", "#": "t_pit_corpsed", "-": "t_wall", @@ -27,10 +27,11 @@ "P": "t_water_pump", "s": "t_floor", "w": [ "t_window_domestic", "t_curtains", "t_curtains" ], - "6": "t_console_broken", - "7": "t_centrifuge" + "6": "t_floor", + "7": "t_floor" }, "furniture": { + "'": "f_generator_broken", "=": "f_canvas_wall", ",": "f_fema_groundsheet", "*": "f_canvas_door", @@ -57,7 +58,9 @@ "U": "f_cupboard", "W": "f_woodstove", "x": "f_crate_o", - "X": "f_crate_c" + "X": "f_crate_c", + "6": "f_console_broken", + "7": "f_centrifuge" }, "toilets": { "&": { "amount": [ 0, 50 ] } }, "items": { diff --git a/data/json/mapgen_palettes/helipad.json b/data/json/mapgen_palettes/helipad.json index 2897a2a5c4449..1ef56488c24ce 100644 --- a/data/json/mapgen_palettes/helipad.json +++ b/data/json/mapgen_palettes/helipad.json @@ -31,10 +31,7 @@ "M": "t_door_metal_locked", ",": "t_concrete_y", "o": "t_sidewalk", - "?": "t_console_broken", - "g": "t_generator_broken", "P": "t_water_pump", - "5": "t_machinery_light", "6": "t_bulk_tank", "I": "t_thconc_y", "U": "t_metal_floor", @@ -47,6 +44,9 @@ "L": "f_locker", "4": "f_locker", "c": "f_chair", + "?": "f_console_broken", + "g": "f_generator_broken", + "5": "f_machinery_light", "s": "f_chair", "l": "f_utility_shelf", "d": "f_desk", diff --git a/data/json/mapgen_palettes/hospital.json b/data/json/mapgen_palettes/hospital.json index 66180a0603779..1a2b0c2981703 100644 --- a/data/json/mapgen_palettes/hospital.json +++ b/data/json/mapgen_palettes/hospital.json @@ -33,9 +33,9 @@ "`": "t_thconc_floor", "+": "t_door_c", "!": "t_door_locked_interior", - "*": "t_centrifuge", - "6": "t_console", - "7": "t_console", + "*": "t_floor", + "6": "t_floor", + "7": "t_floor", "S": "t_floor", "2": "t_floor", "8": "t_floor", @@ -44,6 +44,9 @@ "?": "t_floor" }, "furniture": { + "*": "f_centrifuge", + "6": "f_console", + "7": "f_console", "b": "f_bench", "c": "f_chair", "B": "f_bed", diff --git a/data/json/mapgen_palettes/house_w_palette.json b/data/json/mapgen_palettes/house_w_palette.json index 1cf6d42e0ae3b..33995323b4b21 100644 --- a/data/json/mapgen_palettes/house_w_palette.json +++ b/data/json/mapgen_palettes/house_w_palette.json @@ -50,7 +50,8 @@ "w": "f_rack_wood", "x": "f_entertainment_center", "y": [ "f_indoor_plant", "f_indoor_plant_y" ], - "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ] + "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ], + "?": "f_console_broken" }, "terrain": { ".": "t_linoleum_gray", @@ -69,8 +70,7 @@ "6": "t_carpet_red", "7": "t_carpet_green", "8": "t_carpet_purple", - "9": "t_carpet_yellow", - "?": "t_console_broken" + "9": "t_carpet_yellow" }, "toilets": { "t": { } }, "liquids": { "g": { "liquid": "water_clean", "amount": [ 0, 100 ] } } diff --git a/data/json/mapgen_palettes/junkyard_palette.json b/data/json/mapgen_palettes/junkyard_palette.json index 42d2d3ea8d659..850f72c3f0ff7 100644 --- a/data/json/mapgen_palettes/junkyard_palette.json +++ b/data/json/mapgen_palettes/junkyard_palette.json @@ -3,7 +3,7 @@ "type": "palette", "id": "junkyard_palette", "terrain": { - ".": [ [ "t_pavement", 22 ], "t_region_groundcover_urban" ], + ".": [ [ "t_pavement", 22 ], "t_region_groundcover" ], "g": "t_region_groundcover_urban", "_": [ [ "t_region_groundcover_barren", 5 ], "t_region_groundcover_urban" ], "|": "t_fence_barbed", @@ -26,10 +26,10 @@ "d": "t_door_metal_locked", "m": "t_metal_floor", "9": "t_wall_wood", - "x": "t_console_broken", "4": "t_gutter_downspout" }, "furniture": { + "x": "f_console_broken", "#": "f_straw_bed", "N": "f_ladder", "B": "f_bench", diff --git a/data/json/mapgen_palettes/lab_surface_palette.json b/data/json/mapgen_palettes/lab_surface_palette.json index 0899f163e29b1..7e8a208be2faa 100644 --- a/data/json/mapgen_palettes/lab_surface_palette.json +++ b/data/json/mapgen_palettes/lab_surface_palette.json @@ -24,7 +24,6 @@ "m": "t_door_metal_c", "M": "t_door_metal_locked", "w": "t_gates_control_brick", - "x": "t_console_broken", "]": "t_sidewalk", "*": "t_region_shrub_decorative", "?": [ "t_region_shrub_decorative", "t_region_tree_shade" ], @@ -52,7 +51,8 @@ "S": "f_sink", "s": "f_stool", "t": "f_table", - "U": "f_utility_shelf" + "U": "f_utility_shelf", + "x": "f_console_broken" }, "toilets": { "T": { } }, "vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } } @@ -79,7 +79,6 @@ "m": "t_door_metal_c", "M": "t_door_metal_locked", "p": "t_sewage_pipe", - "x": "t_console_broken", "]": "t_sidewalk", "*": "t_region_shrub_decorative", "<": "t_stairs_up", @@ -111,7 +110,8 @@ "S": "f_sink", "s": "f_stool", "t": "f_table", - "v": "f_vent_pipe" + "v": "f_vent_pipe", + "x": "f_console_broken" }, "toilets": { "T": { } }, "vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } } @@ -129,9 +129,7 @@ "-": "t_door_glass_frosted_c", "=": "t_door_glass_frosted_lab_c", ":": "t_reinforced_glass", - "m": "t_door_metal_c", - "o": "t_centrifuge", - "x": "t_console_broken" + "m": "t_door_metal_c" }, "furniture": { "&": "f_trashcan", @@ -165,7 +163,9 @@ "S": "f_sink", "t": "f_table", "U": "f_utility_shelf", - "v": "f_ventilator" + "v": "f_ventilator", + "o": "f_centrifuge", + "x": "f_console_broken" } } ] diff --git a/data/json/mapgen_palettes/library_palette.json b/data/json/mapgen_palettes/library_palette.json index d42db01ea9ebf..974b5b11c6486 100644 --- a/data/json/mapgen_palettes/library_palette.json +++ b/data/json/mapgen_palettes/library_palette.json @@ -2,8 +2,9 @@ { "type": "palette", "id": "library_palette", - "terrain": { "%": "t_console_broken", "p": "t_region_groundcover_urban", ";": "t_door_locked", "5": "t_region_tree_evergreen" }, + "terrain": { "p": "t_region_groundcover_urban", ";": "t_door_locked", "5": "t_region_tree_evergreen" }, "furniture": { + "%": "f_console_broken", "c": "f_counter", "d": "f_desk", "[": "f_table", diff --git a/data/json/mapgen_palettes/lmoe.json b/data/json/mapgen_palettes/lmoe.json index 90c3cd16938ce..6a48164868480 100644 --- a/data/json/mapgen_palettes/lmoe.json +++ b/data/json/mapgen_palettes/lmoe.json @@ -16,7 +16,6 @@ ":": "t_secretdoor_metal_c", ";": "t_secretdoor_metal_o", "~": "t_water_pump", - "G": "t_generator_broken", "t": "t_metal_floor" }, "furniture": { @@ -32,6 +31,7 @@ "E": "f_exercise", "F": "f_fridge", "f": "f_sofa", + "G": "f_generator_broken", "h": "f_chair", "H": "f_water_heater", "K": "f_sink", diff --git a/data/json/mapgen_palettes/lumberyard.json b/data/json/mapgen_palettes/lumberyard.json index 73b3aa7dfcf2d..4a82f4eb5ffc8 100644 --- a/data/json/mapgen_palettes/lumberyard.json +++ b/data/json/mapgen_palettes/lumberyard.json @@ -15,13 +15,10 @@ ";": "t_door_metal_locked", ".": "t_thconc_floor", "6": "t_gates_mech_control", - "@": "t_machinery_heavy", - "G": "t_generator_broken", "=": "t_conveyor", "+": "t_door_c", "!": "t_door_locked_interior", - "X": "t_console_broken", - "v": "t_chainfence_v", + "v": "t_chainfence", "V": "t_chaingate_l", "x": "t_thconc_floor", "z": "t_flat_roof", @@ -33,13 +30,16 @@ ",": "t_thconc_floor" }, "furniture": { + "@": "f_machinery_heavy", "B": "f_bandsaw", + "G": "f_generator_broken", "J": "f_jointer", "M": "f_mitresaw", "P": "f_planer", "R": "f_router", "T": "f_tablesaw", "U": "f_utility_shelf", + "X": "f_console_broken", "p": "f_drill_press", "i": "f_filing_cabinet", "&": "f_trashcan", diff --git a/data/json/mapgen_palettes/mall_palette.json b/data/json/mapgen_palettes/mall_palette.json index d29d154374a57..fe628abd119b6 100644 --- a/data/json/mapgen_palettes/mall_palette.json +++ b/data/json/mapgen_palettes/mall_palette.json @@ -56,6 +56,8 @@ "ȝ": "f_dryer", "Ʃ": "f_entertainment_center", "y": [ "f_indoor_plant", "f_indoor_plant_y" ], + "x": [ "f_machinery_light", "f_machinery_heavy", "f_machinery_old", "f_machinery_electronic" ], + "?": "f_console_broken", "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ] }, "terrain": { @@ -88,14 +90,12 @@ "+": "t_laminated_door_glass_c", "=": [ "t_door_c", "t_door_locked" ], "p": "t_column", - "x": [ "t_machinery_light", "t_machinery_heavy", "t_machinery_old", "t_machinery_electronic" ], "2": "t_wall_g", "5": "t_wall_wood", "6": "t_carpet_concrete_red", "7": "t_carpet_concrete_green", "8": "t_carpet_concrete_purple", "9": "t_carpet_concrete_yellow", - "?": "t_console_broken", "§": "t_water_pool_shallow_outdoors" }, "toilets": { "t": { } } diff --git a/data/json/mapgen_palettes/mansion.json b/data/json/mapgen_palettes/mansion.json index f81b9ffd22891..1475ec0f43184 100644 --- a/data/json/mapgen_palettes/mansion.json +++ b/data/json/mapgen_palettes/mansion.json @@ -16,6 +16,7 @@ "7": "f_indoor_plant", "8": "f_indoor_plant_y", "9": "f_indoor_plant_y", + "&": "f_console_broken", "?": "f_fireplace", "@": "f_statue", "A": "f_armchair", @@ -65,7 +66,6 @@ }, "terrain": { "%": "t_door_locked_interior", - "&": "t_console_broken", "!": "t_region_groundcover_urban", ")": "t_carpet_concrete_red", "+": "t_door_c", @@ -117,14 +117,8 @@ { "type": "palette", "id": "mansion_palette_basement", - "terrain": { - "#": "t_rock", - "*": "t_machinery_old", - "?": "t_generator_broken", - "X": "t_brick_wall", - "]": "t_sewage_pipe", - "p": "t_sewage_pump" - } + "terrain": { "#": "t_rock", "X": "t_brick_wall", "]": "t_sewage_pipe", "p": "t_sewage_pump" }, + "furniture": { "*": "f_machinery_old", "?": "f_generator_broken" } }, { "type": "palette", diff --git a/data/json/mapgen_palettes/microlab.json b/data/json/mapgen_palettes/microlab.json index e60bcc3cc3e90..12dfcdb76288c 100644 --- a/data/json/mapgen_palettes/microlab.json +++ b/data/json/mapgen_palettes/microlab.json @@ -9,7 +9,6 @@ "2": "t_door_glass_frosted_lab_c", "4": "t_door_metal_pickable", "5": "t_door_metal_locked", - "6": "t_console_broken", "[": "t_door_glass_c", "-": "t_wall_metal", "y": "t_pavement_y", @@ -27,6 +26,7 @@ "&": "f_toilet", "~": "f_shower", "@": "f_bed", + "6": "f_console_broken", "a": "f_armchair", "k": "f_cupboard", "D": "f_dresser", diff --git a/data/json/mapgen_palettes/military/mil_base_palette.json b/data/json/mapgen_palettes/military/mil_base_palette.json index b77256f8be1e3..c52531a943cbe 100644 --- a/data/json/mapgen_palettes/military/mil_base_palette.json +++ b/data/json/mapgen_palettes/military/mil_base_palette.json @@ -48,15 +48,11 @@ "&": "t_grate", "e": "t_gates_mech_control", "5": "t_card_military", - "*": "t_gas_tank", + "*": "t_pavement", "%": "t_pit_corpsed", "8": "t_wall_metal", "9": "t_metal_floor", - "J": "t_generator_broken", - "p": "t_plut_generator", "Z": "t_radio_tower", - "'": "t_console_broken", - "0": "t_console", "@": "t_rock", "~": "t_gutter_downspout" }, @@ -66,6 +62,7 @@ "#": "f_desk", "[": "f_table", ":": "f_table", + "*": "f_gas_tank", "h": "f_chair", "$": "f_filing_cabinet", "`": "f_shredder", @@ -73,6 +70,10 @@ "c": "f_counter", "S": "f_sink", "o": "f_oven", + "J": "f_generator_broken", + "p": "f_compact_ASRG_containment", + "'": "f_console_broken", + "0": "f_console", "t": "f_trashcan", "Y": "f_rack_coat", "O": "f_bookcase", @@ -96,7 +97,7 @@ "L": "f_shower", "6": "f_water_heater", "7": "f_standing_tank", - "H": "f_standing_tank", + "H": "f_diesel_tank", "j": "f_home_furnace", "q": "f_drill_press", "Q": "f_bandsaw", diff --git a/data/json/mapgen_palettes/movie_theater_palette.json b/data/json/mapgen_palettes/movie_theater_palette.json index 87e6569e2813e..cc02ca2b802fc 100644 --- a/data/json/mapgen_palettes/movie_theater_palette.json +++ b/data/json/mapgen_palettes/movie_theater_palette.json @@ -27,7 +27,8 @@ "o": "f_oven", "r": "f_rack", "F": "f_vending_c", - "v": "f_vending_c" + "v": "f_vending_c", + "Z": "f_console_broken" }, "terrain": { "$": "t_carpet_green", @@ -50,7 +51,6 @@ "d": "t_door_c", "a": "t_atm", "w": "t_window", - "Z": "t_console_broken", "-": "t_railing_h", "R": "t_railing_h", "<": "t_ladder_up" diff --git a/data/json/mapgen_palettes/necropolis/necropolis_a.json b/data/json/mapgen_palettes/necropolis/necropolis_a.json index a2bc5a0120f70..303b01e515f4b 100644 --- a/data/json/mapgen_palettes/necropolis/necropolis_a.json +++ b/data/json/mapgen_palettes/necropolis/necropolis_a.json @@ -6,6 +6,8 @@ ")": "f_wreckage", "?": "f_sofa", "@": "f_bed", + "1": "f_generator_broken", + "6": "f_console_broken", "B": "f_bathtub", "C": "f_region_weed", "D": "f_trashcan", @@ -49,12 +51,12 @@ ",": "t_pavement_y", "-": "t_wall", ".": "t_region_groundcover_urban", - "1": "t_generator_broken", + "1": "t_thconc_floor", "2": "t_sewage_pipe", "3": "t_recycler", "4": "t_water_pump", "5": "t_slide", - "6": "t_console_broken", + "6": "t_thconc_floor", "7": "t_chainfence_h", "8": "t_chainfence_v", "9": "t_chaingate_l", diff --git a/data/json/mapgen_palettes/necropolis/necropolis_b1.json b/data/json/mapgen_palettes/necropolis/necropolis_b1.json index 6f7a3e82a7bc5..e26983d1de3fc 100644 --- a/data/json/mapgen_palettes/necropolis/necropolis_b1.json +++ b/data/json/mapgen_palettes/necropolis/necropolis_b1.json @@ -6,6 +6,7 @@ ")": "f_wreckage", "?": "f_sofa", "@": "f_bed", + "6": "f_console_broken", "D": "f_trashcan", "L": "f_locker", "S": "f_sink", @@ -37,9 +38,8 @@ "3": "t_sewage", "4": "t_water_pump", "5": "t_water_sh", - "6": "t_console_broken", - "7": "t_chainfence_h", - "8": "t_chainfence_v", + "7": "t_chainfence", + "8": "t_chainfence", "9": "t_chaingate_l", ";": "t_metal_floor", "<": "t_stairs_up", diff --git a/data/json/mapgen_palettes/necropolis/necropolis_b2.json b/data/json/mapgen_palettes/necropolis/necropolis_b2.json index 35a0329c92f4b..b00668ee624ee 100644 --- a/data/json/mapgen_palettes/necropolis/necropolis_b2.json +++ b/data/json/mapgen_palettes/necropolis/necropolis_b2.json @@ -5,6 +5,12 @@ "furniture": { "?": "f_sofa", "@": "f_bed", + "$": "f_machinery_light", + "%": "f_machinery_heavy", + "(": "f_machinery_old", + "1": "f_generator_broken", + "_": "f_machinery_electronic", + "6": "f_console_broken", "B": "f_bathtub", "C": [ "f_treadmill", "f_treadmill_mechanical" ], "D": "f_trashcan", @@ -35,9 +41,9 @@ " ": "t_metal_floor", "!": "t_bars", "#": "t_ladder_up", - "$": "t_machinery_light", - "%": "t_machinery_heavy", - "(": "t_machinery_old", + "$": "t_metal_floor", + "%": "t_metal_floor", + "(": "t_metal_floor", "*": "t_door_bar_locked", "+": "t_door_metal_c", ",": "t_pavement_y", @@ -45,14 +51,14 @@ ".": "t_rock", "/": "t_rock_floor", "0": "t_conveyor", - "1": "t_generator_broken", + "1": "t_metal_floor", "2": "t_sewage_pipe", "3": "t_sewage", "4": "t_water_pump", "5": "t_gates_control_metal", - "6": "t_console_broken", - "7": "t_chainfence_h", - "8": "t_chainfence_v", + "6": "t_metal_floor", + "7": "t_chainfence", + "8": "t_chainfence", "9": "t_chaingate_l", ":": "t_door_locked", ";": "t_metal_floor", @@ -85,8 +91,8 @@ "Z": "t_metal_floor", "[": "t_door_glass_c", "^": "t_underbrush", - "_": "t_machinery_electronic", - "a": "t_railing_v", + "_": "t_metal_floor", + "a": "t_railing", "b": "t_dirtfloor", "c": "t_metal_floor", "d": "t_metal_floor", diff --git a/data/json/mapgen_palettes/necropolis/necropolis_b3.json b/data/json/mapgen_palettes/necropolis/necropolis_b3.json index 4184ef4853819..2d1d612ed3279 100644 --- a/data/json/mapgen_palettes/necropolis/necropolis_b3.json +++ b/data/json/mapgen_palettes/necropolis/necropolis_b3.json @@ -5,6 +5,12 @@ "furniture": { "?": "f_sofa", "@": "f_bed", + "$": "f_machinery_light", + "%": "f_machinery_heavy", + "(": "f_machinery_old", + "1": "f_generator_broken", + "_": "f_machinery_electronic", + "6": "f_console_broken", "B": "f_bathtub", "C": [ "f_treadmill", "f_treadmill_mechanical" ], "D": "f_trashcan", @@ -36,9 +42,9 @@ " ": "t_metal_floor", "!": "t_bars", "#": "t_ladder_up", - "$": "t_machinery_light", - "%": "t_machinery_heavy", - "(": "t_machinery_old", + "$": "t_metal_floor", + "%": "t_metal_floor", + "(": "t_metal_floor", "*": "t_door_bar_locked", "+": "t_door_metal_c", ",": "t_pavement_y", @@ -46,14 +52,14 @@ ".": "t_rock", "/": "t_rock_floor", "0": "t_conveyor", - "1": "t_generator_broken", + "1": "t_metal_floor", "2": "t_potential_trans", "3": "t_sewage", "4": "t_water_pump", "5": "t_gates_control_metal", - "6": "t_console_broken", + "6": "t_metal_floor", "7": "t_backboard", - "8": "t_chainfence_v", + "8": "t_chainfence", "9": "t_chaingate_l", ":": "t_door_locked", ";": "t_metal_floor", @@ -86,7 +92,7 @@ "Z": "t_metal_floor", "[": "t_door_glass_c", "^": "t_underbrush", - "_": "t_machinery_electronic", + "_": "t_metal_floor", "a": "t_railing_v", "b": "t_dirtfloor", "c": "t_metal_floor", diff --git a/data/json/mapgen_palettes/office.json b/data/json/mapgen_palettes/office.json index 6deaba4d80ed2..05995b369c9cc 100644 --- a/data/json/mapgen_palettes/office.json +++ b/data/json/mapgen_palettes/office.json @@ -23,7 +23,6 @@ "C": "t_linoleum_white", "y": "t_linoleum_white", " ": "t_region_groundcover_urban", - "x": "t_console_broken", ",": "t_pavement_y", "_": "t_pavement", "%": [ [ "t_region_shrub_decorative", 16 ], [ "t_region_groundcover_forest", 5 ] ], @@ -46,9 +45,7 @@ "2": "t_gutter_east", "3": "t_gutter_south", "4": "t_gutter_west", - "5": "t_gutter_drop", - "X": "t_generator_broken", - "N": "t_machinery_heavy" + "5": "t_gutter_drop" }, "furniture": { "?": "f_sofa", @@ -72,6 +69,9 @@ "a": "f_trashcan", "F": "f_filing_cabinet", "Q": "f_safe_l", + "x": "f_console_broken", + "X": "f_generator_broken", + "N": "f_machinery_heavy", "y": "f_locker", "B": "f_bulletin", "6": "f_cellphone_booster", diff --git a/data/json/mapgen_palettes/office_doctor.json b/data/json/mapgen_palettes/office_doctor.json index f76a559975113..591848cdd532e 100644 --- a/data/json/mapgen_palettes/office_doctor.json +++ b/data/json/mapgen_palettes/office_doctor.json @@ -7,14 +7,11 @@ "!": "t_door_locked_interior", "#": "t_wall_w", "$": "t_floor", - "%": "t_console_broken", "&": "t_floor", "+": "t_door_c", ".": "t_floor", "0": "t_window_alarm", "D": "t_floor", - "5": "t_console", - "6": "t_console", "9": "t_window_domestic", ":": "t_door_glass_c", ";": "t_door_locked", @@ -50,6 +47,9 @@ "furniture": { "$": "f_safe_l", "&": "f_toilet", + "%": "f_console_broken", + "5": "f_console", + "6": "f_console", "B": "f_bed", "C": "f_locker", "H": "f_locker", diff --git a/data/json/mapgen_palettes/prison.json b/data/json/mapgen_palettes/prison.json index 88118407be03f..44dce938d3699 100644 --- a/data/json/mapgen_palettes/prison.json +++ b/data/json/mapgen_palettes/prison.json @@ -40,7 +40,6 @@ "s": "t_sidewalk", "t": "t_floor", "w": "t_window", - "x": "t_console_broken", "y": "t_floor", "z": "t_floor", "|": "t_concrete_wall" @@ -64,6 +63,7 @@ "o": "f_bookcase", "r": "f_rack", "t": "f_table", + "x": "f_console_broken", "z": "f_rack" }, "toilets": { "T": { } }, diff --git a/data/json/mapgen_palettes/private_resort.json b/data/json/mapgen_palettes/private_resort.json index 39d90a1e3ec47..effeb1fe942e4 100644 --- a/data/json/mapgen_palettes/private_resort.json +++ b/data/json/mapgen_palettes/private_resort.json @@ -3,6 +3,7 @@ "type": "palette", "id": "p_resort_palette_main_floor", "furniture": { + "&": "f_console_broken", "f": "f_glass_fridge", "B": "f_workbench", "]": "f_fridge", @@ -72,7 +73,6 @@ "P": "t_concrete", "U": "t_water_pool", "m": "t_metal_floor", - "&": "t_console_broken", "p": "t_door_c_peep", "8": "t_door_curtain_c", "n": "t_carpet_green", @@ -189,6 +189,10 @@ "type": "palette", "id": "p_resort_palette_basement", "furniture": { + "&": "f_console_broken", + "1": "f_generator_broken", + "2": "f_machinery_light", + "3": "f_machinery_heavy", "L": "f_locker", "S": "f_utility_shelf", "f": "f_glass_fridge", @@ -212,10 +216,6 @@ "V": "t_bars", "0": "t_ballistic_glass", "l": "t_door_metal_locked", - "&": "t_console_broken", - "1": "t_generator_broken", - "2": "t_machinery_light", - "3": "t_machinery_heavy", "?": "t_secretdoor_metal_c", ",": "t_metal_floor", "m": "t_wall_metal", @@ -233,6 +233,7 @@ "(": "f_small_satelitte_dish", "s": "f_solar_unit", "H": "f_chimney", + "l": "f_machinery_light", "v": "f_roof_turbine_vent" }, "terrain": { @@ -241,8 +242,7 @@ ">": "t_stairs_down", "r": "t_guardrail", "#": "t_sai_box_damaged", - "I": "t_lgtn_arrest", - "l": "t_machinery_light" + "I": "t_lgtn_arrest" } } ] diff --git a/data/json/mapgen_palettes/refugee_center.json b/data/json/mapgen_palettes/refugee_center.json index cefb285301468..15e312bae19ee 100644 --- a/data/json/mapgen_palettes/refugee_center.json +++ b/data/json/mapgen_palettes/refugee_center.json @@ -13,7 +13,6 @@ "0": "t_door_locked_interior", "1": "t_reinforced_glass_shutter", "2": "t_utility_light", - "6": "t_console_broken", "!": "t_fence_barbed", "=": "t_door_metal_locked", ">": "t_stairs_down", @@ -27,6 +26,7 @@ "}": "t_sidewalk" }, "furniture": { + "6": "f_console_broken", ")": "f_wreckage", "@": "f_bed", "D": "f_trashcan", diff --git a/data/json/mapgen_palettes/robofachq.json b/data/json/mapgen_palettes/robofachq.json index 9055efc84710d..a56fc15e5cdf0 100644 --- a/data/json/mapgen_palettes/robofachq.json +++ b/data/json/mapgen_palettes/robofachq.json @@ -9,7 +9,6 @@ "2": "t_door_metal_c", "4": "t_door_metal_pickable", "5": "t_door_metal_locked", - "6": "t_console_broken", "[": "t_door_glass_c", "-": "t_wall", "|": "t_concrete_wall", @@ -28,11 +27,12 @@ ">": "t_stairs_down", "0": "t_window_empty", ":": "t_window_domestic", - "u": "t_chainfence_h", - "U": "t_chainfence_v", + "u": "t_chainfence", + "U": "t_chainfence", "#": "t_rock" }, "furniture": { + "6": "f_console_broken", "&": "f_toilet", "~": "f_shower", "@": "f_bed", diff --git a/data/json/mapgen_palettes/shelter.json b/data/json/mapgen_palettes/shelter.json index f3bb04936e2eb..d0790f5f21591 100644 --- a/data/json/mapgen_palettes/shelter.json +++ b/data/json/mapgen_palettes/shelter.json @@ -11,18 +11,24 @@ "+": "t_door_c", "-": "t_wall_w", "_": "t_linoleum_white", - "6": "t_console", ":": "t_window_domestic", ">": "t_stairs_down", "<": "t_stairs_up", - "x": "t_console_broken", "|": "t_wall_w", ";": "t_concrete_wall", "*": "t_ladder_up", "=": "t_door_locked_interior", "4": "t_gutter_downspout" }, - "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" }, + "furniture": { + "6": "f_console", + "x": "f_console_broken", + "b": "f_bench", + "c": "f_cupboard", + "l": "f_locker", + "S": "f_sink", + "%": "f_trashcan" + }, "toilets": { "T": { } }, "items": { "l": { "item": "SUS_evac_shelter_locker", "chance": 80 }, diff --git a/data/json/mapgen_palettes/steel_mill_palette.json b/data/json/mapgen_palettes/steel_mill_palette.json index d98d6042f5163..981ad62d7f47b 100644 --- a/data/json/mapgen_palettes/steel_mill_palette.json +++ b/data/json/mapgen_palettes/steel_mill_palette.json @@ -24,10 +24,6 @@ ">": "t_stairs_down", "/": "t_ladder_up", "I": "t_ladder_down", - "c": "t_console_broken", - "m": "t_machinery_light", - "M": "t_machinery_heavy", - "E": "t_machinery_electronic", "8": "t_bulk_tank", "^": "t_railroad_rubble", "X": "t_railroad_track", @@ -43,13 +39,17 @@ ";": "t_gates_control_concrete", "a": "t_open_air_rooved", "r": "t_metal_flat_roof", - "g": "t_generator_broken", "G": "t_grate", "2": "t_sai_box", "5": "t_switchgear_l", "`": "t_thconc_y" }, "furniture": { + "c": "f_console_broken", + "m": "f_machinery_light", + "M": "f_machinery_heavy", + "E": "f_machinery_electronic", + "g": "f_generator_broken", "h": "f_chair", "T": "f_table", "A": "f_air_conditioner", diff --git a/data/json/npcs/tacoma_ranch/mission_mapgen_tacoma_commune.json b/data/json/npcs/tacoma_ranch/mission_mapgen_tacoma_commune.json index ebe45aa9e9f71..abc144cef0d05 100644 --- a/data/json/npcs/tacoma_ranch/mission_mapgen_tacoma_commune.json +++ b/data/json/npcs/tacoma_ranch/mission_mapgen_tacoma_commune.json @@ -815,15 +815,8 @@ "W.......rW ", "WWW....WWW " ], - "terrain": { - "r": "t_dirtfloor", - "W": "t_wall_log", - ".": "t_dirtfloor", - "c": "t_conveyor", - "m": "t_machinery_old", - "M": "t_machinery_heavy" - }, - "furniture": { "r": "f_rack" }, + "terrain": { "r": "t_dirtfloor", "W": "t_wall_log", ".": "t_dirtfloor", "m": "t_dirtfloor", "M": "t_dirtfloor", "c": "t_conveyor" }, + "furniture": { "m": "f_machinery_old", "M": "f_machinery_heavy", "r": "f_rack" }, "place_item": [ { "item": "log", "x": 3, "y": 0 }, { "item": "log", "x": 3, "y": 1 }, diff --git a/data/json/obsolete.json b/data/json/obsolete.json index e9ca0030eb1e4..411006155d94f 100644 --- a/data/json/obsolete.json +++ b/data/json/obsolete.json @@ -1231,5 +1231,429 @@ "install": { "skills": [ [ "mechanics", 5 ], [ "electronics", 5 ] ] }, "removal": { "skills": [ [ "mechanics", 3 ] ] } } + }, + { + "type": "terrain", + "id": "t_gas_tank", + "name": "fuel tank", + "description": "A tank filled with gasoline.", + "looks_like": "f_gas_tank", + "symbol": "Q", + "color": "brown_red", + "move_cost": 0, + "coverage": 50 + }, + { + "type": "terrain", + "id": "t_gas_tank_smashed", + "name": "broken fuel tank", + "description": "A broken tank which was filled with gasoline.", + "looks_like": "f_gas_tank_smashed", + "symbol": "Q", + "color": "light_red", + "move_cost": 0, + "coverage": 50 + }, + { + "type": "terrain", + "id": "t_diesel_tank", + "name": "fuel tank", + "description": "A tank filled with diesel.", + "looks_like": "f_diesel_tank", + "symbol": "Q", + "color": "brown_red", + "move_cost": 0, + "coverage": 50 + }, + { + "type": "terrain", + "id": "t_diesel_tank_smashed", + "name": "broken diesel tank", + "description": "A broken tank which was filled with diesel.", + "looks_like": "f_diesel_tank_smashed", + "symbol": "Q", + "color": "light_red", + "move_cost": 0, + "coverage": 50 + }, + { + "type": "terrain", + "id": "t_centrifuge", + "name": "centrifuge", + "description": "This is a centrifuge, a liquid separating device with an automated analyzer unit. It could be used to analyze a medical fluid sample, such as blood, if a test tube was placed in it.", + "symbol": "{", + "color": "magenta", + "move_cost": 0, + "coverage": 30, + "flags": [ "TRANSPARENT", "PERMEABLE" ], + "bash": { + "str_min": 3, + "str_max": 45, + "sound": "crunch!", + "sound_fail": "whack!", + "ter_set": "t_rock_floor", + "items": [ + { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 }, + { "item": "circuit", "count": [ 1, 6 ], "prob": 50 }, + { "item": "scrap", "count": [ 2, 5 ] }, + { "item": "steel_chunk", "count": [ 0, 3 ] }, + { "item": "sheet_metal", "count": [ 1, 3 ] }, + { "item": "cable", "charges": [ 1, 15 ] } + ] + } + }, + { + "type": "terrain", + "id": "t_plut_generator", + "name": "plutonium generator", + "description": "This imposing apparatus harnesses the power of the atom. Refined nuclear fuel is 'burned' to provide nearly limitless electrical power. It's not doing much good here though. Perhaps it could be salvaged for other purposes.", + "symbol": "0", + "color": "light_green", + "looks_like": "f_machinery_electronic", + "move_cost": 0, + "flags": [ "TRANSPARENT", "NOITEM", "SEALED", "REDUCE_SCENT", "PERMEABLE" ], + "bash": { + "str_min": 50, + "str_max": 400, + "explosive": 25, + "ter_set": "t_concrete", + "sound": "metal screeching!", + "sound_fail": "clang!", + "items": [ + { "item": "scrap", "count": [ 4, 16 ] }, + { "item": "steel_chunk", "count": [ 1, 6 ] }, + { "item": "plutonium", "charges": [ 0, 3 ] }, + { "item": "lead", "charges": [ 12, 18 ] } + ] + }, + "deconstruct": { + "ter_set": "t_concrete", + "items": [ + { "item": "RAM", "count": [ 4, 8 ] }, + { "item": "cable", "charges": [ 8, 16 ] }, + { "item": "small_lcd_screen", "count": [ 2, 4 ] }, + { "item": "large_lcd_screen", "count": 1 }, + { "item": "e_scrap", "count": [ 12, 24 ] }, + { "item": "circuit", "count": [ 6, 10 ] }, + { "item": "power_supply", "count": [ 4, 8 ] }, + { "item": "amplifier", "count": [ 3, 6 ] }, + { "item": "plutonium", "charges": [ 2, 8 ] }, + { "item": "scrap", "count": [ 8, 16 ] } + ] + } + }, + { + "type": "terrain", + "id": "t_machinery_light", + "name": "light machinery", + "description": "Assorted light machinery. You could scavenge it for parts.", + "symbol": "$", + "color": "dark_gray", + "move_cost": 10, + "coverage": 65, + "flags": [ "TRANSPARENT", "BASHABLE", "CONTAINER", "FLAMMABLE", "PLACE_ITEM" ], + "deconstruct": { + "ter_set": "t_rock_floor", + "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.", + "ter_set": "t_rock_floor", + "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": "terrain", + "id": "t_machinery_heavy", + "name": "heavy machinery", + "description": "Assorted heavy machinery. You could scavenge it for parts.", + "symbol": "%", + "color": "light_gray", + "move_cost": 0, + "coverage": 75, + "flags": [ "BASHABLE", "CONTAINER", "SEALED", "PLACE_ITEM" ], + "deconstruct": { + "ter_set": "t_rock_floor", + "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.", + "ter_set": "t_rock_floor", + "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": "terrain", + "id": "t_machinery_old", + "name": "old machinery", + "description": "Assorted old machinery. You could scavenge it for parts.", + "symbol": "&", + "color": "brown", + "move_cost": 4, + "coverage": 55, + "flags": [ "TRANSPARENT", "BASHABLE", "CONTAINER", "FLAMMABLE", "PLACE_ITEM" ], + "deconstruct": { + "ter_set": "t_rock_floor", + "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.", + "ter_set": "t_rock_floor", + "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": "terrain", + "id": "t_machinery_electronic", + "name": "electronic machinery", + "description": "Assorted electronic machinery. You could scavenge it for parts.", + "symbol": "$", + "color": "yellow", + "move_cost": 8, + "coverage": 55, + "flags": [ "TRANSPARENT", "BASHABLE", "CONTAINER", "SEALED", "FLAMMABLE", "PLACE_ITEM" ], + "deconstruct": { + "ter_set": "t_rock_floor", + "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.", + "ter_set": "t_rock_floor", + "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": "terrain", + "id": "t_console_broken", + "name": "broken console", + "description": "This is a standalone computer terminal. It doesn't seem to be working. It's the broken screen and shattered circuit boards that's telling you that.", + "symbol": "6", + "color": "light_gray", + "move_cost": 0, + "coverage": 50, + "roof": "t_flat_roof", + "flags": [ "TRANSPARENT", "NOITEM", "INDOORS", "SHORT", "PERMEABLE" ], + "deconstruct": { + "ter_set": "t_floor", + "items": [ + { "item": "processor", "count": [ 1, 2 ] }, + { "item": "RAM", "count": [ 4, 8 ] }, + { "item": "cable", "charges": [ 4, 6 ] }, + { "item": "large_lcd_screen", "count": 1 }, + { "item": "e_scrap", "count": [ 10, 16 ] }, + { "item": "circuit", "count": [ 6, 10 ] }, + { "item": "power_supply", "count": [ 2, 4 ] }, + { "item": "amplifier", "count": [ 2, 4 ] }, + { "item": "plastic_chunk", "count": [ 10, 12 ] }, + { "item": "scrap", "count": [ 6, 8 ] } + ] + }, + "bash": { + "str_min": 16, + "str_max": 150, + "sound": "crunch!", + "sound_fail": "whack!", + "ter_set": "t_floor", + "items": [ + { "item": "processor", "prob": 25 }, + { "item": "RAM", "count": [ 0, 2 ], "prob": 50 }, + { "item": "cable", "charges": [ 1, 2 ], "prob": 50 }, + { "item": "large_lcd_screen", "prob": 25 }, + { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 }, + { "item": "circuit", "count": [ 0, 2 ], "prob": 50 }, + { "item": "power_supply", "prob": 25 }, + { "item": "amplifier", "prob": 25 }, + { "item": "plastic_chunk", "count": [ 4, 10 ], "prob": 50 }, + { "item": "scrap", "count": [ 2, 6 ], "prob": 50 } + ] + } + }, + { + "type": "terrain", + "id": "t_console", + "name": "computer console", + "description": "This is a standalone computer terminal. It can be used to view contents and perform any allowed functions. It might even be possible to hack it, given the skills.", + "symbol": "6", + "color": "blue", + "move_cost": 0, + "coverage": 50, + "light_emitted": 10, + "roof": "t_flat_roof", + "flags": [ "TRANSPARENT", "CONSOLE", "NOITEM", "INDOORS", "SHORT", "PERMEABLE" ], + "deconstruct": { + "ter_set": "t_floor", + "items": [ + { "item": "processor", "count": [ 1, 2 ] }, + { "item": "RAM", "count": [ 4, 8 ] }, + { "item": "cable", "charges": [ 4, 6 ] }, + { "item": "large_lcd_screen", "count": 1 }, + { "item": "e_scrap", "count": [ 10, 16 ] }, + { "item": "circuit", "count": [ 6, 10 ] }, + { "item": "power_supply", "count": [ 2, 4 ] }, + { "item": "amplifier", "count": [ 2, 4 ] }, + { "item": "plastic_chunk", "count": [ 10, 12 ] }, + { "item": "scrap", "count": [ 6, 8 ] } + ] + }, + "bash": { + "str_min": 8, + "str_max": 150, + "sound": "crunch!", + "sound_fail": "whack!", + "ter_set": "t_console_broken", + "items": [ + { "item": "processor", "prob": 25 }, + { "item": "RAM", "count": [ 0, 2 ], "prob": 50 }, + { "item": "cable", "charges": [ 1, 2 ], "prob": 50 }, + { "item": "large_lcd_screen", "prob": 25 }, + { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 }, + { "item": "circuit", "count": [ 0, 2 ], "prob": 50 }, + { "item": "power_supply", "prob": 25 }, + { "item": "amplifier", "prob": 25 }, + { "item": "plastic_chunk", "count": [ 4, 10 ], "prob": 50 }, + { "item": "scrap", "count": [ 2, 6 ], "prob": 50 } + ] + } + }, + { + "type": "terrain", + "id": "t_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": 0, + "coverage": 30, + "flags": [ "TRANSPARENT", "NOITEM", "REDUCE_SCENT", "MOUNTABLE", "PERMEABLE" ], + "bash": { + "str_min": 20, + "str_max": 150, + "sound": "metal screeching!", + "sound_fail": "clang!", + "ter_set": "t_pavement", + "items": [ + { "item": "steel_lump", "prob": 50 }, + { "item": "steel_chunk", "count": [ 1, 4 ] }, + { "item": "scrap", "count": [ 3, 7 ] } + ] + } } ] diff --git a/data/json/test_regions.json b/data/json/test_regions.json index 095d3ed601b9f..6d606d5fdea3e 100644 --- a/data/json/test_regions.json +++ b/data/json/test_regions.json @@ -200,8 +200,6 @@ ",": "t_pavement_y", "_": "t_pavement", "r": "t_floor", - "6": "t_console", - "x": "t_console_broken", "^": "t_floor", ".": "t_floor", "-": "t_wall", @@ -221,6 +219,8 @@ "s": "t_sidewalk" }, "furniture": { + "6": "f_console", + "x": "f_console_broken", "d": "f_dumpster", "O": "f_oven", "r": "f_rack", diff --git a/src/computer_session.cpp b/src/computer_session.cpp index 0dca438e6a174..f321ba0137246 100644 --- a/src/computer_session.cpp +++ b/src/computer_session.cpp @@ -1276,7 +1276,7 @@ void computer_session::failure_shutdown() map &here = get_map(); for( const tripoint &p : here.points_in_radius( get_player_character().pos(), 1 ) ) { if( here.has_flag( flag_CONSOLE, p ) ) { - here.ter_set( p, t_console_broken ); + here.furn_set( p, furn_str_id( "f_console_broken" ) ); add_msg( m_bad, _( "The console shuts down." ) ); found_tile = true; } @@ -1286,7 +1286,7 @@ void computer_session::failure_shutdown() } for( const tripoint &p : here.points_on_zlevel() ) { if( here.has_flag( flag_CONSOLE, p ) ) { - here.ter_set( p, t_console_broken ); + here.furn_set( p, furn_str_id( "f_console_broken" ) ); add_msg( m_bad, _( "The console shuts down." ) ); } } diff --git a/src/construction.cpp b/src/construction.cpp index 4f435bbc91e6c..708a5b0a69e7a 100644 --- a/src/construction.cpp +++ b/src/construction.cpp @@ -1249,6 +1249,21 @@ void construct::done_deconstruct( const tripoint &p ) add_msg( m_info, _( "That %s can not be disassembled!" ), f.name() ); return; } + if( f.id.id() == furn_str_id( "f_console_broken" ) ) { + if( g->u.get_skill_level( skill_electronics ) >= 1 ) { + g->u.practice( skill_electronics, 20, 4 ); + } + } + if( f.id.id() == furn_str_id( "f_console" ) ) { + if( g->u.get_skill_level( skill_electronics ) >= 1 ) { + g->u.practice( skill_electronics, 40, 8 ); + } + } + if( f.id.id() == furn_str_id( "f_machinery_electronic" ) ) { + if( g->u.get_skill_level( skill_electronics ) >= 1 ) { + g->u.practice( skill_electronics, 40, 8 ); + } + } if( f.deconstruct.furn_set.str().empty() ) { here.furn_set( p, f_null ); } else { diff --git a/src/explosion.cpp b/src/explosion.cpp index 2b0a6891a0188..4b5499d0caa09 100644 --- a/src/explosion.cpp +++ b/src/explosion.cpp @@ -657,7 +657,7 @@ void emp_blast( const tripoint &p ) if( sight ) { add_msg( _( "The %s is rendered non-functional!" ), here.tername( p2 ) ); } - here.ter_set( p2, t_console_broken ); + here.furn_set( p2, furn_str_id( "f_machinery_electronic" ) ); return; } // TODO: More terrain effects. diff --git a/src/iexamine.cpp b/src/iexamine.cpp index 667b4ff8d0a16..a6efac7f6eb92 100644 --- a/src/iexamine.cpp +++ b/src/iexamine.cpp @@ -4032,14 +4032,14 @@ cata::optional iexamine::getNearFilledGasTank( const tripoint ¢er, map &here = get_map(); for( const tripoint &tmp : here.points_in_radius( center, SEEX * 2 ) ) { - auto checkingTerr = here.ter( tmp ); + auto check_for_fuel_tank = here.furn( tmp ); if( fuel_type == "gasoline" ) { - if( checkingTerr != ter_str_id( "t_gas_tank" ) ) { + if( check_for_fuel_tank != furn_str_id( "f_gas_tank" ) ) { continue; } } else if( fuel_type == "diesel" ) { - if( checkingTerr != ter_str_id( "t_diesel_tank" ) ) { + if( check_for_fuel_tank != furn_str_id( "f_diesel_tank" ) ) { continue; } } diff --git a/src/mapgen.cpp b/src/mapgen.cpp index d9b6ace630091..1ce7a6db69db8 100644 --- a/src/mapgen.cpp +++ b/src/mapgen.cpp @@ -1559,8 +1559,7 @@ class jmapgen_computer : public jmapgen_piece } void apply( mapgendata &dat, const jmapgen_int &x, const jmapgen_int &y ) const override { const point r( x.get(), y.get() ); - dat.m.ter_set( r, t_console ); - dat.m.furn_set( r, f_null ); + dat.m.furn_set( r, furn_str_id( "f_console" ) ); computer *cpu = dat.m.add_computer( tripoint( r, dat.m.get_abs_sub().z ), name.translated(), security ); for( const auto &opt : options ) { @@ -4373,7 +4372,7 @@ void map::draw_lab( mapgendata &dat ) line( this, t_reinforced_glass, point( SEEX - 2, SEEY - 1 ), point( SEEX - 2, SEEY ) ); line( this, t_reinforced_glass, point( SEEX + 1, SEEY - 1 ), point( SEEX + 1, SEEY ) ); spawn_item( point( SEEX - 4, SEEY - 3 ), "id_science" ); - ter_set( point( SEEX - 3, SEEY - 3 ), t_console ); + furn_set( point( SEEX - 3, SEEY - 3 ), furn_str_id( "f_console" ) ); tmpcomp = add_computer( tripoint( SEEX - 3, SEEY - 3, abs_sub.z ), _( "Bionic access" ), 3 ); tmpcomp->add_option( _( "Manifest" ), COMPACT_LIST_BIONICS, 0 ); @@ -5136,7 +5135,7 @@ void map::draw_mine( mapgendata &dat ) break; } - ter_set( point( SEEX, SEEY ), t_console ); + furn_set( point( SEEX, SEEY ), furn_str_id( "f_console" ) ); tmpcomp = add_computer( tripoint( SEEX, SEEY, abs_sub.z ), _( "NEPowerOS" ), 0 ); tmpcomp->add_option( _( "Read Logs" ), COMPACT_AMIGARA_LOG, 0 ); tmpcomp->add_option( _( "Initiate Tremors" ), COMPACT_AMIGARA_START, 4 ); @@ -5988,7 +5987,7 @@ std::unique_ptr map::add_vehicle_to_map( computer *map::add_computer( const tripoint &p, const std::string &name, int security ) { // TODO: Turn this off? - ter_set( p, t_console ); + furn_set( p, furn_str_id( "f_console" ) ); point l; submap *const place_on_submap = get_submap_at( p, l ); place_on_submap->set_computer( l, computer( name, security ) ); @@ -6372,7 +6371,7 @@ void science_room( map *m, const point &p1, const point &p2, int z, int rotate ) m->place_items( "bionics_common", 70, point( biox, bioy ), point( biox, bioy ), false, calendar::start_of_cataclysm ); - m->ter_set( point( biox, bioy + 2 ), t_console ); + m->furn_set( point( biox, bioy + 2 ), furn_str_id( "f_console" ) ); computer *tmpcomp = m->add_computer( tripoint( biox, bioy + 2, z ), _( "Bionic access" ), 2 ); tmpcomp->add_option( _( "Manifest" ), COMPACT_LIST_BIONICS, 0 ); tmpcomp->add_option( _( "Open Chambers" ), COMPACT_RELEASE_BIONICS, 3 ); @@ -6391,7 +6390,7 @@ void science_room( map *m, const point &p1, const point &p2, int z, int rotate ) m->place_items( "bionics_common", 70, point( biox, bioy ), point( biox, bioy ), false, calendar::start_of_cataclysm ); - m->ter_set( point( biox, bioy - 2 ), t_console ); + m->furn_set( point( biox, bioy - 2 ), furn_str_id( "f_console" ) ); computer *tmpcomp2 = m->add_computer( tripoint( biox, bioy - 2, z ), _( "Bionic access" ), 2 ); tmpcomp2->add_option( _( "Manifest" ), COMPACT_LIST_BIONICS, 0 ); tmpcomp2->add_option( _( "Open Chambers" ), COMPACT_RELEASE_BIONICS, 3 ); @@ -6411,7 +6410,7 @@ void science_room( map *m, const point &p1, const point &p2, int z, int rotate ) m->place_items( "bionics_common", 70, point( biox, bioy ), point( biox, bioy ), false, calendar::start_of_cataclysm ); - m->ter_set( point( biox + 2, bioy ), t_console ); + m->furn_set( point( biox + 2, bioy ), furn_str_id( "f_console" ) ); computer *tmpcomp = m->add_computer( tripoint( biox + 2, bioy, z ), _( "Bionic access" ), 2 ); tmpcomp->add_option( _( "Manifest" ), COMPACT_LIST_BIONICS, 0 ); tmpcomp->add_option( _( "Open Chambers" ), COMPACT_RELEASE_BIONICS, 3 ); @@ -6429,7 +6428,7 @@ void science_room( map *m, const point &p1, const point &p2, int z, int rotate ) mapf::furn_bind( "c", f_counter ) ); m->place_items( "bionics_common", 70, point( biox, bioy ), point( biox, bioy ), false, 0 ); - m->ter_set( point( biox - 2, bioy ), t_console ); + m->furn_set( point( biox - 2, bioy ), furn_str_id( "f_console" ) ); computer *tmpcomp2 = m->add_computer( tripoint( biox - 2, bioy, z ), _( "Bionic access" ), 2 ); tmpcomp2->add_option( _( "Manifest" ), COMPACT_LIST_BIONICS, 0 ); tmpcomp2->add_option( _( "Open Chambers" ), COMPACT_RELEASE_BIONICS, 3 ); @@ -6577,7 +6576,7 @@ void build_mine_room( room_type type, const point &p1, const point &p2, mapgenda // Main build switch! switch( type ) { case room_mine_shaft: { - m->ter_set( p1 + point_south_east, t_console ); + m->furn_set( p1 + point_south_east, furn_str_id( "f_console" ) ); line( m, t_wall, point( p2.x - 2, p1.y + 2 ), point( p2.x - 1, p1.y + 2 ) ); m->ter_set( point( p2.x - 2, p1.y + 1 ), t_elevator ); m->ter_set( point( p2.x - 1, p1.y + 1 ), t_elevator_control_off ); diff --git a/src/submap.cpp b/src/submap.cpp index f01fda2f6a081..bffdd1c0d00e3 100644 --- a/src/submap.cpp +++ b/src/submap.cpp @@ -160,7 +160,7 @@ void submap::update_legacy_computer() if( legacy_computer ) { for( int x = 0; x < SEEX; ++x ) { for( int y = 0; y < SEEY; ++y ) { - if( ter[x][y] == t_console ) { + if( frn[x][y] == furn_str_id( "f_console" ) ) { computers.emplace( point( x, y ), *legacy_computer ); } } @@ -171,7 +171,8 @@ void submap::update_legacy_computer() bool submap::has_computer( const point &p ) const { - return computers.find( p ) != computers.end() || ( legacy_computer && ter[p.x][p.y] == t_console ); + return computers.find( p ) != computers.end() || ( legacy_computer && frn[p.x][p.y] + == furn_str_id( "f_console" ) ); } const computer *submap::get_computer( const point &p ) const @@ -182,7 +183,7 @@ const computer *submap::get_computer( const point &p ) const if( it != computers.end() ) { return &it->second; } - if( legacy_computer && ter[p.x][p.y] == t_console ) { + if( legacy_computer && frn[p.x][p.y] == furn_str_id( "f_console" ) ) { return legacy_computer.get(); } return nullptr; @@ -192,7 +193,7 @@ computer *submap::get_computer( const point &p ) { // need to update to std::map first so modifications to the returned object // only affects the exact point p - update_legacy_computer(); + //update_legacy_computer(); const auto it = computers.find( p ); if( it != computers.end() ) { return &it->second; @@ -202,7 +203,7 @@ computer *submap::get_computer( const point &p ) void submap::set_computer( const point &p, const computer &c ) { - update_legacy_computer(); + //update_legacy_computer(); const auto it = computers.find( p ); if( it != computers.end() ) { it->second = c;