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/gamemodes | |
| parent | ba41749cc6a6693f11a7f1c7535ff758a461a424 (diff) | |
| download | NorthstarMods-1c1d36fad84687a93a629525145c557f78cbf673.tar.gz NorthstarMods-1c1d36fad84687a93a629525145c557f78cbf673.zip | |
lots of general fixes
Diffstat (limited to 'Northstar.CustomServers/scripts/vscripts/gamemodes')
3 files changed, 10 insertions, 3 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 |