lots of general fixes

4 files changed, 4 insertions, 10 deletions

diff --git a/Northstar.Custom/scripts/vscripts/gamemodes/_gamemode_fastball.gnut b/Northstar.Custom/scripts/vscripts/gamemodes/_gamemode_fastball.gnut
index 52b563d4b..815a2bb2f 100644
--- a/Northstar.Custom/scripts/vscripts/gamemodes/_gamemode_fastball.gnut
+++ b/Northstar.Custom/scripts/vscripts/gamemodes/_gamemode_fastball.gnut
@@ -15,6 +15,7 @@ void function GamemodeFastball_Init()
 	// used for respawn
 	PrecacheParticleSystem( $"P_pod_screen_lasers_OUT" )
 	
+	SetShouldUseRoundWinningKillReplay( true )
 	SetRoundBased( true )
 	SetRespawnsEnabled( false )
 	Riff_ForceSetEliminationMode( eEliminationMode.Pilots )
diff --git a/Northstar.Custom/scripts/vscripts/gamemodes/_gamemode_fastball_intro.gnut b/Northstar.Custom/scripts/vscripts/gamemodes/_gamemode_fastball_intro.gnut
index 6a1d0bbdd..754825582 100644
--- a/Northstar.Custom/scripts/vscripts/gamemodes/_gamemode_fastball_intro.gnut
+++ b/Northstar.Custom/scripts/vscripts/gamemodes/_gamemode_fastball_intro.gnut
@@ -131,9 +131,6 @@ void function FastballPlayer( entity player )
 		ClearPlayerAnimViewEntity( player )
 		player.DeployWeapon()
 		player.PlayerCone_Disable()
-		
-		RemoveButtonPressedPlayerInputCallback( player, IN_JUMP, PlayerHoldingJumpInIntro )
-		RemoveButtonReleasedPlayerInputCallback( player, IN_JUMP, PlayerNoLongerHoldingJumpInIntro )
 	})
 	
 	FirstPersonSequenceStruct throwSequence
@@ -179,14 +176,10 @@ void function FastballPlayer( entity player )
 	vector throwVel = AnglesToForward( player.EyeAngles() ) * 950
 	throwVel.z = 675.0
 	
-	// allow players to gain extra height by holding jump after this point too
-	AddButtonPressedPlayerInputCallback( player, IN_JUMP, PlayerHoldingJumpInIntro )
-	AddButtonReleasedPlayerInputCallback( player, IN_JUMP, PlayerNoLongerHoldingJumpInIntro )
-	
 	// wait for it to finish
 	buddy.WaitSignal( "fastball_release" )
 	
-	if ( player in file.playersHoldingJump && file.playersHoldingJump[ player ] )
+	if ( player.IsInputCommandHeld( IN_JUMP ) )
 		throwVel.z = 850.0
 	
 	// have to correct this manually here since due to no 3p animation our position isn't set right during this sequence
diff --git a/Northstar.Custom/scripts/vscripts/gamemodes/_gamemode_gg.gnut b/Northstar.Custom/scripts/vscripts/gamemodes/_gamemode_gg.gnut
index 99a5ccf77..bd9b695a1 100644
--- a/Northstar.Custom/scripts/vscripts/gamemodes/_gamemode_gg.gnut
+++ b/Northstar.Custom/scripts/vscripts/gamemodes/_gamemode_gg.gnut
@@ -32,7 +32,7 @@ void function OnPlayerRespawned_Threaded( entity player )
 
 void function OnPlayerKilled( entity victim, entity attacker, var damageInfo )
 {
-	if ( !victim.IsPlayer() || !attacker.IsPlayer() )
+	if ( !victim.IsPlayer() || !attacker.IsPlayer() || GetGameState() != eGameState.Playing )
 		return
 		
 	if ( attacker == victim ) // suicide
diff --git a/Northstar.Custom/scripts/vscripts/gamemodes/_gamemode_inf.gnut b/Northstar.Custom/scripts/vscripts/gamemodes/_gamemode_inf.gnut
index cc9df1169..2f045a476 100644
--- a/Northstar.Custom/scripts/vscripts/gamemodes/_gamemode_inf.gnut
+++ b/Northstar.Custom/scripts/vscripts/gamemodes/_gamemode_inf.gnut
@@ -103,7 +103,7 @@ void function RespawnInfected( entity player )
 	player.kv.airAcceleration = 2500
 	
 	// scale health with num of infected, with 50 as base health
-	player.SetMaxHealth( 50 + ( GetPlayerArrayOfTeam( INFECTION_TEAM_SURVIVOR ).len() * 25 ) )
+	player.SetMaxHealth( GetPlayerArrayOfTeam( INFECTION_TEAM_SURVIVOR ).len() * 10 )
 		
 	// set loadout 
 	foreach ( entity weapon in player.GetMainWeapons() )