From 5c9e9e3ff474bdb34b415b7f503581725009b5cb Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 16 Jun 2024 01:24:52 -0400 Subject: [PATCH] Block solid sensor --- core/src/mindustry/entities/comp/BuildingComp.java | 1 + core/src/mindustry/logic/LAccess.java | 1 + core/src/mindustry/world/Block.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 dad6e2464b..d9d73bd733 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -1915,6 +1915,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, case y -> World.conv(y); case color -> Color.toDoubleBits(team.color.r, team.color.g, team.color.b, 1f); case dead -> !isValid() ? 1 : 0; + case solid -> block.solid || checkSolid() ? 1 : 0; case team -> team.id; case health -> health; case maxHealth -> maxHealth; diff --git a/core/src/mindustry/logic/LAccess.java b/core/src/mindustry/logic/LAccess.java index 8812bc5815..46044562d6 100644 --- a/core/src/mindustry/logic/LAccess.java +++ b/core/src/mindustry/logic/LAccess.java @@ -35,6 +35,7 @@ public enum LAccess{ cameraWidth, cameraHeight, size, + solid, dead, range, shooting, diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index c2248cffb1..d2b2cbf2fa 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -1407,6 +1407,7 @@ public class Block extends UnlockableContent implements Senseable{ return switch(sensor){ case color -> mapColor.toDoubleBits(); case health, maxHealth -> health; + case solid -> solid ? 1 : 0; case size -> size; case itemCapacity -> itemCapacity; case liquidCapacity -> liquidCapacity;