Skip to content

Re-add localization of TLE ladder units #1533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tedster59 merged 1 commit into from
Dec 30, 2025
Merged

Re-add localization of TLE ladder units #1533

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 19 additions & 17 deletions X2WOTCCommunityHighlander/Src/XComGame/Classes/UITLE_LadderModeMenu.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,11 +412,10 @@ simulated function StartLadder(int LadderIndex, int DifficultySelection, bool Na
local XComGameStateHistory History;
local XComGameState_CampaignSettings CurrentCampaign;
local XComGameState_LadderProgress LadderData;
// Issue #307 Commenting out now unused variables to remove warnings
//local int SoldierIndex;
//local XComGameState_Unit GameUnit;
//local XComGameState_HeadquartersXCom XComHQ;
//local StateObjectReference UnitStateRef;
local int SoldierIndex;
local XComGameState_Unit GameUnit;
local XComGameState_HeadquartersXCom XComHQ;
local StateObjectReference UnitStateRef;

History = class'XComGameStateHistory'.static.GetGameStateHistory();

Expand All @@ -437,26 +436,29 @@ simulated function StartLadder(int LadderIndex, int DifficultySelection, bool Na
// starting an existing ladder from scratch
//XComCheatManager(GetALocalPlayerController().CheatManager).StartLadder(LadderIndex, DifficultySelection);

//XComHQ = XComGameState_HeadquartersXCom(History.GetSingleGameStateObjectForClass(class'XComGameState_HeadquartersXCom'));

LadderData = XComGameState_LadderProgress(History.GetSingleGameStateObjectForClass(class'XComGameState_LadderProgress'));
//Mr. Nice #307: As Hacky as this looks, it does the Right Thing. It combines StartLadder() above
// with the commented out code below, plus setting up the squad respecting config settings etc.
LadderData.LadderRung--;
LadderData.ProceedToNextRung();
LadderData = XComGameState_LadderProgress(History.GetSingleGameStateObjectForClass(class'XComGameState_LadderProgress'));
ConsoleCommand( LadderData.ProgressCommand );
//SoldierIndex = 0;
//foreach XComHQ.Squad(UnitStateRef)
//{

// Start Issue #1531 - re-add localization
XComHQ = XComGameState_HeadquartersXCom(History.GetSingleGameStateObjectForClass(class'XComGameState_HeadquartersXCom'));
SoldierIndex = 0;
foreach XComHQ.Squad(UnitStateRef)
{
// pull the unit from the archives, and add it to the start state
//GameUnit = XComGameState_Unit(History.GetGameStateForObjectID(UnitStateRef.ObjectID));
GameUnit = XComGameState_Unit(History.GetGameStateForObjectID(UnitStateRef.ObjectID));

//if(LadderIndex <= 4)
//class'XComGameState_LadderProgress'.static.LocalizeUnitName(GameUnit, SoldierIndex, LadderIndex);
if(LadderIndex <= 4)
class'XComGameState_LadderProgress'.static.LocalizeUnitName(GameUnit, SoldierIndex, LadderIndex);

//++SoldierIndex;
//}
++SoldierIndex;
}
// End Issue #1531

LadderData = XComGameState_LadderProgress(History.GetSingleGameStateObjectForClass(class'XComGameState_LadderProgress'));
ConsoleCommand( LadderData.ProgressCommand );
// End Issue #307

CurrentCampaign = XComGameState_CampaignSettings(History.GetSingleGameStateObjectForClass(class'XComGameState_CampaignSettings'));
Expand Down