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

Expand Defense Mode and fix a bug #67960

Merged
merged 53 commits into from
Sep 17, 2023

Conversation

MNG-cataclysm
Copy link
Contributor

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.

@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Aug 31, 2023
@MNG-cataclysm MNG-cataclysm reopened this Aug 31, 2023
@github-actions 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
@github-actions github-actions bot added NPC / Factions NPCs, AI, Speech, Factions, Ownership Missions Quests and missions labels Sep 16, 2023
data/json/npcs/missiondef.json Outdated Show resolved Hide resolved
data/json/npcs/other/NPC_pizzaiolo.json Outdated Show resolved Hide resolved
@github-actions 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
data/json/npcs/missiondef.json Outdated Show resolved Hide resolved
data/json/npcs/other/NPC_pizzaiolo.json Outdated Show resolved Hide resolved
MNG-cataclysm and others added 2 commits September 16, 2023 12:34
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 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
@Maleclypse Maleclypse merged commit 1570eb2 into CleverRaven:master Sep 17, 2023
19 of 23 checks passed
@MNG-cataclysm MNG-cataclysm deleted the defense_mode_expansion branch September 18, 2023 12:40
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants