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

Isherwood farm mutable #72424

Merged
merged 24 commits into from
Jun 12, 2024
Merged

Isherwood farm mutable #72424

merged 24 commits into from
Jun 12, 2024

Conversation

Procyonae
Copy link
Contributor

@Procyonae Procyonae commented Mar 16, 2024

Summary

None

Purpose of change

Partially addresses #62747
Mitigates #73493
Isherwood uses old fields

Describe the solution

Remakes the Isherwood farms as a mutable "Isherwood Farm Mutable", shuffling the placement of the isherwood buildings and including the same phases as the regular farm mutable after initial phases placing the Isherwood specific maps and a border of special terrain to reduce the chance of it being overrun with triffids/ants etc
Isherwood specific maps can't spawn extras anymore (the roads inbetween the buildings and the generic buildings/fields still can, a flag/field to disable extras for a whole special would be good)
Makes it globally unique
Adds NPC faction camp support for mutable specials (and translation extraction handling for them)

Describe alternatives you've considered

Also adding paddocks, I'd prefer to wait til the dairy farm is mutable too though so it can be fitting with that
The map still sticks out, I can't think of a particularly good way to make it not stick out in all possible scenarios
This is pretty basic, I'd like to add more entrance layouts and better looking building -> rural road connections in a future PR as well as just more tweaks to all the maps.
Keeping the same special id

Testing

Additional context

Example layout
image

@github-actions github-actions bot added NPC / Factions NPCs, AI, Speech, Factions, Ownership [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. <Bugfix> This is a fix for a bug (or closes open issue) <Enhancement / Feature> New features, or enhancements on existing Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style Info / User Interface Game - player communication, menus, etc. labels Mar 16, 2024
@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions Game: Achievements / Conducts / Scores Player goals and how they are tracked. labels Jun 6, 2024
Could probably do with deduplicating at some point
@github-actions github-actions bot added the [C++] Changes (can be) made in C++. Previously named `Code` label Jun 7, 2024
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Jun 7, 2024
@github-actions github-actions bot added Translation I18n [Python] Code made in Python labels Jun 7, 2024
@Procyonae Procyonae marked this pull request as ready for review June 9, 2024 11:42
@github-actions github-actions bot added Mods Issues related to mods or modding Mods: Aftershock Anything to do with the Aftershock mod Mods: Desert Region Anything relating to the Desert Region mod BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jun 11, 2024
@Maleclypse Maleclypse merged commit 85948df into CleverRaven:master Jun 12, 2024
28 checks passed
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) [C++] Changes (can be) made in C++. Previously named `Code` Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style <Enhancement / Feature> New features, or enhancements on existing Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Game: Achievements / Conducts / Scores Player goals and how they are tracked. Info / User Interface Game - player communication, menus, etc. [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: Aftershock Anything to do with the Aftershock mod Mods: Desert Region Anything relating to the Desert Region mod Mods Issues related to mods or modding NPC / Factions NPCs, AI, Speech, Factions, Ownership [Python] Code made in Python Translation I18n
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants