diff --git a/data/json/furniture_and_terrain/terrain-walls.json b/data/json/furniture_and_terrain/terrain-walls.json index 511809df1cc9d..b4e36cabf4cc9 100644 --- a/data/json/furniture_and_terrain/terrain-walls.json +++ b/data/json/furniture_and_terrain/terrain-walls.json @@ -1352,6 +1352,26 @@ "items": [ { "item": "rock", "count": [ 10, 22 ] } ] } }, + { + "type": "terrain", + "id": "t_bollard", + "name": "bollard", + "looks_like": "t_fence_post", + "description": "A set of concrete and steel bollards designed to harden areas against vehicle ram attacks. It requires a few more steps to walk in between the bollards sticking up out of the ground.", + "symbol": "1", + "color": "light_gray", + "move_cost": 6, + "coverage": 20, + "flags": [ "WALL", "PERMEABLE" ], + "bash": { + "str_min": 350, + "str_max": 650, + "sound": "crash!", + "sound_fail": "whump!", + "ter_set": "t_sidewalk", + "items": [ { "item": "rock", "count": [ 6, 13 ] }, { "item": "steel_chunk", "count": [ 1, 3 ] } ] + } + }, { "type": "terrain", "id": "t_support_l", diff --git a/data/json/mapgen/sub_station.json b/data/json/mapgen/sub_station.json index 200c1be0667f0..8e345e70aa6ba 100644 --- a/data/json/mapgen/sub_station.json +++ b/data/json/mapgen/sub_station.json @@ -8,7 +8,7 @@ "fill_ter": "t_thconc_floor", "rows": [ "SSSSSSSSSSSSSSSSSSSSSSSS", - "SSSSSSSSSSSSSSSSSSSSSSSS", + "SSSttttttttttttttttttSSS", "SS||-;;-||-;;-||-;;-||SS", "SS| | | |SS", "SS| |SS", diff --git a/data/json/mapgen_palettes/subway.json b/data/json/mapgen_palettes/subway.json index 1502b7ebaad56..7c7ec2270d7f6 100644 --- a/data/json/mapgen_palettes/subway.json +++ b/data/json/mapgen_palettes/subway.json @@ -8,6 +8,7 @@ "-": "t_wall_glass", ";": "t_door_glass_c", "S": "t_sidewalk", + "t": "t_bollard", "*": "t_region_shrub_decorative", ">": "t_stairs_down", "<": "t_stairs_up", diff --git a/data/mods/Magiclysm/worldgen/forge_of_wonders.json b/data/mods/Magiclysm/worldgen/forge_of_wonders.json index e5681b712e32c..cf7833a7587e7 100644 --- a/data/mods/Magiclysm/worldgen/forge_of_wonders.json +++ b/data/mods/Magiclysm/worldgen/forge_of_wonders.json @@ -23,25 +23,25 @@ "rows": [ " T 2 ++++++ 2 ", " T +++++++ Y ", - " Y ++++++++ T ", + " Y 55555555 T ", " +++++++ ", " ########||||#########################||&&&&&&&||###############||||##############||||############### ", " #..................................##...........##............................4............4.......# ", - " #..4.@.@...........................##...........##..................XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.# ", - " #...fffff.................2........##...........##..................X$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.# ", - " #...fffff..........................##...........##..................#$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.# ", - " #....@.@.........................................................XXX#$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.| ", - " #........................................44......................X94#$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.| ", - " #............4...........................44......................X89#$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.| ", - " #................................................................X94#$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.| ", - " #...........@.@..................................................XXX#$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.| ", - " #.........zZZZZZ....................................................#$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.# ", + " #..4.@.@...........................##...........##............5.....XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.# ", + " #...fffff.................2........##...........##.............5....X$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.# ", + " #...fffff..........................##...........##............5.....#$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.# ", + " #....@.@.......................................................5.XXX#$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.| ", + " #........................................44...................5..X94#$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.| ", + " #............4...........................44....................5.X89#$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.| ", + " #.............................................................5..X94#$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.| ", + " #...........@.@................................................5.XXX#$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.| ", + " #.........zZZZZZ..............................................5.....#$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.# ", " #..........ZZZZZz...................................##...........##.X$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.# ", " |...........@.@............4...................2....##...........##.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.# ", " |...................................................##...........##.....4...............4..........# ", " |...................................#####|||##########||&&&&&&&||##################|||############## ", " |...................................# +++++++ ", - " |...................................# ++++++++ 2 ", + " |...................................# 55555555 2 ", " #...................................# 2 +++++++ ", " #.......................4...........# ++++++++ 2 ", " #...................................# ++++++++ Y ", @@ -113,7 +113,8 @@ "9": "t_vault_vent", "2": "t_strconc_floor", "4": "t_thconc_floor_echandelier", - "+": "t_railroad_rubble" + "+": "t_railroad_rubble", + "5": "t_bollard" }, "furniture": { "h": "f_demon_forge",