diff options
| author | BobTheBob <32057864+BobTheBob9@users.noreply.github.com> | 2021-07-12 19:44:25 +0100 |
|---|---|---|
| committer | BobTheBob <32057864+BobTheBob9@users.noreply.github.com> | 2021-07-12 19:44:25 +0100 |
| commit | 1c1d36fad84687a93a629525145c557f78cbf673 (patch) | |
| tree | dad9279353a0b492349778a926dbc94a34762667 /Northstar.CustomServers/scripts/vscripts/mp | |
| parent | ba41749cc6a6693f11a7f1c7535ff758a461a424 (diff) | |
| download | NorthstarMods-1c1d36fad84687a93a629525145c557f78cbf673.tar.gz NorthstarMods-1c1d36fad84687a93a629525145c557f78cbf673.zip | |
lots of general fixes
Diffstat (limited to 'Northstar.CustomServers/scripts/vscripts/mp')
5 files changed, 21 insertions, 5 deletions
diff --git a/Northstar.CustomServers/scripts/vscripts/mp/_changemap.nut b/Northstar.CustomServers/scripts/vscripts/mp/_changemap.nut index 7aa6940c6..06270c39c 100644 --- a/Northstar.CustomServers/scripts/vscripts/mp/_changemap.nut +++ b/Northstar.CustomServers/scripts/vscripts/mp/_changemap.nut @@ -14,7 +14,11 @@ void function CodeCallback_MatchIsOver() if ( GetCurrentPlaylistVarInt( "return_to_private_lobby", 0 ) == 1 ) // set in _private_lobby.gnut, temp lol { SetCurrentPlaylist( "private_match" ) // needed for private lobby to load - GameRules_ChangeMap( "mp_lobby", "tdm" ) // need to change back to tdm + + if ( IsSingleplayer() ) + GameRules_ChangeMap( "mp_lobby", "tdm" ) // need to change back to tdm + else + GameRules_ChangeMap( "mp_lobby", GAMETYPE ) // this is esp important for sp, since solo will break a bunch of shit in the private lobby // idk if even necessary to deal with solo but eh whatever better to have it work than not } diff --git a/Northstar.CustomServers/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut b/Northstar.CustomServers/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut index f6cedd4e2..7d5fb9f0d 100644 --- a/Northstar.CustomServers/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut +++ b/Northstar.CustomServers/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut @@ -72,7 +72,9 @@ void function DropshipIntro_OnClientConnected( entity player ) return } - + + // if we're at this point, we have more players than we do dropships, oh dear + RespawnAsPilot( player ) } void function DropshipIntro_OnClientDisconnected( entity player ) diff --git a/Northstar.CustomServers/scripts/vscripts/mp/_score.nut b/Northstar.CustomServers/scripts/vscripts/mp/_score.nut index c54bbf8d1..238eab1d1 100644 --- a/Northstar.CustomServers/scripts/vscripts/mp/_score.nut +++ b/Northstar.CustomServers/scripts/vscripts/mp/_score.nut @@ -31,7 +31,7 @@ void function AddPlayerScore( entity targetPlayer, string scoreEventName, entity { ScoreEvent event = GetScoreEvent( scoreEventName ) - if ( !event.enabled || !targetPlayer.IsPlayer() ) + if ( !event.enabled || !IsValid( targetPlayer ) || !targetPlayer.IsPlayer() ) return var associatedHandle = 0 diff --git a/Northstar.CustomServers/scripts/vscripts/mp/levels/mp_coliseum.nut b/Northstar.CustomServers/scripts/vscripts/mp/levels/mp_coliseum.nut index 37b891699..398b2fc55 100644 --- a/Northstar.CustomServers/scripts/vscripts/mp/levels/mp_coliseum.nut +++ b/Northstar.CustomServers/scripts/vscripts/mp/levels/mp_coliseum.nut @@ -1 +1,6 @@ -//fuck
\ No newline at end of file +global function CodeCallback_MapInit + +void function CodeCallback_MapInit() +{ + SetupLiveFireMaps() +}
\ No newline at end of file diff --git a/Northstar.CustomServers/scripts/vscripts/mp/levels/mp_coliseum_column.nut b/Northstar.CustomServers/scripts/vscripts/mp/levels/mp_coliseum_column.nut index 37b891699..398b2fc55 100644 --- a/Northstar.CustomServers/scripts/vscripts/mp/levels/mp_coliseum_column.nut +++ b/Northstar.CustomServers/scripts/vscripts/mp/levels/mp_coliseum_column.nut @@ -1 +1,6 @@ -//fuck
\ No newline at end of file +global function CodeCallback_MapInit + +void function CodeCallback_MapInit() +{ + SetupLiveFireMaps() +}
\ No newline at end of file |