-
Notifications
You must be signed in to change notification settings - Fork 174
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
Ensure correct MapNumber logic when restoring from backups with draws + add series clinch config parameter + fix OnSeriesResult #821
Conversation
2783c75
to
d4109ba
Compare
Last commit fixes #728 |
1889fe4
to
4cf2222
Compare
Tested everything in here and it seems to work as expected. Tested |
4cf2222
to
225b2a6
Compare
225b2a6
to
5d7244d
Compare
Now also fixes #213 |
b046f02
to
9c8d3ca
Compare
Fixes #190 now also. |
adacb56
to
10819c6
Compare
8f892d8
to
88d162d
Compare
I changed the translation logic to always inject the color around variables if applicable. This means we don't have to make sure different languages use the same colors. I also cleaned up some of the translations a bit, where I could. Player names are now colored based on the side they are on, so for instance when Commands in translations (.ie. |
…draws Read round number from valve backup on restore event Use g_MapNumber in more places and reduce use of Get5_GetMapNumber where not needed Properly calculate series results when ties are included Remove bo2 tie message (it was used when not bo2) Remove call to WriteBackup on match end Remove unused translation from docs
0718f2c
to
66743d7
Compare
Cleaned up EndSeries call Fixed match restart delay to GOTV delay Remove unnecessary g_ForceWinnerSignal and g_ForcedWinner vars Remove duplicate call to Stats_SeriesEnd when forfeiting Ensure Get5_OnDemoFinished is detached from global vars and on a delay for file flush Adjust translation to include time-to-map-change Ensure SetMatchRestartDelay is called after cvars are set, using timers Use datapacks for all backup timer chains, ensuring nothing messes with the parameters Update translations doc + danish Fix mp_match_restart_delay problems related to restoring cvars Cleaned up duplicate code used to start recording, moved all code to recording.sp prevent invalid handle if RestoreCvars is called twice Always reset g_DemoFileName on map start
68784d9
to
ff2e6e8
Compare
Don't wait for gotv when restoring cvars when force-ending a match ensure endmatch unpauses the game
Add gold color; color player names based on their current side Fixed some translations consistently color team names
Fixed correct callout and graphics for winning team when knife-round ends Get rid of Timer_PostKnife Always reset g_HasKnifeRoundStarted when loading configs or maps
ff2e6e8
to
d9b4a16
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good overall, just a few tiny nits that I'd like to see tweaked, feel free to merge it.
This should fix #817.
I also adjusted
Get5_OnBackupRestore
to have the correct map and round number, indicating the match, map and round being restored to.Tried to reduce use of
Get5_GetMapNumber()
where it is not needed.Fixed problems with ties not correctly affecting the next map/series end logic.
I put the fix for #822 in here as well.
Added a
g_SeriesCanClinch
option that allows you to disable clinch-logic in a series, similarly tomp_match_can_clinch
, but for maps.I've moved a lot of code around, fixing the delay on
OnSeriesResult
and probably fixing a lot of weird issues with GOTV recordings.mp_match_restart_delay
is now corrected if it is not long enough, but not shortened if longer. This allows admins to set a longer, fixed pause length between maps regardless of the length of the GOTV delay. Essentially this now includes #825, but I had to put that on top of this due to the way map scores are now handled. This also gets rid ofg_ForceWinnerSignal
andg_ForcedWinner
.Everything here is tested and it all works as far as I can tell.