Merge branch 'R2Northstar:main' into pilotelite_execution

R2Northstar · Oct 2, 2024 · 40e129c · 40e129c
2 parents a39b14c + 75e95ef
commit 40e129c
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_french.txt b/Northstar.Client/mod/resource/northstar_client_localisation_french.txt
@@ -367,7 +367,7 @@ Choisissez Oui si vous êtes d'accord. Ce choix peut être modifié à tout inst
 		"DOWNLOADING_MOD_TEXT"        "Téléchargement de %s1 v%s2..."
 		"WRONG_MOD_VERSION"        "Le serveur requiert la version v%s2 du mod \"%s1\" (vous avez la version v%s3)"
 		"DOWNLOADING_MOD_TEXT_W_PROGRESS"        "Téléchargement de %s1 v%s2...\n(%s3/%s4 Mo)"
-		"CHECKSUMING_TITLE"        "Vérification de la somme de contrôle du mod"
+		"CHECKSUMING_TITLE"        "Vérification de l'intégrité du mod"
 		"CHECKSUMING_TEXT"        "Vérification du contenu de %s1 v%s2..."
 		"EXTRACTING_MOD_TEXT"        "Extraction de %s1 v%s2...\n(%s3/%s4 Mo)"
 		"FAILED_DOWNLOADING"        "Echec du téléchargement du mod"
@@ -379,5 +379,15 @@ Choisissez Oui si vous êtes d'accord. Ce choix peut être modifié à tout inst
 		"MOD_FETCHING_FAILED_GENERAL"        "L'extraction du mod a échoué. Consultez le journal pour plus d'informations."
 		"MANIFESTO_FETCHING_TITLE"        "Préparation du téléchargement du mod"
 		"MANIFESTO_FETCHING_TEXT"        "Récupération de la liste des mods vérifiés..."
+		"MODE_MENU_PVPVE"        "JcJcE"
+		"MODE_MENU_PVE"        "JcE"
+		"MODE_MENU_PVP"        "JcJ"
+		"MODE_MENU_FFA"        "Mêlée générale"
+		"MODE_MENU_OTHER"        "Autre"
+		"MODE_MENU_CUSTOM"        "Personnalisé"
+		"MODE_MENU_ALL"        "Tout"
+		"MODE_MENU_UNKNOWN"        "Inconnu"
+		"MODE_MENU_SWITCH"        "Filtre"
+		"MODE_MENU_TITAN_ONLY"        "Titan Uniquement"
 	}
 }
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/earn_meter/sv_earn_meter_mp.gnut b/Northstar.CustomServers/mod/scripts/vscripts/earn_meter/sv_earn_meter_mp.gnut
@@ -91,6 +91,8 @@ void function EarnMeterMP_PlayerLifeThink( entity player )
 	EarnObject pilotReward = PlayerEarnMeter_GetReward( player ) 
 	float pilotRewardFrac = PlayerEarnMeter_GetRewardFrac( player )
 	int lastEarnMeterMode = PlayerEarnMeter_GetMode( player )
+	bool saidTitanSoon = false
+	bool titanReadyMsg = false
 	float lastPassiveGainTime = Time()
 
 	OnThreadEnd(
@@ -148,15 +150,34 @@ void function EarnMeterMP_PlayerLifeThink( entity player )
 
 		if ( lastEarnMeterMode == eEarnMeterMode.DEFAULT )
 		{
+			if ( Riff_TitanAvailability() != eTitanAvailability.Never )
+			{
+				if ( PlayerEarnMeter_GetOwnedFrac( player ) >= 0.75 && PlayerEarnMeter_GetOwnedFrac( player ) < 0.95 && !saidTitanSoon )
+				{
+					PlayFactionDialogueToPlayer( "mp_titanSoon", player )
+					saidTitanSoon = true
+				}
+				else if( PlayerEarnMeter_GetOwnedFrac( player ) < 0.75 )
+					saidTitanSoon = false
+			}
+
 			if ( PlayerEarnMeter_GetOwnedFrac( player ) < 1.0 )
+			{
 				PlayerEarnMeter_DisableGoal( player )
+				titanReadyMsg = false
+			}
 			else if ( player.GetPlayerNetInt( "goalState" ) != eRewardState.UNAVAILABLE )
 			{
 				// if goal is enabled then the client will show "titan ready" alerts even if it isn't
 				// the problem is that if the goal isn't available when we fill the earnmeter, then it won't make it available
 				// so unfortunately we have to do this manually
 				player.SetPlayerNetInt( "goalState", eRewardState.AVAILABLE )
 				PlayerEarnMeter_RefreshGoal( player )
+				if( !titanReadyMsg )
+				{
+					Remote_CallFunction_NonReplay( player, "ServerCallback_TitanReadyMessage" )
+					titanReadyMsg = true
+				}
 			}
 
 			if ( Time() - lastPassiveGainTime > 4.0 && file.passiveMeterGainEnabled ) // this might be 5.0