From dcc6e9827d7533e5179d1d98e17e16e15531d51d Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 8 Jan 2023 12:29:29 -0500 Subject: [PATCH] Status flash tweaks --- core/src/mindustry/entities/comp/BuildingComp.java | 5 ++++- core/src/mindustry/io/JsonIO.java | 2 -- gradle.properties | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index a6fe69c9aa..419e53c6e5 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -69,6 +69,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, transient String lastAccessed; transient boolean wasDamaged; //used only by the indexer transient float visualLiquid; + private transient float statusTimer; /** TODO Each bit corresponds to a team ID. Only 64 are supported. Does not work on servers. */ transient long visibleFlags; @@ -580,7 +581,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, return BlockStatus.noInput; } - return BlockStatus.active; + return statusTimer < efficiency ? BlockStatus.active : BlockStatus.noInput; } /** Call when nothing is happening to the entity. This increments the internal sleep timer. */ @@ -2022,6 +2023,8 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, //TODO just handle per-block instead if(enabled || !block.noUpdateDisabled){ updateTile(); + + statusTimer = (statusTimer + efficiency/4f * Time.delta) % 1f; } } diff --git a/core/src/mindustry/io/JsonIO.java b/core/src/mindustry/io/JsonIO.java index 16059a3298..dfafe99a17 100644 --- a/core/src/mindustry/io/JsonIO.java +++ b/core/src/mindustry/io/JsonIO.java @@ -345,8 +345,6 @@ public class JsonIO{ } }); - - //use short names for all filter types for(var filter : Maps.allFilterTypes){ var i = filter.get(); diff --git a/gradle.properties b/gradle.properties index 988e99648a..7f15c64713 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,4 +25,4 @@ org.gradle.caching=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=27c9117e45 +archash=d0d80da882