From 049ed086f9bcea2943da8ee62d3fe5c372249f07 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 10 Sep 2017 17:44:20 +0000 Subject: [PATCH] Add assault move to TS. --- mods/ts/bits/assaultmove.shp | Bin 0 -> 5728 bytes mods/ts/bits/attackmove.shp | Bin 0 -> 5728 bytes mods/ts/chrome/ingame-player.yaml | 3 ++- mods/ts/cursors.yaml | 38 ++++++++++++++++++--------- mods/ts/rules/aircraft.yaml | 10 +++---- mods/ts/rules/civilian-infantry.yaml | 12 ++++----- mods/ts/rules/civilian-vehicles.yaml | 2 +- mods/ts/rules/critters.yaml | 6 ++--- mods/ts/rules/defaults.yaml | 18 +++++++++++++ mods/ts/rules/gdi-infantry.yaml | 6 ++--- mods/ts/rules/gdi-vehicles.yaml | 12 ++++----- mods/ts/rules/nod-infantry.yaml | 6 ++--- mods/ts/rules/nod-vehicles.yaml | 12 ++++----- mods/ts/rules/shared-infantry.yaml | 2 +- 14 files changed, 80 insertions(+), 47 deletions(-) create mode 100644 mods/ts/bits/assaultmove.shp create mode 100644 mods/ts/bits/attackmove.shp diff --git a/mods/ts/bits/assaultmove.shp b/mods/ts/bits/assaultmove.shp new file mode 100644 index 0000000000000000000000000000000000000000..c2f742760898a8ebb0a65e95e1be8bc614bd89a6 GIT binary patch literal 5728 zcmds5*>T)P5N#~5#4cBBSqCNgkdN|@tNa7bJp({=2pfVv9fCt}2nxd?I0Sz>1bsRL zzwQA*aEUF^D%m9p62W25(LL`?_jH5E(@*q__Vj>W(o-slpIY88R-3Hjz?dHtVH$bUT{|NVsgt;iqK2LI;Ich3kI&^~BSdtg#|MYTR?s-36m zB~j^=Qnc!0Ot!Hp#-3J?I4Zv+ZaHUFYUn7IyAG1}%}Y0r&lLvBp?w`RaUwi*BE zw9Wtle?fkwwE;+szxHj*mSU@b(0ilJtBgN1av$yR4%z?$#y=VuVrc8ph$`cc$*Y7V zsWvzS;5*~*4V|?ut-R~f6Pq@2JDS-sf{+{Z;Vz3*6y6rm&OeEJI0?eVEQ~xBPe71O~zl- z8l6Cc#q0hg{-(|6pYgY_xW0)$pMP(CKK~hikU!ub1N8Fae260nOwT}q#d4T@k_ce* z1)tA=jb1acvH>i=z%qScXB^0=ykmDjTr0E#G*4`DaEQ;yHah>Q8++W##`G`^Opmmz zyq_E+&523b0dEoWH8c*y*t{b<(Zg5>Ju!t01%r{|F;DCrDS)Q{B!Tb^o@RbB^3>e& zlYh_CwV#Y}YNY7!j|qeOfv`k{rAN#&llGWN>qb!r;+95zBjm}dOhERkg4dl0?B@isB{((%fsRdg zqj&vqO(I9F;n*@06PN73nM()X$Tsk`JA}nmCzf~E;N9XQR>uAGK}q|c__}pJ0kJVZm^>}#2M|ks z(Bc}gxFK*w&0VZcv`$pd8LE*9&L5Z@&eAykT?pWha^%}a9cjy~-0WWV7)TL#k3-!@L&SaL;bG?CJkj|l z!ovOZhXJJpouUg0MMl?k zC_Pj_B04L2&=;nnC!%*=boK$&W|xcp&`Z&YjEa*mjP%^K@li#oJ8@Z8$YNX)`57`W zi~b6^av38E0j;H@;uNevlARME+#en(ZrMub3Rip?t>=pbc@tkG9_9Z!FWD(Cm&yxq zBJMbojx{>ip=LActZSUXbqlcJT$(d$eEskpN>(KBQXEN^2phR-l_d>|7dDXdl7vm6 zaNY2nfGweR#ds-^uys0zJgAteX!Etx3dRiJJX-i7-d=RX7jZ48@w&P66IBf z#UM+r$@)@9T}qUi4$`iHW}L(>9qG$v&F8^J`PXYJV@ScC##ov)X@9QgO2yoht0p&yjORacct;IiRenVSFPq>c(wY9 UoA{5H$heOn=01&Ikm4cw2ey}^tN;K2 literal 0 HcmV?d00001 diff --git a/mods/ts/bits/attackmove.shp b/mods/ts/bits/attackmove.shp new file mode 100644 index 0000000000000000000000000000000000000000..a0f5dbdf12f553a5f44327615393c13cfeda6f3a GIT binary patch literal 5728 zcmds5U5?u}5FXj0Wv{b|W0};C?f#%I1w=r*Gz1BfjO`J8ggo{LJwlI=WAq3;LLYmC zJmv`fhLp5kM@G^hEwbSzGBv{)lHbQ6IU*`4BSp9Lg7&nbDRBwxGoH|>{4E-dwin~_ zKWF3e-{<4<>SkR2_i|kR=5}2E?&Y}r*A>f`n6G>?-*>NxA_{3i81PwnACAj^-i*uN zT#>)MBLC}(d@jfR|8hnC+ZFjASLE-kd`)xwotGaJ0Ry^?!-#HyiC-ED!c#~=UXs5j zn&!qBn(UJ#l`EMh$(|;VxuK=W%UrV*Gxy=F zfN)`o%;X9A5jtRxwv&K+n(h;tqUmHG)2u8=loiclGy%chdXth&Hz9d1Xnk7mNbbUu ze5&Ej;R9Xe1dloS+ySKMs3^FLg)zF!yMCrck(ZjssZl9uik2R1F=j)zXqodYylzVO z2F{lI#M~QmPm}NA)!f~Yw@ng&z{S?cySu|wfVpo-06Q6~6qceQpV8i&B;9f)k+G`` z_&2)4Uo;MXk!Kmkzh19_Kc0#vS*C@iug4u7Gu zywYt@RpK<~M(o4V^~S~pE2G%bsYYYuea#D1A}N%q zLO{GExeDEDxRRGz9?U+8K*T`HB#MT>NY9B$T>ySS%nm(v#7H+IIncvcSbCB)c2F=F zX>!REM@Jfirx-{k+owF8#YxZ8>Vr7>_dN03JD$3Is;B5jX!=r=kamB!{ODDhnYr*&Iq&YIkfQxR+z$wL}a(V4mhUJ-%3ZI z+>+1qp$|)+ueP+QK$4IYoHNvkY%3r>Fytv2N*p2f?7ALd7;aC}r=DH^0XG~_UmrifrsK!mADA4z zrSbmfj;q&h=UXIULJMZ)sd_wOAjQUexz&9&L_9|xUO66aQo8v@Sa_cC@WSzceCGLw z!gGv+ZwdcbL^rJ{xrml-@I_;O#4G2%1w==h^VJB6j@MSEs6^YgqAE<)l6RK$KvxY( zkAU_(={#1(lr1Oy&>U^ji5nGP!th?QYF-K>Y~G2(+HcDuudRHB8(0CokGt|TL3WR$ z-70*(f_YUb+yw~dM_C}tZLD&FBYrB1k`EHxoA@9pO^c5M+|{f#r9H)C8$_&_S%rXt z1M18oaDDX_oVV-~?#SM(@%5u@k+OQ|icfxfOT-vCYqc(Q?FPvAk{Xjj;yP!W3R6Pv ziuN`|!qn*o^2!L8zVd|ycWS_96~N5quYA!%{tBqY@c96+w>Ep-0ykv-mmE!y8;wwU zLAv|K)2fqdQRV;qlqXxk*N5Cz_?gR-bZ_`X)|Fn?w;Hv>SE5V1TCG$KA9cN>U0qYU z0?V{prIZUu#6^GL#g)O1Qv9(U0HcWQ@RcsIqwU88#fTlt*v>YGT>*3ACl#0<|Duf9 zL2T{PQ%bf!Zus$Waw}^`NVPx94q$(l9VYQvcE}<>YWHwB95AtmL-Wua_y>>X@W564 S!^6s0M-a2_fFDRvi2ecf-P{HM literal 0 HcmV?d00001 diff --git a/mods/ts/chrome/ingame-player.yaml b/mods/ts/chrome/ingame-player.yaml index a5da73a7c5..37c2743cd8 100644 --- a/mods/ts/chrome/ingame-player.yaml +++ b/mods/ts/chrome/ingame-player.yaml @@ -43,8 +43,9 @@ Container@PLAYER_WIDGETS: Key: AttackMove DisableKeySound: true TooltipText: Attack Move - TooltipDesc: Selected units will move to the desired location\nand attack any enemies they encounter en route.\n\nLeft-click icon then right-click on target location. + TooltipDesc: Selected units will move to the desired location\nand attack any enemies they encounter en route.\n\nHold {(Ctrl)} while targeting to order an Assault Move\nthat attacks any units or structures encountered en route.\n\nLeft-click icon then right-click on target location. TooltipContainer: TOOLTIP_CONTAINER + TooltipTemplate: BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP Children: Image@ICON: Logic: AddFactionSuffixLogic diff --git a/mods/ts/cursors.yaml b/mods/ts/cursors.yaml index 6e0e0900d9..bc0310c307 100644 --- a/mods/ts/cursors.yaml +++ b/mods/ts/cursors.yaml @@ -102,18 +102,6 @@ Cursors: attackoutsiderange-minimap: Start: 63 Length: 5 - attackmove: - Start: 58 - Length: 5 - attackmove-minimap: - Start: 68 - Length: 5 - assaultmove: - Start: 58 - Length: 5 - assaultmove-minimap: - Start: 68 - Length: 5 harvest: Start: 53 Length: 5 @@ -230,3 +218,29 @@ Cursors: Start: 385 joystick-tl-blocked: Start: 386 + attackmove.shp: cursor + attackmove: + Start: 0 + Length: 10 + attackmove-blocked: + Start: 10 + Length: 1 + attackmove-minimap: + Start: 11 + Length: 10 + attackmove-minimap-blocked: + Start: 21 + Length: 1 + assaultmove.shp: cursor + assaultmove: + Start: 0 + Length: 10 + assaultmove-blocked: + Start: 10 + Length: 1 + assaultmove-minimap: + Start: 11 + Length: 10 + assaultmove-minimap-blocked: + Start: 21 + Length: 1 \ No newline at end of file diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml index a42f9b270c..7f528bbe0d 100644 --- a/mods/ts/rules/aircraft.yaml +++ b/mods/ts/rules/aircraft.yaml @@ -1,6 +1,6 @@ DPOD: Inherits: ^Helicopter - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 10 Tooltip: @@ -65,7 +65,7 @@ DSHP: ORCA: Inherits: ^Helicopter Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 1000 Tooltip: @@ -107,7 +107,7 @@ ORCA: ORCAB: Inherits: ^Aircraft Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 1600 Tooltip: @@ -230,7 +230,7 @@ TRNSPORT: SCRIN: Inherits: ^Aircraft Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 1500 Tooltip: @@ -280,7 +280,7 @@ SCRIN: APACHE: Inherits: ^Helicopter Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 1000 Tooltip: diff --git a/mods/ts/rules/civilian-infantry.yaml b/mods/ts/rules/civilian-infantry.yaml index 0e5d1bd473..60ddedd390 100644 --- a/mods/ts/rules/civilian-infantry.yaml +++ b/mods/ts/rules/civilian-infantry.yaml @@ -29,7 +29,7 @@ UMAGON: Inherits: ^Soldier Inherits@2: ^HealsOnTiberium Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 400 Tooltip: @@ -86,7 +86,7 @@ MUTANT: Inherits: ^Soldier Inherits@2: ^HealsOnTiberium Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 100 Tooltip: @@ -112,7 +112,7 @@ MWMN: Inherits: ^Soldier Inherits@2: ^HealsOnTiberium Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 100 Tooltip: @@ -138,7 +138,7 @@ MUTANT3: Inherits: ^Soldier Inherits@2: ^HealsOnTiberium Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 100 Tooltip: @@ -214,7 +214,7 @@ SLAV: CIV1: Inherits: ^CivilianInfantry - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove WithInfantryBody: DefaultAttackSequence: attack Armament: @@ -227,7 +227,7 @@ CIV2: CIV3: Inherits: ^CivilianInfantry - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove WithInfantryBody: DefaultAttackSequence: attack Armament: diff --git a/mods/ts/rules/civilian-vehicles.yaml b/mods/ts/rules/civilian-vehicles.yaml index 3fb1cd1bf5..405d3a9b08 100644 --- a/mods/ts/rules/civilian-vehicles.yaml +++ b/mods/ts/rules/civilian-vehicles.yaml @@ -2,7 +2,7 @@ Inherits: ^Tank Inherits@VOXELS: ^VoxelActor Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetAll + Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Valued: Cost: 1700 Tooltip: diff --git a/mods/ts/rules/critters.yaml b/mods/ts/rules/critters.yaml index f8f7296e78..5ba05582bb 100644 --- a/mods/ts/rules/critters.yaml +++ b/mods/ts/rules/critters.yaml @@ -2,7 +2,7 @@ DOGGIE: Inherits@1: ^Infantry Inherits@2: ^RegularInfantryDeath Inherits@3: ^HealsOnTiberium - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Tooltip: Name: Tiberian Fiend Health: @@ -54,7 +54,7 @@ VISC_SML: VISC_LRG: Inherits: ^Visceroid Inherits@CRATESTATS: ^CrateStatModifiers - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Tooltip: Name: Adult Visceroid Health: @@ -84,7 +84,7 @@ VISC_LRG: JFISH: Inherits: ^Visceroid Inherits@CRATESTATS: ^CrateStatModifiers - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Tooltip: Name: Tiberium Floater Health: diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 12efc81211..093c88197b 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -136,6 +136,15 @@ ValidTargets: Infantry, Vehicle, Creep, Water, Building, Defense InvalidTargets: NoAutoTarget +^AutoTargetGroundAssaultMove: + Inherits: ^AutoTargetGround + AutoTargetPriority@DEFAULT: + RequiresCondition: !stance-attackanything && !assault-move + AutoTargetPriority@ATTACKANYTHING: + RequiresCondition: stance-attackanything || assault-move + AttackMove: + AssaultMoveScanCondition: assault-move + ^AutoTargetAir: AutoTarget: AutoTargetPriority@DEFAULT: @@ -154,6 +163,15 @@ ValidTargets: Infantry, Vehicle, Creep, Water, Air, Building, Defense InvalidTargets: NoAutoTarget +^AutoTargetAllAssaultMove: + Inherits: ^AutoTargetAll + AutoTargetPriority@DEFAULT: + RequiresCondition: !stance-attackanything && !assault-move + AutoTargetPriority@ATTACKANYTHING: + RequiresCondition: stance-attackanything || assault-move + AttackMove: + AssaultMoveScanCondition: assault-move + ^2x1Shape: HitShape: Type: Rectangle diff --git a/mods/ts/rules/gdi-infantry.yaml b/mods/ts/rules/gdi-infantry.yaml index 7e9112e2a0..01685acbfd 100644 --- a/mods/ts/rules/gdi-infantry.yaml +++ b/mods/ts/rules/gdi-infantry.yaml @@ -1,7 +1,7 @@ E2: Inherits: ^Soldier Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Infantry BuildPaletteOrder: 20 @@ -72,7 +72,7 @@ MEDIC: JUMPJET: Inherits: ^Soldier Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 600 Tooltip: @@ -193,7 +193,7 @@ GHOST: Inherits: ^Soldier Inherits@EXPERIENCE: ^GainsExperience Inherits@2: ^HealsOnTiberium - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 1750 Tooltip: diff --git a/mods/ts/rules/gdi-vehicles.yaml b/mods/ts/rules/gdi-vehicles.yaml index 4bfd4b10aa..dffbf999f6 100644 --- a/mods/ts/rules/gdi-vehicles.yaml +++ b/mods/ts/rules/gdi-vehicles.yaml @@ -51,7 +51,7 @@ HVR: Inherits: ^Vehicle Inherits@VOXELS: ^VoxelActor Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetAll + Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Valued: Cost: 900 Tooltip: @@ -106,7 +106,7 @@ HVR: SMECH: Inherits: ^Vehicle Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 500 Tooltip: @@ -149,7 +149,7 @@ SMECH: MMCH: Inherits: ^Tank Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 800 Tooltip: @@ -208,7 +208,7 @@ HMEC: Inherits: ^Tank Inherits@VOXELS: ^VoxelActor Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetAll + Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Valued: Cost: 3000 Tooltip: @@ -252,7 +252,7 @@ SONIC: Inherits: ^Tank Inherits@VOXELS: ^VoxelActor Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 1300 Tooltip: @@ -295,7 +295,7 @@ JUGG: Inherits: ^Tank Inherits@SPRITES: ^SpriteActor Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 950 Tooltip: diff --git a/mods/ts/rules/nod-infantry.yaml b/mods/ts/rules/nod-infantry.yaml index 57bb632cef..4feeaafe24 100644 --- a/mods/ts/rules/nod-infantry.yaml +++ b/mods/ts/rules/nod-infantry.yaml @@ -1,7 +1,7 @@ E3: Inherits: ^Soldier Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetAll + Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Buildable: Queue: Infantry BuildPaletteOrder: 30 @@ -34,7 +34,7 @@ E3: CYBORG: Inherits: ^Cyborg Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Armor: Type: Light Valued: @@ -69,7 +69,7 @@ CYBORG: CYC2: Inherits: ^Cyborg Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Armor: Type: Heavy Valued: diff --git a/mods/ts/rules/nod-vehicles.yaml b/mods/ts/rules/nod-vehicles.yaml index dddb0c1a6e..d883bfd37a 100644 --- a/mods/ts/rules/nod-vehicles.yaml +++ b/mods/ts/rules/nod-vehicles.yaml @@ -2,7 +2,7 @@ BGGY: Inherits: ^Vehicle Inherits@VOXELS: ^VoxelActor Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 500 Tooltip: @@ -39,7 +39,7 @@ BIKE: Inherits: ^Vehicle Inherits@VOXELS: ^VoxelActor Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetAll + Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Valued: Cost: 600 Tooltip: @@ -79,7 +79,7 @@ TTNK: Inherits: ^Tank Inherits@VOXELS: ^VoxelActor Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 800 Tooltip: @@ -190,7 +190,7 @@ ART2: Inherits: ^Tank Inherits@VOXELS: ^VoxelActor Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 975 Tooltip: @@ -390,7 +390,7 @@ SUBTANK: Inherits: ^Tank Inherits@VOXELS: ^VoxelActor Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 750 Tooltip: @@ -434,7 +434,7 @@ STNK: Inherits: ^Tank Inherits@VOXELS: ^VoxelActor Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetAll + Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Valued: Cost: 1100 Tooltip: diff --git a/mods/ts/rules/shared-infantry.yaml b/mods/ts/rules/shared-infantry.yaml index da3fb7b9e5..fcb0130445 100644 --- a/mods/ts/rules/shared-infantry.yaml +++ b/mods/ts/rules/shared-infantry.yaml @@ -1,7 +1,7 @@ E1: Inherits: ^Soldier Inherits@EXPERIENCE: ^GainsExperience - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Infantry BuildPaletteOrder: 10