From 4206b625a3cbd55cf833c81626c6592055581962 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Tue, 17 Dec 2019 13:59:02 -0800 Subject: [PATCH] (done) Removes long grass from regional terrain lists, makes it into a map extra (#35990) * add json-based map extras for fields add shed adjust frequencies based on playtest * add new extras to forests too * reduce trees and bushes in fields --- data/json/mapgen/map_extras/wilderness.json | 256 ++++++++++++++++++ .../mapgen_palettes/abandoned_barn_p.json | 10 +- data/json/overmap/map_extras.json | 21 ++ data/json/regional_map_settings.json | 57 ++-- 4 files changed, 316 insertions(+), 28 deletions(-) create mode 100644 data/json/mapgen/map_extras/wilderness.json diff --git a/data/json/mapgen/map_extras/wilderness.json b/data/json/mapgen/map_extras/wilderness.json new file mode 100644 index 0000000000000..25c63ed69f8f9 --- /dev/null +++ b/data/json/mapgen/map_extras/wilderness.json @@ -0,0 +1,256 @@ +[ + { + "type": "palette", + "id": "long_grass_meadow_palette", + "terrain": { + " ": "t_null", + ".": [ [ "t_region_groundcover", 10 ], "t_grass_long" ], + ",": [ [ "t_region_groundcover", 4 ], "t_grass_long" ], + ";": [ "t_region_groundcover", [ "t_grass_long", 2 ] ], + "|": [ "t_region_groundcover", [ "t_grass_long", 10 ] ] + }, + "furniture": { + ".": [ [ "f_null", 200 ], [ "f_region_weed", 7 ], [ "f_boulder_small", 2 ], "f_boulder_medium", "f_boulder_large" ], + ",": [ [ "f_null", 200 ], [ "f_region_weed", 8 ], [ "f_boulder_small", 2 ], "f_boulder_medium", "f_boulder_large" ], + ";": [ [ "f_null", 200 ], [ "f_region_weed", 9 ], [ "f_boulder_small", 2 ], "f_boulder_medium", "f_boulder_large" ], + "|": [ [ "f_null", 200 ], [ "f_region_weed", 10 ], [ "f_boulder_small", 2 ], "f_boulder_medium", "f_boulder_large" ] + } + }, + { + "type": "palette", + "id": "copse_trees_palette", + "terrain": { + " ": "t_null", + ".": [ [ "t_region_groundcover", 60 ], "t_region_tree", "t_region_shrub" ], + ",": [ [ "t_region_groundcover", 30 ], [ "t_region_groundcover_forest", 8 ], [ "t_region_tree", 2 ], "t_region_shrub" ], + ";": [ [ "t_region_groundcover", 10 ], [ "t_region_groundcover_forest", 8 ], [ "t_region_tree", 6 ], "t_region_shrub" ], + "|": [ [ "t_region_groundcover_forest", 7 ], "t_water_sh" ] + }, + "furniture": { + ".": [ [ "f_null", 200 ], [ "f_region_weed", 7 ] ], + ",": [ [ "f_null", 200 ], [ "f_region_weed", 8 ] ], + ";": [ [ "f_null", 200 ], [ "f_region_weed", 10 ] ] + } + }, + { + "type": "mapgen", + "method": "json", + "update_mapgen_id": "mx_grass_map", + "object": { + "rows": [ + " ......... ", + " ............... ", + " .......,,,,,....... ", + " .....,,,,,,,,,,..... ", + " ...,,,,,,,,,,,,,,.... ", + " ....,,,;;;;;;;,,,,.... ", + " ...,,,;;;;;;;;;,,,,... ", + "....,,;;;;||;;;;,,,,....", + "...,,,,;;;;;||;;,,,,,...", + "...,;,;;||;||;;;;,,,,...", + "...,,;;;;;;;;||;;,,,,...", + "...,;,;||;||;;;;;,,,,...", + "...,,,,;;;;;;||;,,,,,...", + "...,;,,;;||;||;;,,,,,...", + "...,,,;;|;;;;||;;,,,,...", + "...,,,,,;;||;;;;,,,,,...", + "....,,;,;;;;;;;,,,,,....", + " ...,,,,,,;;||;;;,,,... ", + " ....,,,,,;;;;;,,,,.... ", + " ....,,,,,,,,,,,,,,.... ", + " .......,,,,,,....... ", + " .................... ", + " ................ ", + " .......... " + ], + "palettes": [ "long_grass_meadow_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "update_mapgen_id": "mx_grass_map", + "object": { "place_nested": [ { "chunks": [ [ "mx_grass_nested", 100 ] ], "x": [ 0, 17 ], "y": [ 0, 17 ], "repeat": [ 1, 6 ] } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "mx_grass_nested", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + " .... ", + ".,,,,.", + ".,|;,.", + ".,;|,.", + ".,,,,.", + " .... " + ], + "palettes": [ "long_grass_meadow_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "mx_grass_nested", + "object": { + "mapgensize": [ 8, 8 ], + "rows": [ + " ...... ", + "..,,,,..", + ".,,|;,,.", + ".,;||;,.", + ".,;|;;,.", + ".,,;|,,.", + "..,,,,..", + " ...... " + ], + "palettes": [ "long_grass_meadow_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "update_mapgen_id": "mx_trees_map", + "object": { + "rows": [ + " ......... ", + " ............... ", + " .......,,,,,....... ", + " .....,,,,,,,,,,..... ", + " ...,,,,,,,,,,,,,,.... ", + " ....,,,;;;;;;;,,,,.... ", + " ...,,,;;;;;;;;;,,,,... ", + "....,,;;;;||;;;;,,,,....", + "...,,,,;;;;;||;;,,,,,...", + "...,;,;;||;||;;;;,,,,...", + "...,,;;;;;;;;||;;,,,,...", + "...,;,;||;||;;;;;,,,,...", + "...,,,,;;;;;;||;,,,,,...", + "...,;,,;;||;||;;,,,,,...", + "...,,,;;|;;;;||;;,,,,...", + "...,,,,,;;||;;;;,,,,,...", + "....,,;,;;;;;;;,,,,,....", + " ...,,,,,,;;||;;;,,,... ", + " ....,,,,,;;;;;,,,,.... ", + " ....,,,,,,,,,,,,,,.... ", + " .......,,,,,,....... ", + " .................... ", + " ................ ", + " .......... " + ], + "palettes": [ "copse_trees_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "update_mapgen_id": "mx_trees_map", + "object": { "place_nested": [ { "chunks": [ [ "mx_trees_nested", 100 ] ], "x": [ 0, 17 ], "y": [ 0, 17 ], "repeat": [ 1, 6 ] } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "mx_trees_nested", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + " .... ", + ".,,,,.", + ".,|;,.", + ".,;|,.", + ".,,,,.", + " .... " + ], + "palettes": [ "copse_trees_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "mx_trees_nested", + "object": { + "mapgensize": [ 8, 8 ], + "rows": [ + " ...... ", + "..,,,,..", + ".,,|;,,.", + ".,;||;,.", + ".,;|;;,.", + ".,,;|,,.", + "..,,,,..", + " ...... " + ], + "palettes": [ "copse_trees_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "update_mapgen_id": "mx_fallen_shed_map", + "object": { + "place_nested": [ + { + "chunks": [ [ "mx_grass_nested", 70 ], [ "mx_trees_nested", 30 ] ], + "x": [ 0, 17 ], + "y": [ 0, 17 ], + "repeat": [ 2, 6 ] + }, + { "chunks": [ [ "mx_fallen_shed_nested", 100 ] ], "x": [ 0, 11 ], "y": [ 0, 11 ] } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "mx_fallen_shed_nested", + "object": { + "mapgensize": [ 11, 11 ], + "rows": [ + "--++++--||-", + "-_______RR|", + "w_______RRw", + "w________Rw", + "|_________|", + "||-_____|||", + "|_________|", + "w_________w", + "w_________w", + "-_________|", + "--||||||-||" + ], + "palettes": [ "desolatebarn_palette" ], + "terrain": { "_": "t_dirt" }, + "furniture": { "_": [ [ "f_null", 30 ], "f_rubble", "f_rubble_rock" ] }, + "items": { + "_": { "item": "wood_workshop", "chance": 1 }, + "R": [ { "item": "wood_workshop", "chance": 3 }, { "item": "mischw", "chance": 2 } ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "mx_fallen_shed_nested", + "object": { + "mapgensize": [ 8, 8 ], + "rows": [ + "--w_-||-", + "-______|", + "|______+", + "|R_____+", + "|RR____|", + "|_RRR__w", + "-__RRR_w", + "--w||-||" + ], + "palettes": [ "desolatebarn_palette" ], + "terrain": { "_": "t_dirt" }, + "furniture": { "_": [ [ "f_null", 30 ], "f_rubble", "f_rubble_rock" ] }, + "items": { + "_": { "item": "wood_workshop", "chance": 1 }, + "R": [ { "item": "wood_workshop", "chance": 3 }, { "item": "mischw", "chance": 2 } ] + } + } + } +] diff --git a/data/json/mapgen_palettes/abandoned_barn_p.json b/data/json/mapgen_palettes/abandoned_barn_p.json index 55c671531bf1a..eabe6188dd4a5 100644 --- a/data/json/mapgen_palettes/abandoned_barn_p.json +++ b/data/json/mapgen_palettes/abandoned_barn_p.json @@ -5,9 +5,9 @@ "terrain": { ".": [ [ "t_region_groundcover", 50 ], [ "t_region_shrub", 2 ], "t_region_tree" ], "#": "t_region_shrub", - "&": "t_wall_wood_broken", + "&": [ [ "t_wall_wood_broken", 4 ], "t_wall_wood_chipped" ], "+": [ [ "t_door_c", 2 ], [ "t_door_o", 2 ], "t_door_boarded", "t_door_boarded_damaged" ], - "-": "t_wall_wood_chipped", + "-": [ [ "t_wall_wood_chipped", 4 ], "t_wall_wood" ], ":": "t_fencegate_c", "~": [ "t_swater_sh", [ "t_covered_well", 3 ], "t_water_pump" ], "0": "t_window_empty", @@ -21,7 +21,7 @@ "_": "t_dirtfloor", "=": "t_dirtfloor", "{": "t_dirtfloor", - "%": "t_wall_wood_broken", + "%": [ [ "t_wall_wood_broken", 4 ], "t_wall_wood_chipped" ], "!": "t_dirtfloor", "a": "t_grass", "b": "t_dirtfloor", @@ -33,7 +33,7 @@ "g": "t_generator_broken", "h": "t_dirtfloor", "I": "t_dirtfloor", - "L": [ "t_covered_well", "t_water_pump", "t_water_pump" ], + "L": [ "t_covered_well", [ "t_water_pump", 2 ] ], "m": "t_machinery_old", "M": "t_milking_machine", "n": "t_dirtfloor", @@ -52,7 +52,7 @@ "Q": "t_bulk_tank", "w": "t_window_boarded_noglass", "W": "t_window", - "|": "t_wall_wood", + "|": [ [ "t_wall_wood", 4 ], "t_wall_wood_chipped" ], "<": "t_ladder_up", ">": "t_ladder_down" }, diff --git a/data/json/overmap/map_extras.json b/data/json/overmap/map_extras.json index 7896bda6c724b..bad3eb720a600 100644 --- a/data/json/overmap/map_extras.json +++ b/data/json/overmap/map_extras.json @@ -256,6 +256,27 @@ "color": "yellow", "autonote": true }, + { + "id": "mx_trees", + "type": "map_extra", + "name": "Stand of trees", + "description": "A copse of trees.", + "generator": { "generator_method": "update_mapgen", "generator_id": "mx_trees_map" } + }, + { + "id": "mx_grass", + "type": "map_extra", + "name": "Tall grass", + "description": "A meadow of tall grass.", + "generator": { "generator_method": "update_mapgen", "generator_id": "mx_grass_map" } + }, + { + "id": "mx_fallen_shed", + "type": "map_extra", + "name": "Derelict shed", + "description": "A collapsed shed.", + "generator": { "generator_method": "update_mapgen", "generator_id": "mx_fallen_shed_map" } + }, { "id": "mx_clay_deposit", "type": "map_extra", diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json index 3c17ebadc2d22..5b4f1cea42e3d 100644 --- a/data/json/regional_map_settings.json +++ b/data/json/regional_map_settings.json @@ -6,8 +6,8 @@ "default_groundcover": [ [ "t_region_groundcover", 1 ] ], "region_terrain_and_furniture": { "terrain": { - "t_region_groundcover": { "t_grass": 10, "t_grass_long": 2, "t_grass_dead": 2, "t_dirt": 1 }, - "t_region_groundcover_urban": { "t_grass": 20, "t_grass_dead": 3, "t_dirt": 1 }, + "t_region_groundcover": { "t_grass": 12, "t_grass_dead": 2, "t_dirt": 1 }, + "t_region_groundcover_urban": { "t_grass": 20, "t_grass_dead": 3 }, "t_region_groundcover_forest": { "t_grass_long": 5, "t_grass_tall": 1, "t_moss": 1, "t_grass_dead": 3 }, "t_region_groundcover_swamp": { "t_grass_long": 3, "t_grass_tall": 1, "t_moss": 2, "t_dirt": 2 }, "t_region_shrub": { @@ -143,15 +143,16 @@ }, "river_scale": 1.0, "field_coverage": { - "percent_coverage": 0.93, + "percent_coverage": 0.2, "default_ter": "t_shrub", "other": { - "t_region_tree": 1.2, - "t_region_shrub": 17, - "f_region_flower": 73, - "f_boulder_small": 1, - "f_boulder_medium": 0.6666, - "f_boulder_large": 0.3333 + "t_region_tree": 1, + "t_region_shrub": 3, + "f_region_weed": 49, + "f_region_flower": 37, + "f_boulder_small": 5, + "f_boulder_medium": 4, + "f_boulder_large": 1 }, "boost_chance": 0.833, "boosted_percent_coverage": 2.5, @@ -368,6 +369,8 @@ "mx_portal": 3, "mx_crater": 10, "mx_portal_in": 3, + "mx_grass": 20, + "mx_fallen_shed": 30, "mx_spider": 200, "mx_grove": 500, "mx_shrubbery": 500, @@ -392,6 +395,8 @@ "mx_portal": 3, "mx_crater": 10, "mx_portal_in": 3, + "mx_grass": 10, + "mx_fallen_shed": 20, "mx_shia": 1, "mx_spider": 200, "mx_jabberwock": 1, @@ -418,6 +423,8 @@ "mx_portal": 3, "mx_crater": 10, "mx_portal_in": 3, + "mx_grass": 20, + "mx_fallen_shed": 60, "mx_spider": 200, "mx_grove": 500, "mx_shrubbery": 500, @@ -431,21 +438,25 @@ } }, "field": { - "chance": 90, + "chance": 3, "extras": { - "mx_helicopter": 8, - "mx_military": 8, - "mx_science": 20, - "mx_collegekids": 25, - "mx_drugdeal": 20, - "mx_supplydrop": 10, - "mx_portal": 3, - "mx_crater": 10, - "mx_portal_in": 3, - "mx_point_dead_vegetation": 50, - "mx_point_burned_ground": 50, - "mx_casings": 50, - "mx_corpses": 30 + "mx_helicopter": 6, + "mx_military": 2, + "mx_science": 1, + "mx_collegekids": 3, + "mx_drugdeal": 3, + "mx_supplydrop": 4, + "mx_portal": 1, + "mx_crater": 15, + "mx_portal_in": 1, + "mx_point_dead_vegetation": 100, + "mx_grass": 600, + "mx_trees": 200, + "mx_fallen_shed": 150, + "mx_pond": 120, + "mx_point_burned_ground": 100, + "mx_casings": 20, + "mx_corpses": 3 } }, "road": {