diff --git a/core/src/mindustry/content/Liquids.java b/core/src/mindustry/content/Liquids.java index 679bda6552..5a3a338133 100644 --- a/core/src/mindustry/content/Liquids.java +++ b/core/src/mindustry/content/Liquids.java @@ -51,6 +51,7 @@ public class Liquids{ viscosity = 0.85f; flammability = 0.1f; capPuddles = false; + hidden = true; colorFrom = Color.valueOf("f98f4a"); colorTo = Color.valueOf("9e172c"); diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index f96aa366ba..537cd8db5a 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -1236,7 +1236,7 @@ public class UnitTypes{ //region air support mono = new UnitType("mono"){{ - defaultController = MinerAI::new; + unitBasedDefaultController = u -> new MinerAI(); flying = true; drag = 0.06f; @@ -1255,7 +1255,7 @@ public class UnitTypes{ }}; poly = new UnitType("poly"){{ - defaultController = BuilderAI::new; + unitBasedDefaultController = u -> new BuilderAI(); flying = true; drag = 0.05f; @@ -1310,6 +1310,7 @@ public class UnitTypes{ }}; mega = new UnitType("mega"){{ + //TODO control? defaultController = RepairAI::new; mineTier = 3; @@ -3318,6 +3319,7 @@ public class UnitTypes{ isCounted = false; allowedInPayloads = false; logicControllable = false; + playerControllable = false; envDisabled = 0; payloadCapacity = 0f; diff --git a/core/src/mindustry/type/Liquid.java b/core/src/mindustry/type/Liquid.java index dddde8968d..c7d9a2f9bc 100644 --- a/core/src/mindustry/type/Liquid.java +++ b/core/src/mindustry/type/Liquid.java @@ -57,6 +57,8 @@ public class Liquid extends UnlockableContent implements Senseable{ public boolean capPuddles = true; /** Effect when this liquid vaporizes. */ public Effect vaporEffect = Fx.vapor; + /** If true, this liquid is hidden in most UI. */ + public boolean hidden; public Liquid(String name, Color color){ super(name); @@ -89,6 +91,11 @@ public class Liquid extends UnlockableContent implements Senseable{ } } + @Override + public boolean isHidden(){ + return hidden; + } + public int getAnimationFrame(){ return (int)(Time.time / (gas ? animationScaleGas : animationScaleLiquid) * animationFrames + id*5) % animationFrames; }