From 248447f72ace6cfc7564e6f7fc8fad27a1aee0cf Mon Sep 17 00:00:00 2001
From: Henning Waberg <henning.waberg@gmail.com>
Date: Thu, 22 Nov 2018 01:20:40 +0100
Subject: [PATCH] Introduced Natural Aptitude as counterpart to ComInt but for
 stats

---
 Assets/NaturalAptitudeIcon.png                | Bin 0 -> 3255 bytes
 .../{XComUI.ini => XComStatUpgradeUI.ini}     |  22 +++-
 RPG/Config/XComEngine.ini                     |   4 +-
 .../UILibrary_LWToolbox.upk                   | Bin 50268 -> 61606 bytes
 RPG/Localization/StatUpgradeUI.int            |  12 +-
 RPG/RPG.x2proj                                |   5 +-
 RPG/ReadMe.txt                                |   6 +
 .../UIPersonnel_SoldierListItemDetailed.uc    |  34 +++++-
 RPG/Src/StatUpgradeUI/Classes/StatUIHelper.uc | 105 ++++++++++++++++++
 .../Classes/UIPanel_StatUI_StatLine.uc        |   2 +-
 .../StatUpgradeUI/Classes/UIScreen_StatUI.uc  |  18 ++-
 ...X2DownloadableContentInfo_StatUpgradeUI.uc |   5 +-
 .../Classes/X2EventListener_StatUI.uc         |  14 ++-
 .../Classes/X2TemplateHelper_RPGOverhaul.uc   |  14 ++-
 14 files changed, 216 insertions(+), 25 deletions(-)
 create mode 100644 Assets/NaturalAptitudeIcon.png
 rename RPG/Config/StatUpgradeUI/{XComUI.ini => XComStatUpgradeUI.ini} (73%)
 create mode 100644 RPG/Src/StatUpgradeUI/Classes/StatUIHelper.uc

diff --git a/Assets/NaturalAptitudeIcon.png b/Assets/NaturalAptitudeIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6454461e38e4c64791a531f803bb56a784c163cb
GIT binary patch
literal 3255
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

literal 0
HcmV?d00001

diff --git a/RPG/Config/StatUpgradeUI/XComUI.ini b/RPG/Config/StatUpgradeUI/XComStatUpgradeUI.ini
similarity index 73%
rename from RPG/Config/StatUpgradeUI/XComUI.ini
rename to RPG/Config/StatUpgradeUI/XComStatUpgradeUI.ini
index fd57d7d..0c62d3d 100644
--- a/RPG/Config/StatUpgradeUI/XComUI.ini
+++ b/RPG/Config/StatUpgradeUI/XComStatUpgradeUI.ini
@@ -29,4 +29,24 @@ HealthDeltaStrikeCostLamda = 15
 DefaultStatPointsPerPromotion=15
 
 ; Class specific stat points override DefaultStatPointsPerPromotion
-; +ClassStatPointsPerPromotion=(SoldierClassTemplateName=UniversalSoldier, StatPointsPerPromotion=20)
\ No newline at end of file
+; +ClassStatPointsPerPromotion=(SoldierClassTemplateName=UniversalSoldier, StatPointsPerPromotion=20)
+
+[StatUpgradeUI.StatUIHelper]
+NaturalAptitudeAboveAverageChance=50
+NaturalAptitudeThresholds[0]=50 ; 25% chance
+NaturalAptitudeThresholds[1]=80 ; 15% chance
+NaturalAptitudeThresholds[2]=99 ; 9.5% chance
+NaturalAptitudeThresholds[3]=100 ; 0.5% chance
+
++NaturalAptitudeCharacterTemplates = Soldier
++NaturalAptitudeCharacterTemplates = ReaperSoldier
++NaturalAptitudeCharacterTemplates = SkirmisherSoldier
++NaturalAptitudeCharacterTemplates = TemplarSoldier
++NaturalAptitudeCharacterTemplates = XComMecSoldier
++NaturalAptitudeCharacterTemplates = SkirmXComMecSoldier
+
+BaseSoldierNaturalAptitude[0]=0
+BaseSoldierNaturalAptitude[1]=5
+BaseSoldierNaturalAptitude[2]=10
+BaseSoldierNaturalAptitude[3]=15
+BaseSoldierNaturalAptitude[4]=20
\ No newline at end of file
diff --git a/RPG/Config/XComEngine.ini b/RPG/Config/XComEngine.ini
index dcc5f2a..e84cc9c 100644
--- a/RPG/Config/XComEngine.ini
+++ b/RPG/Config/XComEngine.ini
@@ -5,9 +5,9 @@
 +NonNativePackages=XModBase_Lib
 +NonNativePackages=XCOM2RPGOverhaul
 +NonNativePackages=ExtendedUpgrades
