new features and missing language file

Northstar.Client/mod/resource/northstar_client_localisation_english.txt

@@ -56,6 +56,7 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		"timelimit" "Time Limit"
 		"roundtimelimit" "Time Limit (round-based)"
 		"respawnprotection" "Respawn Protection Time"
+		"late_join_respawn" "Enable late join respawn"
 
 		"pilot_health_multiplier" "Health multiplier"
 		"respawn_delay" "Respawn Delay"

Northstar.Client/mod/resource/northstar_client_localisation_tchinese.txt

@@ -56,6 +56,7 @@
 		"timelimit" "時間限制"
 		"roundtimelimit" "時間限制（回合制）"
 		"respawnprotection" "重生保護時間"
+		"late_join_respawn" "中途加入復活"
 
 		"pilot_health_multiplier" "生命值加成"
 		"respawn_delay" "重生延遲"

Northstar.Custom/mod/scripts/vscripts/rodeo/_rodeo_titan.gnut

@@ -613,14 +613,22 @@ function PlayerBeginsTitanRodeo( entity player, RodeoPackageStruct rodeoPackage,
 
 				if ( IsAlive( player ) )
 				{
-					int attachIndex = newRodeoTitan.LookupAttachment( rodeoPackage.attachPoint )
-					vector startPos = newRodeoTitan.GetAttachmentOrigin( attachIndex )
-
-					if ( !PlayerCanTeleportHere( player, startPos, newRodeoTitan ) )
+					vector startPos
+					if( IsValid( newRodeoTitan ) )
 					{
-						startPos = newRodeoTitan.GetOrigin()
+						int attachIndex = newRodeoTitan.LookupAttachment( rodeoPackage.attachPoint )
+						startPos = newRodeoTitan.GetAttachmentOrigin( attachIndex )
+
 						if ( !PlayerCanTeleportHere( player, startPos, newRodeoTitan ) )
-							startPos = player.GetOrigin()
+						{
+							startPos = newRodeoTitan.GetOrigin()
+							if ( !PlayerCanTeleportHere( player, startPos, newRodeoTitan ) )
+								startPos = player.GetOrigin()
+						}
+					}
+					else
+					{
+						startPos = player.GetOrigin()
 					}
 
 					thread PlayerJumpsOffRodeoTarget( player, newRodeoTitan, startPos )

Northstar.CustomServers/mod/scripts/vscripts/_respawn_protection.gnut

@@ -1,39 +1,113 @@
 global function RespawnProtection_Init
+global function IsRespawnProtectionActive
+
+struct
+{
+	array< entity > players
+} file
 
 void function RespawnProtection_Init(){
+	RegisterSignal( "StopProtection" )
 	AddCallback_OnPlayerRespawned( OnPlayerRespawned )
 }
 
 void function OnPlayerRespawned( entity player )
 {
-	thread RespawnProtection(player,GetCurrentPlaylistVarFloat("respawnprotection",0.0))
+	float time = GetCurrentPlaylistVarFloat( "respawnprotection", 0.0 )
+	if( time > 0.0 )
+	{
+		AddButtonPressedPlayerInputCallback( player, IN_ATTACK, ForceStopProtection )
+		AddButtonPressedPlayerInputCallback( player, IN_OFFHAND0, ForceStopProtection )
+		AddButtonPressedPlayerInputCallback( player, IN_OFFHAND2, ForceStopProtection )
+		AddButtonPressedPlayerInputCallback( player, IN_OFFHAND4, ForceStopProtection )
+		AddButtonPressedPlayerInputCallback( player, IN_MELEE, ForceStopProtection )
+		AddButtonPressedPlayerInputCallback( player, IN_USE, ForceStopProtection )
+		thread RespawnProtection( player, time )
+	}
+}
+
+void function ForceStopProtection( entity player )
+{
+	player.Signal( "StopProtection" )
+}
+
+bool function IsRespawnProtectionActive( entity player )
+{
+	if ( player == null )
+		return false
+	if ( !IsValid( player ) )
+		return false
+
+	return file.players.contains( player )
 }
 
 void function RespawnProtection( entity player , float time ){
 	OnThreadEnd(
 		function() : ( player )
 		{
 			//cancel protect if player attack
-			if( IsDemigod( player ) )
+			if( IsValid( player ) )
 			{
+				ForceStopProtection( player )
+				if( file.players.contains( player ) )
+					file.players.fastremovebyvalue( player )
+				RemoveButtonPressedPlayerInputCallback( player, IN_ATTACK, ForceStopProtection )
+				RemoveButtonPressedPlayerInputCallback( player, IN_OFFHAND0, ForceStopProtection )
+				RemoveButtonPressedPlayerInputCallback( player, IN_OFFHAND2, ForceStopProtection )
+				RemoveButtonPressedPlayerInputCallback( player, IN_OFFHAND4, ForceStopProtection )
+				RemoveButtonPressedPlayerInputCallback( player, IN_MELEE, ForceStopProtection )
+				RemoveButtonPressedPlayerInputCallback( player, IN_USE, ForceStopProtection )
+				SetDefaultMPEnemyHighlight( player )
 				DisableDemigod( player );
+				player.ClearInvulnerable()
 			}
 		}
 	)
 
 	player.EndSignal( "OnDeath" )
 	player.EndSignal( "OnDestroy" )
 	player.EndSignal( "OnPrimaryAttack" )
+	player.EndSignal( "RodeoStarted" )
+	player.EndSignal( "StopProtection" )
 
-	if( IsDemigod( player ) )
+	if( IsValid( player ) )
 	{
-		DisableDemigod( player );
-	}
-	else{
 		//start protect
-		EnableDemigod( player )
-		wait time
-		//cancel protect
-		DisableDemigod( player );
+		if( player.GetPersistentVar( "spawnAsTitan" ) || Riff_SpawnAsTitan() )
+		{
+			player.WaitSignal( "PlayerEmbarkedTitan" )
+			player.SetInvulnerable()
+		}
+		else if( player.IsTitan() )
+		{
+			player.SetInvulnerable()
+		}
+		else
+		{
+			EnableDemigod( player )
+		}
+
+		//start a highlight
+		waitthread ProtectionHighlightThink( player, time )
+	}
+}
+
+void function ProtectionHighlightThink( entity player, float time )
+{
+	player.EndSignal( "OnDeath" )
+	player.EndSignal( "OnDestroy" )
+	player.EndSignal( "OnPrimaryAttack" )
+	player.EndSignal( "RodeoStarted" )
+	player.EndSignal( "StopProtection" )
+
+	float startTime = Time()
+	while( Time() - startTime <= time )
+	{
+		if( IsValid( player ) )
+		{
+			Highlight_SetEnemyHighlight( player, "sp_enemy_pilot" )
+			player.Highlight_SetParam( 2, 0, < 255,215,0 > )
+		}
+		WaitFrame()
 	}
 }

Northstar.CustomServers/mod/scripts/vscripts/lobby/sh_private_lobby_modes_init.gnut

@@ -11,6 +11,7 @@ void function PrivateMatchModesInit()
 	AddPrivateMatchModeSettingArbitrary( "#MODE_SETTING_CATEGORY_MATCH", "timelimit", "12" ) //, "Time Limit" )
 	AddPrivateMatchModeSettingArbitrary( "#MODE_SETTING_CATEGORY_MATCH", "roundtimelimit", "0" ) //, "Time Limit (round-based modes)" )
 	AddPrivateMatchModeSettingArbitrary( "#MODE_SETTING_CATEGORY_MATCH", "respawnprotection", "0.0" ) //, "Player Respawn Protection Time" )
+	AddPrivateMatchModeSettingEnum( "#MODE_SETTING_CATEGORY_MATCH", "late_join_respawn", [ "#SETTING_DISABLED", "#SETTING_ENABLED" ], "1" )
 
 	AddPrivateMatchModeSettingArbitrary( "#MODE_SETTING_CATEGORY_PILOT", "pilot_health_multiplier", "1.0" )
 	AddPrivateMatchModeSettingArbitrary( "#MODE_SETTING_CATEGORY_PILOT", "respawn_delay", "0.0" )
@@ -58,4 +59,4 @@ void function PrivateMatchModesInit()
 	// maps
 	AddPrivateMatchMap( "mp_coliseum" )
 	AddPrivateMatchMap( "mp_coliseum_column" )
-}
+}

