Change gMapSides when knife round swaps. #753
Merged
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
This should fix Side Restore Issues in splewis#699.
|
I get any ideas? |
|
Make sure you don't have any other changes, I've never used smbuild as I've used my own Environment. https://github.com/PhlexPlexico/get5/suites/6611108015/artifacts/248719183 But it looks like it compiled successfully here, so you can use that if you'd like. |
|
Hmm I have the 0.9 changes pulled too. Probably why it happens. Any chance to get this rebased to 0.9 since from what I understand it will be the next release |
|
@tapir We're more likely to rebase 0.9 on this though. I will do that once this gets merged in. |
|
We've been in the talks about that, and whatever gets merged in first we'll adjust and rebase as necessary. But for now, I was working on the fact that it's not breaking changes, so it shouldn't be merged into 0.9 just yet. |
|
Thanks a lot. Turns out was just a matter of renaming it to Get5_GetMapNumber() btw. |
PhlexPlexico
added a commit
to PhlexPlexico/get5
that referenced
this pull request
Jun 26, 2022
* Update Dockerfile to debian 11 (splewis#760) Update Dockerfile to debian 11 * Change gMapSides when knife round swaps. (splewis#753) This should fix Side Restore Issues in splewis#699. * Include basic mkdocs installation. Update build to use one run instead of multiple. TODO: Update build job to build and host files with GH Pages. * Documentation conversion. Start with essentials. Include build job for github pages. Update example match json for new map pool. * Update mkdocs and github action. * Update published directory. * Try once more. * Change to a different build process. * Another build change? * Include space for commands for proper formatting. * Remove redunant text in README and point to docs site. * Swap URL. * Branch update. * Include colours from the utils class. * Update generate_docs.yml Attempt to fix directory issue Co-authored-by: Alex <[email protected]>
PhlexPlexico
added a commit
to PhlexPlexico/get5
that referenced
this pull request
Jul 2, 2022
* Update Dockerfile to debian 11 (splewis#760) Update Dockerfile to debian 11 * Change gMapSides when knife round swaps. (splewis#753) This should fix Side Restore Issues in splewis#699. * Include basic mkdocs installation. Update build to use one run instead of multiple. TODO: Update build job to build and host files with GH Pages. * Documentation conversion. Start with essentials. Include build job for github pages. Update example match json for new map pool. * Update mkdocs and github action. * Update published directory. * Try once more. * Change to a different build process. * Another build change? * Include space for commands for proper formatting. * Remove redunant text in README and point to docs site. * Swap URL. * Branch update. * Include colours from the utils class. * Update generate_docs.yml Attempt to fix directory issue Co-authored-by: Alex <[email protected]> Shift docs generation around.
PhlexPlexico
added a commit
to PhlexPlexico/get5
that referenced
this pull request
Jul 8, 2022
* Update Dockerfile to debian 11 (splewis#760) Update Dockerfile to debian 11 * Change gMapSides when knife round swaps. (splewis#753) This should fix Side Restore Issues in splewis#699. * Include basic mkdocs installation. Update build to use one run instead of multiple. TODO: Update build job to build and host files with GH Pages. * Documentation conversion. Start with essentials. Include build job for github pages. Update example match json for new map pool. * Update mkdocs and github action. * Update published directory. * Try once more. * Change to a different build process. * Another build change? * Include space for commands for proper formatting. * Remove redunant text in README and point to docs site. * Swap URL. * Branch update. * Include colours from the utils class. * Update generate_docs.yml Attempt to fix directory issue Co-authored-by: Alex <[email protected]> Shift docs generation around.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This should fix Side Restore Issues in #699.
Currently on round 0, it appears that the temp valve backup is not created, which causes us to hit the conditional in
RestoreGet5Backup()and callsSetStartingTeams()inteamlogic.spon Line 301. So instead of rewriting a bunch of logic, we just set the currentg_MapSidesvalue to be whichever side choice is selected by the!swapcommand.