diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index 31a7ed8ce0..76824b6cc3 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -1306,6 +1306,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, case health -> health; case maxHealth -> maxHealth; case efficiency -> efficiency(); + case range -> this instanceof Ranged r ? r.range() / tilesize : 0; case rotation -> rotation; case totalItems -> items == null ? 0 : items.total(); case totalLiquids -> liquids == null ? 0 : liquids.total(); diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index 7d8df00b89..753b03f248 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -130,6 +130,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I case y -> World.conv(y); case team -> team.id; case shooting -> isShooting() ? 1 : 0; + case range -> range() / tilesize; case shootX -> World.conv(aimX()); case shootY -> World.conv(aimY()); case mining -> mining() ? 1 : 0; diff --git a/core/src/mindustry/graphics/Drawf.java b/core/src/mindustry/graphics/Drawf.java index 83d9065281..e38fa74c82 100644 --- a/core/src/mindustry/graphics/Drawf.java +++ b/core/src/mindustry/graphics/Drawf.java @@ -221,9 +221,13 @@ public class Drawf{ } public static void construct(float x, float y, TextureRegion region, float rotation, float progress, float speed, float time){ + construct(x, y, region, Pal.accent, rotation, progress, speed, time); + } + + public static void construct(float x, float y, TextureRegion region, Color color, float rotation, float progress, float speed, float time){ Shaders.build.region = region; Shaders.build.progress = progress; - Shaders.build.color.set(Pal.accent); + Shaders.build.color.set(color); Shaders.build.color.a = speed; Shaders.build.time = -time / 20f; @@ -235,9 +239,13 @@ public class Drawf{ } public static void construct(Building t, TextureRegion region, float rotation, float progress, float speed, float time){ + construct(t, region, Pal.accent, rotation, progress, speed, time); + } + + public static void construct(Building t, TextureRegion region, Color color, float rotation, float progress, float speed, float time){ Shaders.build.region = region; Shaders.build.progress = progress; - Shaders.build.color.set(Pal.accent); + Shaders.build.color.set(color); Shaders.build.color.a = speed; Shaders.build.time = -time / 20f; diff --git a/core/src/mindustry/logic/LAccess.java b/core/src/mindustry/logic/LAccess.java index 0c0597c6a1..6dcf46e140 100644 --- a/core/src/mindustry/logic/LAccess.java +++ b/core/src/mindustry/logic/LAccess.java @@ -26,6 +26,7 @@ public enum LAccess{ y, shootX, shootY, + range, shooting, mineX, mineY, diff --git a/servers_v6.json b/servers_v6.json index fcc68297ac..67d025e65c 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -61,7 +61,7 @@ }, { "name": "Minigames", - "address": ["shizashizashiza.ml"] + "address": ["shizashizashiza.ml", "shizashizashiza.ml:6568"] }, { "name": "Korea",