Northstar.CustomServers/mod/scripts/vscripts/mp/_base_gametype_mp.gnut

@@ -9,6 +9,7 @@ global function DecideRespawnPlayer
 global function RespawnAsPilot
 global function RespawnAsTitan
 global function TryGameModeAnnouncement
+global function SetLateJoinRespawnEnabled
 
 global function SetKillcamsEnabled
 global function KillcamsEnabled
@@ -24,6 +25,7 @@ global function SetRecalculateRespawnAsTitanStartPointCallback
 struct {
 	bool killcamsEnabled = true
 	bool playerDeathsHidden = false
+	bool shouldDoRespawnForLatePlayer = true
 	int titanDamageGameStat = -1
 
 	entity intermissionCamera
@@ -44,6 +46,7 @@ void function BaseGametype_Init_MPSP()
 	RegisterSignal( "PlayerRespawnStarted" )
 	RegisterSignal( "KillCamOver" )
 
+	file.shouldDoRespawnForLatePlayer = GetCurrentPlaylistVarInt( "late_join_respawn", 1 ) == 1
 	FlagInit( "WeaponDropsAllowed", true )
 }
 
@@ -185,6 +188,12 @@ void function CodeCallback_OnClientConnectionCompleted( entity player )
 		player.SetPersistentVar( "privateMatchState", 0 )
 
 	// handle spawning late joiners
