Skip to content

Fix Issue #83 - prevent a softlock in Tutorial #88

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
merged 1 commit into from
Feb 13, 2023
Merged

Fix Issue #83 - prevent a softlock in Tutorial #88

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
15 changes: 12 additions & 3 deletions ...yPromotionScreen/Src/X2WOTCCommunityPromotionScreen/Classes/CPS_UIArmory_PromotionHero.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,10 +230,19 @@ simulated function PopulateData()
}

// Display the "soldier has a new class" popup if required (issue #1)
if (Unit.bNeedsNewClassPopup && !`GETMCMVAR(DISABLE_NEWCLASS_POPUPS))
if (Unit.bNeedsNewClassPopup)
{
`HQPRES.UIClassEarned(Unit.GetReference());
Unit.bNeedsNewClassPopup = false; //Prevent from queueing up more of these popups on toggling soldiers.
// If configured so in MCM, do not display the popup, unless we're in Tutorial,
// in which case display it anyway to avoid a softlock (issue #83)
if (`GETMCMVAR(DISABLE_NEWCLASS_POPUPS) && class'XComGameState_HeadquartersXCom'.static.IsObjectiveCompleted('T0_M2_WelcomeToArmory'))
{
// Do nothing.
}
else
{
`HQPRES.UIClassEarned(Unit.GetReference());
Unit.bNeedsNewClassPopup = false; //Prevent from queueing up more of these popups on toggling soldiers.
}
}

AS_SetRank(rankIcon);
Expand Down