Merge branch 'R2Northstar:main' into main

3 files changed, 75 insertions, 4 deletions

diff --git a/Northstar.Custom/mod/resource/northstar_custom_portuguese.txt b/Northstar.Custom/mod/resource/northstar_custom_portuguese.txt
new file mode 100644
index 000000000..62835f52c
--- /dev/null
+++ b/Northstar.Custom/mod/resource/northstar_custom_portuguese.txt
@@ -0,0 +1,69 @@
+"lang"
+{
+	"Language" "portuguese"
+	"Tokens"
+	{	
+		"PL_sbox" "Sandbox"
+		"PL_sbox_lobby" "Saguão de Sandbox"
+		"PL_sbox_desc" "gmod só que pior"
+		"PL_sbox_abbr" "SBOX"
+		"GAMEMODE_SBOX" "Sandbox"
+		
+		"PL_gg" "Gun Game"
+		"PL_gg_lobby" "Saguão de Gun Game"
+		"PL_gg_desc" "Mate com todas as armas para vencer"
+		"PL_gg_abbr" "GG"
+		"GAMEMODE_GG" "Gun Game"
+		
+		"PL_tt" "Titan Tag"
+		"PL_tt_lobby" "Saguão de Titan Tag"
+		"PL_tt_desc" "Ganhe pontos com seu titã. Destrua um para chamar o seu."
+		"PL_tt_abbr" "TT"
+		"GAMEMODE_TT" "Titan Tag"
+		
+		"PL_inf" "Infecção"
+		"PL_inf_lobby" "Saguão de Infecção"
+		"PL_inf_desc" "Sobreviva à infecção. Sobreviventes são infectados quando mortos."
+		"PL_inf_abbr" "INF"
+		"GAMEMODE_INF" "Infecção"
+		"INFECTION_YOU_ARE_INFECTED" "Você foi infectado!"
+		"INFECTION_KILL_SURVIVORS" "Infecte todos os sobreviventes restantes."
+		"INFECTION_FIRST_INFECTED" "%s1 é o paciente zero."
+		"INFECTION_LAST_SURVIVOR" "%s1 é o último sobrevivente!"
+		"INFECTION_KILL_LAST_SURVIVOR" "Infecte eles antes que o tempo acabe!"
+		"INFECTION_YOU_ARE_LAST_SURVIVOR" "Você é o último sobrevivente!"
+		"INFECTION_SURVIVE_LAST_SURVIVOR" "Sobreviva."
+		
+		// these are defined in r1_english but titan war is a shit name so i'm changing it to another one that was referenced in development
+		"GAMEMODE_fw" "Guerra pela Fronteira"
+		"PL_fw" "Guerra pela Fronteira"
+		"PL_fw_lobby" "Saguão de Guerra pela Fronteira"
+		"PL_fw_desc" "Destrua a colheitadeira do inimigo e proteja a sua"
+		"PL_fw_abbr" "FW"
+		
+		"GAMEMODE_kr" "Corrida de Matança"
+		"PL_kr" "Corrida de Matança"
+		"PL_kr_lobby" "Saguão de Matança"
+		"PL_kr_desc" "Acabe com inimigos para aumentar sua matança. Capture a bandeira para começar. Vença matando mais."
+		"PL_kr_abbr" "KR"
+		"SCOREBOARD_KR_RECORD" "Recorde de mortes"
+		"KR_NEW_RACER" "%s1 é o matador"
+		"KR_YOU_ARE_NEW_RACER" "Você é o matador"
+		"KR_YOU_SET_NEW_RECORD" "Bateu o recorde!"
+		"KR_FLAG_INCOMING" "Bandeira reaparecerá em breve"
+		"KR_COLLECT_FLAG" "Capture a bandeira para virar um Matador!"
+		"KR_ENEMY_KILLRACE_OVER" "A matança de %s1 acabou"
+		"KR_YOUR_KILLRACE_OVER" "Sua matança acabou"
+		"KR_YOUR_KILLRACE_SCORE" "Você conseguiu %s1 mortes."
+	
+		"GAMEMODE_fastball" "Fastball"
+		"PL_fastball" "Fastball"
+		"PL_fastball_lobby" "Fastball Lobby"
+		"PL_fastball_desc" "Sem reaparecimento. Invada painéis de controle para ganhar rounds e reaparecer seus aliados."
+		"PL_fastball_abbr" "FB"
+		"FASTBALL_PANEL_CAPTURED" "%s1 capturou painel %s2"
+		"SCOREBOARD_FASTBALL_HACKS" "Painéis capturados"
+		
+		"GAMEMODE_ctf_comp" "CTF Competitivo"
+	}
+}
diff --git a/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_inf.gnut b/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_inf.gnut
index ee6c2c0a0..a0e0b7431 100644
--- a/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_inf.gnut
+++ b/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_inf.gnut
@@ -2,6 +2,7 @@ global function GamemodeInfection_Init
 
 struct {
 	bool hasHadFirstInfection = false
+	bool hasHadLastInfection = false
 	array<entity> playersToNotifyOfInfection
 } file
 
@@ -10,6 +11,7 @@ void function GamemodeInfection_Init()
 	SetSpawnpointGamemodeOverride( FFA )
 	SetLoadoutGracePeriodEnabled( false ) // prevent modifying loadouts with grace period
 	SetWeaponDropsEnabled( false )
+	SetShouldUseRoundWinningKillReplay( true )
 	Riff_ForceTitanAvailability( eTitanAvailability.Never )
 	Riff_ForceBoostAvailability( eBoostAvailability.Disabled )
 	ClassicMP_ForceDisableEpilogue( true )
@@ -69,7 +71,7 @@ void function InfectPlayer( entity player )
 	array<entity> survivors = GetPlayerArrayOfTeam( INFECTION_TEAM_SURVIVOR )
 	if ( survivors.len() == 0 )
 		SetWinner( INFECTION_TEAM_INFECTED )
-	else if ( survivors.len() == 1 )
+	else if ( survivors.len() == 1 && !file.hasHadLastInfection )
 		SetLastSurvivor( survivors[ 0 ] )
 		
 	if ( !file.hasHadFirstInfection )
@@ -175,6 +177,8 @@ void function SetLastSurvivor( entity player )
 	
 	if ( GameTime_TimeLeftSeconds() > 45 )
 		SetServerVar( "gameEndTime", Time() + 45.0 )
+	
+	file.hasHadLastInfection = true
 }
 
 int function TimeoutCheckSurvivors()
@@ -188,4 +192,4 @@ int function TimeoutCheckSurvivors()
 bool function InfectionShouldPlayerStartBleedout( entity player, var damageInfo )
 {
 	return player.GetTeam() != INFECTION_TEAM_INFECTED
-}
\ No newline at end of file
+}
diff --git a/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_gamemode_fw_custom.nut b/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_gamemode_fw_custom.nut
index 8c6e3f635..ca238d5d9 100644
--- a/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_gamemode_fw_custom.nut
+++ b/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_gamemode_fw_custom.nut
@@ -13,8 +13,6 @@ void function SHCreateGamemodeFW_Init()
 
 void function CreateGamemodeFW()
 {
-	//entity e = CreateEntity("npc_turret_mega"); SetAISettingsWrapper( e, "npc_turret_mega_fortwar" ); e.SetOrigin(GetPlayerArray()[0].GetOrigin()); SetTeam(e,3); DispatchSpawn(e)
-
 	// we have to manually add the client/shared scripts to scripts.rson atm so we need to prevent compile errors when they aren't included
 	// best way to do this is to just ignore this whole block for now and wait until we don't have to add them manually