From a11dba2ef29781fbaf570eefabb0398e71bb31cc Mon Sep 17 00:00:00 2001 From: Antti Riikonen Date: Sun, 1 Sep 2024 14:01:07 +0300 Subject: [PATCH] Add indoor flagpole and use it for Hub01 American flags --- .../furniture-decorative.json | 20 +++++++++++++++++++ data/json/mapgen/robofachq_static.json | 12 +++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/data/json/furniture_and_terrain/furniture-decorative.json b/data/json/furniture_and_terrain/furniture-decorative.json index 4bf93d0465279..458ce0a4291e8 100644 --- a/data/json/furniture_and_terrain/furniture-decorative.json +++ b/data/json/furniture_and_terrain/furniture-decorative.json @@ -334,5 +334,25 @@ "sound_vol": 16, "items": [ { "item": "glass_shard", "count": [ 25, 50 ] }, { "item": "splinter", "count": [ 5, 15 ] } ] } + }, + { + "type": "furniture", + "id": "f_indoor_flagpole", + "name": "indoor flagpole", + "description": "A 2.5-meter tall flagpole on a weighted stand. You could hoist up a flag here.", + "symbol": "F", + "color": "light_gray", + "move_cost_mod": 2, + "coverage": 20, + "required_str": 1, + "flags": [ "TRANSPARENT", "PLACE_ITEM" ], + "max_volume": "2 L", + "bash": { + "str_min": 10, + "str_max": 30, + "sound": "crunch!", + "sound_fail": "whack!", + "items": [ { "item": "material_aluminium_ingot", "count": [ 4, 8 ] }, { "item": "scrap", "count": [ 2, 6 ] } ] + } } ] diff --git a/data/json/mapgen/robofachq_static.json b/data/json/mapgen/robofachq_static.json index b7c8375036796..95db0ff859c73 100644 --- a/data/json/mapgen/robofachq_static.json +++ b/data/json/mapgen/robofachq_static.json @@ -380,7 +380,7 @@ "M": "t_ramp_up_high", "m": "t_ramp_up_low" }, - "furniture": { "6": "f_console", ":": "f_server", "f": "f_filing_cabinet" }, + "furniture": { "6": "f_console", ":": "f_server", "f": "f_filing_cabinet", "A": "f_indoor_flagpole" }, "item": { "A": { "item": "american_flag" } }, "items": { "f": { "item": "file_room", "chance": 100, "repeat": [ 10, 30 ] } }, "monster": { "T": { "monster": "mon_robofac_laserturret_mk1" } }, @@ -459,7 +459,15 @@ "R": "t_railing", "W": "t_water_dispenser" }, - "furniture": { "6": "f_console", ":": "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", + "A": "f_indoor_flagpole" + }, "item": { "A": { "item": "american_flag" } }, "items": { "F": { "item": "fridge", "chance": 80 },