From bd409a5576fe9ff262d1e08e1d775ab6af4b7671 Mon Sep 17 00:00:00 2001 From: RoyalFox <112293514+RoyalFox2140@users.noreply.github.com> Date: Thu, 8 Aug 2024 18:40:48 -0400 Subject: [PATCH] feat(balance): Easier ways to remove mi-go gas emitters (#5166) * initial construction and group plus new furniture * style(autofix.ci): automated formatting * Update data/json/furniture_and_terrain/furniture-terrains.json --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Chaosvolt --- data/json/construction.json | 28 +++++++++++++++++++ data/json/construction_group.json | 5 ++++ .../furniture_and_terrain/furniture-migo.json | 16 +++++------ .../furniture-terrains.json | 23 +++++++++++++++ 4 files changed, 64 insertions(+), 8 deletions(-) diff --git a/data/json/construction.json b/data/json/construction.json index ffa449f46451..07d62a61f0c5 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -5133,5 +5133,33 @@ "pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.", "pre_special": "check_empty", "post_furniture": "f_3d_printer_advanced" + }, + { + "type": "construction", + "id": "constr_concrete_lump", + "group": "build_concrete_lump", + "//": "Pours concrete over a scarred lump, its faster because we're not doing this smoothly.", + "category": "CONSTRUCT", + "required_skills": [ [ "fabrication", 3 ] ], + "time": "40 m", + "tools": [ [ [ "con_mix", 50 ] ] ], + "qualities": [ [ { "id": "SMOOTH", "level": 1 } ] ], + "components": [ [ [ "concrete", 2 ] ], [ [ "water", 2 ] ] ], + "pre_furniture": "f_alien_scar", + "post_furniture": "f_concrete_lump" + }, + { + "type": "construction", + "id": "constr_concrete_seeping", + "group": "build_concrete_lump", + "//": "Pours concrete over a seeping scar, its faster because we're not doing this smoothly.", + "category": "CONSTRUCT", + "required_skills": [ [ "fabrication", 3 ] ], + "time": "40 m", + "tools": [ [ [ "con_mix", 50 ] ] ], + "qualities": [ [ { "id": "SMOOTH", "level": 1 } ] ], + "components": [ [ [ "concrete", 2 ] ], [ [ "water", 2 ] ] ], + "pre_furniture": "f_alien_scar_small", + "post_furniture": "f_concrete_lump" } ] diff --git a/data/json/construction_group.json b/data/json/construction_group.json index 4de8625e89b1..6d0ec8c9a2af 100644 --- a/data/json/construction_group.json +++ b/data/json/construction_group.json @@ -1493,5 +1493,10 @@ "type": "construction_group", "id": "wax_floor", "name": "Wax Floor" + }, + { + "type": "construction_group", + "id": "build_concrete_lump", + "name": "Remove Mi-Go gas emitter" } ] diff --git a/data/json/furniture_and_terrain/furniture-migo.json b/data/json/furniture_and_terrain/furniture-migo.json index f000490a00af..1d2622a518c9 100644 --- a/data/json/furniture_and_terrain/furniture-migo.json +++ b/data/json/furniture_and_terrain/furniture-migo.json @@ -76,7 +76,7 @@ "move_cost_mod": 4, "coverage": 20, "required_str": -1, - "flags": [ "TRANSPARENT", "EMITTER" ], + "flags": [ "TRANSPARENT", "EMITTER", "MINEABLE" ], "emissions": [ "emit_glimmer", "emit_shock_burst" ], "//": "TODO: Make a custom toxic gas emission that is not visible to the player", "bash": { "str_min": 30, "str_max": 60, "sound": "splorch!", "sound_fail": "whump!", "furn_set": "f_alien_scar_small" } @@ -91,17 +91,17 @@ "move_cost_mod": 6, "coverage": 40, "required_str": -1, - "flags": [ "TRANSPARENT", "EMITTER" ], + "flags": [ "TRANSPARENT", "EMITTER", "MINEABLE" ], "emissions": [ "emit_hot_air_migo_seep", "emit_shock_burst" ], "//": "TODO: Make a custom toxic gas emission that is not visible to the player", "bash": { - "str_min": 250, - "str_max": 600, + "str_min": 50, + "str_max": 120, "sound": "splorch!", "sound_fail": "splat!", "items": [ { "item": "fetid_goop", "count": [ 6, 13 ], "prob": 100 } ], "//": "reduction matches that of weakest furniture that turns into this when destroyed", - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 600, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 120, "block_unaimed_chance": "25%" } } }, { @@ -115,11 +115,11 @@ "move_cost_mod": 4, "coverage": 20, "required_str": -1, - "flags": [ "TRANSPARENT", "EMITTER" ], + "flags": [ "TRANSPARENT", "EMITTER", "MINEABLE" ], "emissions": [ "emit_migo_atmosphere_seep", "emit_shock_burst" ], "bash": { "str_min": 50, - "str_max": 120, + "str_max": 80, "sound": "splorch!", "sound_fail": "splat!", "items": [ { "item": "fetid_goop", "count": [ 2, 6 ], "prob": 100 } ] @@ -201,7 +201,7 @@ "coverage": 40, "required_str": -1, "light_emitted": 12, - "flags": [ "TRANSPARENT" ], + "flags": [ "TRANSPARENT", "MINEABLE" ], "bash": { "str_min": 45, "str_max": 60, diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json index e5e6b5efe439..123c72e36dd9 100644 --- a/data/json/furniture_and_terrain/furniture-terrains.json +++ b/data/json/furniture_and_terrain/furniture-terrains.json @@ -958,5 +958,28 @@ ], "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } + }, + { + "type": "furniture", + "id": "f_concrete_lump", + "looks_like": "f_boulder_medium", + "name": "concrete lump", + "description": "The result of you pouring concrete over mi-go gas emitters. It's stuck to the floor. It can be used as a primitive anvil.", + "symbol": "0", + "color": "dark_gray", + "move_cost_mod": 6, + "coverage": 60, + "required_str": -1, + "crafting_pseudo_item": "boulder_anvil", + "flags": [ "NOITEM", "TRANSPARENT", "MINEABLE", "UNSTABLE", "MOUNTABLE", "SHORT", "BASHABLE" ], + "bash": { + "str_min": 32, + "str_max": 80, + "sound": "smash!", + "sound_fail": "thump.", + "items": [ { "item": "rock", "count": [ 35, 50 ] } ], + "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", + "ranged": { "reduction": [ 32, 64 ], "destroy_threshold": 64, "block_unaimed_chance": "50%" } + } } ]