Skip to content

Support mutually exclusive abilities (#4) #9

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 2 commits into from
May 16, 2021
Merged

Support mutually exclusive abilities (#4) #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
312ba39
Support mutually exclusive abilities (#4)
May 16, 2021
daaf5f5
Replace `const` with `default` so this builds.
May 16, 2021
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
6 changes: 3 additions & 3 deletions CommunityPromotionScreen.XCOM_sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# XCOM ModBuddy Solution File, Format Version 11.00
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{5DAE07AF-E217-45C1-8DE7-FF99D6011E8A}") = "CommunityPromotionScreen", "CommunityPromotionScreen\CommunityPromotionScreen.x2proj", "{27E16B1C-44A5-4518-BE0A-B4E0A73E3343}"
Project("{5DAE07AF-E217-45C1-8DE7-FF99D6011E8A}") = "CommunityPromotionScreen", "CommunityPromotionScreen\CommunityPromotionScreen.x2proj", "{7206D3A7-2E8B-4241-8BE4-CBE9AA5DD185}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Default|XCOM 2 = Default|XCOM 2
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{27E16B1C-44A5-4518-BE0A-B4E0A73E3343}.Default|XCOM 2.ActiveCfg = Default|XCOM 2
{27E16B1C-44A5-4518-BE0A-B4E0A73E3343}.Default|XCOM 2.Build.0 = Default|XCOM 2
{7206D3A7-2E8B-4241-8BE4-CBE9AA5DD185}.Default|XCOM 2.ActiveCfg = Default|XCOM 2
{7206D3A7-2E8B-4241-8BE4-CBE9AA5DD185}.Default|XCOM 2.Build.0 = Default|XCOM 2
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
3 changes: 3 additions & 0 deletions CommunityPromotionScreen/CommunityPromotionScreen.x2proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
<Content Include="Config\XComPromotionUIMod.ini">
<SubType>Content</SubType>
</Content>
<Content Include="Localization\NewPromotionScreenbyDefault.int">
<SubType>Content</SubType>
</Content>
<Content Include="ReadMe.txt" />
<Content Include="ModPreview.jpg" />
<Content Include="Config\XComEditor.ini" />
Expand Down
2 changes: 2 additions & 0 deletions CommunityPromotionScreen/Localization/NewPromotionScreenbyDefault.int
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[NPSBDP_UIArmory_PromotionHero]
m_strMutuallyExclusive="Mutually exclusive with:"
40 changes: 34 additions & 6 deletions ...yPromotionScreen/Src/NewPromotionScreenbyDefault/Classes/NPSBDP_UIArmory_PromotionHero.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ var int Position, MaxPosition;

var int AdjustXOffset;

var localized string m_strMutuallyExclusive;

simulated function OnInit()
{
super.OnInit();
Expand Down Expand Up @@ -637,6 +639,8 @@ function PreviewAbility(int Rank, int Branch)
local array<SoldierClassAbilityType> AbilityTree;
local string AbilityIcon, AbilityName, AbilityDesc, AbilityHint, AbilityCost, CostLabel, APLabel, PrereqAbilityNames;
local name PrereqAbilityName;
// Variable for Issue #128
local string MutuallyExclusiveNames;

// NPSBDP Patch
Branch += Position;
Expand Down Expand Up @@ -687,24 +691,48 @@ function PreviewAbility(int Rank, int Branch)
{
// Look back to the previous rank and check to see if that ability is a prereq for this one
// If so, display a message warning the player that there is a prereq
// Start Issue #128
foreach AbilityTemplate.PrerequisiteAbilities(PrereqAbilityName)
{
PreviousAbilityTemplate = AbilityTemplateManager.FindAbilityTemplate(PrereqAbilityName);
if (PreviousAbilityTemplate != none && !Unit.HasSoldierAbility(PrereqAbilityName))
if (InStr(PrereqAbilityName, class'UIArmory_PromotionHero'.default.MutuallyExclusivePrefix) == 0)
{
PreviousAbilityTemplate = AbilityTemplateManager.FindAbilityTemplate(
name(Mid(PrereqAbilityName, Len(class'UIArmory_PromotionHero'.default.MutuallyExclusivePrefix))));
if (PreviousAbilityTemplate != none )
{
if (MutuallyExclusiveNames != "")
{
MutuallyExclusiveNames $= ", ";
}
MutuallyExclusiveNames $= PreviousAbilityTemplate.LocFriendlyName;
}
}
else
{
if (PrereqAbilityNames != "")
PreviousAbilityTemplate = AbilityTemplateManager.FindAbilityTemplate(PrereqAbilityName);
if (PreviousAbilityTemplate != none && !Unit.HasSoldierAbility(PrereqAbilityName))
{
PrereqAbilityNames $= ", ";
if (PrereqAbilityNames != "")
{
PrereqAbilityNames $= ", ";
}
PrereqAbilityNames $= PreviousAbilityTemplate.LocFriendlyName;
}
PrereqAbilityNames $= PreviousAbilityTemplate.LocFriendlyName;
}
}
PrereqAbilityNames = class'UIUtilities_Text'.static.FormatCommaSeparatedNouns(PrereqAbilityNames);
MutuallyExclusiveNames = class'UIUtilities_Text'.static.FormatCommaSeparatedNouns(MutuallyExclusiveNames);

if (MutuallyExclusiveNames != "")
{
AbilityDesc = class'UIUtilities_Text'.static.GetColoredText(m_strMutuallyExclusive @ MutuallyExclusiveNames, eUIState_Warning) $ "\n" $ AbilityDesc;
}

if (PrereqAbilityNames != "")
{
AbilityDesc = class'UIUtilities_Text'.static.GetColoredText(m_strPrereqAbility @ PrereqAbilityNames, eUIState_Warning) $ "\n" $ AbilityDesc;
}
// End Issue #128
}
}
else
Expand Down Expand Up @@ -1169,4 +1197,4 @@ static function string GetClassSummary(XComGameState_Unit Unit)
}

return Unit.GetSoldierClassTemplate().ClassSummary;
}
}