+	if( file.shouldDoRespawnForLatePlayer )
+		HandleRespawnForLateJoiner( player )
+}
+
+void function HandleRespawnForLateJoiner( entity player )
+{
 	if ( GetGameState() == eGameState.Playing )
 	{
 		if ( RespawnsEnabled() )
@@ -362,7 +371,8 @@ void function PostDeathThread_MP( entity player, var damageInfo ) // based on ga
 	{
 		player.SetObserverModeStaticPosition( file.intermissionCamera.GetOrigin() )
 		player.SetObserverModeStaticAngles( file.intermissionCamera.GetAngles() )
-		player.StartObserverMode( OBS_MODE_STATIC_LOCKED )
+		if( !IsValid( player.GetParent() ) )
+			player.StartObserverMode( OBS_MODE_STATIC_LOCKED )
 		player.SetObserverTarget( null )
 	}
 
@@ -574,6 +584,11 @@ void function TryGameModeAnnouncement( entity player ) // only putting this here
 	PlayFactionDialogueToPlayer( GameMode_GetGameModeAnnouncement( GAMETYPE ), player )
 }
 
+void function SetLateJoinRespawnEnabled( bool enabled )
+{
+	file.shouldDoRespawnForLatePlayer = enabled
+}
+
 void function SetKillcamsEnabled( bool enabled )
 {
 	file.killcamsEnabled = enabled

Northstar.CustomServers/mod/scripts/vscripts/rodeo/_rodeo.gnut

@@ -180,14 +180,22 @@ function PlayerBeginsNPCRodeo( entity player, RodeoPackageStruct rodeoPackage, e
 
 				if ( IsAlive( player ) )
 				{
-					int attachIndex = newRodeoTarget.LookupAttachment( rodeoPackage.attachPoint )
-					vector startPos = newRodeoTarget.GetAttachmentOrigin( attachIndex )
-
-					if ( !PlayerCanTeleportHere( player, startPos, newRodeoTarget ) )
+					vector startPos
+					if( IsValid( newRodeoTarget ) )
 					{
-						startPos = newRodeoTarget.GetOrigin()
+						int attachIndex = newRodeoTarget.LookupAttachment( rodeoPackage.attachPoint )
+						startPos = newRodeoTarget.GetAttachmentOrigin( attachIndex )
+
 						if ( !PlayerCanTeleportHere( player, startPos, newRodeoTarget ) )
-							startPos = player.GetOrigin()
+						{
+							startPos = newRodeoTarget.GetOrigin()
+							if ( !PlayerCanTeleportHere( player, startPos, newRodeoTarget ) )
+								startPos = player.GetOrigin()
+						}
+					}
+					else
+					{
+						startPos = player.GetOrigin()
 					}
 
 					thread PlayerJumpsOffRodeoTarget( player, newRodeoTarget, startPos )