From 63eeaae22dd9c1e27a1f7fcd38311b9f28308a6a Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 19 Feb 2022 08:58:24 -0500
Subject: [PATCH] Added target cursor

---
 core/assets/cursors/target.png             | Bin 0 -> 1290 bytes
 core/src/mindustry/core/UI.java            |   3 ++-
 core/src/mindustry/input/DesktopInput.java |   5 +++++
 core/src/mindustry/input/Placement.java    |   1 -
 4 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 core/assets/cursors/target.png

diff --git a/core/assets/cursors/target.png b/core/assets/cursors/target.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b5d8d519d2309b79edaa3c96b2a008962c8a98a
GIT binary patch
literal 1290
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS#hE_%8+hEy=Vov9lj?I_Xq
zUaznttRXv}kB@oljB74pGRwp+XYp`d*9s_MlNDJfTcahA?!~&PSw*;uIkb^$;paOa
z3~#5J-@J3zA#c<BGrp7dzTaJQfA{_SYP|`k9&*n3#PC7zf%1Xn2c{f$KQM*8p`SsX
z(T;VQj2+V|j)t(+U$uNM`^{SRwzakOyyv7n{f~dRufP6V`~3CP3C6K{yVPbb((q;I
zGo5{QexS%+LFGdRHL|W3+b#O`J2!bAV-t^!J@!pUe2S8T%wdJUrw<v_Fmm3_`~LdT
zqeuCZdwBJBDJiSmo@dI{%6Vb#{JC>^%gV}{wr<_};L8`29XofP>{U5qDCX>vmYuDA
z<Hn7OlC^8r^jx_*pZ{d4hlUS>rG8?6^6%fj9Ve+AymLq92}|U(rz#vFlF~6HrIIIj
z4}Zwre%p3~ZMnoLfeX{vH-EO!pD}ah&wiFdxySAYUBzcUefo64<(E(TmG_=Ie}4ZH
z`C~4LOdPpC^$rD<^C?HK4J#-q5!rJ4t^4=(gRb9Sy?WKi@Zkx|g|38o`s&XM#SVvl
zm>KiDG-g5a<)c5}zJ1#+BF)35?mv&|OC^_prN=?#=e{a46!_k}eaqV3-fr0_;xI>!
zwZz=qy!rL(*D+t-y?b~5?c29nZ_VN*gj<6f^q2hV^KP;zC@lP#pmlDCfX1#9%yZs<
z|NVZG&h970f+A`R4otOiuNWsfoD<$<wr2hM=S5asFXZIq_a9;V8~J#F2;&*1@6P9(
z=P!T2%bm)lw!8PR)(erxug;x6U$4S-dP2YqhB@gh)0{e(&oEV)UtqM%;ue0f_6keM
zN@FL5uk9i_&Q6I;mrQC+IC_iX9Q3^T#RVkweyItm<p~Hq(6H<;mf(vBj-KI=zx2e*
zT}<<qx(NpUcv9RTVs{{CJu`bo_!BF|?t^O{?g=RrRkMs#ep495deMnn)JB_e*{c4<
zmtGaLOnCmtc1M2V>gIzF6uOk!R@KaNX!CwjVQX!Dda=iG7vTdFjCuan)tjE)6u&p_
zy;0xe$!?23o>cQcGQ(qD22;pmpM>Xy^Qt{3?U8b0SRu<OVp?{N?a;ir$A6}6{@FV%
zZE|c>)T($cgWJJ>P9&zW{Ia>rkQ8w^v21SlcZ>W<$+_j_-vb3%vZmN(3m%DFwTWw$
z+11$>XK?o4=bn)0+Y#8fm?vn}oEM9hHy`rYC}LyD=-Pi+z}Y*bm)(Wq9QOp}_mx)_
z-%jyh+G@l1nq`9Avbon9Kc5i~iqBZS)tb*(`NTWU6}(H@Gmo>XJ^x!6@$>Ui4lemN
z26d-;8NS1R${kleTKs8-fclk{k0u@eQW-UO^|}(lTj{#}hbK5(Tzsnd<2+Mw1@=ZQ
z&aGB_yPKNAXFoQuUeT`4cVXR%Z*RnQAA7g+fUCIV)~SA16j}-`^eyf9IQ4d&Sh2Pw
ziA_<>#?Wt$I0xs67Z;Tl7(BXR5c~J1uqlV&q!<fsgTDFeetw<Sb=K;;<&hbB?-ZGH
zcI`T|ncwM;lDGCDM;`G9495&t+(^kOxF|Z)sJ^Qqs98XOJ=4`lc*5i}&y(grvhXq<
zFJXp)3HItMkHqXr@2zIC+kEbCqPWqCF1ZKBuNNJ!zP2M=Y^p#&dIi&~J=LKHgacT+
pOWV{JoZB7FYQq@1Ap%9>nEkrB^D{U4Ed!Ny44$rjF6*2UngBA_N*MqE

literal 0
HcmV?d00001

diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java
index 8340a6cff6..a8cbc7b3fe 100644
--- a/core/src/mindustry/core/UI.java
+++ b/core/src/mindustry/core/UI.java
@@ -73,7 +73,7 @@ public class UI implements ApplicationListener, Loadable{
     public ColorPicker picker;
     public LogicDialog logic;
 
-    public Cursor drillCursor, unloadCursor;
+    public Cursor drillCursor, unloadCursor, targetCursor;
 
     private @Nullable Element lastAnnouncement;
 
@@ -128,6 +128,7 @@ public class UI implements ApplicationListener, Loadable{
 
         drillCursor = Core.graphics.newCursor("drill", Fonts.cursorScale());
         unloadCursor = Core.graphics.newCursor("unload", Fonts.cursorScale());
+        targetCursor = Core.graphics.newCursor("target", Fonts.cursorScale());
     }
 
     @Override
diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java
index ade15e1911..c856a0b076 100644
--- a/core/src/mindustry/input/DesktopInput.java
+++ b/core/src/mindustry/input/DesktopInput.java
@@ -399,6 +399,10 @@ public class DesktopInput extends InputHandler{
                 cursorType = ui.drillCursor;
             }
 
+            if(commandMode && selectedUnits.any() && ((cursor.build != null && cursor.build.team != player.team()) || (selectedEnemyUnit(input.mouseWorldX(), input.mouseWorldY()) != null))){
+                cursorType = ui.targetCursor;
+            }
+
             if(getRequest(cursor.x, cursor.y) != null && mode == none){
                 cursorType = SystemCursor.hand;
             }
@@ -407,6 +411,7 @@ public class DesktopInput extends InputHandler{
                 cursorType = ui.unloadCursor;
             }
 
+
             if(cursor.build != null && cursor.interactable(player.team()) && !isPlacing() && Math.abs(Core.input.axisTap(Binding.rotate)) > 0 && Core.input.keyDown(Binding.rotateplaced) && cursor.block().rotate && cursor.block().quickRotate){
                 Call.rotateBlock(player, cursor.build, Core.input.axisTap(Binding.rotate) > 0);
             }
diff --git a/core/src/mindustry/input/Placement.java b/core/src/mindustry/input/Placement.java
index 4e6330a87a..7425deeb53 100644
--- a/core/src/mindustry/input/Placement.java
+++ b/core/src/mindustry/input/Placement.java
@@ -190,7 +190,6 @@ public class Placement{
             (plan.tile() != null && plan.tile().block() == plan.block)); //don't count the same block as inaccessible
 
         var result = plans1.clear();
-        var team = player.team();
 
         outer:
         for(int i = 0; i < plans.size;){