From 989249e7dc412d6101c34490405763d4c9571ee4 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 20 Feb 2022 11:14:45 -0500
Subject: [PATCH] Misc small fixes

---
 core/assets-raw/sprites/units/avert.png    | Bin 0 -> 1913 bytes
 core/src/mindustry/ai/RtsAI.java           |   3 ++-
 core/src/mindustry/content/Blocks.java     |   5 ++---
 core/src/mindustry/content/UnitTypes.java  |  23 ++++++++++++++++++++-
 core/src/mindustry/input/DesktopInput.java |   2 +-
 core/src/mindustry/input/InputHandler.java |   2 +-
 6 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 core/assets-raw/sprites/units/avert.png

diff --git a/core/assets-raw/sprites/units/avert.png b/core/assets-raw/sprites/units/avert.png
new file mode 100644
index 0000000000000000000000000000000000000000..1dbf38989e58ab3c892ddaf83c70c3e74c518b9d
GIT binary patch
literal 1913
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

literal 0
HcmV?d00001

diff --git a/core/src/mindustry/ai/RtsAI.java b/core/src/mindustry/ai/RtsAI.java
index 0d7fdcacbe..675cbd4daa 100644
--- a/core/src/mindustry/ai/RtsAI.java
+++ b/core/src/mindustry/ai/RtsAI.java
@@ -27,7 +27,8 @@ public class RtsAI{
     static final IntSet assignedTargets = new IntSet();
     static final float squadRadius = 120f;
     static final int timeUpdate = 0, timerSpawn = 1;
-    static final float minWeight = 0.9f;
+    //TODO make configurable
+    static final float minWeight = 1.1f;
 
     //in order of priority??
     static final BlockFlag[] flags = {BlockFlag.generator, BlockFlag.factory, BlockFlag.core, BlockFlag.battery};
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 94c3358fb3..13045d34e1 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -3733,14 +3733,13 @@ public class Blocks{
         }};
 
         smallDeconstructor = new PayloadDeconstructor("small-deconstructor"){{
-            requirements(Category.units, with(Items.beryllium, 100, Items.silicon, 100, Items.oxide, 50, Items.graphite, 80));
+            requirements(Category.units, with(Items.beryllium, 100, Items.silicon, 100, Items.oxide, 40, Items.graphite, 80));
             itemCapacity = 100;
             consumePower(1f);
             size = 3;
             deconstructSpeed = 1f;
         }};
 
-        //TODO consider usefulness and applicability to serpulo... or anything really
         deconstructor = new PayloadDeconstructor("deconstructor"){{
             requirements(Category.units, with(Items.beryllium, 250, Items.oxide, 100, Items.silicon, 250, Items.carbide, 250));
             itemCapacity = 250;
@@ -3756,7 +3755,7 @@ public class Blocks{
             consumePower(2f);
             size = 3;
             //TODO expand this list
-            filter = Seq.with(Blocks.tungstenWallLarge, Blocks.berylliumWallLarge, Blocks.reinforcedLiquidContainer, Blocks.beamNode);
+            filter = Seq.with(Blocks.tungstenWallLarge, Blocks.berylliumWallLarge, Blocks.reinforcedLiquidContainer, Blocks.reinforcedContainer, Blocks.beamNode);
         }};
 
         //yes this block is pretty much useless
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 78662e8627..3625214007 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -42,7 +42,7 @@ public class UnitTypes{
 
     //air
     public static @EntityDef({Unitc.class}) UnitType flare, eclipse, horizon, zenith, antumbra,
-    evoke;
+    evoke, avert;
 
     //air, legacy
     public static @EntityDef(value = {Unitc.class}, legacy = true) UnitType mono;
@@ -2917,6 +2917,27 @@ public class UnitTypes{
         //endregion
         //region erekir - flying
 
+        /*
+        avert = new ErekirUnitType("avert"){{
+            lowAltitude = false;
+            flying = true;
+            drag = 0.08f;
+            speed = 2.5f;
+            rotateSpeed = 5f;
+            accel = 0.09f;
+            health = 600f;
+            armor = 2f;
+            hitSize = 12f;
+            engineSize = 0;
+
+            setEnginesMirror(
+            new UnitEngine(21 / 4f, 19 / 4f, 2.2f, 45f),
+            new UnitEngine(23 / 4f, -22 / 4f, 2.2f, 315f)
+            );
+        }};
+
+         */
+
         quell = new ErekirUnitType("quell"){{
             aiController = FlyingFollowAI::new;
             envDisabled = 0;
diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java
index c856a0b076..d900b5cda2 100644
--- a/core/src/mindustry/input/DesktopInput.java
+++ b/core/src/mindustry/input/DesktopInput.java
@@ -399,7 +399,7 @@ 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))){
+            if(commandMode && selectedUnits.any() && ((cursor.build != null && !cursor.build.inFogTo(player.team()) && cursor.build.team != player.team()) || (selectedEnemyUnit(input.mouseWorldX(), input.mouseWorldY()) != null))){
                 cursorType = ui.targetCursor;
             }
 
diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index ce2977b9ef..7343fb2965 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -1266,7 +1266,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
             }
         }
 
-        return tmpUnits.min(u -> u.dst(x, y) - u.hitSize/2f);
+        return tmpUnits.min(u -> !u.inFogTo(player.team()), u -> u.dst(x, y) - u.hitSize/2f);
     }
 
     public Seq<Unit> selectedCommandUnits(float x, float y, float w, float h){