From 042bbffe7738536638349ba273db8b2534fd2d6b Mon Sep 17 00:00:00 2001 From: summetdev Date: Wed, 28 Oct 2020 10:19:51 +0300 Subject: [PATCH 1/4] Bounded logic property --- core/src/mindustry/entities/comp/UnitComp.java | 2 ++ core/src/mindustry/logic/LAccess.java | 1 + 2 files changed, 3 insertions(+) diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index 11efcf9948..71a6f7b0bd 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -9,6 +9,7 @@ import arc.scene.ui.layout.*; import arc.struct.*; import arc.util.*; import mindustry.ai.*; +import mindustry.ai.types.*; import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.core.*; @@ -105,6 +106,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I case shootX -> World.conv(aimX()); case shootY -> World.conv(aimY()); case flag -> flag; + case bounded -> controller instanceof LogicAI || controller instanceof Player ? 1 : 0; case payloadCount -> self() instanceof Payloadc pay ? pay.payloads().size : 0; default -> 0; }; diff --git a/core/src/mindustry/logic/LAccess.java b/core/src/mindustry/logic/LAccess.java index 669e447a57..d1bfa0502d 100644 --- a/core/src/mindustry/logic/LAccess.java +++ b/core/src/mindustry/logic/LAccess.java @@ -30,6 +30,7 @@ public enum LAccess{ team, type, flag, + bounded, name, config, payloadCount, From c830db65d74289efa81a4b6f9b9e4ad8d6f8aca5 Mon Sep 17 00:00:00 2001 From: summetdev Date: Wed, 28 Oct 2020 13:52:28 +0300 Subject: [PATCH 2/4] bounded -> controlled --- core/src/mindustry/entities/comp/UnitComp.java | 2 +- core/src/mindustry/logic/LAccess.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index 71a6f7b0bd..19ab2d7daa 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -106,7 +106,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I case shootX -> World.conv(aimX()); case shootY -> World.conv(aimY()); case flag -> flag; - case bounded -> controller instanceof LogicAI || controller instanceof Player ? 1 : 0; + case controlled -> controller instanceof LogicAI || controller instanceof Player ? 1 : 0; case payloadCount -> self() instanceof Payloadc pay ? pay.payloads().size : 0; default -> 0; }; diff --git a/core/src/mindustry/logic/LAccess.java b/core/src/mindustry/logic/LAccess.java index d1bfa0502d..52db598440 100644 --- a/core/src/mindustry/logic/LAccess.java +++ b/core/src/mindustry/logic/LAccess.java @@ -30,7 +30,7 @@ public enum LAccess{ team, type, flag, - bounded, + controlled, name, config, payloadCount, From 6b90bbe421d9c25a9964cc9d0ece19b0844b7e93 Mon Sep 17 00:00:00 2001 From: Summet-V Date: Wed, 4 Nov 2020 17:53:33 +0300 Subject: [PATCH 3/4] Controlled property for blocks --- core/src/mindustry/entities/comp/BuildingComp.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index 8363d16d02..11d61e1b6a 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -29,10 +29,12 @@ import mindustry.logic.*; import mindustry.type.*; import mindustry.ui.*; import mindustry.world.*; +import mindustry.world.blocks.*; import mindustry.world.blocks.ConstructBlock.*; import mindustry.world.blocks.environment.*; import mindustry.world.blocks.payloads.*; import mindustry.world.blocks.power.*; +import mindustry.world.blocks.units.*; import mindustry.world.consumers.*; import mindustry.world.meta.*; import mindustry.world.modules.*; @@ -1285,6 +1287,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, case powerNetStored -> power == null ? 0 : power.graph.getLastPowerStored(); case powerNetCapacity -> power == null ? 0 : power.graph.getLastCapacity(); case enabled -> enabled ? 1 : 0; + case controlled -> this instanceof ControlBlock c ? c.isControlled() ? 1 : 0 : 0; case payloadCount -> getPayload() != null ? 1 : 0; default -> 0; }; From b9b69c899b7381e1d8c2c1157b7982375c2d8ff0 Mon Sep 17 00:00:00 2001 From: Summet-V Date: Wed, 4 Nov 2020 17:54:49 +0300 Subject: [PATCH 4/4] Unused import --- core/src/mindustry/entities/comp/BuildingComp.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index 11d61e1b6a..e42e7eea7d 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -34,7 +34,6 @@ import mindustry.world.blocks.ConstructBlock.*; import mindustry.world.blocks.environment.*; import mindustry.world.blocks.payloads.*; import mindustry.world.blocks.power.*; -import mindustry.world.blocks.units.*; import mindustry.world.consumers.*; import mindustry.world.meta.*; import mindustry.world.modules.*;