Skip to content

Commit 40e129c

Browse files
Merge branch 'R2Northstar:main' into pilotelite_execution
2 parents a39b14c + 75e95ef commit 40e129c

File tree

2 files changed

+32
-1
lines changed

2 files changed

+32
-1
lines changed

Northstar.Client/mod/resource/northstar_client_localisation_french.txt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ Choisissez Oui si vous êtes d'accord. Ce choix peut être modifié à tout inst
367367
"DOWNLOADING_MOD_TEXT" "Téléchargement de %s1 v%s2..."
368368
"WRONG_MOD_VERSION" "Le serveur requiert la version v%s2 du mod \"%s1\" (vous avez la version v%s3)"
369369
"DOWNLOADING_MOD_TEXT_W_PROGRESS" "Téléchargement de %s1 v%s2...\n(%s3/%s4 Mo)"
370-
"CHECKSUMING_TITLE" "Vérification de la somme de contrôle du mod"
370+
"CHECKSUMING_TITLE" "Vérification de l'intégrité du mod"
371371
"CHECKSUMING_TEXT" "Vérification du contenu de %s1 v%s2..."
372372
"EXTRACTING_MOD_TEXT" "Extraction de %s1 v%s2...\n(%s3/%s4 Mo)"
373373
"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
379379
"MOD_FETCHING_FAILED_GENERAL" "L'extraction du mod a échoué. Consultez le journal pour plus d'informations."
380380
"MANIFESTO_FETCHING_TITLE" "Préparation du téléchargement du mod"
381381
"MANIFESTO_FETCHING_TEXT" "Récupération de la liste des mods vérifiés..."
382+
"MODE_MENU_PVPVE" "JcJcE"
383+
"MODE_MENU_PVE" "JcE"
384+
"MODE_MENU_PVP" "JcJ"
385+
"MODE_MENU_FFA" "Mêlée générale"
386+
"MODE_MENU_OTHER" "Autre"
387+
"MODE_MENU_CUSTOM" "Personnalisé"
388+
"MODE_MENU_ALL" "Tout"
389+
"MODE_MENU_UNKNOWN" "Inconnu"
390+
"MODE_MENU_SWITCH" "Filtre"
391+
"MODE_MENU_TITAN_ONLY" "Titan Uniquement"
382392
}
383393
}

Northstar.CustomServers/mod/scripts/vscripts/earn_meter/sv_earn_meter_mp.gnut

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ void function EarnMeterMP_PlayerLifeThink( entity player )
9191
EarnObject pilotReward = PlayerEarnMeter_GetReward( player )
9292
float pilotRewardFrac = PlayerEarnMeter_GetRewardFrac( player )
9393
int lastEarnMeterMode = PlayerEarnMeter_GetMode( player )
94+
bool saidTitanSoon = false
95+
bool titanReadyMsg = false
9496
float lastPassiveGainTime = Time()
9597

9698
OnThreadEnd(
@@ -148,15 +150,34 @@ void function EarnMeterMP_PlayerLifeThink( entity player )
148150

149151
if ( lastEarnMeterMode == eEarnMeterMode.DEFAULT )
150152
{
153+
if ( Riff_TitanAvailability() != eTitanAvailability.Never )
154+
{
155+
if ( PlayerEarnMeter_GetOwnedFrac( player ) >= 0.75 && PlayerEarnMeter_GetOwnedFrac( player ) < 0.95 && !saidTitanSoon )
156+
{
157+
PlayFactionDialogueToPlayer( "mp_titanSoon", player )
158+
saidTitanSoon = true
159+
}
160+
else if( PlayerEarnMeter_GetOwnedFrac( player ) < 0.75 )
161+
saidTitanSoon = false
162+
}
163+
151164
if ( PlayerEarnMeter_GetOwnedFrac( player ) < 1.0 )
165+
{
152166
PlayerEarnMeter_DisableGoal( player )
167+
titanReadyMsg = false
168+
}
153169
else if ( player.GetPlayerNetInt( "goalState" ) != eRewardState.UNAVAILABLE )
154170
{
155171
// if goal is enabled then the client will show "titan ready" alerts even if it isn't
156172
// the problem is that if the goal isn't available when we fill the earnmeter, then it won't make it available
157173
// so unfortunately we have to do this manually
158174
player.SetPlayerNetInt( "goalState", eRewardState.AVAILABLE )
159175
PlayerEarnMeter_RefreshGoal( player )
176+
if( !titanReadyMsg )
177+
{
178+
Remote_CallFunction_NonReplay( player, "ServerCallback_TitanReadyMessage" )
179+
titanReadyMsg = true
180+
}
160181
}
161182

162183
if ( Time() - lastPassiveGainTime > 4.0 && file.passiveMeterGainEnabled ) // this might be 5.0

0 commit comments

Comments
 (0)