diff options
| -rw-r--r-- | Northstar.Client/mod/resource/northstar_client_localisation_english.txt | bin | 10737 -> 21470 bytes | |||
| -rw-r--r-- | Northstar.Custom/mod/scripts/vscripts/rodeo/_rodeo_titan.gnut | 6 | ||||
| -rw-r--r-- | Northstar.CustomServers/mod/scripts/vscripts/mp/_base_gametype_mp.gnut | 3 | ||||
| -rw-r--r-- | Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut | 9 |
4 files changed, 12 insertions, 6 deletions
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_english.txt b/Northstar.Client/mod/resource/northstar_client_localisation_english.txt Binary files differindex 4cb79354..c277964b 100644 --- a/Northstar.Client/mod/resource/northstar_client_localisation_english.txt +++ b/Northstar.Client/mod/resource/northstar_client_localisation_english.txt diff --git a/Northstar.Custom/mod/scripts/vscripts/rodeo/_rodeo_titan.gnut b/Northstar.Custom/mod/scripts/vscripts/rodeo/_rodeo_titan.gnut index 499ca0b7..788b6dbe 100644 --- a/Northstar.Custom/mod/scripts/vscripts/rodeo/_rodeo_titan.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/rodeo/_rodeo_titan.gnut @@ -2288,7 +2288,7 @@ void function PostRodeoAirControl( entity player ) { float elapsedTime = Time() - startTime player.kv.airSpeed = player.GetPlayerSettingsField( "airSpeed" ) * POST_RODEO_AIR_CONTROL_SCALE * (1 - (elapsedTime / POST_RODEO_AIR_CONTROL_DURATION)) - player.kv.airAcceleration = player.GetPlayerSettingsField( "airAcceleration" ) * POST_RODEO_AIR_CONTROL_SCALE * (1 - (elapsedTime / POST_RODEO_AIR_CONTROL_DURATION)) + player.kv.airAcceleration = GetCurrentPlaylistVarInt( "custom_air_accel_pilot", int( player.GetPlayerSettingsField( "airAcceleration" ) ) ) * POST_RODEO_AIR_CONTROL_SCALE * (1 - (elapsedTime / POST_RODEO_AIR_CONTROL_DURATION)) //printt( "scale", POST_RODEO_AIR_CONTROL_SCALE * (1 - (elapsedTime / POST_RODEO_AIR_CONTROL_DURATION)) ) WaitFrame() @@ -2345,7 +2345,7 @@ void function RestorePlayerAirControl( entity player ) //This function should re { Assert( player.IsPlayer() ) player.kv.airSpeed = player.GetPlayerSettingsField( "airSpeed" ) - player.kv.airAcceleration = player.GetPlayerSettingsField( "airAcceleration" ) + player.kv.airAcceleration = GetCurrentPlaylistVarInt( "custom_air_accel_pilot", int( player.GetPlayerSettingsField( "airAcceleration" ) ) ) } bool function ShouldThrowGrenadeInHatch( entity rodeoPilot ) @@ -2490,4 +2490,4 @@ bool function ClientCommand_TryNukeGrenade( entity player, array<string> args ) return true } -#endif
\ No newline at end of file +#endif diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/_base_gametype_mp.gnut b/Northstar.CustomServers/mod/scripts/vscripts/mp/_base_gametype_mp.gnut index 62f7d459..b8cd67ad 100644 --- a/Northstar.CustomServers/mod/scripts/vscripts/mp/_base_gametype_mp.gnut +++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/_base_gametype_mp.gnut @@ -335,6 +335,7 @@ void function PostDeathThread_MP( entity player, var damageInfo ) // based on ga } player.SetPlayerSettings( "spectator" ) // prevent a crash with going from titan => pilot on respawn + player.StopPhysics() // need to set this after SetPlayerSettings if ( RespawnsEnabled() ) { @@ -467,6 +468,7 @@ void function RespawnAsTitan( entity player, bool manualPosition = false ) void function PlayerBecomesSpectator( entity player ) { player.StartObserverMode( OBS_MODE_CHASE ) + player.StopPhysics() player.EndSignal( "OnRespawned" ) player.EndSignal( "OnDestroy" ) @@ -533,6 +535,7 @@ void function PlayerBecomesSpectator( entity player ) player.SetObserverModeStaticAngles( target.GetAngles() ) player.StartObserverMode( OBS_MODE_STATIC ) } + player.StopPhysics() } } diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut b/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut index 119b1712..002b1331 100644 --- a/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut +++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut @@ -148,6 +148,11 @@ void function ScoreEvent_PlayerKilled( entity victim, entity attacker, var damag if ( attacker.p.playerKillStreaks[ victim ] == DOMINATING_KILL_REQUIREMENT ) AddPlayerScore( attacker, "Dominating" ) + if ( Time() - attacker.s.lastKillTime > CASCADINGKILL_REQUIREMENT_TIME ) + { + attacker.s.currentTimedKillstreak = 0 // reset first before kill + attacker.s.lastKillTime = Time() + } // timed killstreaks if ( Time() - attacker.s.lastKillTime <= CASCADINGKILL_REQUIREMENT_TIME ) @@ -161,8 +166,6 @@ void function ScoreEvent_PlayerKilled( entity victim, entity attacker, var damag else if ( attacker.s.currentTimedKillstreak == MEGAKILL_REQUIREMENT_KILLS ) AddPlayerScore( attacker, "MegaKill" ) } - else - attacker.s.currentTimedKillstreak = 0 // reset if a kill took too long attacker.s.lastKillTime = Time() } @@ -231,4 +234,4 @@ void function ScoreEvent_SetupEarnMeterValuesForMixedModes() // mixed modes in t void function ScoreEvent_SetupEarnMeterValuesForTitanModes() { // relatively sure we don't have to do anything here but leaving this function for consistency -}
\ No newline at end of file +} |