Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Logic second/minute spent variables

Browse Source
This commit is contained in:
Anuken
2022-03-13 21:39:35 -04:00
parent 5ad5211f97
commit c5bf0f6768
6 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/logic/GlobalConstants.java
View File

@@ -25,7 +25,7 @@ public class GlobalConstants{
public static final Rand rand = new Rand();
//non-constants that depend on state
private static int varTime, varTick, varWave, varWaveTime;
private static int varTime, varTick, varSecond, varMinute, varWave, varWaveTime;
private ObjectIntMap<String> namesToIds = new ObjectIntMap<>();
private Seq<Var> vars = new Seq<>(Var.class);
@@ -42,6 +42,8 @@ public class GlobalConstants{
//time
varTime = put("@time", 0);
varTick = put("@tick", 0);
varSecond = put("@second", 0);
varMinute = put("@minute", 0);
varWave = put("@waveNumber", 0);
varWaveTime = put("@waveTime", 0);
@@ -120,6 +122,10 @@ public class GlobalConstants{
vars.items[varTime].numval = state.tick / 60.0 * 1000.0;
vars.items[varTick].numval = state.tick;
//shorthands for seconds/minutes spent in save
vars.items[varSecond].numval = state.tick / 60f;
vars.items[varMinute].numval = state.tick / 60f / 60f;
//wave state
vars.items[varWave].numval = state.wave;
vars.items[varWaveTime].numval = state.wavetime / 60f;