From 666aa5b7c28185318a966d2a855bdb698286885c Mon Sep 17 00:00:00 2001
From: darkademic <41052878+darkademic@users.noreply.github.com>
Date: Sat, 10 Feb 2024 22:14:52 +0000
Subject: [PATCH 01/12] Updates. - Reverted Darkener buffs. - Reduced SEAL HP
 from 18k to 16k. No longer immune to mind control/chaos gas. - Added range
 circle when targeting Greater Coalescence & Storm Spike. - Reduced Stealth
 Tank resistance to aircraft slightly. - Increased Sniper IFV damage vs
 vehicles. - Stormrider able to shoot in any direction. - Mothership will
 charge nearby Stormriders/Enervators. - Added Guardian GI IFV turret. -
 Increased Rifle/Rocket Battle Fortress damage. Reduced range (to same as
 infantry). - Medic in Battle Fortress gives healing aura.

---
 mods/ca/bits/ifvtur.shp                      | Bin 63446 -> 69053 bytes
 mods/ca/bits/scrin/audio/mshp-stmrcharge.aud | Bin 0 -> 14973 bytes
 mods/ca/bits/scrin/scrinmuzz7.shp            | Bin 0 -> 176 bytes
 mods/ca/rules/defaults.yaml                  |   2 +-
 mods/ca/rules/infantry.yaml                  |   4 +-
 mods/ca/rules/powers.yaml                    |   4 ++
 mods/ca/rules/scrin.yaml                     |  29 +++++++--
 mods/ca/rules/vehicles.yaml                  |  64 ++++++++++++++-----
 mods/ca/sequences/scrin.yaml                 |   5 +-
 mods/ca/sequences/vehicles.yaml              |  11 +++-
 mods/ca/weapons/missiles.yaml                |  10 +--
 mods/ca/weapons/scrin.yaml                   |  54 ++++++++++++++--
 mods/ca/weapons/smallcaliber.yaml            |  19 ++----
 13 files changed, 151 insertions(+), 51 deletions(-)
 create mode 100644 mods/ca/bits/scrin/audio/mshp-stmrcharge.aud
 create mode 100644 mods/ca/bits/scrin/scrinmuzz7.shp

