diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 6485ca560c..0a3d41e408 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -24,7 +24,6 @@ public class UnitTypes implements ContentList{ public static UnitType alpha, delta, tau, omega, dart, javelin, trident, glaive; public static UnitType starter; - @Override public void load(){ diff --git a/core/src/mindustry/graphics/Drawf.java b/core/src/mindustry/graphics/Drawf.java index 8efe71409e..20f80e2478 100644 --- a/core/src/mindustry/graphics/Drawf.java +++ b/core/src/mindustry/graphics/Drawf.java @@ -46,6 +46,14 @@ public class Drawf{ renderer.lights.line(x, y, x2, y2, stroke, tint, alpha); } + public static void selected(Tilec tile, Color color){ + selected(tile.tile(), color); + } + + public static void selected(Tile tile, Color color){ + selected(tile.x, tile.y, tile.block(), color); + } + public static void selected(int x, int y, Block block, Color color){ Draw.color(color); for(int i = 0; i < 4; i++){ diff --git a/core/src/mindustry/world/blocks/defense/MendProjector.java b/core/src/mindustry/world/blocks/defense/MendProjector.java index 86c3ba583d..5dd1f0a501 100644 --- a/core/src/mindustry/world/blocks/defense/MendProjector.java +++ b/core/src/mindustry/world/blocks/defense/MendProjector.java @@ -95,6 +95,8 @@ public class MendProjector extends Block{ public void drawSelect(){ float realRange = range + phaseHeat * phaseRangeBoost; + indexer.eachBlock(this, realRange, other -> true, other -> Drawf.selected(other, Tmp.c1.set(baseColor).a(Mathf.absin(4f, 1f)))); + Drawf.dashCircle(x, y, realRange, baseColor); } diff --git a/core/src/mindustry/world/blocks/defense/OverdriveProjector.java b/core/src/mindustry/world/blocks/defense/OverdriveProjector.java index 5cd82c5961..3c9431f979 100644 --- a/core/src/mindustry/world/blocks/defense/OverdriveProjector.java +++ b/core/src/mindustry/world/blocks/defense/OverdriveProjector.java @@ -99,6 +99,8 @@ public class OverdriveProjector extends Block{ public void drawSelect(){ float realRange = range + phaseHeat * phaseRangeBoost; + indexer.eachBlock(this, realRange, other -> true, other -> Drawf.selected(other, Tmp.c1.set(baseColor).a(Mathf.absin(4f, 1f)))); + Drawf.dashCircle(x, y, realRange, baseColor); } diff --git a/gradle.properties b/gradle.properties index 68b710ab08..8938dd878f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=b5b739a5e4a4eef3fee045944e220f40de0f6f85 +archash=26861a21f52e7efed4469c604c40e9ad5b54001e