From 3575e820782d231c511ba8192425ecbb9c1dd495 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 9 Sep 2017 21:01:55 +0000 Subject: [PATCH] Add assault move to D2K. --- mods/d2k/bits/assaultmove.shp | Bin 0 -> 3265 bytes mods/d2k/bits/attackmove.shp | Bin 0 -> 3290 bytes mods/d2k/chrome/ingame-player.yaml | 3 ++- mods/d2k/cursors.yaml | 42 +++++++++++++++-------------- mods/d2k/rules/defaults.yaml | 18 +++++++++++++ mods/d2k/rules/infantry.yaml | 10 +++---- mods/d2k/rules/vehicles.yaml | 18 ++++++------- 7 files changed, 56 insertions(+), 35 deletions(-) create mode 100644 mods/d2k/bits/assaultmove.shp create mode 100644 mods/d2k/bits/attackmove.shp diff --git a/mods/d2k/bits/assaultmove.shp b/mods/d2k/bits/assaultmove.shp new file mode 100644 index 0000000000000000000000000000000000000000..19c5da599168c364b67ef6a7c7eabb9d883a8bb1 GIT binary patch literal 3265 zcmX|De~c7Y9sj<8JD>;0+Y=gS%gvjmS87Uij$n;~+-wXrF|nO9u@$ehd%;>-TeCMX z6Ju+7Z+7pB<%BxP&aXdeNF#rMG!SC#Kh>y-?%pn5k(v@DF^wiBmKH?R_MeTP@9d?Q z+|JCK_uhQp=g0T^T}}L_=#Jw0IMFQM{8#j^;fntC=F0x{=wSc4c6I;y%9{T5zM=m0 zH*1S+KKbe0MihEM?=GU=N(!#5r``$*!Yu0zP->5~cM)#ntiF3R&PBFj};^wv;dTk~0-r%}Y8YIpey zo{sQKG=U*87X_XW&Ljeg!ZgKDBug|Q6{d*Ru&Bpr3_wQkBFBEBw;I7?9sS-Ov6a1X z@gbpOEEb{f7jtj|=Z~(cr%BURh|YJ;gvAnH#$g((v)IKCqo}6H3bRCB7yGNGI^!tu zV;$Sdv9u@6#cRU)to2jvlTrG1d&sE!f#_ z$@K*wcg|&5(rmh;i_Z!y5bkJA$#QK>=G`}qi?15JJBj}CKSO`55E*eX&gm@S2UPLO!P=Gt+WOA1wnusx1=+?0QYwcjH{p0Fx1mV62DoaEKAGc#=uCv9Lcng0%2(mQxlwwAvCzY}W+HVQ% zjSo8`%CuZKR?E|L6|1?38{ekvqBSn02qT>MQ+r9oW(xAwb)~j{Ke;K<^VSHXFjrakZJ3x za!&Be(%+@2Mk-qS;?s;WxQt5k?xo6Wwlc=*aX_V$wVPU$PKLgRNV7V$Z&h^A`hg*( z_6#4WiuQJK;jGblMl78(I^PwQH+tiY_xir}L(gMVK&XiM(nx_h1IilqqV@m}FbX;T z3$;Vpt$h^snOKHisfKqrjce*CDDs0GIiT1bnxBu5&xELQ(m{%ghlX%!^WK{7Jb%3t5?Y+PS4B?47bAAE5_k{y^*Gg!%&3<_O8> z&y`Li3s2bloKd7X*A>S!PNJrkU+2=)0w=iPf{ri_Dto7Y#~IkIQ#8Hmv0!gtuP6Q;ZaTwIAd>f!Azfv-iG2#84C$7BX&2( z8YT%3LFgAADFzy8+HBhUF((aU(OyY%bdCuT_Tym;?bpl(NXkfZDAI%#Fg31P1ef#+ zOR+s(*4Q<^EaRDQCzubKs+yEI1zR)-66I;7I_t>(O66V@j9+0>&)zh1P<7}WazT+k zxgwGCjVj#Go#(Fws%#&{HFr#T&Mk+DN9R$wvg)JG&*t(Zj=a*4JjbU)jYDOr92cj> zcJ~nO^U4}EERMBLicn;(sr}N=tuu@KB&MGN@@X8{qcn(csdRzZLsw1HTYLw1~=LZFBc!;GH2A+Bs>3okIl|^=v7A@cvyyX`H zfGzBM`ZZKA!${bGg0|u%*=qWJS_kzbIk$HRsa%uKI)o4dHBQ%*Ds9Aovk$i58ib_B zzv>A6)qb-*L9k^Ujg1vvWEy^5D%y9N@Li`!$nUhrJ=8dJqSbPq+3P>NL>w+^NnBoc5!o z*pTJL(*{$3=fVm%J}_qaAlMijj1{lY&>-(z8DTacYqmn@!sfW5 zRE>?%!}yrrC(7aMLQpf^MD96GQ|LhK%W}!SMM@{*YiU78^j=lbDOnKXD(*GBDa_Qdj%{8-ncO%dIK>ibZMBVQj&R!aMqcX;k-K{*%#u-?;p-fg}cdfSLv>bky4f%wdgphN+IUkEjFep0cYDp#|ax zmb=-V+G|Y_&Oz1@FwyL{vq)F~B0!E|sd;E>xn&Z_HbA>(*0U75Xf#hq0odEAG`OL~ zWKs7556Bnj+ZIiLE10^q6%B-^uH!jlErAG>jUz>8Mg1m~84_Q8*+ZX@reoj&>-_5L zn8#WXsNO|OTQ&7>yUz$ltGE32oA>{F}OJyReBgoe!5u(phWBKt118{g9p)cjFYf8kIY%%G&RiwMSdTmfG1u rA)+XI8Gz~7s=XklPdK}#7Zw+AuElNQ?YE3~FB!EluHBstD`x)>V3Syp literal 0 HcmV?d00001 diff --git a/mods/d2k/bits/attackmove.shp b/mods/d2k/bits/attackmove.shp new file mode 100644 index 0000000000000000000000000000000000000000..2b60c8c6049cd3028b6c453090778a8e86ad4c8a GIT binary patch literal 3290 zcmYjTU5wmT6+YL==BJx%?yQn3DarbJmTijMf@c(pP(s!-sGvcj^&-G5`G=+(eXy@nAQOTudN2`UaYP^?4zQ#(tN`HU=2X))MLv14Ip(hRbUztvsg zPlP&il`dmKw6i!A!kvLXSsDbG%4C6e==s4W5}h&8v;!N6jPoQ86qshW1^vz$ca*cE zcel_swu>~1avNO1{e!2PfnReJ+>6}hG~dF@)G7zIDLtGNrCHWcWHrlvPc=%%rKy%( zCBCa|N4b^`rP;eCtWQ`!))5)vtGe19HJVWzdS2lkY#oeJA}82y?_Ck389SCV%jJ1_ zK$$b!7?-7_S}o7}wVF54n-|z1yorXA#m1EU(aNjF8!s4xj}ZO&UxxYy-)dp7H}^B{ z?WWb8l*W9|oEx=Ghdr>f9!^)Q%noA(8dheh8AS|RtF^z z`J(K-Y%^1J#fNn65L(dRt{%YGy(gs_6o_&@ZpQ9JS9?zhJVc9e%xoydY|PClWsP)S z6FMx7x#P;TX!S3maJRzx%nNB)^+v(^dAv!v9Z^=i3M@>1B2zUFc^nMpnwU4au~;9 z_{MtDRiIMF2|4E7JE;}NQH;5q3Wir_o%>0uVFcIeW;4vP&T%5E<=4RJ2(a3d2DYah z6Z!!{5Dp?o`(&j;IIqYjSq1_cb5uLbX@Odlge{ZLS_mAe02JR*R+u10bPe;A ze5$4EeTU*r#F0dO(cA=}Y5z^fRIyzG2oK z;R%L;*~kMOLESk70mKPbs%zjY)e4UVc0-*2NmxP}$d5<7FJ{PTLe!^Wjx=Y>JwPSI zX<5p7tud`Qk#T6U9E7wQ2R)TzjM-)_2)uvj1S=tZ3Qpzf@+z*=a^M&mAOcFiD>rWUxv4Ob0?(5u`v_gns8J5NG0 z579=DN7jcN-&>GDcW}hxegepM&l!WQcpJn0Zzj5Y!)Q!GEMSLcIXU2-gIzg2LqZ1I z^Lv#!oUoX&$YEGbeV?Zg?icSR-~eh`K~SqXhw&Jsw&B3Z;c;VCDEX6q(B@8-182Cym5D%Iag&gUz)p?LfX zhlbA1;E3we`4$U{*2;q&mI6?h02B#n{7K0rq4%dv%#&yiWLQWRggcg_~1nyd1=a=k? zorCW@*zytN%-j%qsKS}ni0+kR|3f|IQW&>{uo9W}KTMsbcIUTkTlaj4#s z2jzs!bC$H|Bo>GZEe8Zd;oLebt%4ax9tSEkiA8eM+#R$Pia^cimW5QF$#))wTd^w9 zHKhtWFyS78RJbM~74pAYf-_a;)$TMwtadgvl`E7v`E{Y_EG`NZ>ntM$W8MZ8Ii`Hv zQ7!P(t6yi-^K4D(jJ1qNbj;FLW`~MO5%?)Q)49cPES%sjF&f%Xf*f-?WH>BVTGguWE7ScVv!bgm$x_~G(Xe@Cmc$pH z4$(dY!4&ww&Zzzh>?l9lhg;yjZtCBxJSMoM$|IIrS>~)grL0D&QB98D*Zg8Dv zONVgr6Rs*e-69aUiUIoaky|B~!Gs(Vt*opSfjo$Q^&y?T4a>#rGaT{0R|T+#d6*Dd@TtcMxG literal 0 HcmV?d00001 diff --git a/mods/d2k/chrome/ingame-player.yaml b/mods/d2k/chrome/ingame-player.yaml index ccdacd48b2..a5cbb959a2 100644 --- a/mods/d2k/chrome/ingame-player.yaml +++ b/mods/d2k/chrome/ingame-player.yaml @@ -39,8 +39,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: X: 4 diff --git a/mods/d2k/cursors.yaml b/mods/d2k/cursors.yaml index eda5cde70c..d3c031f5e6 100644 --- a/mods/d2k/cursors.yaml +++ b/mods/d2k/cursors.yaml @@ -128,26 +128,6 @@ Cursors: Length: 8 X: 24 Y: 24 - attackmove: - Start: 16 - Length: 8 - X: 24 - Y: 24 - attackmove-minimap: - Start: 16 - Length: 8 - X: 24 - Y: 24 - assaultmove: - Start: 16 - Length: 8 - X: 24 - Y: 24 - assaultmove-minimap: - Start: 16 - Length: 8 - X: 24 - Y: 24 harvest: Start: 16 Length: 8 @@ -315,3 +295,25 @@ Cursors: Length: 3 X: 12 Y: 12 + attackmove.shp: mouse + attackmove: + Start: 0 + Length: 8 + X: -2 + Y: -2 + attackmove-minimap: + Start: 0 + Length: 8 + X: -2 + Y: -2 + assaultmove.shp: mouse + assaultmove: + Start: 0 + Length: 8 + X: -2 + Y: -2 + assaultmove-minimap: + Start: 0 + Length: 8 + X: -2 + Y: -2 \ No newline at end of file diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index de50abb5e2..a49620f1d9 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -132,6 +132,15 @@ ValidTargets: Infantry, Vehicle, Creep, Water, Structure, Defense InvalidTargets: NoAutoTarget +^AutoTargetGroundAssaultMove: + Inherits: ^AutoTargetGround + AutoTargetPriority@DEFAULT: + RequiresCondition: !stance-attackanything && !assault-move + AutoTargetPriority@ATTACKANYTHING: + RequiresCondition: stance-attackanything || assault-move + AttackMove: + AssaultMoveScanCondition: assault-move + ^AutoTargetAll: AutoTarget: AttackAnythingCondition: stance-attackanything @@ -144,6 +153,15 @@ ValidTargets: Infantry, Vehicle, Creep, Water, Air, Structure, Defense InvalidTargets: NoAutoTarget +^AutoTargetAllAssaultMove: + Inherits: ^AutoTargetAll + AutoTargetPriority@DEFAULT: + RequiresCondition: !stance-attackanything && !assault-move + AutoTargetPriority@ATTACKANYTHING: + RequiresCondition: stance-attackanything || assault-move + AttackMove: + AssaultMoveScanCondition: assault-move + ^Vehicle: Inherits@1: ^ExistsInWorld Inherits@2: ^GainsExperience diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml index 54429e29e0..b83312be0b 100644 --- a/mods/d2k/rules/infantry.yaml +++ b/mods/d2k/rules/infantry.yaml @@ -1,6 +1,6 @@ light_inf: Inherits: ^Infantry - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Infantry BuildPaletteOrder: 10 @@ -50,7 +50,7 @@ engineer: trooper: Inherits: ^Infantry - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Infantry BuildPaletteOrder: 20 @@ -124,7 +124,7 @@ thumper: fremen: Inherits: ^Infantry - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Tooltip: Name: Fremen Buildable: @@ -166,7 +166,7 @@ fremen: grenadier: Inherits: ^Infantry - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Infantry BuildPaletteOrder: 80 @@ -197,7 +197,7 @@ grenadier: sardaukar: Inherits: ^Infantry - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Infantry BuildPaletteOrder: 80 diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index 0fe8810f15..863cf45404 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -100,7 +100,7 @@ harvester: trike: Inherits: ^Vehicle - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle BuildPaletteOrder: 10 @@ -140,7 +140,7 @@ trike: quad: Inherits: ^Vehicle - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle Prerequisites: upgrade.light, ~techlevel.medium @@ -175,7 +175,7 @@ quad: siege_tank: Inherits: ^Tank - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Armor Prerequisites: upgrade.heavy, ~techlevel.medium @@ -222,7 +222,7 @@ siege_tank: missile_tank: Inherits: ^Tank - Inherits@AUTOTARGET: ^AutoTargetAll + Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Tooltip: Name: Missile Tank Buildable: @@ -261,7 +261,7 @@ missile_tank: sonic_tank: Inherits: ^Vehicle - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Armor BuildPaletteOrder: 100 @@ -296,7 +296,7 @@ sonic_tank: devastator: Inherits: ^Tank - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Armor BuildPaletteOrder: 100 @@ -341,7 +341,7 @@ devastator: raider: Inherits: ^Vehicle - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle BuildPaletteOrder: 10 @@ -405,7 +405,7 @@ stealth_raider: deviator: Inherits: ^Tank - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 1000 Tooltip: @@ -442,7 +442,7 @@ deviator: ^combat_tank: Inherits: ^Tank - Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Armor BuildPaletteOrder: 40