From 623b7ada11003a4552c1d8a1acf52d486d459360 Mon Sep 17 00:00:00 2001 From: genNAowl <68400583+genNAowl@users.noreply.github.com> Date: Sun, 24 Jan 2021 06:23:12 -0800 Subject: [PATCH] Let Logic Sense Range (#4425) Co-authored-by: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com> --- core/src/mindustry/entities/comp/BuildingComp.java | 1 + core/src/mindustry/entities/comp/UnitComp.java | 1 + core/src/mindustry/logic/LAccess.java | 1 + 3 files changed, 3 insertions(+) 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/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,