From 88d3b5c56994d1b0afcd8fcd05464379b35cc236 Mon Sep 17 00:00:00 2001
From: Henning Waberg <henning.waberg@gmail.com>
Date: Wed, 18 Mar 2020 12:32:03 +0100
Subject: [PATCH] RPGO ability prerequisites should only affect rpgo class now.

Removes double AP rewards on missions
Adds some complemtary spec fix for the warden plugin
Improves some log statements
---
 XCOM2RPGOverhaul.XCOM_sln                     |  10 ++++----
 XCOM2RPGOverhaul.v12.XCOM_suo                 | Bin 457728 -> 488960 bytes
 .../DetailedSoldierListWOTC/XComEngine.ini    |   1 +
 XCOM2RPGOverhaul/Config/XComGameCore.ini      |   2 +-
 XCOM2RPGOverhaul/Config/XComRPG.ini           |   4 +++
 XCOM2RPGOverhaul/Features.txt                 |   2 +-
 .../X2EventListener_RPG_TacticalListener.uc   |  10 ++++----
 .../Classes/X2EventListener_StatUI.uc         |   6 ++---
 .../XCOM2RPGOverhaul/Classes/RPGOVersion.uc   |   2 +-
 .../Classes/RPGO_UIArmory_PromotionHero.uc    |  24 +++++++++++++++---
 ...ownloadableContentInfo_XCOM2RPGOverhaul.uc |   6 ++---
 .../X2EventListener_RPG_StrategyListener.uc   |  14 +++++-----
 .../Classes/X2TemplateHelper_RPGOverhaul.uc   |   3 +++
 13 files changed, 55 insertions(+), 29 deletions(-)

diff --git a/XCOM2RPGOverhaul.XCOM_sln b/XCOM2RPGOverhaul.XCOM_sln
index 7790e3f..0268269 100644
--- a/XCOM2RPGOverhaul.XCOM_sln
+++ b/XCOM2RPGOverhaul.XCOM_sln
@@ -3,7 +3,7 @@ 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}") = "XCOM2RPGOverhaul", "XCOM2RPGOverhaul\XCOM2RPGOverhaul.x2proj", "{CF9EDB78-24F8-49FA-93F5-0BE39DC6A4A5}"
+Project("{5DAE07AF-E217-45C1-8DE7-FF99D6011E8A}") = "XCOM2RPGOverhaul", "XCOM2RPGOverhaul\XCOM2RPGOverhaul.x2proj", "{219CE4B8-DA1D-49EB-A9A2-A7B292DF97F9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,10 +11,10 @@ Global
 		Default|XCOM 2 = Default|XCOM 2
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CF9EDB78-24F8-49FA-93F5-0BE39DC6A4A5}.Debug|XCOM 2.ActiveCfg = Debug|XCOM 2
-		{CF9EDB78-24F8-49FA-93F5-0BE39DC6A4A5}.Debug|XCOM 2.Build.0 = Debug|XCOM 2
-		{CF9EDB78-24F8-49FA-93F5-0BE39DC6A4A5}.Default|XCOM 2.ActiveCfg = Default|XCOM 2
-		{CF9EDB78-24F8-49FA-93F5-0BE39DC6A4A5}.Default|XCOM 2.Build.0 = Default|XCOM 2
+		{219CE4B8-DA1D-49EB-A9A2-A7B292DF97F9}.Debug|XCOM 2.ActiveCfg = Debug|XCOM 2
+		{219CE4B8-DA1D-49EB-A9A2-A7B292DF97F9}.Debug|XCOM 2.Build.0 = Debug|XCOM 2
+		{219CE4B8-DA1D-49EB-A9A2-A7B292DF97F9}.Default|XCOM 2.ActiveCfg = Default|XCOM 2
+		{219CE4B8-DA1D-49EB-A9A2-A7B292DF97F9}.Default|XCOM 2.Build.0 = Default|XCOM 2
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/XCOM2RPGOverhaul.v12.XCOM_suo b/XCOM2RPGOverhaul.v12.XCOM_suo
index 196bd065859919d1199a9e4ec84b04e477e8f303..60b87e657bdd4ea87ed263723c80ebd5ef7ca60f 100644
GIT binary patch
delta 19089
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

