From ef80b88b56011e57485ef52d23181cb7f9d3ef0f Mon Sep 17 00:00:00 2001 From: Procyonae <45432782+Procyonae@users.noreply.github.com> Date: Fri, 23 Feb 2024 04:28:35 +0000 Subject: [PATCH] Blend z0 triffid grove and fix terrains "roof": (#71894) * Blend+Fix roofs * Lint * Update triffid_grove.json --- .../furniture_and_terrain/terrain-flora.json | 2 +- .../terrain-triffid.json | 22 +- data/json/mapgen/triffid/triffid_fields.json | 427 +++++++++++++----- data/json/mapgen/triffid/triffid_grove.json | 57 +-- .../mapgen/triffid/triffid_grove_roof.json | 3 +- .../json/mapgen/triffid/triffid_grove_z2.json | 3 +- .../json/mapgen/triffid/triffid_grove_z3.json | 3 +- data/json/mapgen/triffid/triffid_heart.json | 3 +- data/json/mapgen/triffid/triffid_roots.json | 27 +- data/json/mapgen_palettes/triffid.json | 53 +-- .../overmap_terrain_triffid.json | 7 +- data/json/regional_map_settings.json | 10 +- 12 files changed, 418 insertions(+), 199 deletions(-) diff --git a/data/json/furniture_and_terrain/terrain-flora.json b/data/json/furniture_and_terrain/terrain-flora.json index c5f1df2837c6c..e9e6ce98dff52 100644 --- a/data/json/furniture_and_terrain/terrain-flora.json +++ b/data/json/furniture_and_terrain/terrain-flora.json @@ -651,7 +651,7 @@ "color": [ "red_green", "red_green", "red_green", "brown" ], "//": "barren in winter", "move_cost": 4, - "roof": "t_treetop_mega_fern", + "roof": "t_treetop_giant_fern", "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "NOITEM", "YOUNG", "REDUCE_SCENT", "CLIMB_ADJACENT" ], "bash": { "str_min": 4, diff --git a/data/json/furniture_and_terrain/terrain-triffid.json b/data/json/furniture_and_terrain/terrain-triffid.json index e0785333f505d..263092f1304e9 100644 --- a/data/json/furniture_and_terrain/terrain-triffid.json +++ b/data/json/furniture_and_terrain/terrain-triffid.json @@ -82,9 +82,9 @@ "name": "bark", "description": "A solid piece of bark covers the floor here.", "symbol": ".", - "color": "cyan", + "color": "brown", "move_cost": 2, - "roof": "t_barkfloor", + "roof": "t_barkfloor_noroof", "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD" ], "bash": { "sound": "SMASH!", @@ -95,6 +95,24 @@ "items": [ { "item": "splinter", "count": [ 2, 8 ] } ] } }, + { + "type": "terrain", + "id": "t_barkfloor_noroof", + "name": "bark", + "description": "A solid piece of bark covers the floor here.", + "symbol": ".", + "color": "brown", + "move_cost": 2, + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "COLLAPSES", "FLAT", "ROAD" ], + "bash": { + "sound": "SMASH!", + "ter_set": "t_open_air", + "str_min": 50, + "str_max": 400, + "str_min_supported": 100, + "items": [ { "item": "splinter", "count": [ 2, 8 ] } ] + } + }, { "type": "terrain", "id": "t_triffid_leaves", diff --git a/data/json/mapgen/triffid/triffid_fields.json b/data/json/mapgen/triffid/triffid_fields.json index 2120341fa3c74..8a05bc6d546aa 100644 --- a/data/json/mapgen/triffid/triffid_fields.json +++ b/data/json/mapgen/triffid/triffid_fields.json @@ -2,145 +2,352 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "triffid_field" ], - "weight": 100, + "om_terrain": "triffid_field", "object": { - "fill_ter": "t_region_groundcover_urban", + "fallback_predecessor_mapgen": "forest", "rows": [ - " I ", - " ^ I I ", - " I ", - " ? * I * I ", - " X ? ", - " I I * ", - " ^ I ", - " I ", - " * I X ^ * ", - " I ? * I ", - " ^ * I ^ I ", - " * ", - " I * ? ", - " I ", - " * I ", - " ^ X * ", - " I I ", - " * ", - " I ? * ", - " X ", - " * I ", - " X ^ ", - " X ", - " I I " + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "triffid" ], + "nested": { " ": { "chunks": [ "1x1_megafernification", "null" ] } }, + "place_nested": [ + { "chunks": [ "24x24_triffid_field_n" ], "neighbors": { "south": [ "triffid_grove" ] }, "x": 0, "y": 0 }, + { "chunks": [ "24x24_triffid_field_ne" ], "neighbors": { "south_west": [ "triffid_grove" ] }, "x": 0, "y": 0 }, + { "chunks": [ "24x24_triffid_field_e" ], "neighbors": { "west": [ "triffid_grove" ] }, "x": 0, "y": 0 }, + { "chunks": [ "24x24_triffid_field_se" ], "neighbors": { "north_west": [ "triffid_grove" ] }, "x": 0, "y": 0 }, + { "chunks": [ "24x24_triffid_field_s" ], "neighbors": { "north": [ "triffid_grove" ] }, "x": 0, "y": 0 }, + { "chunks": [ "24x24_triffid_field_sw" ], "neighbors": { "north_east": [ "triffid_grove" ] }, "x": 0, "y": 0 }, + { "chunks": [ "24x24_triffid_field_w" ], "neighbors": { "east": [ "triffid_grove" ] }, "x": 0, "y": 0 }, + { "chunks": [ "24x24_triffid_field_nw" ], "neighbors": { "south_east": [ "triffid_grove" ] }, "x": 0, "y": 0 } + ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "24x24_triffid_field_n", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " 0000000000 ", + " 00000000000000000000 ", + "000000000000000000000000", + "000000000000000000000000", + "000000000000000000000000", + "000000000000000000000000", + "000000011111111110000000", + "000111111111111111111000", + "011111111111111111111110", + "111111111111111111111111", + "111111111111111111111111", + "111111111111111111111111", + "111111112222222211111111", + "111122222222222222221111", + "112222222222222222222211", + "222222222222222222222222", + "222222222222222222222222", + "222222222222222222222222", + "222222222222222222222222", + "222222222222222222222222", + "222222222222222222222222", + "222222222222222222222222", + "222222222222222222222222", + "222222222222222222222222" + ], + "palettes": [ "triffid" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "24x24_triffid_field_ne", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + "0 ", + "000 ", + "00000 ", + "0000000 ", + "00000000 ", + "000000000 ", + "00000000000 ", + "110000000000 ", + "1110000000000 ", + "11111000000000 ", + "111111000000000 ", + "1111111000000000 ", + "1111111100000000 ", + "11111111100000000 ", + "211111111100000000 ", + "2221111111100000000 ", + "2222111111110000000 ", + "22222111111110000000 ", + "22222211111110000000 ", + "222222211111110000000 ", + "222222211111111000000 ", + "2222222211111110000000 " + ], + "palettes": [ "triffid" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "24x24_triffid_field_e", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + "2222222221111110000000 ", + "2222222221111111000000 ", + "22222222221111110000000 ", + "22222222221111111000000 ", + "22222222222111111000000 ", + "22222222222111111000000 ", + "22222222222111111000000 ", + "222222222221111111000000", + "222222222222111111000000", + "222222222222111111000000", + "222222222222111111000000", + "222222222222111111000000", + "222222222222111111000000", + "222222222222111111000000", + "222222222222111111000000", + "222222222222111111000000", + "222222222221111111000000", + "22222222222111111000000 ", + "22222222222111111000000 ", + "22222222222111111000000 ", + "22222222221111111000000 ", + "22222222221111110000000 ", + "2222222221111111000000 ", + "2222222211111110000000 " + ], + "palettes": [ "triffid" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "24x24_triffid_field_se", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + "2222222211111110000000 ", + "222222211111111000000 ", + "222222211111110000000 ", + "22222211111110000000 ", + "22222111111110000000 ", + "2222111111110000000 ", + "2221111111100000000 ", + "211111111100000000 ", + "11111111100000000 ", + "1111111100000000 ", + "1111111000000000 ", + "111111000000000 ", + "11111000000000 ", + "1110000000000 ", + "110000000000 ", + "00000000000 ", + "000000000 ", + "00000000 ", + "0000000 ", + "00000 ", + "000 ", + "0 ", + " ", + " " ], - "palettes": [ "triffid" ] + "palettes": [ "triffid" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ] } }, { "type": "mapgen", "method": "json", - "om_terrain": [ "triffid_field" ], - "weight": 100, + "nested_mapgen_id": "24x24_triffid_field_s", "object": { - "fill_ter": "t_region_groundcover_urban", + "mapgensize": [ 24, 24 ], "rows": [ - " I ", - " X * * X ", - " ^ ? ? ", - " * X ? ^ ", - " ? ", - " ^ X I ^ * ", - " I ", - " * ^ * ^ ", - " ? X I ", - " ", - " X I * X ? ", - " ^ ^ ", - " ? ? X ", - " I X I * ", - " ? ", - " * X ? * X I ", - " ? ", - " I X ^ X ", - " X ", - " ? I * ", - " X I ", - " * ? X ", - " I ", - " * ^ " + "222222222222222222222222", + "222222222222222222222222", + "222222222222222222222222", + "222222222222222222222222", + "222222222222222222222222", + "222222222222222222222222", + "222222222222222222222222", + "222222222222222222222222", + "222222222222222222222222", + "112222222222222222222211", + "111122222222222222221111", + "111111112222222211111111", + "111111111111111111111111", + "111111111111111111111111", + "111111111111111111111111", + "011111111111111111111110", + "000111111111111111111000", + "000000011111111110000000", + "000000000000000000000000", + "000000000000000000000000", + "000000000000000000000000", + "000000000000000000000000", + " 00000000000000000000 ", + " 0000000000 " ], - "palettes": [ "triffid" ] + "palettes": [ "triffid" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ] } }, { "type": "mapgen", "method": "json", - "om_terrain": [ "triffid_field" ], - "weight": 100, + "nested_mapgen_id": "24x24_triffid_field_sw", "object": { - "fill_ter": "t_region_groundcover_urban", + "mapgensize": [ 24, 24 ], "rows": [ + " 0000000111111122222222", + " 000000111111112222222", + " 000000011111112222222", + " 00000001111111222222", + " 00000001111111122222", + " 0000000111111112222", + " 0000000011111111222", + " 000000001111111112", + " 00000000111111111", + " 0000000011111111", + " 0000000001111111", + " 000000000111111", + " 00000000011111", + " 0000000000111", + " 000000000011", + " 00000000000", + " 000000000", + " 00000000", + " 0000000", + " 00000", + " 000", + " 0", " ", - " ? X ? ", - " I ", - " I ? I ", - " ? * ", - " ^ * X ", - " I I X ", - " X ? ", - " X ", - " ? ^ I ? ", - " I I ", - " ", - " * X ? * ", - " ? ^ ", - " I I X ", - " * ", - " X ^ ? ", - " I ", - " I ^ ", - " * X ", - " I ? ", - " ", - " I ", - " X " + " " + ], + "palettes": [ "triffid" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "24x24_triffid_field_w", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " 0000000111111222222222", + " 0000001111111222222222", + " 00000001111112222222222", + " 00000011111112222222222", + " 00000011111122222222222", + " 00000011111122222222222", + " 00000011111122222222222", + "000000111111122222222222", + "000000111111222222222222", + "000000111111222222222222", + "000000111111222222222222", + "000000111111222222222222", + "000000111111222222222222", + "000000111111222222222222", + "000000111111222222222222", + "000000111111222222222222", + "000000111111122222222222", + " 00000011111122222222222", + " 00000011111122222222222", + " 00000011111122222222222", + " 00000011111112222222222", + " 00000001111112222222222", + " 0000001111111222222222", + " 0000000111111122222222" ], - "palettes": [ "triffid" ] + "palettes": [ "triffid" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ] } }, { "type": "mapgen", "method": "json", - "om_terrain": [ "triffid_field" ], - "weight": 100, + "nested_mapgen_id": "24x24_triffid_field_nw", "object": { - "fill_ter": "t_region_groundcover_urban", + "mapgensize": [ 24, 24 ], "rows": [ " ", - " I * * ", - " * ? ", - " * X I I ", - " ^ X ? ^ ", - " ? * ", - " ^ I X * ", - " * ? I ? ", - " ", - " ^ I ? I ", - " X X ", - " ? ^ * ", - " I I X ", - " * I ", - " ? * ? ", - " ^ I ", - " X I X ", - " * I ", - " I ? ", - " X X ", - " I * I ", - " ", - " ? I ", - " X * " + " ", + " 0", + " 000", + " 00000", + " 0000000", + " 00000000", + " 000000000", + " 00000000000", + " 000000000011", + " 0000000000111", + " 00000000011111", + " 000000000111111", + " 0000000001111111", + " 0000000011111111", + " 00000000111111111", + " 000000001111111112", + " 0000000011111111222", + " 0000000111111112222", + " 00000001111111122222", + " 00000001111111222222", + " 000000011111112222222", + " 000000111111112222222", + " 0000000111111222222222" ], - "palettes": [ "triffid" ] + "palettes": [ "triffid" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "1x1_megafernification", + "object": { "mapgensize": [ 1, 1 ], "place_ter_furn_transforms": [ { "transform": "megafernification", "x": 0, "y": 0 } ] } + }, + { + "type": "ter_furn_transform", + "id": "megafernification", + "terrain": [ { "result": "t_mega_fern", "valid_flags": [ "TREE", "SHRUB", "YOUNG" ] } ] + }, + { + "type": "ter_furn_transform", + "id": "remove_forest_terrain_plants", + "terrain": [ { "result": "t_region_groundcover_forest", "valid_flags": [ "TREE", "SHRUB", "YOUNG" ] } ] } ] diff --git a/data/json/mapgen/triffid/triffid_grove.json b/data/json/mapgen/triffid/triffid_grove.json index 1192a9507b916..228feda5a7930 100644 --- a/data/json/mapgen/triffid/triffid_grove.json +++ b/data/json/mapgen/triffid/triffid_grove.json @@ -2,38 +2,39 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "triffid_grove" ], - "weight": 100, + "om_terrain": "triffid_grove", "object": { - "fill_ter": "t_region_groundcover_urban", + "fallback_predecessor_mapgen": "forest", "rows": [ - " ? I ? ", - " I ? I X ? I ", - " I X I I X ^ ###X X ", - " X ? ? ^ X ########## X", - " IX################### ", - " ^############~~~####^ ", - " ?###~~~~~~~~~~~~~~###? ", - " X###~~~~~~~~~~~~~~### ", - " ##~~~~~~~~~~~~~~##^ I", - " I^##~~~~~~~~~~~~~~##?X ", - " ?##~~~~~~~~~~~~~~### ", - " X###~~~~~~~~~~~~~~###^I", - " I###~~~~~~~~~~~~~~### ", - " ###~~~~~~~~~~~~~~##? X", - " ^###~~~~~~~~~~~~~~##^ ", - "? ####~~~~~~~~~~~~~##XI ", - " I###~~~~~~~~~~~~~###? ", - " ? ###~~~~~~~~~~~~~~##X ", - " I^###~~~~~~~~~~~~~~##I ", - " ?X##~~~~~~~~~~~~~~##X ", - " X>########~#########I ", - " ?>>##^XX?####IXX^###X ", - " IX>>X I I I ", - " I ? I " + "222222222222222222222222", + "222222222222222222222222", + "22222222222222222###2222", + "222222222222##########22", + "222###################22", + "222############~~~####22", + "22###~~~~~~~~~~~~~~###22", + "22###~~~~~~~~~~~~~~###22", + "222##~~~~~~~~~~~~~~##222", + "222##~~~~~~~~~~~~~~##222", + "222##~~~~~~~~~~~~~~###22", + "22###~~~~~~~~~~~~~~###22", + "22###~~~~~~~~~~~~~~###22", + "22###~~~~~~~~~~~~~~##222", + "22###~~~~~~~~~~~~~~##222", + "22####~~~~~~~~~~~~~##222", + "222###~~~~~~~~~~~~~###22", + "222###~~~~~~~~~~~~~~##22", + "222###~~~~~~~~~~~~~~##22", + "222##~~~~~~~~~~~~~~##222", + "22>########~#########222", + "22>>##2222####2222###222", + "222>>2222222222222222222", + "222222222222222222222222" ], "palettes": [ "triffid" ], - "terrain": { ">": "t_triffid_slope_down" } + "nested": { "2": { "chunks": [ "1x1_megafernification" ] } }, + "terrain": { ">": "t_triffid_slope_down" }, + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ] } } ] diff --git a/data/json/mapgen/triffid/triffid_grove_roof.json b/data/json/mapgen/triffid/triffid_grove_roof.json index 14109b14a05eb..c0c22ca2d1412 100644 --- a/data/json/mapgen/triffid/triffid_grove_roof.json +++ b/data/json/mapgen/triffid/triffid_grove_roof.json @@ -2,8 +2,7 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "triffid_grove_roof" ], - "weight": 100, + "om_terrain": "triffid_grove_roof", "object": { "fill_ter": "t_barkfloor", "rows": [ diff --git a/data/json/mapgen/triffid/triffid_grove_z2.json b/data/json/mapgen/triffid/triffid_grove_z2.json index 594eea0b41b03..91cff8a822d99 100644 --- a/data/json/mapgen/triffid/triffid_grove_z2.json +++ b/data/json/mapgen/triffid/triffid_grove_z2.json @@ -2,8 +2,7 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "triffid_grove_z2" ], - "weight": 100, + "om_terrain": "triffid_grove_z2", "object": { "fill_ter": "t_barkfloor", "rows": [ diff --git a/data/json/mapgen/triffid/triffid_grove_z3.json b/data/json/mapgen/triffid/triffid_grove_z3.json index 1cee3db103f8f..3a784337766ee 100644 --- a/data/json/mapgen/triffid/triffid_grove_z3.json +++ b/data/json/mapgen/triffid/triffid_grove_z3.json @@ -2,8 +2,7 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "triffid_grove_z3" ], - "weight": 100, + "om_terrain": "triffid_grove_z3", "object": { "fill_ter": "t_barkfloor", "rows": [ diff --git a/data/json/mapgen/triffid/triffid_heart.json b/data/json/mapgen/triffid/triffid_heart.json index 3c3a1d01950d6..1dfa694a61791 100644 --- a/data/json/mapgen/triffid/triffid_heart.json +++ b/data/json/mapgen/triffid/triffid_heart.json @@ -2,8 +2,7 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "triffid_finale" ], - "weight": 100, + "om_terrain": "triffid_finale", "object": { "fill_ter": "t_root_floor", "rows": [ diff --git a/data/json/mapgen/triffid/triffid_roots.json b/data/json/mapgen/triffid/triffid_roots.json index 9bda5900819b4..033166ef2c950 100644 --- a/data/json/mapgen/triffid/triffid_roots.json +++ b/data/json/mapgen/triffid/triffid_roots.json @@ -2,8 +2,7 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "triffid_roots" ], - "weight": 100, + "om_terrain": "triffid_roots", "object": { "fill_ter": "t_root_floor", "rows": [ @@ -40,8 +39,7 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "triffid_rootss" ], - "weight": 100, + "om_terrain": "triffid_rootss", "object": { "fill_ter": "t_root_floor", "rows": [ @@ -78,8 +76,7 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "triffid_rootsn" ], - "weight": 100, + "om_terrain": "triffid_rootsn", "object": { "fill_ter": "t_root_floor", "rows": [ @@ -116,8 +113,7 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "triffid_rootse" ], - "weight": 100, + "om_terrain": "triffid_rootse", "object": { "fill_ter": "t_root_floor", "rows": [ @@ -154,8 +150,7 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "triffid_rootsw" ], - "weight": 100, + "om_terrain": "triffid_rootsw", "object": { "fill_ter": "t_root_floor", "rows": [ @@ -200,8 +195,7 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "triffid_rootsen" ], - "weight": 100, + "om_terrain": "triffid_rootsen", "object": { "fill_ter": "t_root_floor", "rows": [ @@ -238,8 +232,7 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "triffid_rootsnw" ], - "weight": 100, + "om_terrain": "triffid_rootsnw", "object": { "fill_ter": "t_root_floor", "rows": [ @@ -276,8 +269,7 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "triffid_rootssw" ], - "weight": 100, + "om_terrain": "triffid_rootssw", "object": { "fill_ter": "t_root_floor", "rows": [ @@ -314,8 +306,7 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "triffid_rootsse" ], - "weight": 100, + "om_terrain": "triffid_rootsse", "object": { "fill_ter": "t_root_floor", "rows": [ diff --git a/data/json/mapgen_palettes/triffid.json b/data/json/mapgen_palettes/triffid.json index 235a116e81f51..a541b4726bc3b 100644 --- a/data/json/mapgen_palettes/triffid.json +++ b/data/json/mapgen_palettes/triffid.json @@ -2,8 +2,12 @@ { "type": "palette", "id": "triffid", + "nested": { + "0": { "chunks": [ [ "1x1_triffid_field_furniture", 25 ], [ "null", 175 ] ] }, + "1": { "chunks": [ [ "1x1_triffid_field_terrain", 9 ], [ "1x1_triffid_field_furniture", 25 ], [ "null", 166 ] ] }, + "2": { "chunks": [ [ "1x1_triffid_field_terrain", 15 ], [ "1x1_triffid_field_furniture", 35 ], [ "null", 150 ] ] } + }, "terrain": { - " ": [ "t_region_groundcover_urban", "t_mega_fern" ], "#": "t_triffid_bark_wall", "C": "t_barkfloor", "~": "t_triffid_wood_wall", @@ -11,35 +15,26 @@ "P": "t_root_wall", ".": "t_root_floor", "D": [ "t_bramble_door_c", "t_bramble_door_o" ], - "*": "t_puddle", - "[": "t_water_dp", - "I": [ - "t_tree", - "t_tree_apple", - "t_tree_apple", - "t_tree_pear", - "t_tree_pear", - "t_tree_cherry", - "t_tree_peach", - "t_tree_apricot", - "t_tree_plum", - "t_tree_pine", - "t_tree_birch", - "t_tree_maple", - "t_tree_willow", - "t_tree_hickory", - "t_tree_young", - "t_mega_fern", - "t_underbrush", - "t_shrub" - ] + "I": [ [ "t_region_tree_fruit", 2 ], [ "t_mega_fern", 8 ], [ "t_region_tree", 1 ], [ "t_underbrush", 1 ], [ "t_shrub", 1 ] ] }, - "furniture": { - "^": [ "f_rubble_rock", "f_boulder_small", "f_boulder_medium" ], - "?": [ "f_dandelion", "f_flower_spurge", "f_burdock", "f_flower_tulip", "f_lily", "f_bluebell", "f_dahlia", "f_datura" ], - "T": "f_glowingbulb", - "@": "f_brambles", - "X": "f_mutpoppy" + "furniture": { "T": "f_glowingbulb", "@": "f_brambles", "i": [ "f_mutpoppy", "f_region_flower" ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "1x1_triffid_field_terrain", + "object": { "mapgensize": [ 1, 1 ], "rows": [ "I" ], "palettes": [ "triffid" ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "1x1_triffid_field_furniture", + "object": { + "mapgensize": [ 1, 1 ], + "rows": [ "i" ], + "palettes": [ "triffid" ], + "place_ter_furn_transforms": [ { "transform": "remove_forest_terrain_plants", "x": 0, "y": 0 } ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ] } } ] diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_triffid.json b/data/json/overmap/overmap_terrain/overmap_terrain_triffid.json index 7b0b3679be08f..08e8d49d8e2e6 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_triffid.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_triffid.json @@ -3,11 +3,12 @@ "type": "overmap_terrain", "id": "triffid_grove", "name": "triffid grove", + "copy-from": "generic_forest", "sym": "T", "color": "light_red", "see_cost": 5, "mondensity": 2, - "flags": [ "KNOWN_UP", "KNOWN_DOWN", "RISK_HIGH" ] + "flags": [ "KNOWN_UP", "KNOWN_DOWN", "RISK_HIGH", "REQUIRES_PREDECESSOR" ] }, { "type": "overmap_terrain", @@ -150,9 +151,11 @@ "type": "overmap_terrain", "id": "triffid_field", "name": "vibrant field", + "copy-from": "generic_forest", "sym": ".", "color": "green", "see_cost": 5, - "mondensity": 2 + "mondensity": 2, + "flags": [ "REQUIRES_PREDECESSOR" ] } ] diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json index 72a854c661ab7..59be1bfd8c7d1 100644 --- a/data/json/regional_map_settings.json +++ b/data/json/regional_map_settings.json @@ -484,7 +484,15 @@ "ws_giant_sinkhole_1_north", "ws_giant_sinkhole_1_east", "ws_giant_sinkhole_1_south", - "ws_giant_sinkhole_1_west" + "ws_giant_sinkhole_1_west", + "triffid_grove_north", + "triffid_grove_east", + "triffid_grove_south", + "triffid_grove_west", + "triffid_field_north", + "triffid_field_east", + "triffid_field_south", + "triffid_field_west" ], "sparseness_adjacency_factor": 4, "item_group": "forest",