diff options
Diffstat (limited to 'Northstar.CustomServers/scripts/vscripts')
8 files changed, 31 insertions, 8 deletions
diff --git a/Northstar.CustomServers/scripts/vscripts/gamemodes/_featured_mode_settings.gnut b/Northstar.CustomServers/scripts/vscripts/gamemodes/_featured_mode_settings.gnut index 272043804..090814cb2 100644 --- a/Northstar.CustomServers/scripts/vscripts/gamemodes/_featured_mode_settings.gnut +++ b/Northstar.CustomServers/scripts/vscripts/gamemodes/_featured_mode_settings.gnut @@ -56,6 +56,8 @@ void function FeaturedModeSettingsSetupPilotLoadouts( entity player ) if ( IsFeaturedMode( "rocket_arena" ) ) { + // this crashes sometimes for some reason + shouldChangeLoadout = true modifiedLoadout.primary = "mp_weapon_epg" @@ -72,6 +74,8 @@ void function FeaturedModeSettingsSetupPilotLoadouts( entity player ) modifiedLoadout.secondary = "mp_weapon_autopistol" modifiedLoadout.secondaryMods = [ "rocket_arena" ] } + + player.GiveExtraWeaponMod( "rocket_arena" ) } if ( IsFeaturedMode( "shotguns_snipers" ) ) diff --git a/Northstar.CustomServers/scripts/vscripts/gamemodes/_gamemode_ctf.nut b/Northstar.CustomServers/scripts/vscripts/gamemodes/_gamemode_ctf.nut index f34907307..728d742df 100644 --- a/Northstar.CustomServers/scripts/vscripts/gamemodes/_gamemode_ctf.nut +++ b/Northstar.CustomServers/scripts/vscripts/gamemodes/_gamemode_ctf.nut @@ -457,7 +457,7 @@ void function OnPlayerEntersFlagReturnTrigger( entity trigger, entity player ) else flag = file.militiaFlag - if ( !player.IsPlayer() || !player.IsTitan() || player.GetTeam() != flag.GetTeam() || IsFlagHome( flag ) || flag.GetParent() != null ) + if ( !player.IsPlayer() || player.IsTitan() || player.GetTeam() != flag.GetTeam() || IsFlagHome( flag ) || flag.GetParent() != null ) return thread TryReturnFlag( player, flag ) @@ -471,7 +471,7 @@ void function OnPlayerExitsFlagReturnTrigger( entity trigger, entity player ) else flag = file.militiaFlag - if ( !player.IsPlayer() || !player.IsTitan() || player.GetTeam() != flag.GetTeam() || IsFlagHome( flag ) || flag.GetParent() != null ) + if ( !player.IsPlayer() || player.IsTitan() || player.GetTeam() != flag.GetTeam() || IsFlagHome( flag ) || flag.GetParent() != null ) return player.Signal( "FlagReturnEnded" ) diff --git a/Northstar.CustomServers/scripts/vscripts/gamemodes/_gamemode_ffa.nut b/Northstar.CustomServers/scripts/vscripts/gamemodes/_gamemode_ffa.nut index 3292693a8..932f14b7d 100644 --- a/Northstar.CustomServers/scripts/vscripts/gamemodes/_gamemode_ffa.nut +++ b/Northstar.CustomServers/scripts/vscripts/gamemodes/_gamemode_ffa.nut @@ -9,6 +9,9 @@ void function FFA_Init() void function OnPlayerKilled( entity victim, entity attacker, var damageInfo ) { - if ( victim != attacker && victim.IsPlayer() && attacker.IsPlayer() ) + if ( victim != attacker && victim.IsPlayer() && attacker.IsPlayer() && GetGameState() == eGameState.Playing ) + { AddTeamScore( attacker.GetTeam(), 1 ) + attacker.AddToPlayerGameStat( PGS_SCORE, 1 ) + } }
\ No newline at end of file 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 |