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.

Sign up for GitHub

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

Jump to bottom

Allow "run_eoc_selector" cancelling out of the menu #68625

Merged
merged 2 commits into from
Oct 13, 2023
Merged

Allow "run_eoc_selector" cancelling out of the menu #68625

merged 2 commits into from
Oct 13, 2023

Conversation

lispcoc
Copy link
Contributor

@lispcoc lispcoc commented Oct 13, 2023

Summary

None

Purpose of change

Fix #67283

Describe the solution

Add option "allow_cancel".

Describe alternatives you've considered

Testing

Add sample "EOC_selector_test" (example_eocs.json) and works collectly.

Additional context

@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. NPC / Factions NPCs, AI, Speech, Factions, Ownership [JSON] Changes (can be) made in JSON [C++] Changes (can be) made in C++. Previously named `Code` [Markdown] Markdown issues and PRs EOC: Effects On Condition Anything concerning Effects On Condition <Bugfix> This is a fix for a bug (or closes open issue) astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Oct 13, 2023
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Oct 13, 2023
@Maleclypse Maleclypse merged commit 828fcd4 into CleverRaven:master Oct 13, 2023
26 checks passed
@lispcoc lispcoc deleted the eoc_select_cancel branch October 13, 2023 17:16
detahramet pushed a commit to detahramet/Cataclysm-DDA that referenced this pull request Nov 6, 2023
@lispcoc @detahramet
eoc select cancel (CleverRaven#68625)
340b292
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
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` <Documentation> Design documents, internal info, guides and help. 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 [Markdown] Markdown issues and PRs NPC / Factions NPCs, AI, Speech, Factions, Ownership
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

"run_eoc_selector" does not allow cancelling out of the menu
2 participants
@lispcoc @Maleclypse