-+NonNativePackages=DetailedSoldierListWOTC
 +NonNativePackages=NewPromotionScreenbyDefault
 +NonNativePackages=StatUpgradeUI
++NonNativePackages=DetailedSoldierListWOTC
 +NonNativePackages=Debug
 
 [UnrealEd.EditorEngine]
@@ -17,9 +17,9 @@
 +ModEditPackages=XModBase_Core_2_0_1
 +ModEditPackages=XModBase_Lib
 +ModEditPackages=ExtendedUpgrades
-+ModEditPackages=DetailedSoldierListWOTC
 +ModEditPackages=NewPromotionScreenbyDefault
 +ModEditPackages=StatUpgradeUI
++ModEditPackages=DetailedSoldierListWOTC
 +ModEditPackages=Debug
 
 [Engine.Engine]
diff --git a/RPG/Content/DetailedSoldierListWOTC/UILibrary_LWToolbox.upk b/RPG/Content/DetailedSoldierListWOTC/UILibrary_LWToolbox.upk
index 42e296f19583db3a5a52815ee45c36322e44d100..320932e2a546332c581dac2cefdedc6f523a4509 100644
GIT binary patch
delta 13207
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
KfTpdu`u_lR4iN(Y

delta 2425
zcmcJQe@t6d6vywo^tG?H#mb;RQf52WmLD5*EEPt907mA7(QPn?By%K&ItCL4LlPt_
zI8YF?weAe?57Z%uPNJi{X$Z#Z81tVgj>H+0VK$<~Uxa1G82mN7_w}_>(0@$&lJm|x
z_uTvPx!-s0c_Z^tbKOyGmpW2jEs3f{du#}?2q9;EoeMDtnYNPPSz=0JHj<&qAqhg2
z96~@WczIG0a$hWOc8z>l(szaV)N#x+Pu2_T=sW28>j}Zx0e@rHgeUOiYm;Gq1pmdr
zxWq2g1qNYO5|?Tamqdvki~f(5l@;rnoB?dCfiXZan~C?>V3YiQ_AZ%*z*nRNKg;1t
zVG!!1O30AvaBVO&<J-A(x{&dcOj&U##4;Uzpga`rBw<075V~b%{Cj;UGea`=mQWbO
z>2OzfC_F&I$zCBm%_*79aFf&GykR=PQk|sa$;Ow;|1>lAKxbAm1`aM{ZDlsVT-Fxc
zq6WDm4gVBF#?0`zgTtd5D9Db5R)-ef)x%jwDzgaSuqeu!8eMgVo2rr12tPZL@j?P@
z%ucYhCn7|oSka1-Nkt!wDZ)m$lWl;`@_0rMgXNjvEi%dD#d(`xpH#<a$XyGzD!rV%
zPPmd_UzJgxEJi7!H;Ud2ALX2pn?ljNPY-!6DYWFO84KJuuC>PIz3|NszZxHW|I#z|
zLA&K-kcTc&$O1Ny4ug#reld4hia*!^zJUa|<x%sxLJ7;#a)<<XZ$l4!R;*md&fS}y
z>DX>ZG2)(tT|n|~wPrQ>cjS~%Gv^EBO}oEfv2iCQ=Z}`gvMl`)k)VF_u@~16@2}8^
zO8>U(zFBK_7M@b!D-+JQ&#&e^Mh-N!6D5S#%Fk3BlwhV*RNBPX9r{HQF=qFy<xHPz
z!$b8|hh1rVoev|ED6JU+<sxnXo^pkY{1OqET6KjW@`TIHVpV0RJZfr5d5}Fts66`C
z2%YDWM{jqeZ(CCtt&QQ(IfRH>^OO8wqf>%Esp0Q5XRs{UM?^rKCwkX`a-ecY2dcuN
z&E<wuZTkyOH(WTm6gOG1x+?snDNsv;bEGKT?okG#CP81X$I2gXUy`u2jYOi5Z}j$P
zO6s3Da`Z@3%fA){2aj}#dw}|`aE-5%zCo>~RVa+ft|=KV>)_oUqB9we5ODuGo#pUK
zpGrJ^ZPtSRm%SHvJ(r+3)pGj{X0^`mk&jR9!ybWG)&Dw+pZD^<0m92gh&Or&*70(1
zbx73IT4+4j{o~Vf&huZV%q~wADOd9b`|@JHz?(Bn`m*9R@!;i?-kcBTylVdY(M|~~
z7x){-=zm2AACF1MzlBC`jm5*QF%uIHj4xZCNM_M1Dd5mQ|Bpv~9bud{LC?gnZp#pn
zsBIo0JaKR+NzET0Uy|V+?}jl^uK#Z)e!+iMf%p3V<DF{$ovYtsTs<Y`x52{9G;Y5P
Zqn{tZUtNZ%YgUY=VGD6d(@=IT<8J|%QQrUn

diff --git a/RPG/Localization/StatUpgradeUI.int b/RPG/Localization/StatUpgradeUI.int
index e4e2320..c6b8c87 100644
--- a/RPG/Localization/StatUpgradeUI.int
+++ b/RPG/Localization/StatUpgradeUI.int
@@ -7,4 +7,14 @@ m_UpgradeCostHeader="SUM COSTS"
 m_strSoldierSPLabel="SOLDIER SP"
 
 [UIPanel_StatUI_StatLine]
-PsiOffenseLabel="PSI"
\ No newline at end of file
+PsiOffenseLabel="PSI"
+
+[StatUIHelper]
+NaturalAptitude="NATURAL APTITUDE"
+
+NaturalAptitudeLabel[0]="Mortal"
+NaturalAptitudeLabel[1]="Good Genes"
+NaturalAptitudeLabel[2]="Peak Human"
+NaturalAptitudeLabel[3]="Super Human"
+NaturalAptitudeLabel[4]="Godlike"
+
diff --git a/RPG/RPG.x2proj b/RPG/RPG.x2proj
index c7e6e91..14486c8 100644
--- a/RPG/RPG.x2proj
+++ b/RPG/RPG.x2proj
@@ -62,7 +62,7 @@ tags=Gameplay, Soldier Class, Overhaul, RPG, Weapon, Item</Description>
     <Content Include="Config\NewPromotionScreenbyDefault\XComPromotionUIMod.ini">
       <SubType>Content</SubType>
     </Content>
-    <Content Include="Config\StatUpgradeUI\XComUI.ini">
+    <Content Include="Config\StatUpgradeUI\XComStatUpgradeUI.ini">
       <SubType>Content</SubType>
     </Content>
     <Content Include="Config\XComClassData.ini">
@@ -209,6 +209,9 @@ tags=Gameplay, Soldier Class, Overhaul, RPG, Weapon, Item</Description>
     <Content Include="Src\NewPromotionScreenbyDefault\Classes\X2DownloadableContentInfo_NewPromotionScreenbyDefault.uc">
       <SubType>Content</SubType>
     </Content>
+    <Content Include="Src\StatUpgradeUI\Classes\StatUIHelper.uc">
+      <SubType>Content</SubType>
+    </Content>
     <Content Include="Src\StatUpgradeUI\Classes\UIPanel_StatUI_StatLine.uc">
       <SubType>Content</SubType>
     </Content>
diff --git a/RPG/ReadMe.txt b/RPG/ReadMe.txt
index cbb3614..5860339 100644
--- a/RPG/ReadMe.txt
+++ b/RPG/ReadMe.txt
@@ -127,6 +127,12 @@ Known incompatibilities:
 - "Hack Plus" leads to insane high hacking stats
 - I am the commander here
 
+
+[b]My soldier keep getting promited to basegame/other classes?[/b]
+Its a strange bug cause by the config system for some people.
+Use the mod Disable Any Class Wotc and disable all classes but UniversalSoldier in the ingame mod options.
+https://steamcommunity.com/sharedfiles/filedetails/?id=1148535137
+
 [h1]A note on the beta status[/h1]
 This mod will change frequently.
 Therefor it might be needed that you rebuild you soldiers.
diff --git a/RPG/Src/DetailedSoldierListWOTC/Classes/UIPersonnel_SoldierListItemDetailed.uc b/RPG/Src/DetailedSoldierListWOTC/Classes/UIPersonnel_SoldierListItemDetailed.uc
index 8f74573..4ead365 100644
--- a/RPG/Src/DetailedSoldierListWOTC/Classes/UIPersonnel_SoldierListItemDetailed.uc
+++ b/RPG/Src/DetailedSoldierListWOTC/Classes/UIPersonnel_SoldierListItemDetailed.uc
@@ -16,9 +16,9 @@ var UIText AimValue, DefenseValue;
 
 //icons to be shown in the name area
 var UIImage HealthIcon, MobilityIcon, WillIcon, HackIcon, DodgeIcon, PsiIcon, PrimaryWeaponIcon, SecondaryWeaponIcon; 
-var UIText HealthValue, MobilityValue, WillValue, HackValue, DodgeValue, PsiValue;
+var UIText HealthValue, MobilityValue, WillValue, HackValue, DodgeValue, PsiValue, SPValue;
 
-var UIIcon APIcon;
+var UIIcon APIcon, NatAptIcon;
 
 var array<UIIcon> BadTraitIcon;
 
@@ -541,6 +541,27 @@ function AddNameColumnIcons(XComGameState_Unit Unit, out string traitToolTip)
 		}
 	}
 
+	if (NatAptIcon == none)
+	{
+		NatAptIcon = Spawn(class'UIIcon', self);
+		NatAptIcon.bAnimateOnInit = false;
+		NatAptIcon.bDisableSelectionBrackets = true;
+		NatAptIcon.InitIcon('NaturalAptitudeIcon', "img:///UILibrary_LWToolbox.UI.NaturalAptitudeIcon", false, false);
+	}
+	IconXPos += IconXDelta;
+	NatAptIcon.SetScale(IconScale * 0.6);
+	NatAptIcon.SetPosition(IconXPos - (IconToValueOffsetX * 0.1), IconYPos);
+	NatAptIcon.Show();
+	
+	if(SPValue == none)
+	{
+		SPValue = Spawn(class'UIText', self);
+		SPValue.bAnimateOnInit = false;
+		SPValue.InitText('SPValue_ListItem_LW').SetPosition(IconXPos + IconToValueOffsetX, IconYPos + IconToValueOffsetY);
+	}
+	SPValue.SetHtmlText(class'UIUtilities_Text'.static.GetColoredText(string(class'StatUpgradeUI.StatUIHelper'.static.GetSoldierSP(Unit)), eUIState_Normal));
+	SPValue.Show();
+
 	PrimaryLoadoutImage = "img:///UILibrary_RPG.loadout_icon_"  $ string(X2WeaponTemplate(Unit.GetPrimaryWeapon().GetMyTemplate()).WeaponCat);
 	SecondaryLoadoutImage = "img:///UILibrary_RPG.loadout_icon_"  $ string(X2WeaponTemplate(Unit.GetSecondaryWeapon().GetMyTemplate()).WeaponCat);
 	
@@ -548,7 +569,7 @@ function AddNameColumnIcons(XComGameState_Unit Unit, out string traitToolTip)
 	{
 		PrimaryWeaponIcon = Spawn(class'UIImage', self);
 		PrimaryWeaponIcon.bAnimateOnInit = false;
-		PrimaryWeaponIcon.InitImage('PrimaryLoadoutImage_ListItem', PrimaryLoadoutImage).SetScale(IconScale).SetPosition(IconXPos += 35, -9.0f);
+		PrimaryWeaponIcon.InitImage('PrimaryLoadoutImage_ListItem', PrimaryLoadoutImage).SetScale(IconScale).SetPosition(IconXPos += 35 - IconXDelta, -9.0f);
 	}
 
 	if (SecondaryWeaponIcon == none && Unit.GetSecondaryWeapon() != none)
@@ -559,7 +580,7 @@ function AddNameColumnIcons(XComGameState_Unit Unit, out string traitToolTip)
 	}
 
 
-	IconXPos += IconXDelta;
+	//IconXPos += IconXDelta;
 
 	EventTemplateManager = class'X2EventListenerTemplateManager'.static.GetEventListenerTemplateManager();
 
@@ -674,6 +695,11 @@ simulated function UpdateItemsForFocus(bool Focussed)
 			{
 				APIcon.SetForegroundColor(APColours[int(Unit.ComInt)]);
 			}
+
+			if (NatAptIcon != none)
+			{
+				NatAptIcon.SetForegroundColor(APColours[int(class'StatUpgradeUI.StatUIHelper'.static.GetNaturalAptitude(Unit))]);
+			}
 		}
 	}
 
diff --git a/RPG/Src/StatUpgradeUI/Classes/StatUIHelper.uc b/RPG/Src/StatUpgradeUI/Classes/StatUIHelper.uc
new file mode 100644
index 0000000..7817377
--- /dev/null
+++ b/RPG/Src/StatUpgradeUI/Classes/StatUIHelper.uc
@@ -0,0 +1,105 @@
+class StatUIHelper extends Object config(StatUpgradeUI);
+
+enum ENaturalAptitude
+{
+	eNaturalAptitude_Standard,
+	eNaturalAptitude_AboveAverage,
+	eNaturalAptitude_Gifted,
+	eNaturalAptitude_Genius,
+	eNaturalAptitude_Savant,
+};
+
+
+var config array<name> NaturalAptitudeCharacterTemplates;
+var config array<int> NaturalAptitudeThresholds;
+var config int NaturalAptitudeAboveAverageChance;
+var config array<ENaturalAptitude> BaseSoldierNaturalAptitude;
+
+var localized string NaturalAptitudeLabel[ENaturalAptitude.EnumCount]<BoundEnum = ENaturalAptitude>;
+var localized string NaturalAptitude;
+
+static function OnPostCharacterTemplatesCreated()
+{
+	local X2CharacterTemplateManager CharacterTemplateMgr;
+	local X2CharacterTemplate SoldierTemplate;
+	local array<X2DataTemplate> DataTemplates;
+	local int ScanTemplates, ScanAdditions;
+
+	CharacterTemplateMgr = class'X2CharacterTemplateManager'.static.GetCharacterTemplateManager();
+	
+	for ( ScanAdditions = 0; ScanAdditions < default.NaturalAptitudeCharacterTemplates.Length; ++ScanAdditions )
+	{
+		CharacterTemplateMgr.FindDataTemplateAllDifficulties(default.NaturalAptitudeCharacterTemplates[ScanAdditions], DataTemplates);
+		for (ScanTemplates = 0; ScanTemplates < DataTemplates.Length; ++ScanTemplates)
+		{
+			SoldierTemplate = X2CharacterTemplate(DataTemplates[ScanTemplates]);
+			if (SoldierTemplate != none)
+			{
+				SoldierTemplate.OnStatAssignmentCompleteFn = class'StatUIHelper'.static.OnStatAssignmentCompleteNaturalAptitude;
+			}
+		}
+	}
+}
+
+static function OnStatAssignmentCompleteNaturalAptitude(XComGameState_Unit UnitState)
+{
+	local ENaturalAptitude Apt;
+
+	Apt = RollNaturalAptitude();
+
+	//`LOG(default.Class @ GetFuncName() @ Apt @ float(Apt),, 'RPG');
+	UnitState.SetUnitFloatValue('NaturalAptitude', float(Apt) , eCleanUp_Never);
+}
+
+static function int GetBonusStatPointsFromNaturalAptitude(XComGameState_Unit UnitState)
+{
+	//`LOG(default.Class @ GetFuncName() @ default.BaseSoldierNaturalAptitude[GetNaturalAptitude(UnitState)],, 'RPG');
+	return default.BaseSoldierNaturalAptitude[GetNaturalAptitude(UnitState)];
+}
+
+static function ENaturalAptitude GetNaturalAptitude(XComGameState_Unit UnitState)
+{
+	local UnitValue NaturalAptitudeValue;
+	
+	UnitState.GetUnitValue('NaturalAptitude', NaturalAptitudeValue);
+
+	//`LOG(default.Class @ GetFuncName() @ NaturalAptitudeValue.fValue @ GetEnum(Enum'ENaturalAptitude', NaturalAptitudeValue.fValue),, 'RPG');
+	
+	return ENaturalAptitude(NaturalAptitudeValue.fValue);
+}
+
+static function ENaturalAptitude RollNaturalAptitude()
+{
+	local array<int> Thresholds;
+	local int idx, NaturalAptitudeRoll;
+	
+	if (class'X2StrategyGameRulesetDataStructures'.static.Roll(default.NaturalAptitudeAboveAverageChance))
+	{
+		Thresholds = default.NaturalAptitudeThresholds;
+		NaturalAptitudeRoll = `SYNC_RAND_STATIC(100);
+		
+		for (idx = 0; idx < Thresholds.Length; idx++)
+		{
+			if (NaturalAptitudeRoll < Thresholds[idx])
+			{
+				return ENaturalAptitude(1 + idx);
+				break;
+			}
+		}
+	}
+	
+	return eNaturalAptitude_Standard;
+}
+
+static function string GetNaturalAptitudeLabel(ENaturalAptitude NatApt)
+{
+	//`LOG(default.Class @ GetFuncName() @ NatApt @ default.NaturalAptitudeLabel[NatApt] @ default.NaturalAptitudeLabel[eNaturalAptitude_Standard],, 'RPGO');
+	return default.NaturalAptitudeLabel[NatApt];
+}
+
+static function int GetSoldierSP(XComGameState_Unit UnitState)
+{
+	local UnitValue StatPointsValue;
+	UnitState.GetUnitValue('StatPoints', StatPointsValue);
+	return int(StatPointsValue.fValue);
+}
\ No newline at end of file
diff --git a/RPG/Src/StatUpgradeUI/Classes/UIPanel_StatUI_StatLine.uc b/RPG/Src/StatUpgradeUI/Classes/UIPanel_StatUI_StatLine.uc
index 42a2dbe..2684587 100644
--- a/RPG/Src/StatUpgradeUI/Classes/UIPanel_StatUI_StatLine.uc
+++ b/RPG/Src/StatUpgradeUI/Classes/UIPanel_StatUI_StatLine.uc
@@ -1,4 +1,4 @@
-class UIPanel_StatUI_StatLine extends UIPanel config (UI);
+class UIPanel_StatUI_StatLine extends UIPanel config (StatUpgradeUI);
 
 struct StatCostBind
 {
diff --git a/RPG/Src/StatUpgradeUI/Classes/UIScreen_StatUI.uc b/RPG/Src/StatUpgradeUI/Classes/UIScreen_StatUI.uc
index 455e036..adb08c7 100644
--- a/RPG/Src/StatUpgradeUI/Classes/UIScreen_StatUI.uc
+++ b/RPG/Src/StatUpgradeUI/Classes/UIScreen_StatUI.uc
@@ -1,4 +1,4 @@
-class UIScreen_StatUI extends UIArmory config(UI);
+class UIScreen_StatUI extends UIArmory config(StatUpgradeUI);
 
 var UIPanel Container;
 var UIBGBox PanelBG;
@@ -6,7 +6,7 @@ var UIBGBox FullBG;
 var UIX2PanelHeader TitleHeader;
 var UIImage SCImage;
 var UIButton SaveButton;
-var UIText StatPointsText, AbilityPointsText, StatNameHeader, StatValueHeader, UpgradePointsHeader, StatCostHeader, UpgradeCostHeader;
+var UIText NaturalAptitudeText, StatPointsText, AbilityPointsText, StatNameHeader, StatValueHeader, UpgradePointsHeader, StatCostHeader, UpgradeCostHeader;
 var array<UIPanel_StatUI_StatLine> StatLines;
 var bool bLog;
 
@@ -54,6 +54,10 @@ function InitPanels()
 	AbilityPointsText.SetWidth(200);
 	AbilityPointsText.SetPosition(Container.Width - AbilityPointsText.Width - StatPointsText.Width - LeftPadding, LeftPadding);
 
+	NaturalAptitudeText = Spawn(class'UIText', Container).InitText('NaturalAptitudeText');
+	NaturalAptitudeText.SetWidth(450);
+	NaturalAptitudeText.SetPosition(Container.Width - NaturalAptitudeText.Width - LeftPadding, LeftPadding * 2);
+
 	TitleHeader = Spawn(class'UIX2PanelHeader', Container);
 	TitleHeader.InitPanelHeader('', "", "");
 	TitleHeader.SetPosition(SCImage.Width + RunningHeaderOffsetX + 10, LeftPadding);
@@ -116,7 +120,6 @@ function InitStatLines()
 {
 	local UIPanel_StatUI_StatLine StatLine;
 	local int Index, OffsetX, OffsetY;
-	local UnitValue StatPointsValue;
 	local bool bUseBetaStrikeHealthProgression;
 
 	bUseBetaStrikeHealthProgression = UnitState.GetSoldierClassTemplateName() == 'UniversalSoldier';
@@ -162,6 +165,8 @@ function InitStatLines()
 
 function PopulateHeaderData()
 {
+	local string NaturalAptitude;
+
 	if (UnitState.GetSoldierClassTemplate() != none)
 	{
 		SCImage.LoadImage(UnitState.GetSoldierClassIcon());
@@ -170,6 +175,9 @@ function PopulateHeaderData()
 
 	TitleHeader.SetText(UnitState.GetName(eNameType_FullNick), Caps(UnitState.IsSoldier() ? UnitState.GetSoldierClassDisplayName() : ""));
 	TitleHeader.MC.FunctionVoid("realize");
+
+	NaturalAptitude = class'UIUtilities_Text'.static.AlignRight(class'UIUtilities_Text'.static.GetColoredText(class'StatUIHelper'.default.NaturalAptitude $ ":" @ Caps(class'StatUIHelper'.static.GetNaturalAptitudeLabel(class'StatUIHelper'.static.GetNaturalAptitude(UnitState))), eUIState_Normal, FontSize));
+	NaturalAptitudeText.SetHtmlText(NaturalAptitude);
 }
 
 function PopulateSoldierPoints()
@@ -179,7 +187,7 @@ function PopulateSoldierPoints()
 	CurrentSP = Max(GetSoldierSP() - StatPointCostSum, 0);
 	CurrentAP = GetSoldierAP() - AbilityPointCostSum - Min(GetSoldierSP() - StatPointCostSum, 0);
 
-	StatPointsText.SetHtmlText(class'UIUtilities_Text'.static.GetColoredText(m_strSoldierSPLabel @ string(CurrentSP), eUIState_Normal, FontSize));
+	StatPointsText.SetHtmlText(class'UIUtilities_Text'.static.AlignRight(class'UIUtilities_Text'.static.GetColoredText(m_strSoldierSPLabel @ string(CurrentSP), eUIState_Normal, FontSize)));
 	AbilityPointsText.SetHtmlText(class'UIUtilities_Text'.static.GetColoredText(class'UIArmory_PromotionHero'.default.m_strSoldierAPLabel @ string(CurrentAP), eUIState_Normal, FontSize));
 }
 
@@ -360,7 +368,7 @@ simulated function bool IsAllowedToCycleSoldiers()
 
 defaultproperties
 {
-	StatOffsetY=70
+	StatOffsetY=90
 	LeftPadding=40
 	Padding=20
 	FontSize=32
diff --git a/RPG/Src/StatUpgradeUI/Classes/X2DownloadableContentInfo_StatUpgradeUI.uc b/RPG/Src/StatUpgradeUI/Classes/X2DownloadableContentInfo_StatUpgradeUI.uc
index 4e92ed8..b02d2e4 100644
--- a/RPG/Src/StatUpgradeUI/Classes/X2DownloadableContentInfo_StatUpgradeUI.uc
+++ b/RPG/Src/StatUpgradeUI/Classes/X2DownloadableContentInfo_StatUpgradeUI.uc
@@ -1,6 +1,9 @@
 class X2DownloadableContentInfo_StatUpgradeUI extends X2DownloadableContentInfo;
 
-
+static event OnPostTemplatesCreated()
+{
+	class'StatUIHelper'.static.OnPostCharacterTemplatesCreated();
+}
 
 exec function DebugStatUIHeader(
 	int StatNameHeaderWidth,
diff --git a/RPG/Src/StatUpgradeUI/Classes/X2EventListener_StatUI.uc b/RPG/Src/StatUpgradeUI/Classes/X2EventListener_StatUI.uc
index c876e48..d98cc3b 100644
--- a/RPG/Src/StatUpgradeUI/Classes/X2EventListener_StatUI.uc
+++ b/RPG/Src/StatUpgradeUI/Classes/X2EventListener_StatUI.uc
@@ -1,4 +1,4 @@
-class X2EventListener_StatUI extends X2EventListener config(UI);
+class X2EventListener_StatUI extends X2EventListener config(StatUpgradeUI);
 
 struct ClassStatPoints
 {
@@ -70,7 +70,6 @@ static function CHEventListenerTemplate CreateListenerTemplate_OnCompleteRespecS
 static function EventListenerReturn OnCompleteRespecSoldier(Object EventData, Object EventSource, XComGameState GameState, Name Event, Object CallbackData)
 {
 	local XComGameState_Unit UnitState;
-	local UnitValue StatPointsValue;
 	local int SpentSoldierSP, SoldierSP;
 
 	UnitState = XComGameState_Unit(EventData);
@@ -90,17 +89,20 @@ static function EventListenerReturn OnUnitRankUp(Object EventData, Object EventS
 {
 	local XComGameState_Unit UnitState;
 	local UnitValue StatPointsValue;
-	local int StatPointsPerPromotion;
+	local int StatPointsPerPromotion, BonusStatPointsNaturalAptitude;
 
 	UnitState = XComGameState_Unit(EventData);
 
 	if (UnitState != none)
 	{
 		StatPointsPerPromotion = GetClassStatPointsPerPromition(UnitState);
-
-		UnitState = XComGameState_Unit(GameState.CreateStateObject(class'XComGameState_Unit', UnitState.ObjectID));	
+		BonusStatPointsNaturalAptitude = class'StatUIHelper'.static.GetBonusStatPointsFromNaturalAptitude(UnitState);
+		UnitState = XComGameState_Unit(GameState.CreateStateObject(class'XComGameState_Unit', UnitState.ObjectID));
 		UnitState.GetUnitValue('StatPoints', StatPointsValue);
-		UnitState.SetUnitFloatValue('StatPoints', StatPointsValue.fValue + StatPointsPerPromotion, eCleanup_Never);
+		
+		`LOG(default.Class @ GetFuncName() @ "StatPointsValue" @ int(StatPointsValue.fValue) @ "StatPointsPerPromotion" @ StatPointsPerPromotion @ "BonusStatPointsNaturalAptitude" @ BonusStatPointsNaturalAptitude,, 'RPG');
+
+		UnitState.SetUnitFloatValue('StatPoints', StatPointsValue.fValue + StatPointsPerPromotion + BonusStatPointsNaturalAptitude, eCleanup_Never);
 		GameState.AddStateObject(UnitState);
 	}
 
diff --git a/RPG/Src/XCOM2RPGOverhaul/Classes/X2TemplateHelper_RPGOverhaul.uc b/RPG/Src/XCOM2RPGOverhaul/Classes/X2TemplateHelper_RPGOverhaul.uc
index b2b7819..aa08242 100644
--- a/RPG/Src/XCOM2RPGOverhaul/Classes/X2TemplateHelper_RPGOverhaul.uc
+++ b/RPG/Src/XCOM2RPGOverhaul/Classes/X2TemplateHelper_RPGOverhaul.uc
@@ -270,8 +270,17 @@ static function PatchAbilitiesWeaponCondition()
 			WeaponCondition.IncludeWeaponCategories = Restriction.WeaponCategories;
 			Template.AbilityTargetConditions.AddItem(WeaponCondition);
 
-			Template.eAbilityIconBehaviorHUD = eAbilityIconBehavior_HideSpecificErrors;
-			Template.HideErrors.AddItem('AA_WeaponIncompatible');
+			// Hide active abilities if no weapon matches
+			if (
+				(Template.eAbilityIconBehaviorHUD == eAbilityIconBehavior_AlwaysShow ||
+				 Template.eAbilityIconBehaviorHUD == eAbilityIconBehavior_HideSpecificErrors) &&
+				!Template.bIsPassive &&
+				Template.HasTrigger('X2AbilityTrigger_PlayerInput')
+			)
+			{
+				Template.eAbilityIconBehaviorHUD = eAbilityIconBehavior_HideSpecificErrors;
+				Template.HideErrors.AddItem('AA_WeaponIncompatible');
+			}
 		}
 	}
 }
@@ -576,7 +585,6 @@ static function UpdateStorage()
 	}
 }
 
-
 static function PatchAbilityPrerequisites()
 {
 	local X2AbilityTemplateManager				TemplateManager;