diff --git a/core/assets-raw/sprites/units/avert.png b/core/assets-raw/sprites/units/avert.png index 1dbf38989e..ab1344a971 100644 Binary files a/core/assets-raw/sprites/units/avert.png and b/core/assets-raw/sprites/units/avert.png differ diff --git a/core/src/mindustry/ai/types/CommandAI.java b/core/src/mindustry/ai/types/CommandAI.java index a4568538bc..c08fb5c5f5 100644 --- a/core/src/mindustry/ai/types/CommandAI.java +++ b/core/src/mindustry/ai/types/CommandAI.java @@ -98,8 +98,8 @@ public class CommandAI extends AIController{ }else if(local.size > 1){ int count = 0; for(var near : local){ - //has arrived - if(near.isCommandable() && !near.command().hasCommand() && targetPos.equals(near.command().lastTargetPos)){ + //has arrived - no current command, but last one is equal + if(near.isCommandable() && !near.command().hasCommand() && targetPos.epsilonEquals(near.command().lastTargetPos, 0.001f)){ count ++; } } @@ -181,6 +181,11 @@ public class CommandAI extends AIController{ return targetPos != null; } + public void setupLastPos(){ + lastTargetPos = targetPos; + + } + public void commandPosition(Vec2 pos){ targetPos = pos; lastTargetPos = pos; diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 7c4cfe37f4..d1971683d5 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -3149,8 +3149,9 @@ public class UnitTypes{ itemCapacity = 0; setEnginesMirror( - new UnitEngine(34 / 4f, 31 / 4f, 3f, 45f), - new UnitEngine(35 / 4f, -38 / 4f, 3f, 315f) + //new UnitEngine(34 / 4f, 31 / 4f, 3f, 45f), + new UnitEngine(35 / 4f, -38 / 4f, 3f, 315f), + new UnitEngine(39 / 4f, -16 / 4f, 3f, 315f) ); weapons.add(new Weapon("avert-weapon"){{ diff --git a/core/src/mindustry/io/TypeIO.java b/core/src/mindustry/io/TypeIO.java index 00ed8bb0d6..43cd8ef89b 100644 --- a/core/src/mindustry/io/TypeIO.java +++ b/core/src/mindustry/io/TypeIO.java @@ -490,6 +490,7 @@ public class TypeIO{ }else{ ai.targetPos = null; } + ai.setupLastPos(); if(hasAttack){ byte entityType = read.b(); diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index acd7f9e7d9..465950c38f 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -518,8 +518,8 @@ public class Block extends UnlockableContent implements Senseable{ addBar("liquid-" + liq.name, entity -> new Bar( () -> liq.localizedName, liq::barColor, - () -> entity.liquids.get(liq) / liquidCapacity) - ); + () -> entity.liquids.get(liq) / liquidCapacity + )); } /** Adds a liquid bar that dynamically displays a liquid type. */