delta 13287
zcmc(l4O~@K*8lI`XP<L;6R(Jfpm;$<CBQ2nFNSmlL^FrT%uLPD@hwwAL^CtIl9@V6
zz%f=YrbrH$qefD0bId_Ab<B*)X{s?FbR6^FIBGrQm{a)w?F*QdpXcfA^Zy?{U-mxx
zoU>onT6^tv_POqJJ=~W=%bcm))^^x!wqDF;^T%n+)vH%ksRlBD7wC^`1Hco=uL74X
z_E?XX-3wU-pXKceWgE-S{Dn=k=JCZW(fShq6RdgK;tuhK&E|*O)zQOZB6RV1<WRro
za3cQ=a<3u{1#f^zG!l>Wzd&Cw9gG2;Q2r&-^WYR{2EPF|l&i{KLsq4Ikotg;U@=$-
z`hoW_($O{>x2?9G7op;hD6)2o$i;Ucqn^t}`aBp0?gjUu-v1!&f;6J7jdeJm3^oJx
zjEQs<I0j<CZjc3D1oa>p&)tqR2I&Z-bHGXPC`be2R2L5+^9m>g2f$yzSD-8K!h;VY
zeFRJbCEyQWHuxRr2I6qf5~Qj_4<l^>#UK;R1AhW#U^sXmd<LEYN#Ot3tP{F_;LXU|
zQOz!-vp^H5;IljQuU`2y)EbXV4O^^*d?DNJ(e2C7?d@J2aF^08HGInYF0Q*y)2b`#
z=#HyOzv}o1@>l8jwz4p!O8=@%>0hNv|9#Ndjr8w8`Hl3io=dgaqCFL4s|vu43}8X4
z0o+LcGx5mx^&gA&+VvlWyc);#`tOOdAFKap-21ci-yIMBSpE0Fy+2R?oqnMI`ft2_
z`C<(!6+j0DFo75F20p+S_<;_<A9MtE&<O;9&L9wU0YRWE2nO9i2nYq;K@SiHdIARs
z2N8xX+vA8Lanc(^fj*!w=m(;~O&|uuf;iv=%6Sbysyt5uNVMMe>$-RlayNrCFc_qR
zTYw7;0U00@WPza|8w>-(!L48fxDAX1zX3Vmc90A10HeU2U^KW3i~)CpvEUxV7GN8P
z%y=*Xs4lix^Ez1nUnJ~l9X)`A2mh}UZom2a5?1Aw)9>kWclY`Q9hdXPIQJYwV1+8<
zjVaYya`kH7b$L~G6YhB%WshP;u1C5MY1DQ1xR4(NI^e!QunhTbNdJs96loZE7I}fx
z2_lpm4M%1o3RMF`+ESH|L%tub6{8Uy`E;<U?fM?1UjQ|?Z^k_;or3!kksk<>KnggG
zds2}O0=IyxI8R5~6*S>~7ZWfcR?mBcFspmOSR(-!(nr)U47in9Z}0(DbGNwqh@cbf
zULRagy;NfI2C9duRpm?bfEt#8atz7VE~XFAf)dj)q)JQ-*VQvF<i8^(x;KD#{f(+p
zNkygYhZ2Iy_eMDk@Y=P%qRRGrlu(p#)VUIhN^hp}3?3@f_^By?2lB3rE(P#qY>#zv
zd}lfyz`giZPS1AcGb|n&Q6Cv{oK*xD88gt%_s0K1M3|qo(b?Tfk4~bZ(d>357-~kw
zo2jM-sy5V0LPdA6RhIkS$oj~X<7|7J!;2h6tgle(qvr-$RK!-XO2IR|Stts7wqK|%
z5}f&*#Fz{<7@O77G1A)D2~BoR@?D4mwUDXutB=m(FB#VS;$r>>!@7iIGtL$l`&L6Z
zN3XkSK<iC0tvB7&dQ-1&Z=$Oj&$?kRF5Ivex~CWQU)|EjupEiPipmVJ((Q(q3Q&}e
zJma&9Hr{S!4veq=a-%P^+`}P=;m37~zf;>njqzfneO~hE%f~NlsdA0z^6EDM-TzEY
zE*4~ky?LrS*S~rJr^zp96RGSaEwH{Yue5VzB!9!(_Bm?zZ*PHD8FVR<=Li*JSh<HH
zEhiLtuR-&B^I~Hvx<0Z8EqsebTaoEiUI7q@ns%Pf)i<a6vFg*jGK(D&3GEfuH%Fs1
zl2t#-Dt1TE#t95Uw;Mv4dVBp=(N3s34<)~Cf6Qv$nd>zPXH&106up*fWd%5W*P+32
zKwT(5tjYQv?h#t`AnuAp$z1ROs0K%XdR%!VH7j06{(evjrT|q|j&wUf_A0sjd19Bl
zadsB$1WGhHV6U|zCUo(A$Z<4$1?eK7p1BF>LGTH%gU5jc^Fb^~0W&}}Q1@F%l~v}0
z{U8K92A%^;!GD89Py-$SJHQ%%IS^!f1mb@aC+~ud;A7CmN{t=1I1o7{@;gBg7>sTX
zMLGbS0RA{9q!+=zz-^#62ts){(gLsnd;@|}_A=77Ky_IiN>oKSKMuYIw*nLQ^+%e<
zY;>|pd$fMhsimxXrKre`up)ooo%Td=Oy?->(Hb>Jap+jJ6$RR+b03~7B5>Mn2-KX)
zV=PCAuxciU)Tfv2*Jw?$K2A=^W*Zr8@1s>v**hYterM%y#!gu*@=vm1A9Jya=PD@3
zAtLHud3Ge`#ZwU!xkA}lv|(kfaeJu|sNT2Eq2@K{h#K&mYehv*t)h~R{6ouee~Pqg
z+|FKbREc`W?k2`|$|ZdmoSWZe&CiOgJzjl`SLU#=`moL1zuwW<#Hx4k%Ex%AEM33~
zSw*75a^yrRL$!)>Fj;fp;&Vo~56~*Q9S&@7gtc*I_xkjPeOmQryyET2<Yc<2pLSrE
zx8+#2NhpJCn^MdC7!~%>-lP22d1U>i_k398ZLEe|i$n(HcGK+gvYmOc%4}X_DCgtn
zPYbj82rqBcpdwvQErzm)qK<S$UFnFtI&ag!Fuv5xhgqqT0W0~EdiRHJZ*~ZxT`b+*
znVVGxvx(Grrxqzo{8=%pJ|l>4<8c&sp6#<Y(g1B$ua9hfI^T7+-_hv}H5V8op2%bB
zW6mA(rHYQ)SgM*Oa%g2=9w`s!vm{1CE{MKlKcgjD4JD)N>#pQ_S4OiiDtnH5k^3<b
zLl>*LQ8@>hmAkbF8ZpucVLK#yjcJVbFJWml2IDnpj9aeA2HD`lTpGE<StLbHV39&C
z=WQdKz;dnq+^IhcvCN`5XG9OHY+@X_jx#^2abjKNa2~0z#K@ndcZc%Mls24?Wg%)&
zd#5s&i}Ipia^K1wY>~AgEtGcO%I(&XAzpM0WgS}Z*j2zZn{8YD-s2`C|1Y(^(%G3c
z8Wm{{KW|*{0lvVBN$aZzA=48z^$Kwy7Y-soFAxcOgD9=OGHnbCY!9oH&9)!a%Xv*0
z<CU{`p6CWm$tffGT2>Q*{uVx}!SX(X<ps`z_l&A)N&m3lONa0J^Ni`c<~;hT)igd(
z_C3HpWHpFHYQBKj+_SdOzl0u5PF;A(6M{uRWpS)n77u6DzT_xno2=mhF|xUo`LUWY
z%orSrCg*|=KsC7Duc|J7-><5&a@?oPcnA&l=gB|8sVYzNQ=F;>jaz8wXFJuuK#~7%
zo$6t<sD`PI|H-M&S;<$^(SzI}w@hTC^~z8diB-3!w`T)Ey%>8eT^5BP=20qiOZPNZ
zV%GEQ7FJWh1eW(^9^Sg1d#M#3X4d))ceE|&+t3veDzD6A2CqqHoHF8AdgYx6wOre{
zA!jXQYjpZzgxF1aBa9e%b_xq_^TT1jB2gYFVQGva2Z}`UNe}^Ycp%@&b}VBKFX`}N
zRa`cdG1q{KX^whFQeP&L+S|8^l5f}9EjVp=jJ~6BG8($XK}#ycP?>d+?PiqmPo5z&
zy!a|+fA*7i!@gWGR;w;~_~Q7elzOTg#=3MEIrYK(NpTC}3kn~cxro>WF@qZ461j5c
zAvUuMMYwpB@NIVrvdD#sDE>L_lCCD!;Jv+QI1{g^CRKQ870rXg4jACO6@psX)|XD5
zwI1Xe%Lh?ew&o-A&ao=SCRpLTv$gN;80A+2t&AsQ>}tEC^%1PNuYTmF+_k#1!^KSH
ziPa8Gq3r=Hymu&VTB`@!9~?a3!Ku9t9Q@at|Nhc*bK_e5Vx<qS^H$S;H<a=cz2?Ic
zdaKiSak>Zm2{eGcU>|q`><4dJorZKydI!0;z!C5^I0{10p+=;tmSFVaedI47-3OFV
z`Z5~l%R@p=p!~nUC6wdVtEZ6vJ2=g$)R#xI%gROeEO&cRlP~XPZB0v%bs2mkD|b6<
znwkGET<{yczCyd#Rx4^A#2dXXqeykfqZr@0!e(30rjR*(wD;-gbP+5+Gk8$z(x(R3
zzVrnluYy<4lg8^9#`GR)>B|x7P0CYBMZ@^2nlYSr;n1`iv4&It9dw1Cz6FDo6N32D
z%%>Pdi-B8{Eq8IwmHAAR6Yad3)lA`n+%q_q{2+uZsjU&a1I?(NrnaVL@<tU6P|*V_
z08)+hZNKRE4ssLPtfnTI`_OySwLn_X9Sf*yPZP7MqJ@mi=g4_I7F6yYBu8iQEsRDj
z*I>YXQC{y@x`_$(HrzVgt-9JVlvi%zUV=)(83LgbY@<*+XRY07KEdAcwy9mKzU^g3
zDOSjFOkNqlqcCr$@Fs0XI(P7&IVkUIgQ9O{^8-3l)1rNv%jSIUhX~Dy^?DGm@@O8i
zZSUL<H1G4R=IdJ?KFa9G9XzpeBp>UiRIJo~-Fi5h^X-AFnD{q@V3l<l8F3kzufP@X
zAMiE!2DE^yz-D|~X$_vHlXg8&29DzA*iWs9TE_GFtiPN$f&Z>uL1TFXtDL}#+KX$7
z&_s2tHi}lh1oNFakyo;s`6z?ennq2dwJ~z{WS+%#xcLIcTFU2iW%H?g2~P+sgcZ*P
z^MJA-HK89uUJ2k~ZWX5mdAZvz)hyzi`AgQouQICI#Fvxf3Eo%M9p<@=no2od6jx|o
zG;=kNk{=)CQH)%x5SvB5$MJq%jf@{AwoqFp9)t0H7jja2%{XYodF>wBy@Dsn(qp_(
zr&HN_1U33FgVv2?fii6Y->)G6CWnK);B8aeplVm4&F~z`@YHs>+Qx6Kdp-;=4`-_G
zmk(;;(oqbXrhq+sEmfuRVEM{%K9Z5WoS!B~wg{0eO&DCwQi!bN08gQ&G9D;Lp5m`y
z5QoGpa=p%?$?*afuC?d+6h@6T$QqaU6_Z?V@)#<3h6l+Eq3vN*P|2}e+BG-Z(OoMJ
zl647MN#~jwoLd!<CDeG3`%%L%EsDj_$^Y>GP}Nr5koFwyBBQc5_*%Jknl^>Wi|6pB
zK=#?%MJoHPmSe@;<yTX{xv3&C%tJY(h2O+Te94b0tx&+nTDE+8uC|LQ1uf%OO*v|w
zh6{;OFH}tg%H^d{eeI}+G`N{5T9d>G9U7e)sufVfJq#l-HG?8c#TjZCt*6nR3kaIS
z7Hg-d@q)HYE-TTF7&Q4c{xlu=gm;&(tWo0I_#Q8oP<n|jx4+4~U<FES-HD$zYDYbZ
z`l>(Rku>Wo?kAn=cq6l__k2N)+i(FrKO=KDY1>VzdV&{F{4|j-^Q(9TlZ89AQVe~(
z1}W~*+#2QmP54t@o+fDH6@HeS%Xu0V_z6R%y`}Bv<Xp=OiI?+cN`IZjNGPePdu>&i
z#wy?7A#Aw3<7wWLQSKEjnl7fIl2PT_8R<U2QFFmx#YC#x!@HB?W=+WABfJD!IHP??
ziymTjdA5-wCTUF9a%9fOd^@9yNBCxH%+#Xgu@gLo(XI@wiJDIHQMHAQny8Kc2j{Zz
zm{#gdWj(bp8P=qY_LK3S^0Roqn5zZL!gJbLVY%b|W$r(@534P_2yGPpR+~jR1zM0i
zevU^nnmk|o+G7<2tB8}%&v_%3g1K6j%xd9SS4DU2d~M+uXm1qL(B37FxSr#MmD7|i
zuUB4_j4`xh-d6qrKj{~sHG9)VZ|yAkRch%Jb(<C=3%}M%b*kGZF43xOi23cY;v(f9
z&?d{tiK2>;`@FVLE*c>&>2lO<+BQz^O%OKpHcmEg)(l3Y{|LD^ZPo(il{>WsytXh`
zc-0n;(U2P}1pYy+g%iYivtt;`#Kz$SeDWy7*M;fyd4M*!GLgH;zDx^{EfcgNO;&dj
z0gQG}6X#`Np6Xd+8e1qA&d`==mVa-<D!nI$(m&D+nUb#^VwG>Q3{OCrcT)3{^A~C@
zP~I#NM6T7$PhuTEjv#LXpGJ=Ja3SXwX@QK^{Y`U7hg*X$XnLQ|q;sdWG+FbsHm)Nz
zlxw@F?hCw*o~YB-XcXU7Y?l*eiX2TAzM_?CJ9cS>(3X!jP1^GXrfcq6zKHxoMVNfH
zL`>5u_f}Cs#hZChWltgGmX%_PH@%XfouPs*+92tw6b&Z1pWxd(@1pYKIsp&aG({Wa
zadFg`3X2}SLtqikyHhKs{=RyItlA~=7$sfSj?sy!SaM_jCZeb=L-@<+y`s#Ng}asV
zozJTo@G%dgm^s2v7QHCCGg><n7HmJJI@(mvM^eK<Zm0ZVB2KRSOw30kL&aKh^%Y^Y
zh5KMeyRL|A__~F{|5bne3q11#&y#sx`UWOhfDVW68YAFIdTOX-iHMQgg7s0R%-bkn
zv5m{os<W5AN|QzVwN;SB0k%f2IjYTqkZ#cqQ^E6C7aGEJA8NP_qG>vzIS_%2hf!YE
znl*A9<fEvpoR`T{T)fwjO_Sy0wNNzKmye+HvmlqTUBoDZO6s)Xw4ep!3h1MsH&h>=
zrB$2-Q`}apdWW6*Hcc)q)C3;A1e4sHq(|$t{d25TxetmQ>^g{OT~?nIxWT!KJIQOX
zeuTE)Cr-%a5n_QiHS}dZl>a0ew8x2yIywHy<78YCbRYu<YGE)REJjLGpHW7rHkzuU
z^+2i{$Kqvvx?bT+4LijeI`N@!)gH^yb=r8A&6JThi%Ru2zfsN^rDIU;PtX(BUHTeM
z+xPQbt*g<h!6J@P$wy*`Tsc-B!D@G<3ry{k8hmO?ZxJC|#_55q>r5M#Vjr7$dDaWE
z+HvdpdmhXBd&FNt=&m#3<gg*wrc1&H*bHpVIkD3hYa4=Zni;la<PvSE$UBis#TTxD
z_#cb?!vvHkVlyuR*W&RFc_5w~LXUnb?uz|MmC?zK{2p>G=P@#Uh}h>vb&~I@JR^qM
z>%W?||IKN0hd(!G^4`q_&d*wVnu%7E@RyB#WT5p}&siqgS3ONZk5!qvmW&>$tMM2Y
z`i8$`j3NOHRXx2=@1OT8Rff;waS*{&+cdmU&BNZQFV<NE5S;p-71$1u{qywU8e40z
zC0DJ6kzs6kJ)7ap==~OPf*il+A%w{iA)mV-hB2zE=Gi;uh+T~K&KFWXGhL7Om3MT|
zy%@Vhll-)Q%S<2LpUF4o>Tw!9Zr5{JiTuD0^I)g3KbB8-7&?4Wy-1?;10tCA%@vm^
z{5k&6jkd9j$Mm~s$x&Eh$Cdhga!xin(4c?lJt~*#gNFS|(xD|w^{dH6*x^$<(acuI
zvj#cw_ef@9Qc`wmMnY^-Qs%(e#FXTO*wl>V0kKK(nFEFlNp>bUhYq2<aQ%5&Uv31^
z^GC2d)clIxSAF<GJ-?gy-2E3=q3b8tw}REFjl>-ddIO`E|BAtXw|*8tJzmxSPNl1L
z2O>1RfgJmESFP)Sj(B39?xu!O%teg>dUp!xth;2;Jh72kqauSSXoRtuHoUF(q^tY%
z@Ex}q4V)Zr=q}oOUVKc>w=@HB1){o#gb$+u<$4g!e?wnM{S%ok_4oAuz~xowkH|-w
z^nY+f-uiHAnyz_CpNB;qlX-vFXY<&fJlgL|53#8Iv>rn8h;C=w>Euy;?zQp9(ZNsk
zfSaba2EULpem>KdR~rd%AfCg4Ipwh3t+o%Sd^LXto>|MMLr*cp3@_@~Or87(eVzKL
zfjWq-*Hh`eK4PsL^N5&&i$!7^*>~w*NW_+TTxNvAJ;|ewig-cJD7{f)NpLdSxdsld
z;wIx5oqd6iRvQ!_QuQG{&a=2xekAPIRtA6RTrXDoQuRSTQXY9;N8HWNYv(NY=oES4
z4<bUSFtL<w>7WP5s_kMXtA#_xM04pWa>7pNjxJV-LmppD@Wn>W>q1it^wQQD<Mzf@
zSL0#f^rpOAeUIGpfe2#s#TND~mBu0NLC-E#mSQDOzlwQD&R$vswXD<abVwL}`rNrw
z=T4w^ml}Q4S5hU9B_ZY@R_)o!KK56U?k59IiG9rD@|Nyceo9|E$F(D2>o6)Vxzg(L
zhC<va_{)GZOM#P9?ky8;tkvZ?+Z>&`n&5GML*R=NQJM;p;p|fIe0H029`w^Hn}k=n
z?>e*KAM4DfVxQ?oehW@7gthvuoL0Xj-SPOv4tadhdtLPaTDMehq<#BY$YQk)-Ec5)
zxi{Nf5a%Np;IAT{?>ce(s;J1eh!zLw3B!J+29zKCmuFbX(|fc!L&H|t?hJ><r=(;g
zr6k6tW;)>vo$!MhNeKzDL$VT+Q<Ia2ro?A^oZ&OAPCDhcW)BK0*Zan<{pmGa{Jn0{
z+HPh)3OtD#*8Kb$y3l%G)33Ffr9Zuzs`ZAicjl}~bLVDFDw;(0lX^_-<L%WrGg6Y1
zvQjc)6H<pHLn86Xu^B@LWW**7Ovuj67@C!kkaWF7uxus9wy?IfB|ar7IdkB^tk|K6
zN!hW9@!3hSsR@Z0vB_B}na-r4$(h+1nQCo$hEyM@=jV_}!Nnh}Ex%Yj&aSqsUtCEC
zzp<GQ&K@>t_SCrh^NVPbFbl3(LActXzIFuL7@YLI*UnpiQK-K3X8mG2L8!d7n;Fd3
z(URXIR)GD)cD}A5?E0v-!_^*iT-L8+Q=RPX16THe!QW3W?=sd>c#R%r_2*u3S-+0a
zb?&6vxn_u}p=C5+y|Iwy8D^&&NI2lSfvepvb!7b#%k}?`il3mplZ-_w67w6|TKTvC
zTgB{D`-GlDG^8OPhJ4m9wf-ZW`?Xby-|{r5pVmB%^-9G;60y)6L%Jf2Lqe@<BdKGY
z9!#-Yjjl2?&KS&U-TnrzT*EW4ccu<1|BIgD`3!OW3fOk-x)pHFDSf==cYSa{pD)w;
zQQ2)q0adKVmeIA?f)HDbzCLsdSflNuxMhe0umsyZK}T!2h6tlAT&pe;`6|{3@N7<h
z8>1Cm<t|TnwqvXA;uSvbv<>LE+P{1O=|=E-Py=egCh#Iq*A-ik-wL+1m9_q^Y>RaD
zG!B`q;z1W2DmwI&t~kSWO*}4Y=xlfqUk~B9bYryoMk8H&bQfNlOSwz^z{++Rtf%n)
z<`c3k$0*RLsl{+gXQ43;ucnKPm+3)n=<;ZhF&TRt4;T|G_v<;BcvM!(ohH6Wr~|<z
zPo;+ax?Aa_)mG?^UMN#vhA42q9z*YbZNyS;f!T+g3yoK)>=C1mV!VxYvh))jn-$Jf
z1G|);=~u9y*1_;5`y!(gm2oqW90QFaa*r{>=|B&&8@)8!Ttd(9Gkm1`zjZe!dp|Qm
z-m=VyV?P+qVLjbw9mB;JjoNDixx^@Hj=6@O2r=_%{ryHqdcC*lB^Q36e~NzmpmW%o
zdD(%Wy6h{xfSSgc4@yX+oKfDV`c0}|eQC=I;~Tm##(bO{$BgdM_cQ%IeBnQbpKNS4
zjS_4+tTrNP?Hn_Vmj6><@H59ZNu$rFnA7Oha-)~3aS1sG8$PscwQ;VtYK6fm{BdKp
zG@mpgIUP+h=TX@PBU(OGVN7S_SO5{)2b&}0+%?8(Nca<dJdJ<ac!R>Z(G9PI#t~Iz
zk&4Vy>B+^$qtx*uqlcX0V=U8tRBaNq%{Hm5LN!!~I_(MQTyTRCL6E)v)K>Fx*-~Y2
zlk&!xvuWKoFw45J#!-s<LO-Z(Sxj}a4Qz#dWQ^D8^Jd*G*F9sDV8f*&hT`Bx2-PK{
zM&EnP=+;);qs(wB{nCh(j^~X{{C{nl4B9o(aM72hSx${PrcQ6KH)^G$$yn~KjHI;{
zdG|~s4FXdQLM(>tan9&u(!ME1oV<Fsv6$VU!yj=<zl!GzCK(~J=@VlG`(7i;sIC)>
zoN>}{d40Fd7tP9hj1g3PzZoR+Dvc^k&=tm1k4&gI+UzD*ZZc9Cb@~J|*`0`B>@XQg
z-@Au!kNlo+s9}<!Q^6(US-LV2SM4j%6Q`fqL#AIg_F-H3tTB%2j$>axuf@15TCYQa
z-l{99a{jCMsUqFi&$QGSR#N&b)1T_5p#2WB5f!*&jqa59D&CguvBoAD=WP!2rpDQ5
zLd{p{z2A5f6I3;M%_gLOSMy<wPFTiMY632$Z+>IODg&s!*7IKEOfVy^^*o=NUeN<(
z&rtIbyzZ=rrTpey9R?PQf!#8}ctqY8W^T})YA_$5x~`@VHD$oZG!AHO)FICgHj5aA
zjx_hS_N-~15lW3O8jf#03AKD}9HjduV@@>`qt>QB8ou(yToa02vC$xU;1j(Uz17Q%
zqZ5~mm>(g?3)p?Oo9=5)?9eqKd`GT7SB3-`_N1w^%uO=3t2wS!niA6N4F7dw0j<z(
zERv?9`f8c`wJ{G`{vXFLG5&toBr?p0WxvtpgYar?dXAtIV_=|VQRX|?e)!IGm6)!l
zxkr<-Zh|?Z%|T%5_L9)?7@-<nDG#KWkz8Utdj-`!ZmcHz08G!SbI>xh-igr3B5Igs
zhRfRvO>a&w=b9VjSB2(1%(IlYZ5h}o_#QLStNq6YwBewU^26U4bh_8<t!C6=`rSBl
G$^Qip1}857

diff --git a/XCOM2RPGOverhaul/Config/DetailedSoldierListWOTC/XComEngine.ini b/XCOM2RPGOverhaul/Config/DetailedSoldierListWOTC/XComEngine.ini
index f709e31..cd80de5 100644
--- a/XCOM2RPGOverhaul/Config/DetailedSoldierListWOTC/XComEngine.ini
+++ b/XCOM2RPGOverhaul/Config/DetailedSoldierListWOTC/XComEngine.ini
@@ -1,3 +1,4 @@
 [Engine.Engine]
 -ModClassOverrides=(BaseGameClass="UIPersonnel_SoldierListItem", ModClass="UIPersonnel_SoldierListItemDetailed")
+-ModClassOverrides=(BaseGameClass="UIPersonnel_SoldierListItem", ModClass="DetailedSoldierListWOTC_Integrated.UIPersonnel_SoldierListItemDetailed")
 +ModClassOverrides=(BaseGameClass="UIPersonnel_SoldierListItem", ModClass="XCOM2RPGOverhaul.UIPersonnel_SoldierListItemDetailed")
\ No newline at end of file
diff --git a/XCOM2RPGOverhaul/Config/XComGameCore.ini b/XCOM2RPGOverhaul/Config/XComGameCore.ini
index 062accb..2e6d260 100644
--- a/XCOM2RPGOverhaul/Config/XComGameCore.ini
+++ b/XCOM2RPGOverhaul/Config/XComGameCore.ini
@@ -3,7 +3,7 @@
 
 [XComGame.X2EventListener_AbilityPoints]
 -MaxTacticalEventAbilityPointsPerBattle=2
-+MaxTacticalEventAbilityPointsPerBattle=10
++MaxTacticalEventAbilityPointsPerBattle=5
 
 [XModBase_Core_2_0_1.XMBConfig]
 ;+AllSoldierAbilitySet=EquipmentStatCaps
\ No newline at end of file
diff --git a/XCOM2RPGOverhaul/Config/XComRPG.ini b/XCOM2RPGOverhaul/Config/XComRPG.ini
index 8c4be4e..1071440 100644
--- a/XCOM2RPGOverhaul/Config/XComRPG.ini
+++ b/XCOM2RPGOverhaul/Config/XComRPG.ini
@@ -387,6 +387,10 @@ IRIMetaInfo = (bMeta=true, AllowedWeaponCategories=(bioamp), InventorySlots=(eIn
 +ForceComplementarySpecializations=Tactician
 IRIMetaInfo = (bMeta=true, AllowedWeaponCategories=(bioamp), InventorySlots=(eInvSlot_SecondaryWeapon), iWeightSecondary=1)
 
+; Fix for warden class and swo
+[Flow X2UniversalSoldierClassInfo]
++ForceComplementarySpecializations=Ebb
+
 [RPGO.X2Effect_ReducedRecoveryTime]
 +FIELD_SURGEON_CHANCE_FOR_NUM_EFFECTS[0]=100
 +FIELD_SURGEON_CHANCE_FOR_NUM_EFFECTS[1]=50
diff --git a/XCOM2RPGOverhaul/Features.txt b/XCOM2RPGOverhaul/Features.txt
index c336f6f..a0281dc 100644
--- a/XCOM2RPGOverhaul/Features.txt
+++ b/XCOM2RPGOverhaul/Features.txt
@@ -20,7 +20,7 @@ The baseline ability cost for buying abilities is raised too however:
 
 Individual abilities may cost more or less depending on their powerlevel.
 
-The ability point rewards are doubled and the mission cap is raised from 2 to 10 AP/mission
+The ability point mission cap is raised from 2 to 5 AP/mission
 
 [h1]Soldier SP[/h1]
 
diff --git a/XCOM2RPGOverhaul/Src/RPGO/Classes/X2EventListener_RPG_TacticalListener.uc b/XCOM2RPGOverhaul/Src/RPGO/Classes/X2EventListener_RPG_TacticalListener.uc
index 830876e..d15fe4a 100644
--- a/XCOM2RPGOverhaul/Src/RPGO/Classes/X2EventListener_RPG_TacticalListener.uc
+++ b/XCOM2RPGOverhaul/Src/RPGO/Classes/X2EventListener_RPG_TacticalListener.uc
@@ -22,7 +22,7 @@ static function CHEventListenerTemplate CreateListenerTemplateScamperBegin()
 	Template.RegisterInStrategy = false;
 
 	Template.AddCHEvent('ScamperBegin', OnScamperBegin, ELD_OnStateSubmitted);
-	`LOG("Register Event OnScamperBegin",, 'RPG');
+	`LOG(default.class @ "Register Event OnScamperBegin",, 'RPG');
 
 	return Template;
 }
@@ -37,7 +37,7 @@ static function CHEventListenerTemplate CreateListenerTemplateOnCleanupTacticalM
 	Template.RegisterInStrategy = false;
 
 	Template.AddCHEvent('CleanupTacticalMission', OnCleanupTacticalMission, ELD_OnStateSubmitted);
-	`LOG("Register Event CleanupTacticalMission",, 'RPG');
+	`LOG(default.class @ "Register Event CleanupTacticalMission",, 'RPG');
 
 	return Template;
 }
@@ -52,10 +52,10 @@ static function CHEventListenerTemplate CreateListenerTemplateGetItemRange()
 	Template.RegisterInStrategy = false;
 
 	Template.AddCHEvent('OnGetItemRange', OnGetItemRangeBombard, ELD_OnStateSubmitted);
-	`LOG("Register Event OnGetItemRangeBombard",, 'RPG');
+	`LOG(default.class @ "Register Event OnGetItemRangeBombard",, 'RPG');
 
 	Template.AddCHEvent('OnGetItemRange', OnGetItemRangeScout, ELD_OnStateSubmitted);
-	`LOG("Register Event OnGetItemRangeScout",, 'RPG');
+	`LOG(default.class @ "Register Event OnGetItemRangeScout",, 'RPG');
 
 	return Template;
 }
@@ -70,7 +70,7 @@ static function CHEventListenerTemplate CreateListenerTemplateFailsafe()
 	Template.RegisterInStrategy = false;
 
 	Template.AddCHEvent('PreAcquiredHackReward', OnPreAcquiredHackReward, ELD_OnStateSubmitted);
-	`LOG("Register Event PreAcquiredHackReward",, 'RPG');
+	`LOG(default.class @ "Register Event PreAcquiredHackReward",, 'RPG');
 
 	return Template;
 }
diff --git a/XCOM2RPGOverhaul/Src/StatUpgradeUI/Classes/X2EventListener_StatUI.uc b/XCOM2RPGOverhaul/Src/StatUpgradeUI/Classes/X2EventListener_StatUI.uc
index ed2a5e4..33bb56d 100644
--- a/XCOM2RPGOverhaul/Src/StatUpgradeUI/Classes/X2EventListener_StatUI.uc
+++ b/XCOM2RPGOverhaul/Src/StatUpgradeUI/Classes/X2EventListener_StatUI.uc
@@ -27,7 +27,7 @@ static function CHEventListenerTemplate CreateMainMenuListenerTemplate()
 	Template.RegisterInStrategy = true;
 
 	Template.AddCHEvent('OnArmoryMainMenuUpdate', OnArmoryMainMenuUpdate, ELD_Immediate);
-	`LOG("Register Event OnArmoryMainMenuUpdate",, 'RPG');
+	`LOG(default.Class @ "Register Event OnArmoryMainMenuUpdate",, 'RPG');
 
 	return Template;
 }
@@ -41,7 +41,7 @@ static function CHEventListenerTemplate CreateListenerTemplate_OnUnitRankUp()
 	Template.RegisterInStrategy = true;
 
 	Template.AddCHEvent('UnitRankUp', OnUnitRankUp, ELD_Immediate);
-	`LOG("Register Event OnUnitRankUp",, 'RPG');
+	`LOG(default.Class @ "Register Event OnUnitRankUp",, 'RPG');
 
 	return Template;
 }
@@ -55,7 +55,7 @@ static function CHEventListenerTemplate CreateListenerTemplate_OnCompleteRespecS
 	Template.RegisterInStrategy = true;
 
 	Template.AddCHEvent('CompleteRespecSoldier', OnCompleteRespecSoldier, ELD_OnStateSubmitted);
-	`LOG("Register Event CompleteRespecSoldier",, 'RPG');
+	`LOG(default.Class @ "Register Event CompleteRespecSoldier",, 'RPG');
 
 	return Template;
 }
diff --git a/XCOM2RPGOverhaul/Src/XCOM2RPGOverhaul/Classes/RPGOVersion.uc b/XCOM2RPGOverhaul/Src/XCOM2RPGOverhaul/Classes/RPGOVersion.uc
index c0b39bb..1187bb0 100644
--- a/XCOM2RPGOverhaul/Src/XCOM2RPGOverhaul/Classes/RPGOVersion.uc
+++ b/XCOM2RPGOverhaul/Src/XCOM2RPGOverhaul/Classes/RPGOVersion.uc
@@ -28,6 +28,6 @@ defaultproperties
 {
     MajorVersion = 0;
     MinorVersion = 2;
-    PatchVersion = 9;
+    PatchVersion = 10;
     Commit = "beta";
 }
\ No newline at end of file
diff --git a/XCOM2RPGOverhaul/Src/XCOM2RPGOverhaul/Classes/RPGO_UIArmory_PromotionHero.uc b/XCOM2RPGOverhaul/Src/XCOM2RPGOverhaul/Classes/RPGO_UIArmory_PromotionHero.uc
index e0b09e0..32f62c7 100644
--- a/XCOM2RPGOverhaul/Src/XCOM2RPGOverhaul/Classes/RPGO_UIArmory_PromotionHero.uc
+++ b/XCOM2RPGOverhaul/Src/XCOM2RPGOverhaul/Classes/RPGO_UIArmory_PromotionHero.uc
@@ -551,7 +551,7 @@ function bool CanPurchaseAbility(int Rank, int Branch, name AbilityName)
 	//Emulate Resistance Hero behaviour
 	if(AbilityRanks == 0)
 	{				
-		return (Rank < UnitState.GetRank() && CanAffordAbility(Rank, Branch) && UnitState.MeetsAbilityPrerequisites(AbilityName));
+		return (Rank < UnitState.GetRank() && CanAffordAbility(Rank, Branch) && MeetsAbilityPrerequisites(UnitState, AbilityName));
 	}
 
 	//Don't allow non hero units to purchase abilities with AP without a training center
@@ -567,10 +567,28 @@ function bool CanPurchaseAbility(int Rank, int Branch, name AbilityName)
 	}
 
 	//Normal behaviour
-	// Musashi 11-05-17 do not check ability prerequisites for resistance heroes
+	// Musashi 11-05-17 do not check ability prerequisites for other classes than UniversalSoldier
 	return (Rank < UnitState.GetRank() &&
 		CanAffordAbility(Rank, Branch) &&
-		(UnitState.MeetsAbilityPrerequisites(AbilityName) || UnitState.IsResistanceHero()));
+		MeetsAbilityPrerequisites(UnitState, AbilityName));
+}
+
+function bool MeetsAbilityPrerequisites(XComGameState_Unit UnitState, name AbilityName)
+{
+	local bool bMeetsAbilityPrerequisites;
+
+	bMeetsAbilityPrerequisites = UnitState.MeetsAbilityPrerequisites(AbilityName);
+
+	// Dont use RPGO AbilityPrerequisites for other classes
+	if (!bMeetsAbilityPrerequisites && UnitState.GetSoldierClassTemplateName() != 'UniversalSoldier')
+	{
+		if (class'X2TemplateHelper_RPGOverhaul'.static.IsPrerequisiteAbility(AbilityName))
+		{
+			return true;
+		}
+	}
+
+	return bMeetsAbilityPrerequisites;
 }
 
 function int GetAbilityPointCost(int Rank, int Branch)
diff --git a/XCOM2RPGOverhaul/Src/XCOM2RPGOverhaul/Classes/X2DownloadableContentInfo_XCOM2RPGOverhaul.uc b/XCOM2RPGOverhaul/Src/XCOM2RPGOverhaul/Classes/X2DownloadableContentInfo_XCOM2RPGOverhaul.uc
index e414936..2243bbb 100644
--- a/XCOM2RPGOverhaul/Src/XCOM2RPGOverhaul/Classes/X2DownloadableContentInfo_XCOM2RPGOverhaul.uc
+++ b/XCOM2RPGOverhaul/Src/XCOM2RPGOverhaul/Classes/X2DownloadableContentInfo_XCOM2RPGOverhaul.uc
@@ -7,11 +7,11 @@ var config string DisplayName;
 // Double tactical ability points
 static event InstallNewCampaign(XComGameState StartState)
 {
-	local XComGameState_HeadquartersXCom XComHQ;
+	//local XComGameState_HeadquartersXCom XComHQ;
 
-	XComHQ = class'X2TemplateHelper_RPGOverhaul'.static.GetNewXComHQState(StartState);
+	//XComHQ = class'X2TemplateHelper_RPGOverhaul'.static.GetNewXComHQState(StartState);
 
-	XComHQ.BonusAbilityPointScalar *= 2.0;
+	//XComHQ.BonusAbilityPointScalar *= 2.0;
 	
 }
 
diff --git a/XCOM2RPGOverhaul/Src/XCOM2RPGOverhaul/Classes/X2EventListener_RPG_StrategyListener.uc b/XCOM2RPGOverhaul/Src/XCOM2RPGOverhaul/Classes/X2EventListener_RPG_StrategyListener.uc
index d08aa37..d95a963 100644
--- a/XCOM2RPGOverhaul/Src/XCOM2RPGOverhaul/Classes/X2EventListener_RPG_StrategyListener.uc
+++ b/XCOM2RPGOverhaul/Src/XCOM2RPGOverhaul/Classes/X2EventListener_RPG_StrategyListener.uc
@@ -33,7 +33,7 @@ static function CHEventListenerTemplate CreateListenerTemplate_OnUnitRankUp()
 	Template.AddCHEvent('UnitRankUp', OnUnitRankUpSecondWaveRoulette, ELD_OnStateSubmitted);
 	// compatibility with Commanders Choice Wotc
 	Template.AddCHEvent('UnitRankUp', OnUnitRankUpSecondWaveRoulette, ELD_Immediate);
-	`LOG("Register Event OnUnitRankUpSecondWaveRoulette",, 'RPG');
+	`LOG(default.class @ "Register Event OnUnitRankUpSecondWaveRoulette",, 'RPG');
 
 	return Template;
 }
@@ -47,7 +47,7 @@ static function CHEventListenerTemplate CreateListenerTemplate_OnCompleteRespecS
 	Template.RegisterInStrategy = true;
 
 	Template.AddCHEvent('CompleteRespecSoldier', OnCompleteRespecSoldierSWTR, ELD_OnStateSubmitted);
-	`LOG("Register Event OnCompleteRespecSoldierSWTR",, 'RPG');
+	`LOG(default.class @ "Register Event OnCompleteRespecSoldierSWTR",, 'RPG');
 
 	return Template;
 }
@@ -63,13 +63,13 @@ static function CHEventListenerTemplate CreateListenerTemplate_OnSoldierInfo()
 	Template.RegisterInStrategy = true;
 
 	Template.AddCHEvent('SoldierClassIcon', OnSoldierInfo, ELD_Immediate);
-	`LOG("Register Event SoldierClassIcon",, 'RPG');
+	`LOG(default.class @ "Register Event SoldierClassIcon",, 'RPG');
 
 	Template.AddCHEvent('SoldierClassDisplayName', OnSoldierInfo, ELD_Immediate);
-	`LOG("Register Event SoldierClassDisplayName",, 'RPG');
+	`LOG(default.class @ "Register Event SoldierClassDisplayName",, 'RPG');
 
 	Template.AddCHEvent('SoldierClassSummary', OnSoldierInfo, ELD_Immediate);
-	`LOG("Register Event SoldierClassSummary",, 'RPG');
+	`LOG(default.class @ "Register Event SoldierClassSummary",, 'RPG');
 
 	return Template;
 }
@@ -84,7 +84,7 @@ static function CHEventListenerTemplate CreateListenerTemplate_OnGetLocalizedCat
 	Template.RegisterInStrategy = true;
 
 	Template.AddCHEvent('GetLocalizedCategory', OnGetLocalizedCategory, ELD_Immediate);
-	`LOG("Register Event OnGetLocalizedCategory",, 'RPG');
+	`LOG(default.class @ "Register Event OnGetLocalizedCategory",, 'RPG');
 
 	return Template;
 }
@@ -426,7 +426,7 @@ static function CHEventListenerTemplate CreateListenerTemplate_OnBestGearLoadout
 	//	Setting low priority so the unit gets specializations assigned by an event listener above
 	Template.AddCHEvent('UnitRankUp', OnUnitRankUp_IRIRandomClass, ELD_OnStateSubmitted, 10);
 
-	`LOG("Register Event OnBestGearLoadoutApplied",, 'RPG');
+	`LOG(default.class @ "Register Event OnBestGearLoadoutApplied",, 'RPG');
 
 	return Template;
 }
diff --git a/XCOM2RPGOverhaul/Src/XCOM2RPGOverhaul/Classes/X2TemplateHelper_RPGOverhaul.uc b/XCOM2RPGOverhaul/Src/XCOM2RPGOverhaul/Classes/X2TemplateHelper_RPGOverhaul.uc
index c644026..a7bef77 100644
--- a/XCOM2RPGOverhaul/Src/XCOM2RPGOverhaul/Classes/X2TemplateHelper_RPGOverhaul.uc
+++ b/XCOM2RPGOverhaul/Src/XCOM2RPGOverhaul/Classes/X2TemplateHelper_RPGOverhaul.uc
@@ -33,6 +33,9 @@ static function bool IsPrerequisiteAbility(name AbiliityName)
 	}
 	return false;
 }
+
+
+
 static function AddSecondWaveOptions()
 {
 	AddSecondWaveOption(