From 042bbffe7738536638349ba273db8b2534fd2d6b Mon Sep 17 00:00:00 2001 From: summetdev Date: Wed, 28 Oct 2020 10:19:51 +0300 Subject: [PATCH 01/28] 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 02/28] 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 03/28] 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 04/28] 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.*; From 0f31eb7d23963d6dae8c2bf019f4b282d069bd5a Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 6 Nov 2020 18:09:08 -0500 Subject: [PATCH 05/28] Changed arc sound backend --- .gitignore | 1 + core/assets/sounds/pew.ogg | Bin 5621 -> 12352 bytes .../world/blocks/ConstructBlock.java | 2 +- gradle.properties | 2 +- ios/robovm.xml | 3 +-- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b199017043..09bdd6ec4b 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ steam_appid.txt /annotations/src/main/resources/META-INF/services /core/assets/version.properties /core/assets/locales +/core/assets/cache/ /ios/src/mindustry/gen/ /core/src/mindustry/gen/ ios/robovm.properties diff --git a/core/assets/sounds/pew.ogg b/core/assets/sounds/pew.ogg index 0c1df7f711cbf6e2481a5e5af301f188cba9f2ee..d4b1c791c6c15c68c1f2834fbaf0b78db9bc860f 100644 GIT binary patch delta 9176 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