diff options
| author | BobTheBob <32057864+BobTheBob9@users.noreply.github.com> | 2021-12-19 17:32:09 +0000 |
|---|---|---|
| committer | BobTheBob <32057864+BobTheBob9@users.noreply.github.com> | 2021-12-19 17:32:09 +0000 |
| commit | f8685213baf4eef93dae6cc98c8e4a8318565bd3 (patch) | |
| tree | c5bfb10ee066e5f7fb031376ddb8b435577b2991 /Northstar.CustomServers/mod/scripts/vscripts/evac | |
| parent | 7cac56cb9bcaabed9562a7b46718f5c5de3400b8 (diff) | |
| download | NorthstarMods-f8685213baf4eef93dae6cc98c8e4a8318565bd3.tar.gz NorthstarMods-f8685213baf4eef93dae6cc98c8e4a8318565bd3.zip | |
fixes and dropship refactor
Diffstat (limited to 'Northstar.CustomServers/mod/scripts/vscripts/evac')
| -rw-r--r-- | Northstar.CustomServers/mod/scripts/vscripts/evac/_evac.gnut | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/evac/_evac.gnut b/Northstar.CustomServers/mod/scripts/vscripts/evac/_evac.gnut index 96b84c23..d086d65b 100644 --- a/Northstar.CustomServers/mod/scripts/vscripts/evac/_evac.gnut +++ b/Northstar.CustomServers/mod/scripts/vscripts/evac/_evac.gnut @@ -136,19 +136,10 @@ void function EvacEpilogueCompleted( entity dropship ) { wait 5.0 - if ( IsValid( dropship ) ) - { - foreach ( entity player in dropship.s.evacSlots ) - { - if ( !IsValid( player ) ) - continue - - ScreenFadeToBlackForever( player, 2.0 ) - } - } + foreach ( entity player in GetPlayerArray() ) + ScreenFadeToBlackForever( player, 2.0 ) wait 2.0 - SetGameState( eGameState.Postmatch ) } @@ -197,6 +188,7 @@ void function Evac( int evacTeam, float initialWait, float arrivalTime, float wa dropship.SetModel( $"models/vehicle/crow_dropship/crow_dropship_hero.mdl" ) dropship.SetValueForModelKey( $"models/vehicle/crow_dropship/crow_dropship_hero.mdl" ) DispatchSpawn( dropship ) + dropship.SetModel( $"models/vehicle/crow_dropship/crow_dropship_hero.mdl" ) dropship.s.evacSlots <- [ null, null, null, null, null, null, null, null ] @@ -305,7 +297,7 @@ void function Evac( int evacTeam, float initialWait, float arrivalTime, float wa if ( player.GetTeam() == dropship.GetTeam() ) SetPlayerActiveObjective( player, "EG_DropshipExtractFailedEscape" ) - return + continue } SetPlayerActiveObjective( player, "EG_DropshipExtractSuccessfulEscape" ) |