diff --git a/mods/ca/bits/ifvtur.shp b/mods/ca/bits/ifvtur.shp
index 88f7d1080744a43a6d60d810fde9469a63d917b4..7b4f538d07ace01fb4032ba1f44a688794a351bb 100644
GIT binary patch
delta 10055
zcmZXY378#KmB%ZD;ILFxgf99Kg+?H1Y(*a1gkVJD>kfkGTbp|Q(m`=S1vCPJf@AH=
zy;b!>TwqwlaYGabM>3+I2!o1@8!m{7I-=EVA_P>x1v~S<_Z+})CVU^i_diwd)xS@j
zd+w>abI0-<FWc37<t_&P9fJR^2cN&U;VXSM^P9})?nCjjn71-lO;G%u%v+eIL-Ebb
zFEUr`OYuJQQ*Y%Dk27B}Nhe6=kC_KHD87YxGjpH)DE>C)^~~K?QGCd}X4}q5?{m+g
z;Iiiu=a}1>`|MBg_b?ZkCmulY>zJ#iNT1LA8S}UUDgGJe9?v6v2GKKq$blmcq5~gd
zKFB=&V2WSOv=1TuF6JG~b*m}<3FhCJqvuonCgz$KkiJ;cGmK>~q`;e)w=q|&q4)--
z&%A;8DD#jP(RuSs!Td7wKIZ<@be_w+SP|DZ?&N^;VmhJE+{V0}X}yGwpTx|Vw=n<0
zTyrR2h*>aiVeVwEd#T~8>l^3bgW|Q!9n9AqM)B*I2Q^6-%s(?vJ)GjVG7ma}^jXaB
zGY>zK;vZw~b(G=h3%~CuI`9y4cr@v6FkkY|q%UFawwCl3<}a8pJBH$yG9O@WSV!?s
zGwowZpL?uFAAZS!*_V<2EOXEGq|apD&OGYn6#qDLkK;(6#k`BT?iCcjin;GANpEHD
z^!UR&Hqe1zGf#LG=^L2SEz*}U_naYpKJ#Jb{4B+9VIH!PbjjSo>>f{X?|S~Q|Eno*
z0rMBkwI@*gQs$G)*Plr7Z!ur=8q(XCk2B{_qWEphV_!@98lq<$@Hz@q%qN+rwJCll
zb3=#pcIFGaq%UJWyGQ!{%m<jAKE=PvJa|Al(nS5=&w<y>(SfU(dz?(VU{1KCFJT@u
z<nx(F%#*%>`LYq|TbU<pBK;HQsSD6*{XM8Y;NR(+i4QT)I)(HO<~gq?{W$ZyH;~@#
zRAR-Pd?V?LnFqXy^ySPoZzg>WsMr7cw@~0V=4($Q{bS~#ZzV06i_GKRM)Av;k1<br
zJH<cBe3ZHIbUvTC<8)sCuQ-Dae2Dpb=7uvVekt=2=JD^K_+`u;%$avm{0ip7%=KIN
z_nC{#_3!fd0`DR|&V1cjq_1K=`)tzhV?M$hokQ_km@j@e>21u%nC){ZejRhod89w;
z@rQlhLjlR$^}VFu&-@efo##{h0p{y3Abkh(#P^Z@8gtFRkdB!TGEaOz#l7wPVHIa0
zWB!%-W}i-cf_Y&;dO9S2m$@Y(y<bfH3iIs==@lvQv&<7Stv#cr55{|QI$?J~+{Sby
z=?^gXEl7Wad1OiYcIG=O(tD4I*D>d}lC~}+-lU28fBQBHG(JH5CiAoplHTP*#Dclv
z!=z*8-<cO&MDd51r(R6@N6ZcXO8WE6gD!zq>rbc;`1c3q+@++qGbb-2{ch$Dm@mGZ
z;ukWXV4nIBihqxJ)D@(!WHvrZdMl{c|FVChfX94{dCtcuzJnQkob;+s5U*#R{7KTr
zr-+|qzUoTS_b|`@H0cAcB7XfUUjL_mh64M4mUtU8xSI5u&k^rr2LDd_$ZLqdWnTDs
z(ue;C@%zm4zCe2SYl&AfU%j2H{Qm89VB3EZ5C0<ZC(P5YBmGOJ`z6wMFi-k2>F+Q%
zUQhaF=3zIGzMScNh4eO$KkW5Y3Z%@xGta(};`cM>zDD}H%-Ner-^4uTX42O(*Zddh
zE0}xTLfU6~f8h`3ew_~NV7~Pmq<_O)_$KL}G2eJA>3f)`eT(${%(vY}`a$Ly|4sT~
z=DFY2+B0_22P60nov`A&#Duw%nSPJr%f3&Hnagh{?K5}z0qKzWtRIrjn7jUnbgqf|
zH-Ail3z>W0LHfhYy?;XbBIX~NgF7kyCFXN}N;+iT!#wF{6u*|a&(BE*ifaA+i36wI
zMF)P$oc#sqFES7OCF!lqzcJ7F6~%wU?Eeqx?=X+~HR(?>pLI9svp~K6f6jqpenSVY
zVD9o;(r;ki%yepspUM0-^LdLDzkqos^XPjhUNY}y9(gaXe{nCJ@N?$D_mSSh{2Fu5
z`zd}h^V7^Hm?u0y$1h_(%-rxhieJopgn7b)9v%49gTyD9?(a!|fw}ubq!*aqW*+@8
z#Xrupc94D#^DgGmk5GIY^8x0u-lKG&V&2Vs!5=7oCi5ER4(6eMq~lwdUtm7YeEFaF
zcbRuHk9dsY1=G8aKeQgF16MN5CrF>qypP%YGsTU+5U*y=|CRI}e<R+=e9M!hSN@&j
z%r`7)?HSfiI&eL6!C2;FQ5ZX!moFoI^e)6Zm|K>UHg_d{j(Nfg(!XPh-AEttEaI=2
z(LX7@-Y{OeI~}--DfS?}c2DBH%x!y-US|?-G?#7P@7c%R>+QMB2*lE^hWh{hh7sDf
z5}_R|J=ZXD+m7luAt8p{mJ~DV-EwJ_VaU{Nx98{k-H~M3?+gZg_bIt)s+yW|s?Bt?
zvKOm{;{@T9J~^@NhBKCSn0s1BVO%(lu;NTfAzFDW%d<RJj?yB-XLIT7T?~K8UIuHK
zvKIRG(sILyr0pvi+jeFk5C^uB!U{JgqL}HAmYxHz3A_$h4|*e0UoIc^+x@wLI}%Ht
z`cvf0sH&zMCq6|VE(%+~tZAoYuC(p(ctY5rmbGOE8O*{Rep*;*uKeYux@;<yYe`-$
z<yHR)L9ML{<W_kL>_x-KqGSl=8Hf(nw~FcB@M){={9Ml^tJ#d(?hRabVUxbNnYhTS
z<7C=PV&;Y4z;8QYY^&o*U8T6la$_P&eQRky!zk)V`gY<}$`;Ou;xxex&cjTq<R+f-
z&W25tg1vMQPO|VLx)^+AJg%dZ%=vccwi7ws9jf0dTK-JCJs7%!;cBh3mfP<1UAK{}
zRM$?;Y<e^`sr@0Bh$O;Hr&ThXcpTW}QUiZ~Syv{mH!(3zaF-kS*(lD(H43H)jmwBQ
zX{Bi^&vk(&;+YJicEf}m2XK4<ia1w>li06Qvb1R1hS6^2WoM)elqL$i-R_?3&J9QE
z$2}Rtbh|s}Iy$9km8VFtvKS?HqWq+JDUxQYL*}9m!E+^J-xf}p720zgr%odd>O9k{
zLnKL>WofI$o<%M=$%ig8A|Ga-hZ2x+;Mud;W@RKq>R~-?i>&ODSDY7i+gMd|!$g};
z!rJYq3_G~pD#3+7hAZ4pCkp+oOOyBmWm)7|GjhgG-qOyj#$+jzz>Z3xzEh-D%XFM1
zis5_}@{ez)35tNN%B-1}RKPFMR&@zbbI9Uo(GG_*OH(kvzAam2&(+3k+c&!HcCSA-
z4Ae!(X%yHqJw#lm#2<!GmL}P>yNRkbi?ua#%JgKO$A03N+FK;Yl_}FYz#3Ox^EgFc
zXyj?Ci&wN#<P=^htER~1GgbqCX$1-()Jv>JI_*I)vstS=+t`+MIasR_T?xZb&iaF4
zYzN-bzOcK9GV%NE4(v9pScgQO#!+)P8ez4SV{NxIWdXaj??>8QOHNK!WsxP3)^RII
zB<^7&E_ksCkz_5^9ST*OkrZO-9M#2+z(Pxvv!&&pVW<AAYuCC_m2qOhsx94_Fi~cU
zsXnZB`@<~E_3eevc+lx|=bVOArph?3!(@7XG)mJ6eJ>=kVirO~A$|g96p0*<C#$Ja
zW|Y*Xm5Q>V$^->~5lS?%x|B_+T^5B&E)U1*LQ-+BlWBK7_5idy-N`}$kA6NEp^Q;-
zm23%tjCQ-dq0p`)Sq_khPUJQk%2Q~CkU>5@y?XU@;QQ)ZVWF04=H-QHN|`39@{0RB
z9#^VkRFTXpZNF$?0hXr7cxA~%rxZ%%)GW(q++r($+kE7PsK+!^U&kM?+_3YYEyHLq
zQ>##k9+)Amoo?4PJr%(vx0dA`(mGs7L;7Ao-<!rw!&=ebYb9x#nWbqKC_v>l&dX|2
z_li*Dx+FxJHE{;a>edws)i$ySTg1|VFjFqQTit)`3_+nAZSDDi@*Iv-!u&9_^`;UB
zy|#?%!HmA6c2GyXjxs!)&~`<do8=tJ!X3?`;FXn?0!_ujZ-_{yxe67c#?}ot<y4`)
zC8)}B>`XM^9ydjbq$Nxb6%BK^wUL>%l-aPAFJ1JMOG~*#luT|?CW9bSdqdvrv}F?Z
z^uB~v81!(gox)>^Qc;U43aq?zd%eE98oQ(lRg+m+mDsAMg{m^O!aY&>i%}xYYEtSz
znpbJF8c#Gbc4@VQEU?>Zlc7wp$}_YhZ4o<GSVTILVW>SOn>U7wp(+hIYPV%x_eO^9
zm1Sh3mtu*Jro)t$k{_2tuh(<kX)H|DJFCo+_@5mtkh^j+cdEdzlZC1(DTksmvu0zW
z%5_d9I+GAsamX1`m=~%$wcz||cWJCTeVo)NE47kbEX!Kk8@Ahph`nADa|JRHZ>~FS
zq_7kBM^sGGwgu8RH-bBrswjxcs;cd1ioBGfoU9VR&Z|nb3K`2rLzH5o)I*fSo|&U~
z(Ji$#sdmup|5@{lIF9OCubVomqsXu$U4p}Qw~({F8NHxmIU;jWZ<OncHSNgl_tw@6
zG*tw44DS_gtspZ=Dyu5@BjincYmOU@VkNeJB{Q|13#l4_N3|zg83d-1;+fPXmP#GM
zQ4p()VHl007(HA0ler6nCPuoarcvD6ZU?#3*P9CLx!z!CTQqN0wk@khZU;2r$)GN(
zMi#~<&3{o^HZYHxxpo&>RtuY=h|m(%rDBniyFmVfxrEKdfu)uMdZDr!htaIwa>8}(
z*`n<8P-kJp=wQ8WqU2-?wF`HFeF|M)Es3gX_(-BkR)J|*Hk=IWSjot2Z7m&VLg@P%
z$4T16l?0lKQ1&9&Qxjca{)0R5v^$|1Ph!Q^ERDjpJ=3<N*@H9uc;rQ`A%3l$^m>Dc
zvXjn?kh^)LTb)s08n)xAQQBBGsthaKWj}WuDQH?NqDd!_(s7EGIzNrzPpW+|$0}9+
zuxbAvf7tx=lo?w~9&WL6w{Ek(tG0ppQkY%L?P^Vg_Kd6Db$bJJH-yS0nQ;fb{yeg!
z*A4nt6IF-O4|P*6TU9xQ{-0n(pVWOYjVB$)N~au23nRwJE+xju0+;mEPK>Un{4QOr
z+Mb$%wLgR`mAurptYolRH$As)!QEiBc89#2tlXu_9m*0dWLyX7(Cv47^NlQ6)LV8X
zn_1Gb?X=+(*;t)aq*W<f@EAGL(>aY}#~GKcbfO@O5!y;2W!_R2jl6~V3{!9U^bJO4
zRRUu?FQKVqFcMqtNITrv#<NIgquxi#YM^$F-W-OZP&HsYcWrc4MtkXe!)(QJ$#c+_
zt0cmBmSQws6nkq!X=xTRsRKWyy(3O5XFP^$v?f)PagqrP8EV>v!7M?os@0+sco>>8
zCL$Qi!x|>n!x?6s+~3&7gx^u4fQ=Q6Evl3Q4+b%ISy7$o9l{UNkqgViMrBkgl1n@;
zVLq8g4dKB{eJ#hmlNiMk{8EHesH(KG$*M6quBLb+&aEUbuo35(?f{`aS#89*x~15N
z&sF#Ouw|YR*1AQDQ60^>CT_R71R6%z$r7`RX$2R>O{?N;fHjQC%gkGPG7)8|N5(>@
zNc~lE?Qpu;#76AvJD*2!Bw*CUu{3O{#~nPcsKr~Qlhwq83F{ub=SiX_9EqnCm0Tec
zJ>){6>xCF_*sB_DaoZEOjt8pU+8AzB7A-&M<gwX}Vk^=06$c5t_B&ly_nR^=F-D>c
z^n-``h8ZXBXgF;xhF)Z;uavbP1Zc@vP1tSJDJAxbvaA~82@Gl~!<c1d*{Co!l1ogD
zs7bYo)Erh|64$d0?tZZN50m&Pot?wt2z6nLxlRG2Gc-RT$$>ZMb_U(<9BNAW7}s%G
zA*)>%S;Vsz3SeAe*P9xRRyQpyTvPvns-AO!$+4`ow=hCwmDLz6T<a!g+eX!(5f^<V
zPchr<in)QzV#|KYEY|-@q*C?oNLT6RXl-DJiQbknw_T=1XIj;G75f9sGQG|KuLF27
z1!kq^+_XRAhn6njGR`YJp^va>qkXHqN%YIvrhq+KN)g7n)GQklrW(gRqi9)Kb7I^m
z^*oN-pSILEuDUz+l^BamklB^UY^m41?bqs9wmF;iqg20nDBQN0$<8K2?ceJDwa_F7
zaEsNWiz2q;DP^{s^xT-dMq|77aI30hv>M6OUrR()6=72pWkmy8iq{8WYF6Wl{+u+4
zth_>^;Sa?cp|`2b;&v!YNr5SYpC9n9hF>SBtpi1p4C4TgG01kH>r#34MBagCG<Ris
zH0TV_J^S#iSBvzg2K`>Q=c0A1<B^?VpR5)}!qkssWgM9mULR}{ChV#+1m=#^4qIlU
zqNg1ZXJM384ZKrQesOiwEwYP7p!|AGJorj_gwQW+^v)Tfyi@~=*Q&k*!|Jt|>U+a>
zA+rwr(i7ltuHBy>bbB)qy#-hqmv{%(>$-yObzo1SD@~223tgw7t=@f9sS_>8lKgrF
z2Hr8=Ew!c^WLPG7g)WGvD!pWq9Ni#QDb{}RfPn{f{S>(u`fN&XKWrparFBtNsx;%p
zI#)^6vzr*Uv6HOdh@w@0K@*l2T%?p5xi?zfAE2;Zson+{(#~Oc5(%bB#ZIe6!wjbi
z8ad+-FUDY2a&nt3oF4dAfo$U2sCn2!Zd=-GQ*B!0RlTW+d@f$?HKg_CVJNE;V-ced
ztP8h;S%1clXo|y(*O?l2dpy+5jxY@m`oj@fosOyoUNMf)d6e@IBb4K$!6_td+Z-#a
maH@{xn3A2?kMS6xjN<(w-gw~urgEAJ4DITz#|PU_r2h+}MmX#M

delta 4428
zcmXZbc~p&g0LJkf;@FRpCCd<lY-5O_Y?HlYUo#A0vP%eMyk#dw88noPt!$G~BeK<G
zYwT;*8Ecf(wN+zq%)R&dUVnUk-{<$9?m5nVk4KltG#5AO7Bg8s^)3HWEH<cQ3bpo3
zJdHISv<KoDbavD}9n-OVW$mNzAlf@=AA~y%4u#mciXK>r*Rf7j?E#pEj@7hJ#1t%9
zUHfoMKs#scL(tgA!L9}un1qfswa>+;=v_;DGCJ2*2jgw*^o91_Sf-A8iZo1D8CuoV
z#X8Kzo-W$=V#Rvu8F&NT>ucYRA8^E%+EdZBfjY{jVKUh@)G!V+(7us&PYlH)_!{fG
z>N#Irfrs%q)@rQhhGCRd%lDfy8JwEvfk7CFm$5=q-TUA&Ovm@=+Key4a7@R~=-%8E
zYW;rGEX%=aBAT)9SK5=&rG+{i|3$yAwVy$kmg+#fge_ZX--_kjOor`?=ey}54~Mr_
zpTcHs)ElwnH|hYqhwa;H--J2n*-m>rR&-Yfxf?p%XXx&s-h*Y^tEb{+Y~4ZoHZ0Ro
z9f)_)y_5D`Sf#Ui4SqH_O#4<B575g~eFU3yQAcChuIgaSN8fJR)3JVc^(r*ufF9b7
z6b`j|Y6!u5*tVDUP52Q<ducz5jlI>8Scty8wP&D*k2*mbrrLcptj3S%-&cDkdiGN%
zVWa-)Xsk3qy#RBt|3K}>u-+i`BAb@qe>Ow!!MfOsWrnE3vGP#$Msyj*^Vn**`Utl7
zRi8nx5$c=h_noD!?_aL<VEIfQDf2LJl-i85zE>CGoYCr%W8`YA>Zgvv+GEu*=sHfF
zVA1yecNniB1N;1-zK+fP)hqEScAB6)1`E(<qV_HL8hcFQc{ESr{qH<k7whmPdQQ>4
z314B)soJB_jNPVbkHviKFrB}TPq9OQ!50L`LhL(3y$dS^s^{Y?95GXSIyRl9j>H1&
zH(Pr$x(2DY7#tkuXjq9Q=BgLqJDfgGdk&5cR^LGH5cLUkov&Vux#<0)b|Z;{^8yXa
z@IM^S|4<P|gzC8_Ve$e7EL2xtB#+{x#cKN{au0ehwY6b-qJwGPGCfdwxr{`o73#HE
zWu<yEx`nGR<Fr+3ht)C}eScC{SR+$yT7LhNA~aNsl&8^ut-9FHG92yKsTboX3|X%|
z5B)Z%uc2p@dOy1SVrlF9x59d`eBR)Yjp`(<x=B47uVB+??GadnelglFV(ZQ7III?{
zUSrYr{@ZQQU|<2x`c=Cb7j0ELZ<8rFbi3NLL+-#XJJnej9H*`mFHgqv{!iYeq1JAh
zfnj^pu6t!BhV4_k{U#q{M1s2Iet8M!{H`v2K*nLOM1IxTiMohPk}dy`H*xYo^?e+c
ztiFLhht%h>$6<9Ewn$OOpwkg`q`{%wQ4LG+6V5!QJsXD{S6{&HC)BCfE>)d~u4(F6
zEcd566pi;Bg3@(i#tA3Yk8tEE^=%w`TAhXdXVlp^@vJ%*r(~$}G3YN_8>Y`Xn8MEK
z0sHfE34X?<7qr`5l#8+WC3PqkyR2S_rLL%#VTr5i<u)z9|MJ%~M4-cU^?G!;q27RR
zaqvy;hp<MbdLd?^&n@kV=y+QlX4U%sy<_mdql;VE{jT~T*14x%gCB6peeI8M(BJCw
z*zO<o4lMOR9ca<^{@-C}_fQwHSnQE{45p#eW9?J%9M*lJJp?nc%~S2G@FBWo@&2#K
z(gSy}-ZOOop1`utwGYL3EJCkr-A7|Sdgf@4!dK|^!qCOe7xE(x%T*u1(l6B`@f^0v
z)4mNW<g4f6U2J349*H^VVZ74CYJ7+dUu&O=324UVZ*(7k2e1%3zUA-YLu~a<dpLSL
i=g_r47jam=P#uiVabS`5%py}#bq9}UQ6A;(7XA<8wn+v6

diff --git a/mods/ca/bits/scrin/audio/mshp-stmrcharge.aud b/mods/ca/bits/scrin/audio/mshp-stmrcharge.aud
new file mode 100644
index 0000000000000000000000000000000000000000..036e86ccff66bc24150636982d656e10b833e9ee
GIT binary patch
literal 14973
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

literal 0
HcmV?d00001

diff --git a/mods/ca/bits/scrin/scrinmuzz7.shp b/mods/ca/bits/scrin/scrinmuzz7.shp
new file mode 100644
index 0000000000000000000000000000000000000000..7fb640161682c6b8957f4c1825997c9c58b74fd9
GIT binary patch
literal 176
zcmaKkI|_h63`7T9wbZMKy%+H^EB1otu<>XqvZM=6WD6@3$YVYvA*Scf<O1Z-YvoaS
vRo)SP#z$Z;Qaq6|$ji|5vp2wI-tnrpz^S5uDSK)FRk+NeVbRY2|0Xsb05m#(

literal 0
HcmV?d00001

diff --git a/mods/ca/rules/defaults.yaml b/mods/ca/rules/defaults.yaml
index ff379509cd..45fd5a4115 100644
--- a/mods/ca/rules/defaults.yaml
+++ b/mods/ca/rules/defaults.yaml
@@ -931,7 +931,7 @@
 		Step: 500
 		Delay: 75
 		StartIfBelow: 100
-		DamageCooldown: 200
+		DamageCooldown: 100
 		RequiresCondition: hospitalheal
 	ExternalCondition@HOSPITAL:
 		Condition: hospitalheal
diff --git a/mods/ca/rules/infantry.yaml b/mods/ca/rules/infantry.yaml
index af0bbbf3ae..783caf8c9b 100644
--- a/mods/ca/rules/infantry.yaml
+++ b/mods/ca/rules/infantry.yaml
@@ -3774,7 +3774,7 @@ SEAL:
 	Tooltip:
 		Name: Navy SEAL
 	Health:
-		HP: 18000
+		HP: 16000
 	UpdatesPlayerStatistics:
 		AddToArmyValue: true
 	Buildable:
@@ -3844,6 +3844,8 @@ SEAL:
 	WithDecoration@COMMANDOSKULL:
 		Sequence: pip-seal
 	-Targetable@HERO:
+	-Targetable@MindControlImmune:
+	-Targetable@ChaosImmune:
 	GrantConditionOnHealingReceived@HEALINGCOOLDOWN:
 		RequiredHealing: 40000
 
diff --git a/mods/ca/rules/powers.yaml b/mods/ca/rules/powers.yaml
index 5ab8bf6c7c..7ee52b8c20 100644
--- a/mods/ca/rules/powers.yaml
+++ b/mods/ca/rules/powers.yaml
@@ -1505,6 +1505,8 @@
 		CameraRemoveDelay: 1
 		DisplayRadarPing: True
 		SupportPowerPaletteOrder: 50
+		TargetCircleRange: 7c511
+		TargetCircleColor: b070ff90
 
 ^BuzzerSwarmPower:
 	DetonateWeaponPower@BUZZERSWARM:
@@ -1623,6 +1625,8 @@
 		CameraRemoveDelay: 1
 		DisplayRadarPing: True
 		SupportPowerPaletteOrder: 40
+		TargetCircleRange: 4c512
+		TargetCircleColor: ff000099
 
 ^SuppressionPower:
 	DetonateWeaponPower@SUPPRESSION:
diff --git a/mods/ca/rules/scrin.yaml b/mods/ca/rules/scrin.yaml
index 74c913c5d2..e658d6cbfd 100644
--- a/mods/ca/rules/scrin.yaml
+++ b/mods/ca/rules/scrin.yaml
@@ -157,6 +157,17 @@ VEHICLES.SCRIN:
 	WithIdleOverlay@TEMPORAL:
 		RequiresCondition: being-warped || shield-warped
 
+^MothershipRearmable:
+	Targetable@MothershipRearmable:
+		TargetTypes: MothershipRearmable
+		RequiresCondition: ammo < 15
+	ReloadAmmoPool@MothershipRearmable:
+		Count: 3
+		Delay: 75
+		RequiresCondition: mshp-rearm
+	ExternalCondition@MothershipRearmable:
+		Condition: mshp-rearm
+
 ^FleetRecallable:
 	Targetable@FleetRecallable:
 		TargetTypes: FleetRecallable
@@ -473,7 +484,7 @@ S3:
 		PauseOnCondition: !ammo
 	Armament@BATF:
 		Name: batf
-		Weapon: DisintegratorBeamE
+		Weapon: DisintegratorBeamBATF
 	AttackFrontal:
 		PauseOnCondition: being-warped
 		FacingTolerance: 0
@@ -525,7 +536,7 @@ S4:
 		LocalOffset: 150,0,400
 	Armament@BATF:
 		Name: batf
-		Weapon: IntruderDiscs
+		Weapon: IntruderDiscsBATF
 	AttackFrontal:
 		PauseOnCondition: being-warped
 		FacingTolerance: 0
@@ -2155,6 +2166,7 @@ STMR:
 	Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove
 	Inherits@HULLREGEN: ^HullRegen
 	Inherits@SHIELDS: ^ScrinShields
+	Inherits@MothershipRearmable: ^MothershipRearmable
 	Inherits@SCRINVEHICLEVOICE: ^ScrinVehicleVoice
 	Buildable:
 		Queue: AircraftSQ, AircraftMQ
@@ -2197,7 +2209,7 @@ STMR:
 		MuzzlePalette: scrin
 	WithMuzzleOverlay:
 	AttackAircraft:
-		FacingTolerance: 160
+		FacingTolerance: 512
 		PersistentTargeting: false
 		OpportunityFire: true
 		PauseOnCondition: empdisable || being-warped
@@ -2284,6 +2296,7 @@ ENRV:
 	Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove
 	Inherits@HULLREGEN: ^HullRegen
 	Inherits@SHIELDS: ^ScrinShields
+	Inherits@MothershipRearmable: ^MothershipRearmable
 	Inherits@SCRINVEHICLEVOICE: ^ScrinVehicleVoice
 	Buildable:
 		Queue: AircraftSQ, AircraftMQ
@@ -2406,6 +2419,10 @@ ENRV:
 		MaxStrength: 5625
 	GpsRadarDot:
 		Sequence: Plane
+	Targetable@MothershipRearmable:
+		RequiresCondition: ammo < 5
+	ReloadAmmoPool@MothershipRearmable:
+		Count: 1
 
 DEVA:
 	Inherits: ^Helicopter
@@ -2763,6 +2780,7 @@ INVA:
 MSHP:
 	Inherits: ^Helicopter
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
+	Inherits@GAINSEXPERIENCE: ^GainsExperience
 	Inherits@HULLREGEN: ^HullRegen
 	Inherits@SHIELDS: ^ScrinShields
 	Inherits@FleetRecallable: ^FleetRecallable
@@ -2776,7 +2794,7 @@ MSHP:
 	TooltipExtras:
 		Strengths: • Strong vs Buildings, Defenses, Heavy Armor, Light Armor, Infantry
 		Weaknesses: • Cannot attack Aircraft\n• Long charge time before firing anti-structure weapon\n• Cannot move while firing
-		Attributes: • Maximum 1 can be built\n• Can create wormholes
+		Attributes: • Maximum 1 can be built\n• Can create wormholes\n• Can recharge nearby Stormriders/Enervators
 	RenderSprites:
 		PlayerPalette: playerscrin
 	Voiced:
@@ -2949,6 +2967,9 @@ MSHP:
 		RequiresSelection: true
 		Position: BottomLeft
 		Margin: 4, 3
+	PeriodicExplosion:
+		Weapon: MothershipCharge
+		LocalOffset: 0,0,256
 
 #
 # ---- Husks
diff --git a/mods/ca/rules/vehicles.yaml b/mods/ca/rules/vehicles.yaml
index 71a5184abd..dcf7e182d9 100644
--- a/mods/ca/rules/vehicles.yaml
+++ b/mods/ca/rules/vehicles.yaml
@@ -4341,6 +4341,8 @@ STNK.Nod:
 	WithColoredSelectionBox@INVIS:
 		RequiresCondition: invisibility || hidden
 		ColorSource: Player
+	DamageTypeDamageMultiplier@A2GPROTECTION:
+		Modifier: 60
 
 BIKE:
 	Inherits: ^VehicleTD
@@ -4819,6 +4821,9 @@ IFV:
 	Tooltip@sharturr:
 		Name: Ravager IFV
 		RequiresCondition: sharturr
+	Tooltip@ggiturr:
+		Name: GGI IFV
+		RequiresCondition: ggiturr
 	Tooltip@psyturr:
 		Name: Psychic IFV
 		RequiresCondition: psyturr
@@ -4826,7 +4831,7 @@ IFV:
 		Strengths: • Strong vs Aircraft, Heavy Armor
 		Weaknesses: • Weak vs Infantry
 		Attributes: • Weapon/function changes depending on infantry passenger
-		RequiresCondition: !full || samturr || nochange
+		RequiresCondition: !full || samturr || ggiturr || nochange
 	TooltipExtras@gunturr:
 		Strengths: • Strong vs Infantry, Light Armor
 		Weaknesses: • Weak vs Heavy Armor, Defenses\n• Cannot attack Aircraft
@@ -4939,21 +4944,21 @@ IFV:
 	Armament@E3:
 		Weapon: IFVRocketsE
 		LocalOffset: 192,100,176, 192,-100,176
-		RequiresCondition: samturr && !cryr-upgrade
+		RequiresCondition: (samturr || ggiturr) && !cryr-upgrade
 	Armament@E3AA:
 		Name: secondary
 		Weapon: IFVRocketsAAE
 		LocalOffset: 192,100,176, 192,-100,176
-		RequiresCondition: samturr && !cryr-upgrade
+		RequiresCondition: (samturr || ggiturr) && !cryr-upgrade
 	Armament@E3CRYO:
 		Weapon: IFVRocketsE.CRYO
 		LocalOffset: 192,100,176, 192,-100,176
-		RequiresCondition: samturr && cryr-upgrade
+		RequiresCondition: (samturr || ggiturr) && cryr-upgrade
 	Armament@E3CRYOAA:
 		Name: secondary
 		Weapon: IFVRocketsAAE.CRYO
 		LocalOffset: 192,100,176, 192,-100,176
-		RequiresCondition: samturr && cryr-upgrade
+		RequiresCondition: (samturr || ggiturr) && cryr-upgrade
 	Armament@E4:
 		Weapon: FireballLauncher
 		Recoil: 85
@@ -5087,12 +5092,15 @@ IFV:
 		PauseOnCondition: empdisable || being-warped
 		RequiresCondition: !spyturr
 	WithMuzzleOverlay:
-	WithSpriteTurret@samturr:
+	WithSpriteTurret@defaultturr:
 		RequiresCondition: !full || nochange
 		Sequence: turret
-	WithSpriteTurret@samturr2:
+	WithSpriteTurret@samturr:
 		RequiresCondition: samturr
 		Sequence: turret2
+	WithSpriteTurret@ggiturr:
+		RequiresCondition: ggiturr
+		Sequence: turret18
 	WithSpriteTurret@gun:
 		RequiresCondition: gunturr
 		Sequence: turret3
@@ -5153,7 +5161,7 @@ IFV:
 			n2: fragturr
 			n3: samturr
 			n3c: samturr
-			u3: samturr
+			u3: ggiturr
 			n4: flamturr
 			n5: chemturr
 			e8: desoturr
@@ -5255,27 +5263,27 @@ IFV:
 	AutoTargetPriority@DEFAULTAA:
 		ValidTargets: Infantry, Vehicle, Water, Underwater, Air, AirSmall, Defense
 		InvalidTargets: NoAutoTarget
-		RequiresCondition: (!stance-attackanything && !assault-move) && (!full || samturr)
+		RequiresCondition: (!stance-attackanything && !assault-move) && (!full || samturr || ggiturr)
 	AutoTargetPriority@ATTACKANYTHINGAA:
 		ValidTargets: Infantry, Vehicle, Water, Underwater, Air, AirSmall, Structure, Defense
 		InvalidTargets: NoAutoTarget
-		RequiresCondition: (stance-attackanything || assault-move) && (!full || samturr)
+		RequiresCondition: (stance-attackanything || assault-move) && (!full || samturr || ggiturr)
 	AutoTargetPriority@DEFAULTAAPRIO:
-		RequiresCondition: (!stance-attackanything && !assault-move) && (!full || samturr)
+		RequiresCondition: (!stance-attackanything && !assault-move) && (!full || samturr || ggiturr)
 		ValidTargets: Air, AirSmall
 		InvalidTargets: NoAutoTarget
 		Priority: 10
 	AutoTargetPriority@ATTACKANYTHINGAAPRIO:
-		RequiresCondition: (!stance-attackanything && !assault-move) && (!full || samturr)
+		RequiresCondition: (!stance-attackanything && !assault-move) && (!full || samturr || ggiturr)
 		ValidTargets: Air, AirSmall
 		InvalidTargets: NoAutoTarget
 		Priority: 10
 	AutoTargetPriority@DEFAULTG:
-		RequiresCondition: !stance-attackanything && !assault-move && full && !samturr
+		RequiresCondition: !stance-attackanything && !assault-move && full && !(samturr || ggiturr)
 		ValidTargets: Infantry, Vehicle, Water, Underwater, Defense
 		InvalidTargets: NoAutoTarget
 	AutoTargetPriority@ATTACKANYTHINGG:
-		RequiresCondition: (stance-attackanything || assault-move) && full && !samturr
+		RequiresCondition: (stance-attackanything || assault-move) && full && !(samturr || ggiturr)
 		ValidTargets: Infantry, Vehicle, Water, Underwater, Structure, Defense, Mine
 		InvalidTargets: NoAutoTarget
 	AttackMove:
@@ -5317,7 +5325,7 @@ IFV:
 	KeepsDistance:
 		RequiresCondition: engturr || medturr || spyturr
 	DamageTypeDamageMultiplier@A2GPROTECTION:
-		RequiresCondition: !full || samturr
+		RequiresCondition: !full || samturr || ggiturr
 	AmbientSoundCA:
 		SoundFiles: flamer-loop1.aud
 		InitialSound: flamer-start1.aud
@@ -5333,6 +5341,15 @@ IFV:
 		Image: chrono
 		ExplodeInstead: true
 		RequiresCondition: ivanturr && !being-warped
+	DamageMultiplier@GGI:
+		RequiresCondition: ggiturr
+		Modifier: 80
+	FirepowerMultiplier@GGI:
+		RequiresCondition: ggiturr
+		Modifier: 105
+	RangeMultiplier@GGI:
+		RequiresCondition: ggiturr
+		Modifier: 115
 
 IFV.AI:
 	Inherits: ^Tank
@@ -5535,6 +5552,8 @@ RECK:
 		Name: Intruder Reckoner
 	Tooltip@sharturr:
 		Name: Ravager Reckoner
+	Tooltip@ggiturr:
+		Name: GGI Reckoner
 	Tooltip@psyturr:
 		Name: Psychic Reckoner
 
@@ -6697,6 +6716,7 @@ BATF:
 			bh: loaded
 			ivan: loaded
 			shad: loaded
+			medi: loaded-medic
 			mech: loaded-repair
 			seal: loaded-seal
 			rmbo: loaded-cmdo
@@ -6782,6 +6802,20 @@ BATF:
 		Position: TopLeft
 		ValidRelationships: Ally, Enemy, Neutral
 	-Targetable@HERO:
+	WithIdleOverlay@MEDIC:
+		Sequence: medic
+		PauseOnCondition: empdisable || being-warped
+		RequiresCondition: loaded-medic
+		Offset: 0,0,250
+	ProximityExternalCondition@MEDIC:
+		RequiresCondition: loaded-medic
+		Condition: hospitalheal
+		Range: 4c512
+	WithRangeCircle@MEDIC:
+		Type: IFVHeal
+		Color: 00FF0080
+		Range: 4c512
+		RequiresCondition: loaded-medic
 
 BATF.AI:
 	Inherits: BATF
diff --git a/mods/ca/sequences/scrin.yaml b/mods/ca/sequences/scrin.yaml
index 351a9901a9..d52f7fb635 100644
--- a/mods/ca/sequences/scrin.yaml
+++ b/mods/ca/sequences/scrin.yaml
@@ -1331,10 +1331,9 @@ stmr:
 		ZOffset: 1022
 		BlendMode: Additive
 	muzzle:
-		Filename: scrinmuzz1.shp
+		Filename: scrinmuzz7.shp
+		Length: *
 		BlendMode: Additive
-		Length: 6
-		Facings: 16
 	icon:
 		Filename: stmricon.shp
 
diff --git a/mods/ca/sequences/vehicles.yaml b/mods/ca/sequences/vehicles.yaml
index 6156af8a4d..1449c28355 100644
--- a/mods/ca/sequences/vehicles.yaml
+++ b/mods/ca/sequences/vehicles.yaml
@@ -1647,7 +1647,7 @@ ifv:
 		Length: 32
 	psy:
 		Filename: ifvtur.shp
-		Start: 544
+		Start: 576
 		Length: 1
 	turret:
 		Filename: ifvtur.shp
@@ -1735,6 +1735,11 @@ ifv:
 		Start: 512
 		Facings: 32
 		UseClassicFacings: True
+	turret18:
+		Filename: ifvtur.shp
+		Start: 544
+		Facings: 32
+		UseClassicFacings: True
 	open:
 		Filename: ifv.shp
 		Start: 32
@@ -2094,6 +2099,10 @@ batf:
 		Filename: minigun16.shp
 		Length: 6
 		Facings: 16
+	medic:
+		Filename: mouse.shp
+		Start: 194
+		Length: 1
 	icon:
 		Filename: batficon.shp
 
diff --git a/mods/ca/weapons/missiles.yaml b/mods/ca/weapons/missiles.yaml
index b69c9f8ace..a29d106c40 100644
--- a/mods/ca/weapons/missiles.yaml
+++ b/mods/ca/weapons/missiles.yaml
@@ -278,7 +278,7 @@ Dragon.TibCore:
 		ContrailStartColorAlpha: 170
 		ContrailStartWidth: 0c40
 	Warhead@1Dam: SpreadDamage
-		Damage: 7175
+		Damage: 5125
 	Warhead@3Eff: CreateEffect
 		ImpactSounds: tibcorehit1.aud, tibcorehit2.aud, tibcorehit3.aud
 	Warhead@tib: CreateEffect
@@ -319,7 +319,7 @@ DragonBATF:
 	Projectile: MissileCA
 		RangeLimit: 7c0
 	Warhead@1Dam: SpreadDamage
-		Damage: 3000
+		Damage: 3750
 
 DragonBATF.TD:
 	Inherits: DragonBATF
@@ -337,7 +337,7 @@ DragonBATF.CRYO:
 	Projectile: MissileCA
 		RangeLimit: 7c0
 	Warhead@1Dam: SpreadDamage
-		Damage: 3000
+		Damage: 3750
 
 DragonBATF.TibCore:
 	Inherits: Dragon.TibCore
@@ -345,13 +345,13 @@ DragonBATF.TibCore:
 	Projectile: MissileCA
 		RangeLimit: 9c0
 	Warhead@1Dam: SpreadDamage
-		Damage: 3250
+		Damage: 3850
 
 DragonBATF.CYB.TibCore:
 	Inherits: DragonBATF.TibCore
 	Report: itanweaa.aud, itanweab.aud, itanweac.aud
 	Warhead@1Dam: SpreadDamage
-		Damage: 4400
+		Damage: 5400
 
 HellfireAG:
 	Inherits: ^AirToGroundMissile
diff --git a/mods/ca/weapons/scrin.yaml b/mods/ca/weapons/scrin.yaml
index 32d9d45f93..748257f656 100644
--- a/mods/ca/weapons/scrin.yaml
+++ b/mods/ca/weapons/scrin.yaml
@@ -27,10 +27,10 @@ DisintegratorBeam:
 			Light: 34
 			Concrete: 75
 
-DisintegratorBeamE:
+DisintegratorBeamBATF:
 	Inherits: DisintegratorBeam
 	Warhead@1Dam: SpreadDamage
-		Damage: 1700
+		Damage: 2250
 
 DisintegratorBeamAA:
 	Inherits: DisintegratorBeam
@@ -219,6 +219,11 @@ IntruderDiscs:
 			Heavy: 90
 			Concrete: 100
 
+IntruderDiscsBATF:
+	Inherits: IntruderDiscs
+	Warhead@1Dam: SpreadDamage
+		Damage: 2150
+
 DevastatorDiscs:
 	Inherits: PlasmaDiscs
 	Range: 16c0
@@ -388,7 +393,7 @@ RiftCannon:
 	Warhead@1Dam: SpreadDamage
 		Spread: 512
 		Falloff: 100, 37, 23, 10, 0
-		Damage: 3500
+		Damage: 2500
 		Versus:
 			None: 15
 			Light: 75
@@ -425,9 +430,9 @@ MiniRift:
 	Range: 1c0
 	Projectile: InstantHit
 	Warhead@1Dam: SpreadDamage
-		Spread: 896
+		Spread: 692
 		Damage: 840
-		Falloff: 100, 90, 0
+		Falloff: 100, 70, 0
 		Versus:
 			None: 3
 			Wood: 30
@@ -438,9 +443,9 @@ MiniRift:
 		DamageTypes: BulletDeath
 		ValidRelationships: Enemy, Neutral
 	Warhead@2Dam: SpreadDamage
-		Spread: 896
+		Spread: 692
 		Damage: 168
-		Falloff: 100, 90, 0
+		Falloff: 100, 70, 0
 		Versus:
 			None: 3
 			Wood: 30
@@ -1037,6 +1042,41 @@ GravityStabilizerZap:
 		Condition: highlight
 		ValidTargets: Resupplying
 
+MothershipCharge:
+	ReloadDelay: 10
+	Warhead@Dummy: Dummy
+		ValidTargets: Ground, Water, Air
+	Warhead@Zaps: FireShrapnel
+		ValidTargets: Ground, Water, Air
+		Weapon: MothershipChargeZap
+		Amount: 3
+		AimChance: 100
+		AllowDirectHit: true
+		ThrowWithoutTarget: false
+		AimTargetStances: Ally
+		ImpactSounds: mshp-stmrcharge.aud
+
+MothershipChargeZap:
+	Inherits: GravityStabilizerZap
+	ValidTargets: MothershipRearmable
+	Range: 7c0
+	Projectile: ElectricBolt
+		TrackTarget: true
+		Colors: FFFFFF66, FFFFFF33
+		Duration: 3
+		Distortion: 160
+		DistortionAnimation: 160
+	Warhead@1Dum: Dummy
+		ValidRelationships: Ally
+		ValidTargets: MothershipRearmable
+	Warhead@highlight: GrantExternalCondition
+		ValidTargets: MothershipRearmable
+	Warhead@rearm: GrantExternalCondition
+		Range: 0c511
+		Duration: 80
+		Condition: mshp-rearm
+		ValidTargets: MothershipRearmable
+
 ShardLauncher:
 	StartBurstReport: shard-fire1.aud
 	ReloadDelay: 25
diff --git a/mods/ca/weapons/smallcaliber.yaml b/mods/ca/weapons/smallcaliber.yaml
index 2702791906..4513c0fb7f 100644
--- a/mods/ca/weapons/smallcaliber.yaml
+++ b/mods/ca/weapons/smallcaliber.yaml
@@ -507,27 +507,14 @@ M1CarbineBATF:
 	-Report:
 	StartBurstReport: baocatta.aud, baocattb.aud, baocattc.aud
 	ReloadDelay: 10
-	Range: 6c0
 	Warhead@1Dam: SpreadDamage
-		Damage: 650
-		Versus:
-			None: 100
-			Wood: 15
-			Concrete: 15
-			Light: 25
-			Heavy: 5
+		Damage: 750
 
 M16CarbineBATF:
 	Inherits: M1CarbineBATF
 
 BATFGun:
 	Inherits: M1CarbineBATF
-	Range: 5c0
-	Warhead@1Dam: SpreadDamage
-		Damage: 1800
-		Versus:
-			Wood: 10
-			Concrete: 5
 
 M60mg:
 	Inherits: ^LightMG
@@ -842,6 +829,10 @@ SNIPERBATF.UPG:
 
 SniperIFVGun:
 	Inherits: SNIPER.vehicle
+	Warhead@1Dam: SpreadDamage
+		Versus:
+			Light: 60
+			Heavy: 60
 
 CommandoIFVGun:
 	Inherits: SMG

From ab3d5974f2f27f9423cf9b5edbe0d0e1dfa642a3 Mon Sep 17 00:00:00 2001
From: darkademic <41052878+darkademic@users.noreply.github.com>
Date: Sun, 11 Feb 2024 22:29:01 +0000
Subject: [PATCH 02/12] USA drops require Barracks/Factory plus either radar or
 aircraft production. Reverted Nighthawk to normal selection priority.

---
 mods/ca/rules/aircraft.yaml   |  1 -
 mods/ca/rules/infantry.yaml   |  2 +-
 mods/ca/rules/scrin.yaml      |  5 +++++
 mods/ca/rules/structures.yaml | 26 ++++++++++++++++++++++++--
 mods/ca/rules/vehicles.yaml   |  2 +-
 5 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/mods/ca/rules/aircraft.yaml b/mods/ca/rules/aircraft.yaml
index 5c84553389..844e87ee84 100644
--- a/mods/ca/rules/aircraft.yaml
+++ b/mods/ca/rules/aircraft.yaml
@@ -842,7 +842,6 @@ NHAW:
 	Inherits: ^Helicopter
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
 	Inherits@TRANSPORT: ^Transport
-	Inherits@SELECTION: ^SelectableSupportUnit
 	RenderSprites:
 		Image: nhaw
 	Buildable:
diff --git a/mods/ca/rules/infantry.yaml b/mods/ca/rules/infantry.yaml
index 783caf8c9b..6bffd925e7 100644
--- a/mods/ca/rules/infantry.yaml
+++ b/mods/ca/rules/infantry.yaml
@@ -496,7 +496,7 @@ U3.squad:
 		Queue: InfantrySQ, InfantryMQ
 		BuildAtProductionType: ParadropInfantry
 		BuildPaletteOrder: 1000
-		Prerequisites: dome, ~infantry.usa, ~techlevel.medium
+		Prerequisites: radaroraircraft, ~infantry.usa, ~techlevel.medium
 		Description: Prepare five Guardian GIs for airdrop.
 	TooltipExtras:
 		Strengths: • Strong vs Heavy Armor, Aircraft, Buildings, Defenses
diff --git a/mods/ca/rules/scrin.yaml b/mods/ca/rules/scrin.yaml
index e658d6cbfd..47f41c1fed 100644
--- a/mods/ca/rules/scrin.yaml
+++ b/mods/ca/rules/scrin.yaml
@@ -3877,6 +3877,9 @@ NERV:
 	ProvidesPrerequisite@radarorrepair:
 		Prerequisite: radarorrepair
 		RequiresCondition: !tech-locked
+	ProvidesPrerequisite@RadarOrAircraft:
+		Prerequisite: radaroraircraft
+		RequiresCondition: !tech-locked
 	ProvidesPrerequisite@scrinrad:
 		Prerequisite: radar.scrin
 		RequiresCondition: !tech-locked
@@ -4009,6 +4012,8 @@ GRAV:
 		Prerequisite: aircraft.traveler
 	ProvidesPrerequisite@scrin:
 		Prerequisite: aircraft.scrin
+	ProvidesPrerequisite@RadarOrAircraft:
+		Prerequisite: radaroraircraft
 	SupportPowerChargeBar:
 	Power:
 		Amount: -20
diff --git a/mods/ca/rules/structures.yaml b/mods/ca/rules/structures.yaml
index 70f7e85fcf..0b2e3f0ba6 100644
--- a/mods/ca/rules/structures.yaml
+++ b/mods/ca/rules/structures.yaml
@@ -653,6 +653,9 @@ DOME:
 	ProvidesPrerequisite@radarorrepair:
 		Prerequisite: radarorrepair
 		RequiresCondition: !tech-locked
+	ProvidesPrerequisite@RadarOrAircraft:
+		Prerequisite: radaroraircraft
+		RequiresCondition: !tech-locked
 	ProvidesPrerequisiteValidatedFaction@allrad:
 		Factions: england, france, germany, usa
 		Prerequisite: radar.allies
@@ -1545,6 +1548,8 @@ HPAD:
 		Factions: russia, ukraine, yuri
 		Prerequisite: aircraft.hind
 	ProvidesPrerequisite@buildingname:
+	ProvidesPrerequisite@RadarOrAircraft:
+		Prerequisite: radaroraircraft
 	Targetable@INFILTRATION:
 		RequiresCondition: !being-warped
 		TargetTypes: SpyInfiltrate, SabInfiltrate
@@ -1619,10 +1624,12 @@ AFLD:
 	ProvidesPrerequisiteValidatedFaction@kiro:
 		Factions: russia, ukraine, iraq
 		Prerequisite: aircraft.kiro
+	ProvidesPrerequisite@buildingname:
+	ProvidesPrerequisite@RadarOrAircraft:
+		Prerequisite: radaroraircraft
 	SupportPowerChargeBar:
 	Power:
 		Amount: -20
-	ProvidesPrerequisite@buildingname:
 	Targetable@INFILTRATION:
 		RequiresCondition: !being-warped
 		TargetTypes: SpyInfiltrate, SabInfiltrate
@@ -2451,6 +2458,14 @@ RADARORREPAIR:
 	Buildable:
 		Description: Radar or Service Depot/Repair Facility
 
+RADARORAIRCRAFT:
+	AlwaysVisible:
+	Interactable:
+	Tooltip:
+		Name: Radar or Aircraft Production
+	Buildable:
+		Description: Radar or Aircraft Production
+
 VEHICLES.MCV:
 	AlwaysVisible:
 	Interactable:
@@ -3536,6 +3551,9 @@ HQ:
 	ProvidesPrerequisite@radarorrepair:
 		Prerequisite: radarorrepair
 		RequiresCondition: !tech-locked
+	ProvidesPrerequisite@RadarOrAircraft:
+		Prerequisite: radaroraircraft
+		RequiresCondition: !tech-locked
 	ProvidesPrerequisiteValidatedFaction@gdirad:
 		Factions: talon, zocom, eagle, arc
 		Prerequisite: radar.gdi
@@ -3812,6 +3830,8 @@ HPAD.TD:
 	ProvidesPrerequisite@chinook:
 		Prerequisite: aircraft.chinook
 	ProvidesPrerequisite@buildingname:
+	ProvidesPrerequisite@RadarOrAircraft:
+		Prerequisite: radaroraircraft
 	Targetable@INFILTRATION:
 		RequiresCondition: !being-warped
 		TargetTypes: SpyInfiltrate, SabInfiltrate
@@ -4018,10 +4038,12 @@ AFLD.GDI:
 		Prerequisite: aircraft.chinook
 	ProvidesPrerequisite@chinookvisible:
 		Prerequisite: aircraft.chinookvisible
+	ProvidesPrerequisite@RadarOrAircraft:
+		Prerequisite: radaroraircraft
+	ProvidesPrerequisite@buildingname:
 	SupportPowerChargeBar:
 	Power:
 		Amount: -20
-	ProvidesPrerequisite@buildingname:
 	Targetable@INFILTRATION:
 		RequiresCondition: !being-warped
 		TargetTypes: SpyInfiltrate, SabInfiltrate
diff --git a/mods/ca/rules/vehicles.yaml b/mods/ca/rules/vehicles.yaml
index dcf7e182d9..5b9d5f0873 100644
--- a/mods/ca/rules/vehicles.yaml
+++ b/mods/ca/rules/vehicles.yaml
@@ -291,7 +291,7 @@ GTNK.squad:
 		Queue: VehicleSQ, VehicleMQ
 		BuildAtProductionType: ParadropVehicle
 		BuildPaletteOrder: 440
-		Prerequisites: dome, ~vehicles.usa, ~techlevel.medium
+		Prerequisites: radaroraircraft, ~vehicles.usa, ~techlevel.medium
 		Description: Prepare a pair of  Grizzly Tanks for airdrop.
 	TooltipExtras:
 		Strengths: • Strong vs Heavy Armor, Light Armor

From bdcae0cbe5a69e480ba5656a1e2563831d27ce46 Mon Sep 17 00:00:00 2001
From: darkademic <41052878+darkademic@users.noreply.github.com>
Date: Mon, 12 Feb 2024 17:04:14 +0000
Subject: [PATCH 03/12] Prevent Mothership being recalled while using main
 weapon. Interrupt plasma beam weapons on death. Default Nighthawk stance to
 Defend.

---
 OpenRA.Mods.CA/Projectiles/PlasmaBeam.cs | 2 +-
 mods/ca/rules/aircraft.yaml              | 2 +-
 mods/ca/rules/scrin.yaml                 | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/OpenRA.Mods.CA/Projectiles/PlasmaBeam.cs b/OpenRA.Mods.CA/Projectiles/PlasmaBeam.cs
index 923eb436fd..cfff593cc1 100644
--- a/OpenRA.Mods.CA/Projectiles/PlasmaBeam.cs
+++ b/OpenRA.Mods.CA/Projectiles/PlasmaBeam.cs
@@ -360,7 +360,7 @@ public void Tick(World world)
 			CheckBlocked();
 			CalculateColors(direction);
 
-			if (++ticks >= info.Duration)
+			if (++ticks >= info.Duration || args.SourceActor.IsDead)
 			{
 				world.AddFrameEndTask(w => w.Remove(this));
 				return;
diff --git a/mods/ca/rules/aircraft.yaml b/mods/ca/rules/aircraft.yaml
index 844e87ee84..f6ba8f918b 100644
--- a/mods/ca/rules/aircraft.yaml
+++ b/mods/ca/rules/aircraft.yaml
@@ -954,7 +954,7 @@ NHAW:
 		Count: 2
 		RequiresCondition: upg-crym
 	AutoTarget:
-		InitialStance: ReturnFire
+		InitialStance: Defend
 		InitialStanceAI: AttackAnything
 		HoldFireCondition: stance-holdfire
 	AttackAircraft:
diff --git a/mods/ca/rules/scrin.yaml b/mods/ca/rules/scrin.yaml
index 47f41c1fed..50fbbb33b9 100644
--- a/mods/ca/rules/scrin.yaml
+++ b/mods/ca/rules/scrin.yaml
@@ -2970,6 +2970,8 @@ MSHP:
 	PeriodicExplosion:
 		Weapon: MothershipCharge
 		LocalOffset: 0,0,256
+	Targetable@FleetRecallable:
+		RequiresCondition: !attacking
 
 #
 # ---- Husks

From 4e26341c9a5ec87c8fca5b5f123e93cdaf00ce65 Mon Sep 17 00:00:00 2001
From: darkademic <41052878+darkademic@users.noreply.github.com>
Date: Mon, 12 Feb 2024 18:28:30 +0000
Subject: [PATCH 04/12] Increase TOW missile RoF and add TankBuster modifier.

---
 mods/ca/weapons/missiles.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mods/ca/weapons/missiles.yaml b/mods/ca/weapons/missiles.yaml
index a29d106c40..64c24d54cf 100644
--- a/mods/ca/weapons/missiles.yaml
+++ b/mods/ca/weapons/missiles.yaml
@@ -801,7 +801,7 @@ TOW:
 	Range: 5c0
 	ValidTargets: Vehicle, Structure
 	Report: tow1.aud, tow2.aud
-	ReloadDelay: 150
+	ReloadDelay: 130
 	Projectile: MissileCA
 		Speed: 180
 		Inaccuracy: 0
@@ -820,6 +820,7 @@ TOW:
 			Wood: 40
 			Concrete: 30
 			Light: 40
+		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath, TankBuster
 
 EMPRockets:
 	Inherits: ^AntiGroundMissile

From cbe67109ae89203178429a9a1ab521d71897ac80 Mon Sep 17 00:00:00 2001
From: darkademic <41052878+darkademic@users.noreply.github.com>
Date: Mon, 12 Feb 2024 19:19:13 +0000
Subject: [PATCH 05/12] Don't allow decoys to be IC'd.

---
 mods/ca/rules/vehicles.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mods/ca/rules/vehicles.yaml b/mods/ca/rules/vehicles.yaml
index 5b9d5f0873..968bf817b7 100644
--- a/mods/ca/rules/vehicles.yaml
+++ b/mods/ca/rules/vehicles.yaml
@@ -3087,6 +3087,10 @@ FTNK.Decoy:
 	-GrantConditionOnHealingReceived@REPAIRCOOLDOWN:
 	-UpdatesPlayerStatistics:
 	-RevealOnDeath:
+	-WithPalettedOverlay@IRONCURTAIN:
+	-DamageMultiplier@IRONCURTAIN:
+	-TimedConditionBar@IRONCURTAIN:
+	-ExternalCondition@INVULNERABILITY:
 
 HFTK.Decoy:
 	Inherits: HFTK
@@ -3139,6 +3143,10 @@ HFTK.Decoy:
 	-GrantConditionOnHealingReceived@REPAIRCOOLDOWN:
 	-UpdatesPlayerStatistics:
 	-RevealOnDeath:
+	-WithPalettedOverlay@IRONCURTAIN:
+	-DamageMultiplier@IRONCURTAIN:
+	-TimedConditionBar@IRONCURTAIN:
+	-ExternalCondition@INVULNERABILITY:
 
 APC2:
 	Inherits: ^TankTD

From 201ffe62fa38765d2d536d0426d7f4f481b4f89f Mon Sep 17 00:00:00 2001
From: darkademic <41052878+darkademic@users.noreply.github.com>
Date: Mon, 12 Feb 2024 20:49:50 +0000
Subject: [PATCH 06/12] Increase Bombardier damage vs buildings, reduce vs
 defenses. Increase Atomizer range from 8 to 9.

---
 mods/ca/weapons/ballistics.yaml | 4 ++--
 mods/ca/weapons/scrin.yaml      | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mods/ca/weapons/ballistics.yaml b/mods/ca/weapons/ballistics.yaml
index 3c34ca56e1..6e4a4e02fb 100644
--- a/mods/ca/weapons/ballistics.yaml
+++ b/mods/ca/weapons/ballistics.yaml
@@ -638,8 +638,8 @@ GrenadeJJ:
 		Falloff: 100, 50, 28, 18, 12, 6, 0
 		Versus:
 			None: 150
-			Wood: 65
-			Concrete: 100
+			Wood: 80
+			Concrete: 80
 			Heavy: 20
 			Light: 95
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath, FlakVestMitigated, AirToGround
diff --git a/mods/ca/weapons/scrin.yaml b/mods/ca/weapons/scrin.yaml
index 748257f656..e8549ee522 100644
--- a/mods/ca/weapons/scrin.yaml
+++ b/mods/ca/weapons/scrin.yaml
@@ -1605,7 +1605,7 @@ TiberiumCoalescenceZap:
 AtomizerBolts:
 	Report: atomizer-fire1.aud
 	ReloadDelay: 150
-	Range: 8c0
+	Range: 9c0
 	TargetActorCenter: true
 	MinRange: 1c512
 	Projectile: Missile
@@ -1665,6 +1665,7 @@ AtomizedEcho:
 
 AtomizerBoltsAA:
 	Inherits: AtomizerBolts
+	Range: 7c512
 	ValidTargets: Air, AirSmall
 	Projectile: Missile
 		Speed: 225

From c47542549b74dd999dc84167c097424e8a63f16c Mon Sep 17 00:00:00 2001
From: darkademic <41052878+darkademic@users.noreply.github.com>
Date: Mon, 12 Feb 2024 21:57:12 +0000
Subject: [PATCH 07/12] Fixed Mirage Tank palette. Improved some GPS icons.

---
 mods/ca/bits/gpsdot.shp     | Bin 2989 -> 3305 bytes
 mods/ca/rules/vehicles.yaml |   8 +++++---
 mods/ca/sequences/misc.yaml |   3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/mods/ca/bits/gpsdot.shp b/mods/ca/bits/gpsdot.shp
index 5ad7b8cd14bbb2524f94957cdd930690c77bca56..a4b9b52776f991f10a6254e7f1174c1c3679ced7 100644
GIT binary patch
delta 842
zcmaJ=J5Iwu6ddEV^Mw}$2}DOhMZ;Yj%O{}84d_e~@{y20IS8W20n*XXAX<7*?tm8F
zXYGh6BF(&+oqapIFMc}RoRvqA-!Xc)h=2#+R`^H2@5uP)f#G{>`0Na?6T{2Yu+cEw
z1njhoU$qVU9mCgvo2a|I8J1Z_&U2C}Y1IO}1I=KR%aQXjFd~-o8HudrlpH`lL4GHi
z6hUI2x-;7o)L7LNqH?{^?Rj33Zz8*=JP*QNzNpq^D>tay{CgxvlDq7Q7OpcU*O$ww
zD>a<B<=e^XCo1By2~3Dzhiru(;t-e<4F;lifU!QsKu!E`LQ@!R7;Ofc7;OhCXZEV6
z<^GN{!gp2S9DGA|u3nO_q~zzRQ-m4qn^sY9q<UIwDhe4Ct5(UZL@H!ff^26=iy&_$
z%GPW!W2rt~(@mj)bt5&gQI4^0wY1u5a%9ylG~?DH?L?FKk2~4?IX9kLPW>PL9Tk5n
Ezmv4U5&!@I

delta 456
zcmZvZF;2ul3`PHDCQAgY%!&dbC^-msFya7QB#?-J1P#goIKftX16oQD6$R}|AR6k3
z@9{*tLQFBwcI<DDvpQTH)HB%G#~w~5KnGl!|C0GRasRDwJ_YAvbe@&Y-Klex`Ml-+
zSLK{<JAX14JJyBg;pU?M2vS$TP(nJ0szfu}2qCo-3njCaC_{wal9ra76b#Vu<LIxG
zrqKJbLX}k&^iE<@$bS7dU==yR`cPu6_fNC2dBfQ`ce61XpKxV^f;Vkurk7GOvEe3%
ps(%ghr4;Ak_y}l)Dgs>lF8GI%fHr**PiNL5uvWk|E#J%U@)zX6VgLXD

diff --git a/mods/ca/rules/vehicles.yaml b/mods/ca/rules/vehicles.yaml
index 968bf817b7..26732e8a88 100644
--- a/mods/ca/rules/vehicles.yaml
+++ b/mods/ca/rules/vehicles.yaml
@@ -451,6 +451,7 @@ GTNK.squad:
 	WithMirageSpriteBody:
 		RequiresCondition: tree && england
 		Name: tree
+		IsPlayerPalette: false
 	WithFacingSpriteBody:
 		RequiresCondition: !tree
 	WithSpriteTurret:
@@ -473,7 +474,7 @@ GTNK.squad:
 		UncloakSound: appear1md.aud
 		UncloakOn: Attack, Unload, Infiltrate, Demolish, Dock, Move, Damage, Heal
 		Palette: player
-		IsPlayerPalette: true
+		IsPlayerPalette: false
 		RequiresCondition: england && !cloak-force-disabled && !being-warped && !empdisable && !driver-dead
 		PauseOnCondition: invisibility
 	Cloak@CRATE-CLOAK:
@@ -6091,6 +6092,7 @@ RTNK:
 		EffectiveOwner: Self
 	WithMirageSpriteBody:
 		RequiresCondition: tree
+		IsPlayerPalette: false
 		Name: tree
 	UpdatesPlayerStatistics:
 		AddToArmyValue: true
@@ -6138,7 +6140,7 @@ RTNK:
 		UncloakSound: appear1md.aud
 		UncloakOn: Attack, Dock, Move, Damage, Heal
 		Palette: player
-		IsPlayerPalette: true
+		IsPlayerPalette: false
 		RequiresCondition: !cloak-force-disabled && !being-warped && !empdisable && !driver-dead
 		PauseOnCondition: invisibility
 	Cloak@CRATE-CLOAK:
@@ -6157,7 +6159,7 @@ RTNK:
 	WithDecoration@disguise:
 		RequiresCondition: hidden
 		Image: gpsdot
-		Sequence: Vehicle
+		Sequence: MirageTank
 		Palette: player
 		IsPlayerPalette: true
 		Position: Center
diff --git a/mods/ca/sequences/misc.yaml b/mods/ca/sequences/misc.yaml
index 875011e56f..824b3971ee 100644
--- a/mods/ca/sequences/misc.yaml
+++ b/mods/ca/sequences/misc.yaml
@@ -1675,6 +1675,9 @@ gpsdot:
 	LargeInfantry:
 		Filename: gpsdot.shp
 		Start: 12
+	MirageTank:
+		Filename: gpsdot.shp
+		Start: 13
 
 icon:
 	abomb:

From f69bcd7c2a83a0fc22cc3e2984ff45b6f33729b3 Mon Sep 17 00:00:00 2001
From: darkademic <41052878+darkademic@users.noreply.github.com>
Date: Mon, 12 Feb 2024 22:28:10 +0000
Subject: [PATCH 08/12] Increased jamming field radius by 1.

---
 mods/ca/rules/misc.yaml     | 6 +++---
 mods/ca/rules/vehicles.yaml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mods/ca/rules/misc.yaml b/mods/ca/rules/misc.yaml
index 372ad5d346..d4f314e173 100644
--- a/mods/ca/rules/misc.yaml
+++ b/mods/ca/rules/misc.yaml
@@ -1056,16 +1056,16 @@ jamming.field:
 		Delay: 225
 	WithRangeCircle@JAMMER:
 		Type: JammingField
-		Range: 5c0
+		Range: 6c0
 		Visible: Always
 		ValidRelationships: Ally, Enemy, Neutral
 		Color: c0c0d4AA
 	ProximityExternalCondition@WEAPJAMMER:
-		Range: 5c0
+		Range: 6c0
 		ValidRelationships: Enemy, Neutral
 		Condition: weapjammed
 	ProximityExternalCondition@JAMMER:
-		Range: 5c0
+		Range: 6c0
 		ValidRelationships: Enemy, Neutral
 		Condition: jammed
 	Targetable@JFIELD:
diff --git a/mods/ca/rules/vehicles.yaml b/mods/ca/rules/vehicles.yaml
index 26732e8a88..b42aecd0b1 100644
--- a/mods/ca/rules/vehicles.yaml
+++ b/mods/ca/rules/vehicles.yaml
@@ -2200,7 +2200,7 @@ MRJ:
 		Description: Support vehicle that can disrupt enemy targeting systems.
 	TooltipExtras:
 		Weaknesses: • Unarmed
-		Attributes: • Jamming fields reduce rate of fire and accuracy of enemy vehicles
+		Attributes: • Jamming fields reduce rate of fire and accuracy of enemy vehicles/defenses
 	Health:
 		HP: 22000
 	Armor:

From 6a24353abae6acecb7a53296479cd4e9b235a7b0 Mon Sep 17 00:00:00 2001
From: darkademic <41052878+darkademic@users.noreply.github.com>
Date: Tue, 13 Feb 2024 19:13:44 +0000
Subject: [PATCH 09/12] Updates. - Fix condition warheads not applying to large
 actors with multiple targetable locations. - Added IronCurtainImmune and
 ChronoshiftImmune to easily prevent decoys from being targeted by these. -
 Reduced Venom damage vs buildings (with upgrade no change).

---
 OpenRA.Mods.CA/Traits/Attachable.cs           |  2 +-
 .../GrantExternalConditionPowerCA.cs          |  8 +-
 .../GrantExternalConditionCAWarhead.cs        | 79 ++++++++++++++++
 mods/ca/maps/ca07-subversion/rules.yaml       |  2 -
 mods/ca/maps/ca07-subversion/weapons.yaml     |  4 +-
 mods/ca/maps/ca15-domination/weapons.yaml     |  2 +-
 mods/ca/maps/ca25-singularity/weapons.yaml    |  2 +-
 mods/ca/maps/ca30-reckoning/weapons.yaml      |  8 +-
 mods/ca/maps/tfca/tfca-weapons.yaml           |  2 +-
 mods/ca/rules/powers.yaml                     |  3 +-
 mods/ca/rules/vehicles.yaml                   | 18 ++--
 mods/ca/weapons/ballistics.yaml               | 14 +--
 mods/ca/weapons/custom/scrinfestation.yaml    |  4 +-
 mods/ca/weapons/explosions.yaml               | 10 +--
 mods/ca/weapons/missiles.yaml                 | 36 ++++----
 mods/ca/weapons/other.yaml                    | 89 ++++++++++---------
 mods/ca/weapons/scrin.yaml                    | 40 ++++-----
 mods/ca/weapons/smallcaliber.yaml             |  6 +-
 mods/ca/weapons/superweapons.yaml             | 10 +--
 19 files changed, 208 insertions(+), 131 deletions(-)
 create mode 100644 OpenRA.Mods.CA/Warheads/GrantExternalConditionCAWarhead.cs

diff --git a/OpenRA.Mods.CA/Traits/Attachable.cs b/OpenRA.Mods.CA/Traits/Attachable.cs
index bfc0cf34b9..2f03f56435 100644
--- a/OpenRA.Mods.CA/Traits/Attachable.cs
+++ b/OpenRA.Mods.CA/Traits/Attachable.cs
@@ -348,7 +348,7 @@ public override bool CanTargetActor(Actor self, Actor target, TargetModifiers mo
 			if (!attachable.Info.ValidRelationships.HasRelationship(stance))
 				return false;
 
-			if (!attachable.Info.Types.Overlaps(target.GetAllTargetTypes()))
+			if (!attachable.Info.Types.Overlaps(target.GetEnabledTargetTypes()))
 				return false;
 
 			cursor = target.TraitsImplementing<AttachableTo>().Any(x => x.CanAttach(attachable)) ? attachable.Info.EnterCursor : attachable.Info.BlockedCursor;
diff --git a/OpenRA.Mods.CA/Traits/SupportPowers/GrantExternalConditionPowerCA.cs b/OpenRA.Mods.CA/Traits/SupportPowers/GrantExternalConditionPowerCA.cs
index a56440a81b..70f41d4d02 100644
--- a/OpenRA.Mods.CA/Traits/SupportPowers/GrantExternalConditionPowerCA.cs
+++ b/OpenRA.Mods.CA/Traits/SupportPowers/GrantExternalConditionPowerCA.cs
@@ -36,7 +36,10 @@ public class GrantExternalConditionPowerCAInfo : SupportPowerInfo
 		public readonly string OnFireSound = null;
 
 		[Desc("Target types that condition can be applied to. Leave empty for all types.")]
-		public readonly BitSet<TargetableType> ValidTargets = default(BitSet<TargetableType>);
+		public readonly BitSet<TargetableType> ValidTargets = default;
+
+		[Desc("Target types that condition can be applied to. Leave empty for all types.")]
+		public readonly BitSet<TargetableType> InvalidTargets = default;
 
 		[Desc("Player relationships which condition can be applied to.")]
 		public readonly PlayerRelationship ValidRelationships = PlayerRelationship.Ally;
@@ -197,7 +200,8 @@ private IEnumerable<Actor> GetTargetsInCircle(CPos xy)
 				.Where(a => a.IsInWorld
 					&& !a.IsDead
 					&& info.ValidRelationships.HasRelationship(Self.Owner.RelationshipWith(a.Owner))
-					&& (info.ValidTargets.IsEmpty || info.ValidTargets.Overlaps(a.GetAllTargetTypes()))
+					&& (info.ValidTargets.IsEmpty || info.ValidTargets.Overlaps(a.GetEnabledTargetTypes()))
+					&& (info.InvalidTargets.IsEmpty || !info.InvalidTargets.Overlaps(a.GetEnabledTargetTypes()))
 					&& a.TraitsImplementing<ExternalCondition>().Any(t => t.Info.Condition == info.Condition && t.CanGrantCondition(Self))
 					&& (!info.TargetMustBeVisible || Self.Owner.Shroud.IsVisible(a.Location))
 					&& a.CanBeViewedByPlayer(Self.Owner)
diff --git a/OpenRA.Mods.CA/Warheads/GrantExternalConditionCAWarhead.cs b/OpenRA.Mods.CA/Warheads/GrantExternalConditionCAWarhead.cs
new file mode 100644
index 0000000000..9d7fe5b6dd
--- /dev/null
+++ b/OpenRA.Mods.CA/Warheads/GrantExternalConditionCAWarhead.cs
@@ -0,0 +1,79 @@
+#region Copyright & License Information
+/*
+ * Copyright (c) The OpenRA Developers and Contributors
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System.Linq;
+using OpenRA.GameRules;
+using OpenRA.Mods.Common.Traits;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Warheads
+{
+	[Desc("Grant an external condition to hit actors.")]
+	public class GrantExternalConditionCAWarhead : Warhead
+	{
+		[FieldLoader.Require]
+		[Desc("The condition to apply. Must be included in the target actor's ExternalConditions list.")]
+		public readonly string Condition = null;
+
+		[Desc("Duration of the condition (in ticks). Set to 0 for a permanent condition.")]
+		public readonly int Duration = 0;
+
+		public readonly WDist Range = WDist.FromCells(1);
+
+		public readonly WDist RangeLimit = WDist.FromCells(2);
+
+		public override void DoImpact(in Target target, WarheadArgs args)
+		{
+			var firedBy = args.SourceActor;
+
+			if (target.Type == TargetType.Invalid)
+				return;
+
+			var rangeLimit = Range > RangeLimit ? Range : RangeLimit;
+			var actors = firedBy.World.FindActorsInCircle(target.CenterPosition, rangeLimit);
+
+			foreach (var a in actors)
+			{
+				if (!IsValidAgainst(a, firedBy))
+					continue;
+
+				HitShape closestActiveShape = null;
+				var closestDistance = int.MaxValue;
+
+				// PERF: Avoid using TraitsImplementing<HitShape> that needs to find the actor in the trait dictionary.
+				foreach (var targetPos in a.EnabledTargetablePositions)
+				{
+					if (targetPos is HitShape hitshape)
+					{
+						var distance = hitshape.DistanceFromEdge(a, target.CenterPosition).Length;
+						if (distance < closestDistance)
+						{
+							closestDistance = distance;
+							closestActiveShape = hitshape;
+						}
+					}
+				}
+
+				// Cannot be damaged without an active HitShape.
+				if (closestActiveShape == null)
+					continue;
+
+				// Cannot be damaged if HitShape is outside Spread.
+				if (closestDistance > Range.Length)
+					continue;
+
+				a.TraitsImplementing<ExternalCondition>()
+					.FirstOrDefault(t => t.Info.Condition == Condition && t.CanGrantCondition(firedBy))
+					?.GrantCondition(a, firedBy, Duration);
+			}
+		}
+	}
+}
diff --git a/mods/ca/maps/ca07-subversion/rules.yaml b/mods/ca/maps/ca07-subversion/rules.yaml
index 3d66e63355..6e7b16841d 100644
--- a/mods/ca/maps/ca07-subversion/rules.yaml
+++ b/mods/ca/maps/ca07-subversion/rules.yaml
@@ -63,8 +63,6 @@ HTNK.Drone:
 		PauseOnCondition: empdisable || being-warped
 	Tooltip:
 		GenericVisibility: None
-	Voiced:
-		-RequiresCondition:
 
 MTNK.Drone:
 	-ExternalCondition@DRONECONTROL:
diff --git a/mods/ca/maps/ca07-subversion/weapons.yaml b/mods/ca/maps/ca07-subversion/weapons.yaml
index 74db813514..8c283467c2 100644
--- a/mods/ca/maps/ca07-subversion/weapons.yaml
+++ b/mods/ca/maps/ca07-subversion/weapons.yaml
@@ -1,6 +1,6 @@
 Hack:
 	Range: 8c0
-	Warhead@immobilise: GrantExternalCondition
+	Warhead@immobilise: GrantExternalConditionCA
 		Range: 0c511
 		Duration: 50
 		Condition: notmobile
@@ -25,7 +25,7 @@ IonBolt:
 		Damage: 4000
 
 MEMP:
-	Warhead@emp: GrantExternalCondition
+	Warhead@emp: GrantExternalConditionCA
 		Duration: 600
 
 StnkMissile:
diff --git a/mods/ca/maps/ca15-domination/weapons.yaml b/mods/ca/maps/ca15-domination/weapons.yaml
index 05590178d8..b5b734e1ee 100644
--- a/mods/ca/maps/ca15-domination/weapons.yaml
+++ b/mods/ca/maps/ca15-domination/weapons.yaml
@@ -2,7 +2,7 @@ MicrowaveZap:
 	Warhead@1Dam: SpreadDamage
 		Versus:
 			None: 25
-	Warhead@empdef: GrantExternalCondition
+	Warhead@empdef: GrantExternalConditionCA
 		Range: 0c511
 		Duration: 175
 
diff --git a/mods/ca/maps/ca25-singularity/weapons.yaml b/mods/ca/maps/ca25-singularity/weapons.yaml
index 0f94552d4d..9754e182b4 100644
--- a/mods/ca/maps/ca25-singularity/weapons.yaml
+++ b/mods/ca/maps/ca25-singularity/weapons.yaml
@@ -113,7 +113,7 @@ MothershipExplosion:
 		Spread: 8c0
 		Damage: 80000
 		ValidTargets: Wall
-	Warhead@emp: GrantExternalCondition
+	Warhead@emp: GrantExternalConditionCA
 		Range: 20c0
 		Duration: 3000
 		Condition: empdisable
diff --git a/mods/ca/maps/ca30-reckoning/weapons.yaml b/mods/ca/maps/ca30-reckoning/weapons.yaml
index 13dc888b3b..e28b99f371 100644
--- a/mods/ca/maps/ca30-reckoning/weapons.yaml
+++ b/mods/ca/maps/ca30-reckoning/weapons.yaml
@@ -31,11 +31,11 @@ ExterminatorLaserReversed:
 		FollowingOffset: 50,100,0
 
 MicrowaveZap:
-	Warhead@emp: GrantExternalCondition
+	Warhead@emp: GrantExternalConditionCA
 		InvalidTargets: ExterminatorTripod
 
 MicrowaveZap.UPG:
-	Warhead@emp2: GrantExternalCondition
+	Warhead@emp2: GrantExternalConditionCA
 		Range: 0c511
 		Duration: 50
 		Condition: empdisable
@@ -50,9 +50,9 @@ C4:
 		ValidTargets: ExterminatorTripod
 
 EnlightenedEmp:
-	Warhead@1Emp: GrantExternalCondition
+	Warhead@1Emp: GrantExternalConditionCA
 		InvalidTargets: ExterminatorTripod
-	Warhead@empExterminator: GrantExternalCondition
+	Warhead@empExterminator: GrantExternalConditionCA
 		Range: 0c896
 		Duration: 30
 		Condition: empdisable
diff --git a/mods/ca/maps/tfca/tfca-weapons.yaml b/mods/ca/maps/tfca/tfca-weapons.yaml
index 7d783ae525..b8d16b7385 100644
--- a/mods/ca/maps/tfca/tfca-weapons.yaml
+++ b/mods/ca/maps/tfca/tfca-weapons.yaml
@@ -100,7 +100,7 @@ Heal:
 
 Repair:
 	ReloadDelay: 40
-	Warhead@highlight: GrantExternalCondition
+	Warhead@highlight: GrantExternalConditionCA
 		ValidTargets: Structure
 	Warhead@1Dam: SpreadDamage
 		Damage: -3500
diff --git a/mods/ca/rules/powers.yaml b/mods/ca/rules/powers.yaml
index 7ee52b8c20..b885eaf1cc 100644
--- a/mods/ca/rules/powers.yaml
+++ b/mods/ca/rules/powers.yaml
@@ -277,7 +277,7 @@
 		DisplayRadarPing: True
 		Range: 4c512
 		MaxTargets: 9
-		InvalidTargetTypes: Husk
+		InvalidTargetTypes: Husk, ChronoshiftImmune
 		DisplayTimerRelationships: Ally, Neutral, Enemy
 		SupportPowerPaletteOrder: 20
 		ShowSelectionBoxes: true
@@ -672,6 +672,7 @@
 		MaxTargets: 5
 		MinTargets: 0
 		ValidTargets: Vehicle, Ship, Structure
+		InvalidTargets: IronCurtainImmune
 		Duration: 600
 		AllowMultiple: false
 		Description: \nMakes up to 5 selected vehicles or structures\n    temporarily immune to damage.\n\nWarning: Harmful to infantry.
diff --git a/mods/ca/rules/vehicles.yaml b/mods/ca/rules/vehicles.yaml
index b42aecd0b1..aff794d139 100644
--- a/mods/ca/rules/vehicles.yaml
+++ b/mods/ca/rules/vehicles.yaml
@@ -3041,6 +3041,12 @@ BGGY:
 	WithPalettedOverlay@Decoy:
 		Palette: decoy
 		ValidRelationships: Ally
+	Targetable@MindControlImmune:
+		TargetTypes: MindControlImmune
+	Targetable@IronCurtainImmune:
+		TargetTypes: IronCurtainImmune
+	Targetable@ChronoshiftImmune:
+		TargetTypes: ChronoshiftImmune
 
 FTNK.Decoy:
 	Inherits: FTNK
@@ -3058,8 +3064,6 @@ FTNK.Decoy:
 		Weapon: DecoyDespawn
 		EmptyWeapon: DecoyDespawn
 		-RequiresCondition:
-	Targetable@MindControlImmune:
-		TargetTypes: MindControlImmune
 	-ActorLostNotification:
 	-Buildable:
 	-ProducibleWithLevel:
@@ -3088,10 +3092,6 @@ FTNK.Decoy:
 	-GrantConditionOnHealingReceived@REPAIRCOOLDOWN:
 	-UpdatesPlayerStatistics:
 	-RevealOnDeath:
-	-WithPalettedOverlay@IRONCURTAIN:
-	-DamageMultiplier@IRONCURTAIN:
-	-TimedConditionBar@IRONCURTAIN:
-	-ExternalCondition@INVULNERABILITY:
 
 HFTK.Decoy:
 	Inherits: HFTK
@@ -3114,8 +3114,6 @@ HFTK.Decoy:
 		Weapon: DecoyDespawn
 		EmptyWeapon: DecoyDespawn
 		-RequiresCondition:
-	Targetable@MindControlImmune:
-		TargetTypes: MindControlImmune
 	-ActorLostNotification:
 	-Buildable:
 	-ProducibleWithLevel:
@@ -3144,10 +3142,6 @@ HFTK.Decoy:
 	-GrantConditionOnHealingReceived@REPAIRCOOLDOWN:
 	-UpdatesPlayerStatistics:
 	-RevealOnDeath:
-	-WithPalettedOverlay@IRONCURTAIN:
-	-DamageMultiplier@IRONCURTAIN:
-	-TimedConditionBar@IRONCURTAIN:
-	-ExternalCondition@INVULNERABILITY:
 
 APC2:
 	Inherits: ^TankTD
diff --git a/mods/ca/weapons/ballistics.yaml b/mods/ca/weapons/ballistics.yaml
index 6e4a4e02fb..e809b23324 100644
--- a/mods/ca/weapons/ballistics.yaml
+++ b/mods/ca/weapons/ballistics.yaml
@@ -488,12 +488,12 @@ TitanGun:
 	Warhead@3Eff: CreateEffect
 		Explosions: large_artillery_explosion
 		ImpactSounds: artyhit.aud, artyhit2.aud, artyhit3.aud
-	Warhead@Concussion1: GrantExternalCondition
+	Warhead@Concussion1: GrantExternalConditionCA
 		Range: 0c768
 		Duration: 150
 		Condition: concussion
 		ValidTargets: Ground, Infantry, Vehicle, Ship
-	Warhead@Concussion2: GrantExternalCondition
+	Warhead@Concussion2: GrantExternalConditionCA
 		Range: 1c768
 		Duration: 50
 		Condition: concussion
@@ -652,7 +652,7 @@ EMPGrenade:
 		Versus:
 			Concrete: 85
 		DamageTypes: Prone50Percent, TriggerProne, ElectricityDeath
-	Warhead@5emp: GrantExternalCondition
+	Warhead@5emp: GrantExternalConditionCA
 		Range: 0c768
 		Duration: 40
 		Condition: empdisable
@@ -753,17 +753,17 @@ CryoMortar:
 		Explosions: cryohit
 		ExplosionPalette: ra2effect-ignore-lighting-alpha75
 		ImpactSounds: cryoblast.aud
-	Warhead@chill1: GrantExternalCondition
+	Warhead@chill1: GrantExternalConditionCA
 		Condition: chilled
 		Duration: 250
 		Range: 1c0
 		ValidRelationships: Enemy, Neutral
-	Warhead@chill2: GrantExternalCondition
+	Warhead@chill2: GrantExternalConditionCA
 		Condition: chilled
 		Duration: 200
 		Range: 2c0
 		ValidRelationships: Enemy, Neutral
-	Warhead@chillally: GrantExternalCondition
+	Warhead@chillally: GrantExternalConditionCA
 		Condition: chilled
 		Duration: 50
 		Range: 0c682
@@ -784,7 +784,7 @@ SonicMortar:
 			Light: 60
 			Heavy: 30
 			Concrete: 100
-	Warhead@concussion: GrantExternalCondition
+	Warhead@concussion: GrantExternalConditionCA
 		Condition: concussion
 		Duration: 75
 		Range: 1c768
diff --git a/mods/ca/weapons/custom/scrinfestation.yaml b/mods/ca/weapons/custom/scrinfestation.yaml
index 442906bf6a..315d121bc8 100644
--- a/mods/ca/weapons/custom/scrinfestation.yaml
+++ b/mods/ca/weapons/custom/scrinfestation.yaml
@@ -75,9 +75,9 @@ MiniRift:
 		Delay: 75
 		Versus:
 			None: 35
-	Warhead@3Slow: GrantExternalCondition
+	Warhead@3Slow: GrantExternalConditionCA
 		ValidTargets: Vehicle, Cyborg, Infantry
-	Warhead@4Slow: GrantExternalCondition
+	Warhead@4Slow: GrantExternalConditionCA
 		ValidTargets: Vehicle, Cyborg, Infantry
 
 GunWalkerZap:
diff --git a/mods/ca/weapons/explosions.yaml b/mods/ca/weapons/explosions.yaml
index fddd73f912..163e80d7d1 100644
--- a/mods/ca/weapons/explosions.yaml
+++ b/mods/ca/weapons/explosions.yaml
@@ -797,13 +797,13 @@ MEMP:
 	Warhead@2Eff: CreateEffect
 		ExplosionPalette: tsunit-ignore-lighting-alpha75
 		Explosions: pulse_explosion3
-	Warhead@emp: GrantExternalCondition
+	Warhead@emp: GrantExternalConditionCA
 		Range: 5c0
 		Duration: 300
 		Condition: empdisable
 		ValidTargets: Ground, Vehicle, Air
 		InvalidTargets: Defense
-	Warhead@empdef: GrantExternalCondition
+	Warhead@empdef: GrantExternalConditionCA
 		Range: 5c0
 		Duration: 600
 		Condition: empdisable
@@ -828,7 +828,7 @@ ChaosGas:
 		Explosions: gasring2
 		ExplosionPalette: caneon-ignore-lighting-alpha75
 		ImpactSounds: vchaatta.aud
-	Warhead@chaos: GrantExternalCondition
+	Warhead@chaos: GrantExternalConditionCA
 		Range: 3c0
 		Duration: 200
 		Condition: berserk
@@ -849,7 +849,7 @@ ChaosDroneExplodeSmall:
 		ExplosionPalette: caneon
 		ImpactSounds: firebl3.aud
 		ImpactActors: false
-	Warhead@chaos: GrantExternalCondition
+	Warhead@chaos: GrantExternalConditionCA
 		Range: 1c512
 
 CryoExplosion:
@@ -857,7 +857,7 @@ CryoExplosion:
 		Explosions: cryoblast
 		ExplosionPalette: ra2effect-ignore-lighting-alpha75
 		ImpactSounds: cryoblast.aud
-	Warhead@chill: GrantExternalCondition
+	Warhead@chill: GrantExternalConditionCA
 		Condition: chilled
 		Duration: 150
 		Range: 1c768
diff --git a/mods/ca/weapons/missiles.yaml b/mods/ca/weapons/missiles.yaml
index 64c24d54cf..b2b3321ec9 100644
--- a/mods/ca/weapons/missiles.yaml
+++ b/mods/ca/weapons/missiles.yaml
@@ -222,12 +222,12 @@ SeismicMissile:
 		Explosions: med_splash
 		ValidTargets: Water, Underwater
 		InvalidTargets: Ship, Structure, Bridge
-	Warhead@Concussion1: GrantExternalCondition
+	Warhead@Concussion1: GrantExternalConditionCA
 		Range: 1c512
 		Duration: 275
 		Condition: concussion
 		ValidTargets: Ground, Infantry, Vehicle, Ship
-	Warhead@Concussion2: GrantExternalCondition
+	Warhead@Concussion2: GrantExternalConditionCA
 		Range: 3c0
 		Duration: 175
 		Condition: concussion
@@ -260,7 +260,7 @@ Dragon.CRYO:
 		Explosions: cryohit
 		ExplosionPalette: ra2effect-ignore-lighting-alpha75
 		ImpactSounds: cryohit.aud
-	Warhead@chill: GrantExternalCondition
+	Warhead@chill: GrantExternalConditionCA
 		Condition: chilled
 		Duration: 60
 		Range: 0c341
@@ -646,7 +646,7 @@ RedEye.CRYO:
 		Explosions: cryohit
 		ExplosionPalette: ra2effect-ignore-lighting-alpha75
 		ImpactSounds: cryoblast.aud
-	Warhead@chill: GrantExternalCondition
+	Warhead@chill: GrantExternalConditionCA
 		Condition: chilled
 		Duration: 60
 		Range: 0c341
@@ -846,7 +846,7 @@ EMPRockets:
 			Wood: 40
 			Concrete: 30
 			Light: 60
-	Warhead@Emp: GrantExternalCondition
+	Warhead@Emp: GrantExternalConditionCA
 		Range: 0c768
 		Duration: 40
 		Condition: empdisable
@@ -1387,7 +1387,7 @@ IFVRocketsE.CRYO:
 		Explosions: cryohit
 		ExplosionPalette: ra2effect-ignore-lighting-alpha75
 		ImpactSounds: cryohit.aud
-	Warhead@chill: GrantExternalCondition
+	Warhead@chill: GrantExternalConditionCA
 		Condition: chilled
 		Duration: 60
 		Range: 0c341
@@ -1415,7 +1415,7 @@ IFVRocketsAAE.CRYO:
 		Explosions: cryohit
 		ExplosionPalette: ra2effect-ignore-lighting-alpha75
 		ImpactSounds: cryoblast.aud
-	Warhead@chill: GrantExternalCondition
+	Warhead@chill: GrantExternalConditionCA
 		Condition: chilled
 		Duration: 60
 		Range: 0c341
@@ -1498,7 +1498,7 @@ IFVRocketsAAE.CRYO:
 	Warhead@4Eff: CreateEffect
 		ImpactSounds: xplobig4.aud
 		Explosions: artillery_explosion
-	Warhead@Concussion: GrantExternalCondition
+	Warhead@Concussion: GrantExternalConditionCA
 		Range: 0c768
 		Duration: 70
 		Condition: concussion
@@ -1854,7 +1854,7 @@ ScrinTorp:
 	Warhead@3Eff: CreateEffect
 		Explosions: large_explosion
 		ImpactSounds: expnew16.aud, expnew17.aud
-	Warhead@green: GrantExternalCondition
+	Warhead@green: GrantExternalConditionCA
 		Range: 0c511
 		Duration: 2
 		Condition: greenhighlight
@@ -1878,7 +1878,7 @@ ScrinTorpAA:
 		Damage: 4000
 	Warhead@3Eff: CreateEffect
 		ImpactSounds: expnew17.aud
-	Warhead@green: GrantExternalCondition
+	Warhead@green: GrantExternalConditionCA
 		Range: 0c511
 		Duration: 2
 		Condition: greenhighlight
@@ -1961,17 +1961,17 @@ CryoMissile:
 		Explosions: cryoblast
 		ExplosionPalette: ra2effect-ignore-lighting-alpha75
 		ImpactSounds: cryoblast.aud
-	Warhead@chill1: GrantExternalCondition
+	Warhead@chill1: GrantExternalConditionCA
 		Condition: chilled
 		Duration: 250
 		Range: 1c0
 		ValidRelationships: Enemy, Neutral
-	Warhead@chill2: GrantExternalCondition
+	Warhead@chill2: GrantExternalConditionCA
 		Condition: chilled
 		Duration: 200
 		Range: 2c0
 		ValidRelationships: Enemy, Neutral
-	Warhead@chillally: GrantExternalCondition
+	Warhead@chillally: GrantExternalConditionCA
 		Condition: chilled
 		Duration: 50
 		Range: 0c682
@@ -1996,11 +1996,11 @@ CryoMissileNHAW:
 		LaunchAngle: 3
 	Warhead@1Dam: SpreadDamage
 		Damage: 1000
-	Warhead@chill1: GrantExternalCondition
+	Warhead@chill1: GrantExternalConditionCA
 		Range: 1c512
-	Warhead@chill2: GrantExternalCondition
+	Warhead@chill2: GrantExternalConditionCA
 		Range: 3c0
-	Warhead@chillally: GrantExternalCondition
+	Warhead@chillally: GrantExternalConditionCA
 		Range: 1c341
 	Warhead@cryoresidue: CreateTintedCells
 		Level: 200
@@ -2082,7 +2082,7 @@ BlackEagleMissiles:
 		Damage: 22000
 		Versus:
 			Concrete: 75
-	Warhead@VeiledCondition: GrantExternalCondition
+	Warhead@VeiledCondition: GrantExternalConditionCA
 		Range: 2c512
 		Duration: 175
 		Condition: gapveiled
@@ -2104,7 +2104,7 @@ BlackEagleMissilesAA:
 		Image: MISSILE
 	Warhead@1Dam: SpreadDamage
 		Damage: 12000
-	Warhead@VeiledCondition: GrantExternalCondition
+	Warhead@VeiledCondition: GrantExternalConditionCA
 		Range: 2c512
 		Duration: 175
 		Condition: gapveiled
diff --git a/mods/ca/weapons/other.yaml b/mods/ca/weapons/other.yaml
index f0d4cde0e6..10fca348a1 100644
--- a/mods/ca/weapons/other.yaml
+++ b/mods/ca/weapons/other.yaml
@@ -483,13 +483,13 @@ PortaTeslaCharge:
 	-Report:
 	-Warhead@1Dam:
 	-Warhead@2Smu:
-	Warhead@charge: GrantExternalCondition
+	Warhead@charge: GrantExternalConditionCA
 		Range: 42
 		Duration: 70
 		Condition: charged
 		ValidRelationships: Ally
 		ValidTargets: TeslaBoost
-	Warhead@highlight: GrantExternalCondition
+	Warhead@highlight: GrantExternalConditionCA
 		Range: 0c511
 		Duration: 2
 		Condition: highlight
@@ -676,7 +676,7 @@ Repair:
 	-Warhead@2Dam:
 	-Warhead@3Dam:
 	-Warhead@4Dam:
-	Warhead@highlight: GrantExternalCondition
+	Warhead@highlight: GrantExternalConditionCA
 		Range: 0c511
 		Duration: 2
 		Condition: highlight
@@ -706,7 +706,7 @@ RepairFlash:
 	-Warhead@2Dam:
 	-Warhead@3Dam:
 	-Warhead@4Dam:
-	Warhead@highlight: GrantExternalCondition
+	Warhead@highlight: GrantExternalConditionCA
 		Range: 2c511
 		Duration: 2
 		Condition: highlight
@@ -714,7 +714,7 @@ RepairFlash:
 
 ShieldFlash:
 	Inherits: RepairFlash
-	Warhead@highlight: GrantExternalCondition
+	Warhead@highlight: GrantExternalConditionCA
 		Range: 2c511
 		Duration: 2
 		Condition: highlight
@@ -748,7 +748,7 @@ PlaceC4:
 		DeathTypes: ExplosionDeath
 		Range: 1
 	Warhead@TargetValidator: SpreadDamage
-	Warhead@highlight: GrantExternalCondition
+	Warhead@highlight: GrantExternalConditionCA
 		Range: 0c256
 		Duration: 2
 		Condition: highlight
@@ -764,7 +764,7 @@ PlaceC4Seal:
 		TriggerTime: 20
 		Type: c4seal
 		ScaleTriggerTimeWithValue: true
-	Warhead@highlight: GrantExternalCondition
+	Warhead@highlight: GrantExternalConditionCA
 		ValidTargets: Ground, Structure
 
 C4:
@@ -820,7 +820,7 @@ Ivanbomb:
 		AttachSounds: icraatta.aud
 		MissWeapon: DelayedTNT
 	Warhead@TargetValidator: SpreadDamage
-	Warhead@highlight: GrantExternalCondition
+	Warhead@highlight: GrantExternalConditionCA
 		Range: 0c256
 		Duration: 2
 		Condition: highlight
@@ -881,7 +881,7 @@ DefuseKit:
 		Width: 48
 		Duration: 4
 		Color: FFFFFF80
-	Warhead@flash: GrantExternalCondition
+	Warhead@flash: GrantExternalConditionCA
 		Range: 128
 		Duration: 3
 		Condition: detach
@@ -925,7 +925,7 @@ Hack:
 		Actors: camera.hacker
 		Range: 1
 		ImpactActors: false
-	Warhead@green: GrantExternalCondition
+	Warhead@green: GrantExternalConditionCA
 		Range: 0c511
 		Duration: 2
 		Condition: greenhighlight
@@ -978,7 +978,7 @@ MADTankDetonate:
 			Heavy: 0
 			Concrete: 100
 			Brick: 100
-	Warhead@Concussion: GrantExternalCondition
+	Warhead@Concussion: GrantExternalConditionCA
 		Range: 7c0
 		Duration: 150
 		Condition: concussion
@@ -1213,13 +1213,13 @@ EnlightenedEmp:
 		Jammable: false
 		TrailImage: smokey
 		TrailPalette: scrinplasma
-	Warhead@1Emp: GrantExternalCondition
+	Warhead@1Emp: GrantExternalConditionCA
 		Range: 0c896
 		Duration: 100
 		Condition: empdisable
 		ValidTargets: Ground, Vehicle
 		InvalidTargets: Cyborg, Defense
-	Warhead@2Emp: GrantExternalCondition
+	Warhead@2Emp: GrantExternalConditionCA
 		Range: 0c896
 		Duration: 50
 		Condition: empdisable
@@ -1249,7 +1249,7 @@ VenomLaser:
 		DamageTypes: Prone50Percent, TriggerProne, FireDeath, AirToGround
 		Versus:
 			None: 250
-			Wood: 60
+			Wood: 50
 			Concrete: 40
 			Light: 95
 			Heavy: 65
@@ -1270,6 +1270,7 @@ VenomLaser.UPG:
 		Spread: 42
 		Damage: 6325
 		Versus:
+			Wood: 60
 			Concrete: 55
 
 VenomLaserAA:
@@ -1517,12 +1518,12 @@ KirovClusterBomb:
 	Warhead@3Eff: CreateEffect
 		Explosions: large_artillery_explosion
 		ImpactSounds: artyhit.aud, artyhit2.aud, artyhit3.aud
-	Warhead@Concussion1: GrantExternalCondition
+	Warhead@Concussion1: GrantExternalConditionCA
 		Range: 0c768
 		Duration: 125
 		Condition: concussion
 		ValidTargets: Ground, Infantry, Vehicle, Ship
-	Warhead@Concussion2: GrantExternalCondition
+	Warhead@Concussion2: GrantExternalConditionCA
 		Range: 1c768
 		Duration: 35
 		Condition: concussion
@@ -1654,7 +1655,7 @@ SonicZap.UPG:
 		Color: 00ffcc25
 	Warhead@1Dam: SpreadDamage
 		Damage: 820
-	Warhead@4Conc: GrantExternalCondition
+	Warhead@4Conc: GrantExternalConditionCA
 		Range: 0c512
 		Duration: 75
 		Condition: concussion
@@ -1698,7 +1699,7 @@ GapBeam:
 		DistortionAnimation: 64
 		TrackTarget: true
 	Warhead@1Dum: Dummy
-	Warhead@Debuff: GrantExternalCondition
+	Warhead@Debuff: GrantExternalConditionCA
 		Range: 1c512
 		Duration: 15
 		Condition: gapveiled
@@ -1733,7 +1734,7 @@ VeilSmall:
 	ReloadDelay: 10
 	Range: 1c0
 	Projectile: InstantHit
-	Warhead@Debuff: GrantExternalCondition
+	Warhead@Debuff: GrantExternalConditionCA
 		Range: 2c512
 		Duration: 15
 		Condition: veiled
@@ -1746,21 +1747,21 @@ VeilSmall:
 
 VeilMedium:
 	Inherits: VeilSmall
-	Warhead@Debuff: GrantExternalCondition
+	Warhead@Debuff: GrantExternalConditionCA
 		Range: 4c768
 	Warhead@Cloud: CreateEffect
 		Inaccuracy: 3c768
 
 VeilLarge:
 	Inherits: VeilSmall
-	Warhead@Debuff: GrantExternalCondition
+	Warhead@Debuff: GrantExternalConditionCA
 		Range: 7c0
 	Warhead@Cloud: CreateEffect
 		Inaccuracy: 6c0
 
 VeilFull:
 	Inherits: VeilSmall
-	Warhead@Debuff: GrantExternalCondition
+	Warhead@Debuff: GrantExternalConditionCA
 		Range: 9c256
 	Warhead@Cloud: CreateEffect
 		Inaccuracy: 7c512
@@ -1959,13 +1960,13 @@ OrcaBomb:
 	Warhead@4Eff: CreateEffect
 		Explosions: artillery_explosion
 		ValidTargets: Ground, Ship, Trees
-	Warhead@emp: GrantExternalCondition
+	Warhead@emp: GrantExternalConditionCA
 		Range: 1c512
 		Duration: 375
 		Condition: empdisable
 		ValidTargets: Ground, Structure, Vehicle
 		InvalidTargets: Defense
-	Warhead@empdef: GrantExternalCondition
+	Warhead@empdef: GrantExternalConditionCA
 		Range: 1c512
 		Duration: 625
 		Condition: empdisable
@@ -2011,12 +2012,12 @@ MicrowaveZap:
 		Falloff: 100, 37, 14, 0
 		Damage: 30000
 		DamageTypes: Prone50Percent, TriggerProne, FireDeath
-	Warhead@emp: GrantExternalCondition
+	Warhead@emp: GrantExternalConditionCA
 		Range: 0c511
 		Duration: 100
 		Condition: empdisable
 		ValidTargets: Vehicle
-	Warhead@empdef: GrantExternalCondition
+	Warhead@empdef: GrantExternalConditionCA
 		Range: 0c511
 		Duration: 100
 		Condition: empdisable
@@ -2034,12 +2035,12 @@ MicrowaveZap.UPG:
 		InvalidTargets: Infantry, Ship, Structure, Wall, Husk, Air
 		CargoEffect: Kill
 		Range: 0c511
-	Warhead@emp: GrantExternalCondition
+	Warhead@emp: GrantExternalConditionCA
 		Range: 1c0
 		ValidTargets: Vehicle
-	Warhead@empdef: GrantExternalCondition
+	Warhead@empdef: GrantExternalConditionCA
 		Duration: 200
-	Warhead@highlight: GrantExternalCondition
+	Warhead@highlight: GrantExternalConditionCA
 		Range: 0c511
 		Duration: 2
 		Condition: highlight
@@ -2129,7 +2130,7 @@ Flare:
 		ZOffset: 4096
 	Warhead@1Dam: TargetDamage
 		ValidTargets: Structure
-	Warhead@2Con: GrantExternalCondition
+	Warhead@2Con: GrantExternalConditionCA
 		ValidTargets: Structure
 		Range: 0c32
 		Duration: 8
@@ -2167,7 +2168,7 @@ ChaosCloud:
 	Range: 1c0
 	ValidTargets: Ground, Water
 	Projectile: InstantHit
-	Warhead@1Cond: GrantExternalCondition
+	Warhead@1Cond: GrantExternalConditionCA
 		ValidTargets: Ground, Vehicle
 		Range: 1c512
 		Duration: 50
@@ -2245,7 +2246,7 @@ RadBeamWeapon:
 		Falloff: 100, 37, 25, 15, 0
 		ValidTargets: Infantry
 		DamageTypes: RadiationDeath
-	Warhead@2irrad: GrantExternalCondition
+	Warhead@2irrad: GrantExternalConditionCA
 		Range: 0c256
 		Duration: 250
 		Condition: irradiated
@@ -2369,7 +2370,7 @@ CyCannon:
 	Warhead@3Eff: CreateEffect
 		Explosions: large_explosion
 		ImpactSounds: expnew16.aud, expnew17.aud
-	Warhead@green: GrantExternalCondition
+	Warhead@green: GrantExternalConditionCA
 		Range: 0c511
 		Duration: 2
 		Condition: greenhighlight
@@ -2404,7 +2405,7 @@ NeutronCannonAA:
 	Warhead@ShieldDamage: SpreadDamage
 		Damage: 250
 		ValidTargets: Shielded
-	Warhead@ShieldWarp: GrantExternalCondition
+	Warhead@ShieldWarp: GrantExternalConditionCA
 		Range: 0c512
 		Duration: 10
 		Condition: shield-warped
@@ -2496,13 +2497,13 @@ SonicPulse.UPG:
 		Explosions: sonicblastupg1, sonicblastupg2
 	Warhead@3Eff: CreateEffect
 		Explosions: sonicpulseupg1, sonicpulseupg2
-	Warhead@ConcussionVehicles: GrantExternalCondition
+	Warhead@ConcussionVehicles: GrantExternalConditionCA
 		Range: 1c0
 		Duration: 150
 		Condition: concussion
 		ValidTargets: Vehicle, Ship
 		ValidRelationships: Enemy, Neutral
-	Warhead@ConcussionInfantry: GrantExternalCondition
+	Warhead@ConcussionInfantry: GrantExternalConditionCA
 		Range: 1c0
 		Duration: 25
 		Condition: concussion
@@ -2557,7 +2558,7 @@ DisruptorPulse.Amp:
 	Warhead@2Eff: CreateFacingEffect
 		Explosions: sonicwaveupg1, sonicwaveupg2
 		ExplosionPalette: effect
-	Warhead@4Conc: GrantExternalCondition
+	Warhead@4Conc: GrantExternalConditionCA
 		Range: 0c768
 		Duration: 75
 		Condition: concussion
@@ -2619,7 +2620,7 @@ JDAM:
 		RandomClusterCount: 3
 		Dimensions: 3,3
 		Footprint: xxx xxx xxx
-	Warhead@Concussion: GrantExternalCondition
+	Warhead@Concussion: GrantExternalConditionCA
 		Range: 3c0
 		Duration: 70
 		Condition: concussion
@@ -2684,7 +2685,7 @@ AttachShadowBeacon:
 		ValidTargets: ShadowBeacon
 	Warhead@TargetValidator: SpreadDamage
 		ValidTargets: ShadowBeacon
-	Warhead@highlight: GrantExternalCondition
+	Warhead@highlight: GrantExternalConditionCA
 		Range: 341
 		Duration: 2
 		Condition: redhighlight
@@ -2857,7 +2858,7 @@ MineDefuser:
 		Damage: 12000
 		ValidTargets: Mine
 		Delay: 5
-	Warhead@1Def: GrantExternalCondition
+	Warhead@1Def: GrantExternalConditionCA
 		Condition: defused
 		Range: 0c511
 		Duration: 25
@@ -2952,13 +2953,13 @@ ShadeEmp:
 			Concrete: 75
 			Brick: 5
 		DamageTypes: Prone50Percent, TriggerProne, ElectricityDeath, AirToGround
-	Warhead@1Emp: GrantExternalCondition
+	Warhead@1Emp: GrantExternalConditionCA
 		Range: 1c256
 		Duration: 325
 		Condition: empdisable
 		ValidTargets: Ground, Vehicle, Defense
 		InvalidTargets: Cyborg
-	Warhead@2Emp: GrantExternalCondition
+	Warhead@2Emp: GrantExternalConditionCA
 		Range: 1c256
 		Duration: 125
 		Condition: empdisable
@@ -3090,7 +3091,7 @@ FloatingDiscLaser:
 FloatingDiscPowerDrainer:
 	Inherits: ^FloatingDiscDrainer
 	ValidTargets:	PowerDrainable
-	Warhead@PowerDrain: GrantExternalCondition
+	Warhead@PowerDrain: GrantExternalConditionCA
 		Range: 0c128
 		Duration: 11
 		Condition: discpowerdrain
@@ -3100,7 +3101,7 @@ FloatingDiscPowerDrainer:
 FloatingDiscResourceDrainer:
 	Inherits: ^FloatingDiscDrainer
 	ValidTargets:	ResourceDrainable
-	Warhead@ResourceDrain: GrantExternalCondition
+	Warhead@ResourceDrain: GrantExternalConditionCA
 		Range: 0c128
 		Duration: 11
 		Condition: resourcedrain
diff --git a/mods/ca/weapons/scrin.yaml b/mods/ca/weapons/scrin.yaml
index e8549ee522..0ad313fde0 100644
--- a/mods/ca/weapons/scrin.yaml
+++ b/mods/ca/weapons/scrin.yaml
@@ -455,12 +455,12 @@ MiniRift:
 			Brick: 20
 		DamageTypes: BulletDeath
 		ValidRelationships: Ally
-	Warhead@3Slow: GrantExternalCondition
+	Warhead@3Slow: GrantExternalConditionCA
 		Range: 1c0
 		Duration: 10
 		Condition: slowed
 		ValidTargets: Vehicle, Ship, Cyborg
-	Warhead@4Slow: GrantExternalCondition
+	Warhead@4Slow: GrantExternalConditionCA
 		Range: 2c0
 		Duration: 10
 		Condition: slowed
@@ -765,7 +765,7 @@ EnervatorBolts:
 			Heavy: 100
 			Concrete: 100
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath, TankBuster, AirToGround
-	Warhead@2Sup: GrantExternalCondition
+	Warhead@2Sup: GrantExternalConditionCA
 		Range: 0c768
 		Duration: 75
 		Condition: suppression
@@ -801,7 +801,7 @@ EnervatorBoltsAA:
 		Falloff: 100, 50, 14, 0
 		ValidTargets: AirSmall
 		ValidRelationships: Enemy, Neutral
-	Warhead@2Sup: GrantExternalCondition
+	Warhead@2Sup: GrantExternalConditionCA
 		ValidTargets: Air, AirSmall
 
 InvaderLauncher:
@@ -994,7 +994,7 @@ IonCloudChargeZap:
 	-Warhead@1Dam:
 	-Warhead@2Smu:
 	-Warhead@3Eff:
-	Warhead@highlight: GrantExternalCondition
+	Warhead@highlight: GrantExternalConditionCA
 		Range: 0c511
 		Duration: 2
 		Condition: highlight
@@ -1036,7 +1036,7 @@ GravityStabilizerZap:
 		Width: 32
 	Warhead@1Dum: Dummy
 		ValidRelationships: Ally
-	Warhead@highlight: GrantExternalCondition
+	Warhead@highlight: GrantExternalConditionCA
 		Range: 0c511
 		Duration: 1
 		Condition: highlight
@@ -1069,9 +1069,9 @@ MothershipChargeZap:
 	Warhead@1Dum: Dummy
 		ValidRelationships: Ally
 		ValidTargets: MothershipRearmable
-	Warhead@highlight: GrantExternalCondition
+	Warhead@highlight: GrantExternalConditionCA
 		ValidTargets: MothershipRearmable
-	Warhead@rearm: GrantExternalCondition
+	Warhead@rearm: GrantExternalConditionCA
 		Range: 0c511
 		Duration: 80
 		Condition: mshp-rearm
@@ -1262,7 +1262,7 @@ SuppressionField:
 	Warhead@1Dam: SpreadDamage
 		Spread: 1c0
 		Damage: 1
-	Warhead@2sup: GrantExternalCondition
+	Warhead@2sup: GrantExternalConditionCA
 		Range: 3c0
 		Duration: 600
 		Condition: suppression
@@ -1270,7 +1270,7 @@ SuppressionField:
 
 SuppressionSiphonField:
 	Inherits: SuppressionField
-	Warhead@3siphon: GrantExternalCondition
+	Warhead@3siphon: GrantExternalConditionCA
 		Range: 3c0
 		Duration: 600
 		Condition: suppression-siphon
@@ -1365,7 +1365,7 @@ IonSurge:
 	ReloadDelay: 20
 	Range: 1c0
 	Projectile: InstantHit
-	Warhead@surge: GrantExternalCondition
+	Warhead@surge: GrantExternalConditionCA
 		Range: 6c0
 		Duration: 375
 		Condition: ionsurge
@@ -1488,12 +1488,12 @@ LeecherBeam:
 			Heavy: 15
 			Concrete: 15
 			Brick: 5
-	Warhead@DRAIN: GrantExternalCondition
+	Warhead@DRAIN: GrantExternalConditionCA
 		Range: 1c512
 		Duration: 100
 		Condition: powerdrain
 		ValidTargets: PowerDrainable
-	Warhead@SLOW: GrantExternalCondition
+	Warhead@SLOW: GrantExternalConditionCA
 		Range: 0c768
 		Duration: 30
 		Condition: slowed
@@ -1631,7 +1631,7 @@ AtomizerBolts:
 			Heavy: 100
 			Concrete: 90
 		DamageTypes: Prone50Percent, AtomizedDeath
-	Warhead@atomize: GrantExternalCondition
+	Warhead@atomize: GrantExternalConditionCA
 		Range: 0c768
 		Duration: 155
 		Condition: atomized
@@ -1642,7 +1642,7 @@ AtomizerBolts:
 		ExplosionPalette: scrin
 		Image: atmzbolthit
 		ImpactSounds: atomizer-hit1.aud
-	Warhead@red: GrantExternalCondition
+	Warhead@red: GrantExternalConditionCA
 		Range: 0c768
 		Duration: 2
 		Condition: redhighlight
@@ -1677,12 +1677,12 @@ AtomizerBoltsAA:
 			Light: 100
 			Concrete: 100
 			Brick: 100
-	Warhead@atomize: GrantExternalCondition
+	Warhead@atomize: GrantExternalConditionCA
 		ValidTargets: Air, AirSmall
 		Range: 1c512
 	Warhead@3Eff: CreateEffect
 		ValidTargets: Air, AirSmall
-	Warhead@red: GrantExternalCondition
+	Warhead@red: GrantExternalConditionCA
 		ValidTargets: Air, AirSmall
 		Range: 1c512
 
@@ -1697,7 +1697,7 @@ AtomizeSpreadInit:
 AtomizeSpread:
 	Range: 1c512
 	Projectile: InstantHit
-	Warhead@cond: GrantExternalCondition
+	Warhead@cond: GrantExternalConditionCA
 		Range: 0c512
 		Duration: 120
 		Condition: atomized
@@ -1753,7 +1753,7 @@ MindSparkSpawnerMaster:
 		ForceGround: false
 		ValidTargets: Ground, Water, Trees
 		Delay: 8
-	Warhead@Suppress: GrantExternalCondition
+	Warhead@Suppress: GrantExternalConditionCA
 		Range: 2c0
 		Duration: 325
 		Condition: suppression
@@ -1765,7 +1765,7 @@ MindSparkSpawnerSlave:
 	-Warhead@2Eff:
 	Warhead@Spawn: SpawnActor
 		-Delay:
-	Warhead@Suppress: GrantExternalCondition
+	Warhead@Suppress: GrantExternalConditionCA
 		-Delay:
 
 MindSparkZap:
diff --git a/mods/ca/weapons/smallcaliber.yaml b/mods/ca/weapons/smallcaliber.yaml
index 4513c0fb7f..d67bc72187 100644
--- a/mods/ca/weapons/smallcaliber.yaml
+++ b/mods/ca/weapons/smallcaliber.yaml
@@ -796,7 +796,7 @@ SNIPER.vehicle:
 		ImpactSounds: splash9.aud
 		ValidTargets: Water, Underwater
 		InvalidTargets: Ship, Structure, Bridge
-	Warhead@Concussion: GrantExternalCondition
+	Warhead@Concussion: GrantExternalConditionCA
 		Range: 0c256
 		Duration: 75
 		Condition: concussion
@@ -805,7 +805,7 @@ SNIPER.vehicle:
 SNIPER.vehicleElite:
 	Inherits: SNIPER.vehicle
 	Report: ijarwe2a.aud
-	Warhead@Concussion: GrantExternalCondition
+	Warhead@Concussion: GrantExternalConditionCA
 		InvalidTargets: DriverKillLow
 	Warhead@DriverKill: ChangeOwnerToNeutral
 		ValidTargets: DriverKillLow
@@ -813,7 +813,7 @@ SNIPER.vehicleElite:
 		ValidRelationships: Enemy
 		CargoEffect: Block
 		Range: 0c511
-	Warhead@highlight: GrantExternalCondition
+	Warhead@highlight: GrantExternalConditionCA
 		Range: 0c511
 		Duration: 2
 		Condition: highlight
diff --git a/mods/ca/weapons/superweapons.yaml b/mods/ca/weapons/superweapons.yaml
index 90b0017caa..dde4682700 100644
--- a/mods/ca/weapons/superweapons.yaml
+++ b/mods/ca/weapons/superweapons.yaml
@@ -196,7 +196,7 @@ GeneticMutationBomb:
 		Velocity: 15, 0, -35
 		Acceleration: 0, 0, 0
 		Shadow: true
-	Warhead@COND: GrantExternalCondition
+	Warhead@COND: GrantExternalConditionCA
 		Range: 4c0
 		Duration: 16
 		Condition: geneticmutation
@@ -408,7 +408,7 @@ Empicbm:
 		ExplosionPalette: tseffect-ignore-lighting-alpha75
 		Explosions: pulse_explosion
 		ImpactSounds: empexpl.aud
-	Warhead@emp: GrantExternalCondition
+	Warhead@emp: GrantExternalConditionCA
 		Range: 5c0
 		Duration: 500
 		Condition: empdisable
@@ -475,12 +475,12 @@ EMPMissileLauncher:
 		ExplosionPalette: tseffect-ignore-lighting-alpha75
 		Explosions: pulse_explosion
 		ImpactSounds: empexpl.aud
-	Warhead@emp1: GrantExternalCondition
+	Warhead@emp1: GrantExternalConditionCA
 		Range: 2c256
 		Duration: 600
 		Condition: empdisable
 		ValidTargets: Ground, Vehicle, Air
-	Warhead@emp2: GrantExternalCondition
+	Warhead@emp2: GrantExternalConditionCA
 		Range: 4c512
 		Duration: 300
 		Condition: empdisable
@@ -640,7 +640,7 @@ ForceShield:
 	Warhead@4Eff: CreateEffect
 		ExplosionPalette: effect-ignore-lighting-alpha85
 		Explosions: forceshield_effect
-	Warhead@fspower: GrantExternalCondition
+	Warhead@fspower: GrantExternalConditionCA
 		Range: 15c0
 		Duration: 500
 		Condition: forcedisabled

From c56f61738606c2b3acaf46554e0b0a7d4057cce6 Mon Sep 17 00:00:00 2001
From: darkademic <41052878+darkademic@users.noreply.github.com>
Date: Tue, 13 Feb 2024 20:48:39 +0000
Subject: [PATCH 10/12] Added fast regrowth option.

---
 mods/ca/languages/rules/en.ftl                |  4 ++++
 mods/ca/maps/tfca/tfca-rules-base.yaml        |  2 ++
 mods/ca/rules/custom/campaign-rules.yaml      |  3 +++
 mods/ca/rules/custom/composition-tester.yaml  |  3 +++
 mods/ca/rules/custom/mastermind-madness.yaml  |  2 ++
 .../rules/custom/scrinfestation-minigame.yaml |  2 ++
 mods/ca/rules/defaults.yaml                   |  3 +++
 mods/ca/rules/misc.yaml                       | 23 +++++++++++++++++++
 mods/ca/rules/player.yaml                     | 11 +++++++--
 9 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/mods/ca/languages/rules/en.ftl b/mods/ca/languages/rules/en.ftl
index 449904ae0a..574e77ac2a 100644
--- a/mods/ca/languages/rules/en.ftl
+++ b/mods/ca/languages/rules/en.ftl
@@ -30,6 +30,10 @@ checkbox-balanced-harvesting =
     .label = Balanced Harvesting
     .description = Enables dynamic harvester speed to account for the direction of resources relative to refineries
 
+checkbox-fast-regrowth =
+    .label = Fast Regrowth
+    .description = Resources regrow at a faster rate
+
 dropdown-queuetype =
     .label = Production Type
     .description = Single-Queue = One queue per production category\n\nMulti-Queue = One queue per production structure\n\nMulti-Queue Scaled = Multi-Queue, but where additional production structures have increased cost,\n                                   which can be reduced via T2/T3 upgrades
diff --git a/mods/ca/maps/tfca/tfca-rules-base.yaml b/mods/ca/maps/tfca/tfca-rules-base.yaml
index 09c75e7036..cace04622d 100644
--- a/mods/ca/maps/tfca/tfca-rules-base.yaml
+++ b/mods/ca/maps/tfca/tfca-rules-base.yaml
@@ -95,6 +95,8 @@ Player:
 		Visible: False
 	LobbyPrerequisiteCheckbox@BALANCEDHARVESTING:
 		Visible: False
+	LobbyPrerequisiteCheckbox@FASTREGROWTH:
+		Visible: False
 	LobbyPrerequisiteCheckbox@REVEALONFIRE:
 		Enabled: False
 		Locked: True
diff --git a/mods/ca/rules/custom/campaign-rules.yaml b/mods/ca/rules/custom/campaign-rules.yaml
index 324ad19cdc..9c51820b6f 100644
--- a/mods/ca/rules/custom/campaign-rules.yaml
+++ b/mods/ca/rules/custom/campaign-rules.yaml
@@ -43,6 +43,9 @@ Player:
 	LobbyPrerequisiteCheckbox@BALANCEDHARVESTING:
 		Locked: True
 		Visible: False
+	LobbyPrerequisiteCheckbox@FASTREGROWTH:
+		Locked: True
+		Visible: False
 	LobbyPrerequisiteCheckbox@REVEALONFIRE:
 		Locked: True
 		Visible: False
diff --git a/mods/ca/rules/custom/composition-tester.yaml b/mods/ca/rules/custom/composition-tester.yaml
index 8253665708..fc60402481 100644
--- a/mods/ca/rules/custom/composition-tester.yaml
+++ b/mods/ca/rules/custom/composition-tester.yaml
@@ -64,6 +64,9 @@ Player:
 	LobbyPrerequisiteCheckbox@BALANCEDHARVESTING:
 		Enabled: True
 		Visible: False
+	LobbyPrerequisiteCheckbox@FASTREGROWTH:
+		Enabled: False
+		Visible: False
 	LobbyPrerequisiteCheckbox@REVEALONFIRE:
 		Enabled: False
 		Locked: True
diff --git a/mods/ca/rules/custom/mastermind-madness.yaml b/mods/ca/rules/custom/mastermind-madness.yaml
index 2f763dcbc3..397a470b03 100644
--- a/mods/ca/rules/custom/mastermind-madness.yaml
+++ b/mods/ca/rules/custom/mastermind-madness.yaml
@@ -60,6 +60,8 @@ Player:
 		Visible: False
 	LobbyPrerequisiteCheckbox@BALANCEDHARVESTING:
 		Visible: False
+	LobbyPrerequisiteCheckbox@FASTREGROWTH:
+		Visible: False
 	LobbyPrerequisiteCheckbox@REVEALONFIRE:
 		Enabled: False
 		Locked: True
diff --git a/mods/ca/rules/custom/scrinfestation-minigame.yaml b/mods/ca/rules/custom/scrinfestation-minigame.yaml
index 08cec64f81..f77bba5925 100644
--- a/mods/ca/rules/custom/scrinfestation-minigame.yaml
+++ b/mods/ca/rules/custom/scrinfestation-minigame.yaml
@@ -69,6 +69,8 @@ Player:
 		Visible: False
 	LobbyPrerequisiteCheckbox@BALANCEDHARVESTING:
 		Visible: False
+	LobbyPrerequisiteCheckbox@FASTREGROWTH:
+		Visible: False
 	LobbyPrerequisiteCheckbox@REVEALONFIRE:
 		Enabled: False
 		Locked: True
diff --git a/mods/ca/rules/defaults.yaml b/mods/ca/rules/defaults.yaml
index 45fd5a4115..990ef23b49 100644
--- a/mods/ca/rules/defaults.yaml
+++ b/mods/ca/rules/defaults.yaml
@@ -3236,6 +3236,9 @@
 		Condition: on-tib
 		Range: 4c0
 		ValidRelationships: Ally, Neutral, Enemy
+	GrantConditionOnPrerequisite@FastRegrowth:
+		Condition: fast-regrowth
+		Prerequisites: global.fastregrowth
 
 ^Tree:
 	Inherits@1: ^SpriteActor
diff --git a/mods/ca/rules/misc.yaml b/mods/ca/rules/misc.yaml
index d4f314e173..f4797c3450 100644
--- a/mods/ca/rules/misc.yaml
+++ b/mods/ca/rules/misc.yaml
@@ -489,6 +489,10 @@ MINE:
 		Terrain: Ore
 	SeedsResource:
 		Interval: 70
+		RequiresCondition: !fast-regrowth
+	SeedsResource@FastRegrowth:
+		Interval: 35
+		RequiresCondition: fast-regrowth
 	MapEditorData:
 		Categories: Resource spawn
 	RequiresSpecificOwners:
@@ -497,6 +501,9 @@ MINE:
 		Condition: on-ore
 		Range: 4c0
 		ValidRelationships: Ally, Neutral, Enemy
+	GrantConditionOnPrerequisite@FastRegrowth:
+		Condition: fast-regrowth
+		Prerequisites: global.fastregrowth
 
 GMINE:
 	Inherits@1: ^SpriteActor
@@ -517,6 +524,12 @@ GMINE:
 		Terrain: Gems
 	SeedsResource:
 		ResourceType: Gems
+		Interval: 65
+		RequiresCondition: !fast-regrowth
+	SeedsResource@FastRegrowth:
+		ResourceType: Gems
+		Interval: 35
+		RequiresCondition: fast-regrowth
 	MapEditorData:
 		Categories: Resource spawn
 	RequiresSpecificOwners:
@@ -525,6 +538,9 @@ GMINE:
 		Condition: on-gems
 		Range: 4c0
 		ValidRelationships: Ally, Neutral, Enemy
+	GrantConditionOnPrerequisite@FastRegrowth:
+		Condition: fast-regrowth
+		Prerequisites: global.fastregrowth
 
 RAILMINE:
 	Inherits@1: ^SpriteActor
@@ -945,6 +961,11 @@ SPLIT2:
 	SeedsResource:
 		ResourceType: Tiberium
 		Interval: 70
+		RequiresCondition: !fast-regrowth
+	SeedsResource@FastRegrowth:
+		ResourceType: Tiberium
+		Interval: 35
+		RequiresCondition: fast-regrowth
 	AppearsOnMapPreview:
 		Terrain: Tiberium
 	MapEditorData:
@@ -959,6 +980,8 @@ SPLITBLUE:
 		Image: split3
 	SeedsResource:
 		ResourceType: BlueTiberium
+	SeedsResource@FastRegrowth:
+		ResourceType: BlueTiberium
 	AppearsOnMapPreview:
 		Terrain: BlueTiberium
 	Tooltip:
diff --git a/mods/ca/rules/player.yaml b/mods/ca/rules/player.yaml
index c4268bf067..610d37993d 100644
--- a/mods/ca/rules/player.yaml
+++ b/mods/ca/rules/player.yaml
@@ -150,7 +150,7 @@ Player:
 		DefaultCash: 6000
 		DefaultCashDropdownDisplayOrder: 1
 	DeveloperMode:
-		CheckboxDisplayOrder: 11
+		CheckboxDisplayOrder: 14
 	Shroud:
 		FogCheckboxEnabled: True
 		FogCheckboxLocked: False
@@ -189,7 +189,7 @@ Player:
 		Label: checkbox-reveal-on-fire.label
 		Description: checkbox-reveal-on-fire.description
 		Enabled: False
-		DisplayOrder: 8
+		DisplayOrder: 11
 		Prerequisites: global.revealonfire
 	LobbyPrerequisiteCheckbox@BALANCEDHARVESTING:
 		ID: balancedharvesting
@@ -198,6 +198,13 @@ Player:
 		Enabled: True
 		DisplayOrder: 4
 		Prerequisites: global.balancedharvesting
+	LobbyPrerequisiteCheckbox@FASTREGROWTH:
+		ID: fastregrowth
+		Label: checkbox-fast-regrowth.label
+		Description: checkbox-fast-regrowth.description
+		Enabled: False
+		DisplayOrder: 8
+		Prerequisites: global.fastregrowth
 	LobbyPrerequisiteDropdown@QUEUETYPE:
 		ID: queuetype
 		Label: dropdown-queuetype.label

From 7a291dc433bdbf209d0b0ea8396f5c5e5affc52d Mon Sep 17 00:00:00 2001
From: darkademic <41052878+darkademic@users.noreply.github.com>
Date: Tue, 13 Feb 2024 21:16:19 +0000
Subject: [PATCH 11/12] Reduce harvester scan radius.

---
 mods/ca/rules/vehicles.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mods/ca/rules/vehicles.yaml b/mods/ca/rules/vehicles.yaml
index aff794d139..90f90b3761 100644
--- a/mods/ca/rules/vehicles.yaml
+++ b/mods/ca/rules/vehicles.yaml
@@ -1591,8 +1591,8 @@ HARV:
 		Resources: Tiberium, BlueTiberium, Ore, Gems
 		BaleUnloadDelay: 1
 		BaleLoadDelay: 4
-		SearchFromProcRadius: 15
-		SearchFromHarvesterRadius: 8
+		SearchFromProcRadius: 8
+		SearchFromHarvesterRadius: 6
 		HarvestFacings: 8
 		EmptyCondition: no-ore
 	WithHarvesterPipsDecoration:
@@ -4592,8 +4592,8 @@ HARV.TD:
 		Resources: Tiberium, BlueTiberium, Ore, Gems
 		BaleUnloadDelay: 1
 		BaleLoadDelay: 4
-		SearchFromProcRadius: 15
-		SearchFromHarvesterRadius: 8
+		SearchFromProcRadius: 8
+		SearchFromHarvesterRadius: 6
 		HarvestFacings: 8
 		EmptyCondition: no-ore
 	WithHarvesterPipsDecoration:

From 407df87bfc74325ccab4c9cac935d041c395f07c Mon Sep 17 00:00:00 2001
From: darkademic <41052878+darkademic@users.noreply.github.com>
Date: Wed, 14 Feb 2024 07:41:15 +0000
Subject: [PATCH 12/12] Prevent recalling enemy units.

---
 OpenRA.Mods.CA/Traits/SupportPowers/RecallPower.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/OpenRA.Mods.CA/Traits/SupportPowers/RecallPower.cs b/OpenRA.Mods.CA/Traits/SupportPowers/RecallPower.cs
index 2b2fd7895d..673781c7ae 100644
--- a/OpenRA.Mods.CA/Traits/SupportPowers/RecallPower.cs
+++ b/OpenRA.Mods.CA/Traits/SupportPowers/RecallPower.cs
@@ -47,6 +47,9 @@ sealed class RecallPowerInfo : SupportPowerInfo
 		[Desc("Target types that cannot be recalled.")]
 		public readonly BitSet<TargetableType> InvalidTargetTypes = default(BitSet<TargetableType>);
 
+		[Desc("Player relationships that can be recalled.")]
+		public readonly PlayerRelationship ValidRelationships = PlayerRelationship.Ally;
+
 		[CursorReference]
 		[Desc("Cursor to display when the targeted area is blocked.")]
 		public readonly string TargetBlockedCursor = "move-blocked";
@@ -178,6 +181,9 @@ public bool IsValidTarget(Actor a)
 			if (a == null || !a.IsInWorld || a.IsDead)
 				return false;
 
+			if (!info.ValidRelationships.HasRelationship(Self.Owner.RelationshipWith(a.Owner)))
+				return false;
+
 			var targetTypes = a.GetEnabledTargetTypes();
 
 			if (!targetTypes.Overlaps(info.ValidTargetTypes))