mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-14 09:47:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

Status flash tweaks

Browse Source
This commit is contained in:
Anuken
2023-01-08 12:29:29 -05:00
parent e27f7c8332
commit dcc6e9827d
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/entities/comp/BuildingComp.java
View File

@ -69,6 +69,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
transient String lastAccessed; transient String lastAccessed;
transient boolean wasDamaged; //used only by the indexer transient boolean wasDamaged; //used only by the indexer
transient float visualLiquid; transient float visualLiquid;
private transient float statusTimer;
/** TODO Each bit corresponds to a team ID. Only 64 are supported. Does not work on servers. */ /** TODO Each bit corresponds to a team ID. Only 64 are supported. Does not work on servers. */
transient long visibleFlags; transient long visibleFlags;
@ -580,7 +581,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
return BlockStatus.noInput; 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. */ /** 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 //TODO just handle per-block instead
if(enabled || !block.noUpdateDisabled){ if(enabled || !block.noUpdateDisabled){
updateTile(); updateTile();
statusTimer = (statusTimer + efficiency/4f * Time.delta) % 1f;
} }
} }

2
core/src/mindustry/io/JsonIO.java
View File

@ -345,8 +345,6 @@ public class JsonIO{
} }
}); });
//use short names for all filter types //use short names for all filter types
for(var filter : Maps.allFilterTypes){ for(var filter : Maps.allFilterTypes){
var i = filter.get(); var i = filter.get();

2
gradle.properties
View File

@ -25,4 +25,4 @@ org.gradle.caching=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=27c9117e45 archash=d0d80da882