Skip to content

Commit

Permalink
Merge pull request #72812 from Procyonae/ForestBiomeTerrainNoRawStrings
Browse files Browse the repository at this point in the history
Forest biome terrain oter_id -> oter_type_id
  • Loading branch information
I-am-Erk authored Apr 3, 2024
2 parents dee02e4 + de45319 commit 8b4c779
Show file tree
Hide file tree
Showing 9 changed files with 165 additions and 662 deletions.
201 changes: 41 additions & 160 deletions data/json/regional_map_settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -353,154 +353,53 @@
},
"forest_thick": {
"terrains": [
"forest_thick",
"forest_trail_isolated",
"forest_trail_end_north",
"forest_trail_end_east",
"forest_trail_end_south",
"forest_trail_end_west",
"forest_trail_ns",
"forest_trail_ew",
"forest_trail_ne",
"forest_trail_es",
"forest_trail_sw",
"forest_trail_wn",
"forest_trail_new",
"forest_trail_nsw",
"forest_trail_esw",
"forest_trail_nes",
"forest_trail_nesw",
"campsite_north",
"campsite_south",
"campsite_east",
"campsite_west",
"campsite_cabin_incomplete_north",
"campsite_cabin_incomplete_south",
"campsite_cabin_incomplete_east",
"campsite_cabin_incomplete_west",
"campsite_field_biker_north",
"campsite_field_biker_south",
"campsite_field_biker_east",
"campsite_field_biker_west",
"campsite_field_biker_destroyed_north",
"campsite_field_biker_destroyed_south",
"campsite_field_biker_destroyed_east",
"campsite_field_biker_destroyed_west",
"campsite_a_north",
"campsite_a_south",
"campsite_a_east",
"campsite_a_west",
"desolatebarn_north",
"desolatebarn_south",
"desolatebarn_east",
"desolatebarn_west",
"derelict_property_north",
"derelict_property_south",
"derelict_property_east",
"derelict_property_west",
"homelesscamp_north",
"homelesscamp_south",
"homelesscamp_east",
"homelesscamp_west",
"spider_pit_north",
"spider_pit_south",
"spider_pit_east",
"spider_pit_west",
"survivor_forest_camp_north",
"survivor_forest_camp_south",
"survivor_forest_camp_east",
"survivor_forest_camp_west",
"central_lab_entrance",
"moonshine_still_north",
"moonshine_still_south",
"moonshine_still_east",
"moonshine_still_west",
"moonshine_still_1_north",
"moonshine_still_1_south",
"moonshine_still_1_east",
"moonshine_still_1_west",
"moonshine_still_2_north",
"moonshine_still_2_south",
"moonshine_still_2_east",
"moonshine_still_2_west",
"standing_stones",
"ws_survivor_bunker_f0_north",
"ws_survivor_bunker_f0_south",
"ws_survivor_bunker_f0_east",
"ws_survivor_bunker_f0_west",
"bandit_cabin_north",
"bandit_cabin_south",
"bandit_cabin_east",
"bandit_cabin_west",
"bandit_garage_1_north",
"bandit_garage_1_south",
"bandit_garage_1_east",
"bandit_garage_1_west",
"bandit_garage_2_north",
"bandit_garage_2_south",
"bandit_garage_2_east",
"bandit_garage_2_west",
"natural_spring_north",
"natural_spring_south",
"natural_spring_east",
"natural_spring_west",
"anthill",
"bandit_cabin",
"bandit_garage_1",
"bandit_garage_2",
"campsite",
"campsite_a",
"campsite_cabin_incomplete",
"campsite_field_biker",
"campsite_field_biker_destroyed",
"cave",
"special_forest_thick",
"island_forest_north",
"island_forest_east",
"island_forest_south",
"island_forest_west",
"island_forest_thick_north",
"island_forest_thick_east",
"island_forest_thick_south",
"island_forest_thick_west",
"central_lab_entrance",
"corpse_tentacle_surface_entry",
"derelict_property",
"desolatebarn",
"forest_thick",
"forest_trail",
"forest_trail_intersection",
"homelesscamp",
"island_forest",
"island_forest_thick",
"lake_shore",
"moonshine_still",
"moonshine_still_1",
"moonshine_still_2",
"natural_spring",
"river",
"river_c_not_ne",
"river_c_not_nw",
"river_c_not_se",
"river_c_not_sw",
"river_center",
"river_north",
"river_east",
"river_south",
"river_west",
"river_ne",
"river_nw",
"river_se",
"river_sw",
"river_nw",
"river_c_not_ne",
"river_c_not_se",
"river_c_not_sw",
"river_c_not_nw",
"stream_north",
"stream_east",
"stream_south",
"stream_west",
"stream_corner_north",
"stream_corner_east",
"stream_corner_south",
"stream_corner_west",
"stream_end_north",
"stream_end_east",
"stream_end_south",
"stream_end_west",
"slimepit_top",
"anthill_north",
"anthill_east",
"anthill_south",
"anthill_west",
"corpse_tentacle_surface_entry_north",
"corpse_tentacle_surface_entry_east",
"corpse_tentacle_surface_entry_south",
"corpse_tentacle_surface_entry_west",
"ws_giant_sinkhole_1_north",
"ws_giant_sinkhole_1_east",
"ws_giant_sinkhole_1_south",
"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"
"special_forest_thick",
"spider_pit",
"standing_stones",
"stream",
"stream_corner",
"stream_end",
"survivor_forest_camp",
"triffid_grove",
"triffid_field",
"ws_giant_sinkhole_1",
"ws_survivor_bunker_f0"
],
"sparseness_adjacency_factor": 4,
"item_group": "forest",
Expand Down Expand Up @@ -538,25 +437,7 @@
"terrain_furniture": { }
},
"forest_water": {
"terrains": [
"forest_water",
"hunter_shack_north",
"hunter_shack_south",
"hunter_shack_east",
"hunter_shack_west",
"hunter_shack_1_north",
"hunter_shack_1_south",
"hunter_shack_1_east",
"hunter_shack_1_west",
"shipwreck_river_1_north",
"shipwreck_river_1_south",
"shipwreck_river_1_east",
"shipwreck_river_1_west",
"shipwreck_river_2_north",
"shipwreck_river_2_south",
"shipwreck_river_2_east",
"shipwreck_river_2_west"
],
"terrains": [ "forest_water", "hunter_shack", "hunter_shack_1", "shipwreck_river_1", "shipwreck_river_2" ],
"sparseness_adjacency_factor": 2,
"item_group": "forest",
"item_group_chance": 60,
Expand Down
Loading

0 comments on commit 8b4c779

Please sign in to comment.