From 181646ccbb5658bd8735cfe1b99506c73bd3baa0 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Mon, 9 Dec 2019 00:34:16 -0500 Subject: [PATCH] Safer Scheduling/Vote Overtime Rework --- Classic/evoClassicTaco.vl2 | Bin 71309 -> 71362 bytes Classic/scripts/autoexec/VoteOverTime.cs | 67 ++++++++++++----------- Classic/scripts/autoexec/VoteSound.cs | 5 +- 3 files changed, 39 insertions(+), 33 deletions(-) diff --git a/Classic/evoClassicTaco.vl2 b/Classic/evoClassicTaco.vl2 index 28645a68fb53d91464a35968fcd1a981b26d3faa..ded9f12123829f6a008bdbdab73dac79594e07fc 100644 GIT binary patch delta 8793 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 delta 8803 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 J1OMHy{{w!ex{3e* diff --git a/Classic/scripts/autoexec/VoteOverTime.cs b/Classic/scripts/autoexec/VoteOverTime.cs index eb9fb1a..e14a8b1 100644 --- a/Classic/scripts/autoexec/VoteOverTime.cs +++ b/Classic/scripts/autoexec/VoteOverTime.cs @@ -1,10 +1,15 @@ // Vote OverTime Script // // Dont allow the match to end if a time vote is pending +// Or if the timelimit has changed +// +// Changes were also made in the Evo Admin.ovl and DefaultGame.ovl +// DefaultGame::voteChangeMission, DefaultGame::voteChangeTimeLimit, serverCmdStartNewVote +// +// The VoteChangeTimeLimit functions in evo dictate VOStatus conditions +$VOStatus = "Normal"; -//Changes were also made in the Evo Admin.ovl and DefaultGame.ovl -//DefaultGame::voteChangeMission, DefaultGame::voteChangeTimeLimit, serverCmdStartNewVote package VoteOverTime { @@ -25,23 +30,24 @@ function DefaultGame::checkTimeLimit(%game, %forced) if (%curTimeLeftMS <= 0) { - //Vote Overtime - //Check if Vote is active or if the timelimit has changed. - if( !$VoteInProgress && !$TimeLimitChanged ) + //Vote Overtime + //Check if Time Vote is starting or active or if the timelimit has changed. + //If the timelimit has changed, don't end the game. + switch$($VOStatus) { - // time's up, put down your pencils - %game.timeLimitReached(); - } - else if( $missionRunning && $VoteInProgress && !$TimeLimitChanged ) - { - //Restart the function so the map can end if the Vote doesnt pass. - schedule(2000, 0, "RestartcheckTimeLimit", %game, %forced); - - if( !$VoteInProgressMsg ) - { - messageAll('', '\c2Vote Overtime Initiated.~wfx/powered/turret_heavy_activate.wav', %display); - $VoteInProgressMsg = true; - } + case Starting: + if($missionRunning) + { + messageAll('', '\c2Vote Overtime Initiated.~wfx/powered/turret_heavy_activate.wav', %display); + $VOStatus = "InProgress"; + } + case InProgress: + //Do Nothing + case TimeChanged: + //Do Nothing + case Normal: + // time's up, put down your pencils + %game.timeLimitReached(); } } else @@ -56,42 +62,39 @@ function DefaultGame::checkTimeLimit(%game, %forced) } } -// Reset every map change function DefaultGame::gameOver(%game) { Parent::gameOver(%game); //Reset everything to do with Vote Overtime ResetVOall(%game); + + if(isEventPending($VoteSoundSchedule)) + cancel($VoteSoundSchedule); } }; -function RestartcheckTimeLimit(%game, %forced) -{ - %game.checkTimeLimit(%game, %forced); -} - +// Various Flags for the different situations +// Starting a TimeVote - Sets flags so the game wont end during this vote function StartVOTimeVote(%game) { + $VOStatus = "Starting"; $VoteSoundInProgress = true; - $VoteInProgress = true; - $TimeLimitChanged = false; } +// Tribes wont change the time after its reached zero and you cant change it again afterwards until a gameover/map change. +// But this serves its purpose for extending the game whether it works (technically) or not. function ResetVOTimeChanged(%game) { - $VoteInProgress = false; - $TimeLimitChanged = true; - $VoteInProgressMsg = false; + $VOStatus = "TimeChanged"; $VoteSoundInProgress = false; } +// Reset everything. So everything functions normally after a map change. function ResetVOall(%game) { - $VoteInProgress = false; - $TimeLimitChanged = false; - $VoteInProgressMsg = false; + $VOStatus = "Normal"; $VoteSoundInProgress = false; } diff --git a/Classic/scripts/autoexec/VoteSound.cs b/Classic/scripts/autoexec/VoteSound.cs index d4fc129..8cea7cb 100644 --- a/Classic/scripts/autoexec/VoteSound.cs +++ b/Classic/scripts/autoexec/VoteSound.cs @@ -52,6 +52,9 @@ function VoteSound( %game, %typename, %arg1, %arg2, %VoteSoundRandom ) messageAll('', '\c1Vote in Progress: \c0To change the mission to Tournament Mode (%1). %3~wgui/objective_notification.wav', %arg1, %arg2, %votemsg ); } - schedule(12000, 0, "VoteSound", %game, %typename, %arg1, %arg2, %VoteSoundRandom); + if(isEventPending($VoteSoundSchedule)) + cancel($VoteSoundSchedule); + + $VoteSoundSchedule = schedule(12000, 0, "VoteSound", %game, %typename, %arg1, %arg2, %VoteSoundRandom); } }