From b66294b50a77671c211d1b4c9245d590a6a8b408 Mon Sep 17 00:00:00 2001 From: DeltaNedas Date: Sat, 14 Nov 2020 18:09:46 +0000 Subject: [PATCH 1/2] add mining/mineX/mineY sensors --- core/src/mindustry/entities/comp/UnitComp.java | 3 +++ core/src/mindustry/logic/LAccess.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index 992a40e955..6a83bbde08 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -123,6 +123,9 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I case shooting -> isShooting() ? 1 : 0; case shootX -> World.conv(aimX()); case shootY -> World.conv(aimY()); + case mining -> mining() ? 1 : 0; + case mineX -> mining() ? mineTile.x : -1; + case mineY -> mining() ? mineTile.y : -1; case flag -> flag; case controlled -> controller instanceof LogicAI || controller instanceof Player ? 1 : 0; case payloadCount -> self() instanceof Payloadc pay ? pay.payloads().size : 0; diff --git a/core/src/mindustry/logic/LAccess.java b/core/src/mindustry/logic/LAccess.java index acac5efdce..ab1d7ca687 100644 --- a/core/src/mindustry/logic/LAccess.java +++ b/core/src/mindustry/logic/LAccess.java @@ -27,6 +27,9 @@ public enum LAccess{ shootX, shootY, shooting, + mineX, + mineY, + mining, team, type, flag, From 9bde0dc18af3b78a4a3255a3d4bea41166e07b98 Mon Sep 17 00:00:00 2001 From: DeltaNedas Date: Sat, 14 Nov 2020 18:18:52 +0000 Subject: [PATCH 2/2] multiple inheritance h --- core/src/mindustry/entities/comp/UnitComp.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index 6a83bbde08..097cce0130 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -37,6 +37,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I @Import float x, y, rotation, elevation, maxHealth, drag, armor, hitSize, health, ammo, minFormationSpeed; @Import Team team; @Import int id; + @Import @Nullable Tile mineTile; private UnitController controller; UnitType type;