Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace artificial forests using predecessor mapgen #55735

Merged
merged 25 commits into from
Mar 27, 2022
Merged

Replace artificial forests using predecessor mapgen #55735

merged 25 commits into from
Mar 27, 2022

Conversation

LovamKicsiGazsii
Copy link
Contributor

@LovamKicsiGazsii LovamKicsiGazsii commented Feb 27, 2022

Summary

Content "Updates derelict/abandoned/wilderness locations"

Purpose of change

To create smoother transitions between forests and points of interest. Slightly overhauls wilderness locations that haven't been edited in 3-5 years to make them blend in with their environment.

Describe the solution

Updates a few locations with predecessor mapgen and/or regional terrain.

  • abandoned barn: predecessor mapgen (forest)
  • abandoned storefront: regional groundcover + palettized, added parameters
  • campsite: predecessor mapgen (forest/field) + added tent nests
  • central lab: predecessor mapgen (forest)
  • derelict property: predecessor mapgen (forest) + palettized, added parameters
  • giant sinkhole: predecessor mapgen (field) + replaced layer of rock with soil at Z = -1
  • hunting blind: predecessor mapgen (field) + replaced chair with camp chairs
  • incomplete cabin: predecessor mapgen (forest) + added more tools, added tent nests
  • moonshine camp: predecessor mapgen (forest) + palettized
  • service area interface: regional groundcover + gates now face the road
  • spider pit: predecessor mapgen (forest) + replaced layer of rock with soil at Z = -1
  • standing stones: predecessor mapgen (forest)
  • survivor bunker: predecessor mapgen (forest) + removed root walls, replaced item groups
  • swamp shack: predecessor mapgen (swamp) + palettized, added one parameter

Describe alternatives you've considered

None.

Testing

Surveyed the land for the aforementioned locations. Works as expected.

Additional context

Screenshots

abandoned barn
abbarn
abbarn1
abbarn2

abandoned storefront
abstore

campsites
campsite
campsite_f
campsite_0

central lab
centrallab

derelict property
derelict1
derelict2
derelict3

giant sinkhole
sinkhole

hunting blind
hunting

incomplete cabin
incomplete

moonshine camp
moonshine1
moonshine2
moonshine3

service area interface
sai

spider pit
spider1
spider2

standing stones
standing

survivor bunker
survbunker
survbunker1

swamp shack
shack
shack2

I've yet to edit cabins, riverside dwellings, homeless camps, dumpsites, survivor campsites, etc. for a later PR.

hunting blind - use predecessor mapgen, replace chair with camp chair
sinkhole - use predecessor mapgen, replace rock with soil
service are interface - use abstract terrain
survivor bunker - use predecessor mapgen, remove root walls, replace item groups
abstorefront - migrate abstorefront_2, palettize, use parameters and abstract terrain
migrate to abstorefront.json
swamp shack - palettize, use parameters and predecessor mapgen
abandoned barn - use predecessor mapgen
barn palette - remove unused furniture and terrain
create 3x3, 5x5 tent nested chunks
derelict property - palettize, use predecessor mapgen and parameters
standing stones - use predecessor mapgen
campsite - use predecessor mapgen and nested tents
incomplete cabin - use predecessor mapgen and nested tents, spawn tools
destroyed biker tents - use predecessor mapgen and nested tents, place blood and bile fields
central lab entrance - use predecessor mapgen
moonshine camp - palettize, use predecessor mapgen
@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Feb 27, 2022
@Maleclypse Maleclypse added <Bugfix> This is a fix for a bug (or closes open issue) [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display labels Feb 28, 2022
Copy link
Member

@NetSysFire NetSysFire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool change! I like it. It also makes making changes to structures waaaay easier now that all the noisy forest stuff is gone. Well done so far.

data/json/mapgen/bugs/spider_pit.json Show resolved Hide resolved
@BrettDong BrettDong removed the Json label Mar 12, 2022
@Maleclypse
Copy link
Member

I restarted the tests because I wasn't sure if there was some Aftershock mapgen failing for unrelated reasons or if it was directly impacted by this PR. If it fails again with Aftershock errors it's likely that you need to adjust some Aftershock mapgen to mirror your changes here.

@LovamKicsiGazsii
Copy link
Contributor Author

Forgot to edit regional_map_settings.json. Locations are now registered with the correct biome.

regional

@github-actions github-actions bot added the Mods: No Hope Relating to the mod No Hope label Mar 19, 2022
@ZhilkinSerg ZhilkinSerg reopened this Mar 20, 2022
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 25, 2022
@kevingranade kevingranade merged commit 4504f18 into CleverRaven:master Mar 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display Mods: No Hope Relating to the mod No Hope
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants