diff options
| author | BobTheBob <32057864+BobTheBob9@users.noreply.github.com> | 2021-12-05 23:28:38 +0000 |
|---|---|---|
| committer | BobTheBob <32057864+BobTheBob9@users.noreply.github.com> | 2021-12-05 23:28:38 +0000 |
| commit | f1a07e1b01923b45f7a82c063d25b8dea5b13d53 (patch) | |
| tree | 265a20be313fbdc054887c5be3d78797cbd6e707 /Northstar.CustomServers/mod/scripts/vscripts/evac | |
| parent | 51e16034230f4dd759900c7922b8db43941e0a70 (diff) | |
| download | NorthstarMods-f1a07e1b01923b45f7a82c063d25b8dea5b13d53.tar.gz NorthstarMods-f1a07e1b01923b45f7a82c063d25b8dea5b13d53.zip | |
fixes from playtest
Diffstat (limited to 'Northstar.CustomServers/mod/scripts/vscripts/evac')
| -rw-r--r-- | Northstar.CustomServers/mod/scripts/vscripts/evac/_evac.gnut | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/evac/_evac.gnut b/Northstar.CustomServers/mod/scripts/vscripts/evac/_evac.gnut index d84ab8735..9a7e89e22 100644 --- a/Northstar.CustomServers/mod/scripts/vscripts/evac/_evac.gnut +++ b/Northstar.CustomServers/mod/scripts/vscripts/evac/_evac.gnut @@ -94,9 +94,11 @@ void function EvacEpilogueSetup() void function EvacEpilogue() { - // make sure we don't run this on ffa modes if no epilogue was specified, since evac is default epilogue - if ( GetCurrentPlaylistVarInt( "max_teams", 2 ) == 2 ) - thread Evac( GetOtherTeam( GetWinningTeam() ), EVAC_INITIAL_WAIT, EVAC_ARRIVAL_TIME, EVAC_WAIT_TIME, EvacEpiloguePlayerCanBoard, EvacEpilogueShouldLeaveEarly, EvacEpilogueCompleted ) + int winner = GetWinningTeam() + + // make sure we don't run this on ffa modes if no epilogue was specified or it won't work for current gamestate, since evac is default epilogue + if ( GetCurrentPlaylistVarInt( "max_teams", 2 ) == 2 && ( winner == TEAM_MILITIA || winner == TEAM_IMC ) ) + thread Evac( GetOtherTeam( winner ), EVAC_INITIAL_WAIT, EVAC_ARRIVAL_TIME, EVAC_WAIT_TIME, EvacEpiloguePlayerCanBoard, EvacEpilogueShouldLeaveEarly, EvacEpilogueCompleted ) else thread EvacEpilogueCompleted( null ) // this is hacky but like, this also shouldn't really be hit in normal gameplay } |