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

Bastion fort fallback_predecessor, palette tweaks, tourist and closed variants #66508

Merged
merged 12 commits into from
Jul 3, 2023

Conversation

Procyonae
Copy link
Contributor

@Procyonae Procyonae commented Jun 28, 2023

Summary

Content "Fixes Bastion Fort terrain and adds variance"

Purpose of change

Bastion Fort sticks out a bit, has a few missing terrain definitions, spawns are all in a tight square

Describe the solution

Adds fallback_predecessor
Tweaks palette to be prettier
Adds a couple of extra item/furniture spawns
Gives the gift shop peep some breathing room
Adds a "tourist" variant where there's no reenactors just regular zeds and some doors are locked and a "closed" variant with no zeds and all locked doors

Describe alternatives you've considered

Making the walls thicker to make their interior walkable
Adding a road connection
Making the "roof" more interesting

Testing

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Map / Mapgen Overmap, Mapgen, Map extras, Map display Scenarios New Scenarios, balancing, bugs with scenarios Spawn Creatures, items, vehicles, locations appearing on map json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Jun 28, 2023
@Procyonae Procyonae changed the title Bastion fort fallback_predecessor, palette tweaks, tourist and closed variants [CTD Help wanted] Bastion fort fallback_predecessor, palette tweaks, tourist and closed variants Jun 30, 2023
@Procyonae Procyonae marked this pull request as ready for review July 1, 2023 11:26
@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` and removed astyled astyled PR, label is assigned by github actions labels Jul 2, 2023
src/mapgen.cpp Outdated Show resolved Hide resolved
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added BasicBuildPassed This PR builds correctly, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Jul 3, 2023
@Procyonae Procyonae changed the title [CTD Help wanted] Bastion fort fallback_predecessor, palette tweaks, tourist and closed variants Bastion fort fallback_predecessor, palette tweaks, tourist and closed variants Jul 3, 2023
@Maleclypse Maleclypse merged commit 089b2b5 into CleverRaven:master Jul 3, 2023
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 [C++] Changes (can be) made in C++. Previously named `Code` Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [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 Scenarios New Scenarios, balancing, bugs with scenarios Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants