From 64afe4cfdec6494758be82e9dd72b5c411388ba0 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 24 Sep 2017 19:36:51 +0000 Subject: [PATCH] Display (attack|assault)move-blocked cursor outside map bounds. This makes them consistent with the regular move order. --- OpenRA.Mods.Common/Traits/AttackMove.cs | 6 ++-- mods/cnc/bits/mouse4.shp | Bin 3224 -> 7927 bytes mods/cnc/bits/mouse8.shp | Bin 2091 -> 0 bytes mods/cnc/cursors.yaml | 35 ++++++++++++++++-------- mods/d2k/bits/assaultmove.shp | Bin 3265 -> 3217 bytes mods/d2k/bits/attackmove.shp | Bin 3290 -> 3254 bytes mods/d2k/cursors.yaml | 18 +++++++++++- mods/ra/bits/attackmove.shp | Bin 3049 -> 2390 bytes mods/ra/cursors.yaml | 8 ++++++ 9 files changed, 50 insertions(+), 17 deletions(-) delete mode 100644 mods/cnc/bits/mouse8.shp mode change 100644 => 100755 mods/d2k/bits/assaultmove.shp mode change 100644 => 100755 mods/d2k/bits/attackmove.shp diff --git a/OpenRA.Mods.Common/Traits/AttackMove.cs b/OpenRA.Mods.Common/Traits/AttackMove.cs index 0f639c64aa..a31c6422ab 100644 --- a/OpenRA.Mods.Common/Traits/AttackMove.cs +++ b/OpenRA.Mods.Common/Traits/AttackMove.cs @@ -156,10 +156,8 @@ namespace OpenRA.Mods.Common.Traits public override string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi) { - if (world.Map.Contains(cell)) - return mi.Modifiers.HasModifier(Modifiers.Ctrl) ? "assaultmove" : "attackmove"; - - return "generic-blocked"; + var prefix = mi.Modifiers.HasModifier(Modifiers.Ctrl) ? "assaultmove" : "attackmove"; + return world.Map.Contains(cell) ? prefix : prefix + "-blocked"; } public override bool InputOverridesSelection(World world, int2 xy, MouseInput mi) diff --git a/mods/cnc/bits/mouse4.shp b/mods/cnc/bits/mouse4.shp index b1d9bb3792b1568ffe2be18dd657ab60a22eb68a..07824a75b50c548bb21b90903d748d3bae3e2fb4 100644 GIT binary patch literal 7927 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 LlJJ@KHIDLcwxUCU literal 3224 zcmchZO>7%Q6vyA}&Zd)Ql37$$fM{#C6{s;3mdtZ~_;ogbE^1sCwWO+mSYjQIXoFP$9L4mJiVjs?SL0yiOiE3gxfR>;kAXKU?2yZCk_V`Y z*@dH!>k*7x>4?FBbXRB3`9>0t5QrLS);) zp@Xk@-E;n30=C~_koP?y{H=z^eS16DJ1coUCq#as4z3^Rja+l*$af2OiO1{V-e>o@ zd|?s#ZoIhf)=wleZ^_%^pHjh?D4Sdem+-P7#I(sdzipa=7i2eVQ6>Z*u}pMqwG2~u zgpUyJn&>l(BjE+rV*ry+VYn&FL_m`R7C)N-_;W+}MadnN-H3({Yj}&L;Swt0@(_fN zsvZNhf%^z=3~oq2r@-n6nm(lIqiZcq9}4K2tIvP|+R*=y^e;E0mn3*tb_LDLYkG^N z>G^=JAGv<~7@!Tkk(c;NJN#)0_2kR<XjE2OzqRy)>LcEO62|3$Vm(&b6pZk z24z46<|i+8N~R)~kRf9#L%Y{y0HDYAyk}e^c(vG#Z9Ur?FiyD9stBIe{&QbF|HAY>fsY zGTTVtR>ma{T_&-4I7eH#p@;O_C;g@LgYj#u?DmlcgU4tr>d<|svD+>wgL z9)_aH+e4+H0|OKljZ%DP^0@_y#waQpcEgr4Kq+bqL&sLjV6>@d=(ASQFi-HY(kY7} zpvhTQw2j~wC3jSIBN{%e;VqViD@BtBR7u@bw07`7(Ke!=Q($!jO&`+q(Y2PQD@8;4 zT19I|4-{=9dP#zZWmnL=yr#EUnywTL>1!3O9lfb&ZSbchG*C30jcI&V<6A6^SBi%C zrlKLZsc7rG_okw)gP)LSSAMf{QtVP0$5p}=^)Xz1jG_cf1#dtc%>?0@nkxYOgU*5PY6}!krFwRjm1+WmyO42c8@Oh9;qC$SCxA68F1%}E?w#Q z#|>5J?X6uIGp?RDGINBVBr>J3Kcz~f&xusFaf9=5vryo9`KMo$-H(KSX7U0bG77k~ zGU0fI^GnkC4B>ivj&KhX2eT-LYabDgAJ0jgA;rZ(su&I*V;jMCX88}(t@T-0*nU_Q vkW7H6UbzWwI&5A(K-{Fg%}rcAKp+IxAC;--GxPOkk2!9VB!qOkSO diff --git a/mods/cnc/bits/mouse8.shp b/mods/cnc/bits/mouse8.shp deleted file mode 100644 index bff0a2b4ed75fdc1eef5ef763662137a8b3d71d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2091 zcmciDO>7%Q7zW_?bF$7t7c)^w6Ix=A)g&Cu&jyvWij~H8(o3XBZk1aBZ7R+*Qg4o( z?XCmi1S%~^R8`Lf6@&yrsJ(GoZyYyG^CJ?FIFLqxwoyS;9LkEBT_?7qR)B=?!JjR8 zJoC)^&8!CbilW1>Q@~mIAxlB+2?f=w)}^N4`?cnvUQ~kmZaAn$OHeRbhq_GFGdZ^VjPUNuIo0*q1_oExpqA6SoL`5@V*R_>*us+sG@Xnq5w&vD}w z+EmCc(9d0omFl zPo{6XvoLRC>;Z1mdRp8)iha)UDKdd0$J2O4II+@Y*mGVgdPza<%4vV z^*vA2c``N6J&wvt(&G;Ko{eEDZ@|_xcY-Pk{ai=toe?tu+BQp%^1hnu_&YUK@26G{ z;Xsv2>H~Avsr(*!-J&NRrE-SR0P>C9+Y#;K9lkK3_tZ>+sY@1mCj6M#C`;NXpsOa^ zilNdgWlqMIZ4Qy^%gPz5Y{Gj%G)y5sezG;PD=y)>RC8Hc`dcB>Bc;AjD#`WWMywpBF6VT}(uC~y zEB}^d3?SiL#@nJvq(~1VIX#)vH1A1ZS`()Uqf$AIf~v9>PXl;|1$1Qhczc1RW-1NA z9fmxM!j@{2w!3LEu84k|Pm$9}%bhfTk>Z0^zV#%3!;daLGrn`ugm0wg%Q6vMDIL;d zfzPPs_L-mCSG4pEc~AeNo~+NV0qI{CyN!BRQ2@OrXx>wRNJ`_19=`Rmw9Op>?_21U zeaYLUZ!1NqPlRt_koXzB;I;c3v2%~aXL=*G{2UXH=S?-nm%VrEe8}7XpZko_-8yy( z8SY0Y(_MKH7@Hk}3|%NOA(bnGg#N|Xi1qWMUYoc@&an?yqU2sh=?ttqMf3$fOaZLZ z*58}E!@Sg}P2FAm;Q!IyxR2Sx5G${|3Yqb8lq?gMZO#1cD6JhKOXD9c$4G94_l$qX z1W$y=)5b@vx;CBrQa%i}51~G{bgt@pC=QVd)r7Km8pXCR)X2H*kC9gh&x4wJ8&NSJ$ i>`gqk!igPNP0|mXmM{Fx7>@&MG16bZUy`fZp5QO(UY5xK diff --git a/mods/cnc/cursors.yaml b/mods/cnc/cursors.yaml index 48782591c5..ada0b6beb5 100644 --- a/mods/cnc/cursors.yaml +++ b/mods/cnc/cursors.yaml @@ -155,23 +155,41 @@ Cursors: move: Start: 0 Length: 8 - move-minimap: - Start: 8 - Length: 4 move-rough: Start: 0 Length: 8 + move-minimap: + Start: 8 + Length: 4 attackmove: Start: 12 Length: 8 attackmove-minimap: Start: 20 Length: 4 - move-blocked: + assaultmove: Start: 24 + Length: 8 + assaultmove-minimap: + Start: 32 + Length: 4 + move-blocked: + Start: 36 + Length: 1 + attackmove-blocked: + Start: 37 + Length: 1 + assaultmove-blocked: + Start: 38 Length: 1 move-blocked-minimap: - Start: 25 + Start: 39 + Length: 1 + attackmove-blocked-minimap: + Start: 39 + Length: 1 + assaultmove-blocked-minimap: + Start: 40 Length: 1 mouse5.shp: cursor guard: @@ -217,10 +235,3 @@ Cursors: Length: 8 attackoutsiderange-minimap: Start: 8 - mouse8.shp: cursor - assaultmove: - Start: 0 - Length: 8 - assaultmove-minimap: - Start: 8 - Length: 4 \ No newline at end of file diff --git a/mods/d2k/bits/assaultmove.shp b/mods/d2k/bits/assaultmove.shp old mode 100644 new mode 100755 index 19c5da599168c364b67ef6a7c7eabb9d883a8bb1..46aee2e292428983d3f309d30770fa36423dd965 GIT binary patch literal 3217 zcma);e~cVu8ONVz+H1k<-MxGCfYRR1Gkd*KwZOYjAkgB@N{W$0nAHG6sm!HPeiX>u za5FJhq3`V8wbHW%#f*)voz*#p1K~&zT=* z&Yd4C-Sgw)OY*mT`cYtG;QG#z*#S^K;Hf?UtS3oRpzP1qf${{_eLt31Z#E-wdFu{P zE|qrrQ&UrM97SNz%}x@esW1W`B|=F$%9S)8rfCv_VUa>}k7Z0GY1#}!=*y=01p-w_ z1Qi$<4}BNWtnr;DtW}{XKt&K?s~780GvfXC*V8n$bdv&JbvOJ*_Dhlj?VC_Vf&$M2 zGRQn^QN0;YNixxVHh*x5h=OKB2W(Pd>uCfdNMi8;ZnAZH)+GGCiuhTBSE9F1qj8z> zBjtfs_-59v)ji*}tisJI1hP>S3nl9V91TLm8zcrvBG!{$>#JS|%g2)>o|>|X?FX>+ zlx7tj5+!F?q|+~IN1o75^uX`_q0vJYZddRQ08{kaD`56QnD8N)BTRkDZRd;`d73ig zpxG3cIoC^lm*+Ll5{^l?uMd3Bq&fl;Z<|qsj8D1Hoo|@d*T=@jOh)deX(*Oj1j}K? zcryw^Bx6T@4zBA0$x#@DxxZKgeJTMmueF{R<2hzI5BZMPC8!YIeQQ1ci}k3W!{@^s z*7Jc>(%yma{)F!*&B!GxuMkVy`_bsiUP9%Td(D2*4VZl!3pbHYRC_|X*d`N&OK0yAt_h$jJVHkIP-*t~HgvLBr9*5yWyYzdm8%D1g66bgE)Nc_X!4 zk>w$v@=$vljBb{La9(>OFh6CJxfiU$AB9f+Ri!-qtjQG_hlL62_3D$7wBdT>Lt&ru zk;1~hz;m@~oz+=>Px-BHYeFbj^J*76n61H?16t>PoIR*@wqo^#GrbEKW(RUu%y61{ zmbgN}I4*z%o-~_8P*P#m1<)VCi^-Bo-c~?G>IDSSTk~R${rXyxfmHKvN$I~ zHV#C)!rJpAk#luHuZOvJI29^MfYV`D$xV~n!cNrVv*66%d|6rg+lpmu~ea`j^1Z}Ocl9SRK=}u z)#z`bM^xyV!XxD_Q!ngiC#%TY%_6&qW#Mkci=>Sb#f_$}kk|HCi@64oU)?bBiiNDL z9HJdEmO)0j+&f%bwE?zoBJ+&`vA`8k#BQU^AGr)jC&To6%Bk zeuh}7!XwLoZ8niQ*YfODkdqDKSQ0C6=2j5JMlMphiRm)EY$4y7SE>9)5V0m5z2SL& z0)lsmLLWzrqR2LYrK@}@vSi^0bdJNdM?-Kv^qH$0$Y5cktwU^vVh|PuQ6%;gb$UR4 zsk#~neg%WP7kT06z0`q&ja=d87z^(fo3Tz$AS~z8+J!|^7YD6U5W8^5;$Q6B%%6;> zaTL0RZgH^i2$bkg)jhZ$*H{k=L#5SosTX%=`!K-7(v??u#(1`!U*X6-D#2%zFN?6q zI#4*J+|pfYs_m=(ohn;tt0kp;?LijgQ~F|hG6#T_hF*YiVI%vz7~ zUgpx9?2%s(MPbOrqQu7nlPoV!+yb|9Z(OB7ESA$;@CZX$4=ePa-ixcv!i%KEcg`$$|+wm4c`# z9+G;FmFZo;S`!snqTMVz&*Qq(O@sl3)~rGxmUo(%%S?T=mmLDl2d6K^dWZl&lSWns zykTcJM-SPIK(w0xq8?8T1JMZkOP|SgoEO1IT;qFSBL@_DLd?pKnQB~K0+a0RZ`%Y< zi#fV1&@S2QUi-ObZ#Z#O%ih;ce4=GTxnLb^aFYs|Z+jVAg2ZFJc_i@I%Q$Pz zUcu4@gTcj|x0te6tK8N`;B~W^GS#zTE0^IVj?v&q#6H5Igp0pK4>@{0Y4Uu2FPpX8 zZB`q3-hzR;>$|y`nTJgSDhjNN6t;%Aak}&YUne%_D#nF7=h6ajn)+eR9B+KgWwAD! z!^6z*1&Q`^0^xJq!6I?Bt*e)(@6Wr>6f29#buNVl@4hNn<(~5G zyscd(6&`B+CbI4Od!7MX}Z1TsJb=oX~DfRK7N z5|@0Q4mgV~sC#2$av59-rkV=~CWj&}`IVfBI2)KNIZALL^9uy$t^1Ho(799Y%gM8VEd?&f>UhKi9-39&4)j;9;HE>74TCrJIG0JTwQo1yD>uqRDzyyJqsFqMyz$XwbT2Fb&Ii-yXbpcXP3IDVQTs7- zyD!h|c|tI$_VT9*!P2pOHX$_f{AyJHCn8i=wVu~%7aVy;YyDE2c||k(J6A*Y3+>&3 H1>64v5$pYU 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 diff --git a/mods/d2k/bits/attackmove.shp b/mods/d2k/bits/attackmove.shp old mode 100644 new mode 100755 index 2b60c8c6049cd3028b6c453090778a8e86ad4c8a..284ebc0f8a8f9f1a7bffbf9656dc5381a9ecc1ea GIT binary patch literal 3254 zcma);Yiu0V701t+JPdVg-!(B1f<0%}aY#En?k)iY3Gv-UX|+g&aXUN%%~-VIWzfvv zomLGia(CAo116~Rp*$+lMnI?tK?zYQYDFtS)$Z*2K|%r{X|iZ z`?34w?!52)-T(QY|Cx~f2+o5i5nvm@j`VmQ7ssI`i(|NSaXhkYam;lsj?-r>jwjDt z9Jh8aj<2pr-}2v|1`n%YWCs~Vw1$Vy*_lBVKHWg-U4A&u&B$7)n6l^~9xFPY^R2-LA6 zori&`I0_Nf7@rAXy^ci&M)ibqRkIgsc3|`R`+*!&QI+T14ZoHBlH@?^I@GqHYPk$# zk(zg?7Puuz3e~>!#uc!0w9U6$JQcHb60J+D zAL}w0_-$QGx{X>n3LPhNy^euA6hoP;^9csk7@a{zGa)vTIo4OWdb(09<|o`z$r)-* zVDkmT8S+VF{Soo>>}$rMXN+S#@cVxlbiac;H2e{OK}N0fVc}e8M3C=5ram3EQp`-f zSY*uAAP|@M*GTixayj?{vP-6SO*JYjsv#ip+L=cj6X_7T(^b>P+T`SMG|IF_nV$$hoz75o&}F-`~g|a2^sg ze>QZmo(-gnt(^!THKHiRN|ZZatZeN?YgzI->M+-<`pL9l;SZR(j`;G}Gu5!@Jg+Nc z2~+lyr6b(tAs&=`5q}_rT-{)hfgL)gBs@41vItJogm2)E>sY#Ey(Qg|E4jsXSy6NDl~UON6qgWLg>&ak6qwnav{#`H`@2$!U3awFBV=s z)w_h5wjo8vC}$aKmJ1cEqXMQ6V43b91>_QrlbeCdr2<2XP>Jf{WMKO# z>@rx>T$W50S)q-X4Fu5}WdTOENb!bX*5cGd{87qEfaHj zaJTx5M&)`@5I4f*!SA3)jM9~0=}K;yGBbPG(?;bjYKR?0Il73uG*6VaNEFwyE=-L) z!@nw86m6@pdHhWW>uK%hPKd$gJ!pNdqrz{TjlL=K)i6x<8?E<@kW=yFWT4Ifk53K_Bmb^5%uoo_e6mivcC9xpqZUoJMS=ObJyq!5S z$7CryoLXuJul!ckW|{hCy}%~op5yqPI*%{umK=iR&i>4C9cH)cQszYa1(1@bFP1 z`Or8z0EfF%xE|_AaXX9smB}EJP4#)?EYR_By8~2it-B0w?&c0pc3L^AS$(sU|6$3R zWsgN$WRoX=3z%W2Smm|A1c6al3gZ3(PwzMBKP$*pZp&_!Zy~g3oVC-K<-Z4Hs zX)sowu?ogI(gc`A;J4)T(k>QX+TwMdOocF@(OJ+4#4_jJ zwMv;mFS`b+`(`i3T8scclU9-g{OWYv!NI%(YK)il%+M(-u9UN#9zCkQ&N8SJ6&F^$$R+5Uq`#8| zINnR9Pfj+oF1N}zy*2epu^frN2%P<%p*E|*xjpD*y$x^u-0(IZJ8UE$8OJ_1lHpXk zKGwO1#Z0)hiXB4Yk=`^el-c4qiY;8qA_j}exg5vRAhuqI%`L!_V2@?2Uu3aVj2HP< zoq@BhaA08{$kP43S(^y>d44aOxZI@*u!-Z=KrM_y#pb5wRr*XGobxm`hqZ{&HI&^ia0wKo%f}qT^d!VQu-q6bBW;w z?-XnoY2Xpik==X%P*AP)Nb6^Y@gwA(!=+LDqP9N(=rjL)=YP*UpxeCu`N-M0;Y z!Ns6-CqO99O@j;#qDr1Im~Mho(guu z65#wWdxlYuCM%Urg0RMZqMw7iPX`D^V{fn*tv;O}920YyJrAGG4<)PcKLMh!w)u)N bcFv)fjOH(mxi<~f-@XEpUl<<_EZOmIid4FJ 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 diff --git a/mods/d2k/cursors.yaml b/mods/d2k/cursors.yaml index d3c031f5e6..d99b9122f5 100644 --- a/mods/d2k/cursors.yaml +++ b/mods/d2k/cursors.yaml @@ -306,6 +306,14 @@ Cursors: Length: 8 X: -2 Y: -2 + attackmove-blocked: + Start: 8 + X: -2 + Y: -2 + attackmove-blocked-minimap: + Start: 8 + X: -2 + Y: -2 assaultmove.shp: mouse assaultmove: Start: 0 @@ -316,4 +324,12 @@ Cursors: Start: 0 Length: 8 X: -2 - Y: -2 \ No newline at end of file + Y: -2 + assaultmove-blocked: + Start: 8 + X: -2 + Y: -2 + assaultmove-blocked-minimap: + Start: 8 + X: -2 + Y: -2 diff --git a/mods/ra/bits/attackmove.shp b/mods/ra/bits/attackmove.shp index e0dfbc1d3ff75eb0ded85077cffeafc4079fde34..9c47a75e5fae134c9fe07f625ec3f1a29fccc37d 100644 GIT binary patch literal 2390 zcmeH|U1%It6vxk**_~{cN%n4$5-ZJ2N}(cs7^qOtQZ`mWiVyt&(H11@ZMy;M?xqD% z5y_p|uOz!Gl{VVo$4l`=sp1E<0R<6slC){lq?*Q2Hmm8*xSQFcFFt7Fo!zaCwqjod z9~_u_&pG$r|2Z)8yXOw@o-XKw7y^6>FyQ&0AVfTShX5)MKRnx-?-ZNsM?{Et_J|0o zpRbR#{BK+9-}oTn*?oRcSMl|qTJsjEdH!VyBA)$`1Zq29zufYFZLMz$K*Y0W0?qxK zS3$(HALU{z9|lR(?JI;2vI(GJwva9W$Sy%9Ll@~V*MecNjCn5@8D^LdL8@ScLWF2r zb*>X)9Z4mVW}y(v!#))oF`!MNgry36cDAh5=iG1;xPFYkbjm^=kR^F@R=&Mg3togbcGfSJ#*XVclA zG29n^re{-k-{cW6_rTda;PmRyt`bX!OXjd@PZ{UyC!AKxW_!iL5Z!sH7A2}9`c zv9ozWD?fRx7YBw>0)G&tSHWLC?Uw?9fHW$W%jGIc$5F}(!7@YXC6sh-Wjs#^l#Bdj zx9i_H-B4T}T#@ATisXd>fIRqxOMWRB3^t26BT513H7vh}g5K0YA{@HI(Hkvf%}jr z=UYTU5=K!lP&k2-fzpYFJ?e%3*z->^H{;<}-IaKZuLb6eZw6MI*bZs8YTGg3Y{31x zZJWCx6LW0aS!$s{Laf%S=xz;ERx=R{r@BNQ+^HDuQq3cSw6XflV3?;sdy2{AcEMm( z>?5(BO)1-nE%l#d)$nl+2nqFn9xjm%PDm_V_Xw#vOLb1jlEVoJmpLE8!O5#gI3Lq> zJp4Z$4fg(RI%?PHsM?$kyUOWEd33;fCeMhN1`iLd=i&y0zu-}|{~LHPSL1{>dPk;^ z^Lj_bYXhXiLnFh{n0x?Wou0`6VOFz4bZ|1rx_l;Y&Cl7Diaj@P0nu~3Ymlu+bC$DM zabhv2vgla3oYy)G-a23%bF{rI2CI1Ym{`pvjYZp1-&Yk565O4dUvz9xw0n%$;=Hyd z(v`O6DwdU0jLMuf5kL-uC3~b<4g|(GqEU%iWP_@tYF4arVLL_?=1x6W zV8#AxdVB8H4Jh)_mWgm_ t8yYoPCi`ZezkYvb|LzA}{tgeM@xX|1D3KNthnC-I86%DG@^8F^-vI&b63hSq literal 3049 zcmd6pPfQ$D9LK+Jp@qW0ys4Hpdte7c!iB^!+8!(i@J~#Phs8gMh8WRos*%Z~a=BS=J6xEN*^>(?wcsM%$YD-j8 ztx-)MiRx5aRBx8+$@b{@qjD{_hr_6T1#~Q&;1CL?qXZg|&1G_cLTCK6q5!ED< z)_x3DR#^7aNark7<=hxBsf{W+Q;BRwsH&L32wkRxXHE0mXd;`-T0)%;+JKBIG99_p zCz)JsW_mhk0*qInnz{2!N1=}d99Y(1--1=}p%2SZfuqY-SgOb9xce;nSn4v`>?wvz ziyQP`^6RAytbEIc`U4fv#@gLVQ*ih(>W~vM8Wt1+7<5+Rf!4)4ur-EOi{R*! zv{oUId>O}(c%$8D^LoP#lb@=c|MCVNIe`6A4#zKKjt`B)6pmwnc~;d= znCjV;KVT{fjnokeT7oVh?f8n1L~xu^9A6t?!vFbYX1pi=qKj}rD63#XG5);%I|lPN z&amKnxfOToo>dgjp|uZt3yOm)+bx#1$l9eMSzFsAXUE>m-(sAceQk?P?q=)|MAg`JDO7aLcd!U`y$ywY zcF{oHlC2TNoiOIEK8WQ7q`IV!_AP6PL_Wa|3Q3KW_QIoT?0WlH2)9 rh#Rl1^s*Zp;Aiyc0Z{Edcwu#x8Qb+=uk#+|T