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

Cleanup Various PR & bring some of the NO6 private branch changes into main #186

Merged
merged 6 commits into from
May 5, 2024

Conversation

jt-traub
Copy link
Contributor

@jt-traub jt-traub commented May 5, 2024

nedbrek and others added 6 commits May 4, 2024 18:59
Fix for text describing the FACTION command, so that it works for
the case of martial factions as well.
This allows dumping all the surface city names to post for
the cities win condition.
A common New Origins win condition is percent of cities voting.
Add a global define to enable this, and put the counting and automatic
victory declaration, as well as a times message once someone has made
good progress towards it.   While this won't be used for NO7, I suspect
it will be good to have for the future.

Also, the freezing code was highly NO6 specific, so it shouldn't be
on the master branch.
As I was going through a few of the open PR, there were some small
changes which made for nice QoL improvements so I added them here.
This is cleanup for the other changes in the previous commits.
This fixes up the compile errors, adds unit test for the order
checker changes, and updates the snapshots with the practice
event changes as well as the rules with the MARTIAL changes.
@jt-traub jt-traub merged commit 7571f0c into master May 5, 2024
10 checks passed
@jt-traub jt-traub deleted the jt-cleanup-various-prs branch May 5, 2024 18:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants