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

Place_vending function can place unpowered machines #75078

Merged
merged 5 commits into from
Jul 26, 2024

Conversation

John-Candlebury
Copy link
Member

@John-Candlebury John-Candlebury commented Jul 17, 2024

Summary

Features "Place_vending function can place unpowered machines"

Purpose of change

Allow the placement of vending machines while accounting for whether the structure they are placed in is powered/unpowered,

Describe the solution

Add a new "powered" bool that governs the placement of powered/unpowered machines.

Atm this will only add the new functionality and fix aftershock. @GuardianDll probably has a better grasp of which machines should be powered in vanilla, since they have already made this audit. All other vending machines will spawn unpowered.

Describe alternatives you've considered

It takes me longer to make maps in perpetuity (it already takes me a long while).

Testing

Visited both port agustmoon and a microlab, vending machines spawned as expected.

@github-actions github-actions bot added Map / Mapgen Overmap, Mapgen, Map extras, Map display [C++] Changes (can be) made in C++. Previously named `Code` labels Jul 17, 2024
@github-actions github-actions bot added <Enhancement / Feature> New features, or enhancements on existing json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions astyled astyled PR, label is assigned by github actions [JSON] Changes (can be) made in JSON Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. <Documentation> Design documents, internal info, guides and help. Mods Issues related to mods or modding [Markdown] Markdown issues and PRs Mods: Aftershock Anything to do with the Aftershock mod and removed BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jul 17, 2024
@John-Candlebury John-Candlebury marked this pull request as ready for review July 18, 2024 13:42
@github-actions github-actions bot requested a review from Maleclypse July 18, 2024 13:42
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jul 19, 2024
@Maleclypse
Copy link
Member

Needs conflict resolution

@Maleclypse Maleclypse merged commit 3c5c6c7 into CleverRaven:master Jul 26, 2024
26 of 27 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` <Documentation> Design documents, internal info, guides and help. <Enhancement / Feature> New features, or enhancements on existing 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 [Markdown] Markdown issues and PRs Mods: Aftershock Anything to do with the Aftershock mod Mods Issues related to mods or modding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants