-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
Expand Defense Mode and fix a bug #67960
Merged
Maleclypse
merged 53 commits into
CleverRaven:master
from
MNG-cataclysm:defense_mode_expansion
Sep 17, 2023
Merged
Expand Defense Mode and fix a bug #67960
Maleclypse
merged 53 commits into
CleverRaven:master
from
MNG-cataclysm:defense_mode_expansion
Sep 17, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
astyled
astyled PR, label is assigned by github actions
label
Aug 31, 2023
github-actions
bot
added
json-styled
JSON lint passed, label assigned by github actions
BasicBuildPassed
This PR builds correctly, label assigned by github actions
labels
Aug 31, 2023
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
MNG-cataclysm
force-pushed
the
defense_mode_expansion
branch
from
September 15, 2023 17:22
e2fa7a3
to
6122190
Compare
github-actions
bot
added
NPC / Factions
NPCs, AI, Speech, Factions, Ownership
Missions
Quests and missions
labels
Sep 16, 2023
github-actions
bot
removed
json-styled
JSON lint passed, label assigned by github actions
BasicBuildPassed
This PR builds correctly, label assigned by github actions
labels
Sep 16, 2023
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
github-actions
bot
added
json-styled
JSON lint passed, label assigned by github actions
BasicBuildPassed
This PR builds correctly, label assigned by github actions
labels
Sep 16, 2023
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
EOC: Effects On Condition
Anything concerning Effects On Condition
[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
Missions
Quests and missions
Mods: Defense Mode
Anything to do with the Defense Mode mod
Mods
Issues related to mods or modding
NPC / Factions
NPCs, AI, Speech, Factions, Ownership
Scenarios
New Scenarios, balancing, bugs with scenarios
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Content "Expand and refine Defense Mode."
Purpose of change
Expand Defense Mode some more as suggested in #67706, and fix a small NPC-related bug.
Describe the solution
Adds several new start locations to Defense Mode: a gun store, survivor camp, cabin, cave, sugar house, motel, pawn shop, and restaurant. This also makes the wave control and teleport EOCs global, as NPCs could trigger waves and would randomly teleport you when running off the map.
Describe alternatives you've considered
Not doing this.
Testing
Went into the game and started everywhere, it all looks great.
Additional context
I'm not reworking the spawn mechanics yet until I figure out a good way to get the plans mentioned implemented, but I will try and rework the teleport EOC soon to allow some limited travel.