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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2023-09-07 09:23:22 -04:00
parent a47e4518fe d0e3a691d1
commit b9f2da7286
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/mindustry/logic/GlobalVars.java
View File

@@ -27,7 +27,7 @@ public class GlobalVars{
public static final Rand rand = new Rand(); public static final Rand rand = new Rand();
//non-constants that depend on state //non-constants that depend on state
private static int varTime, varTick, varSecond, varMinute, varWave, varWaveTime; private static int varTime, varTick, varSecond, varMinute, varWave, varWaveTime, varServer;
private ObjectIntMap<String> namesToIds = new ObjectIntMap<>(); private ObjectIntMap<String> namesToIds = new ObjectIntMap<>();
private Seq<Var> vars = new Seq<>(Var.class); private Seq<Var> vars = new Seq<>(Var.class);
@@ -56,6 +56,8 @@ public class GlobalVars{
varWave = put("@waveNumber", 0); varWave = put("@waveNumber", 0);
varWaveTime = put("@waveTime", 0); varWaveTime = put("@waveTime", 0);
varServer = put("@server", 0);
//special enums //special enums
put("@ctrlProcessor", ctrlProcessor); put("@ctrlProcessor", ctrlProcessor);
put("@ctrlPlayer", ctrlPlayer); put("@ctrlPlayer", ctrlPlayer);
@@ -147,6 +149,9 @@ public class GlobalVars{
//wave state //wave state
vars.items[varWave].numval = state.wave; vars.items[varWave].numval = state.wave;
vars.items[varWaveTime].numval = state.wavetime / 60f; vars.items[varWaveTime].numval = state.wavetime / 60f;
//network
vars.items[varServer].numval = (net.server() || !net.active()) ? 1 : 0;
} }
/** @return a piece of content based on its logic ID. This is not equivalent to content ID. */ /** @return a piece of content based on its logic ID. This is not equivalent to content ID. */

4
servers_v7.json
View File

@@ -223,5 +223,9 @@
{ {
"name": "Alex Multiverse", "name": "Alex Multiverse",
"address": ["alexmindustryv7.servegame.com:25588", "alexmindustryv7.servegame.com:41962", "alexmindustrypvp.ddns.net:6767", "alexmindustrypvp.ddns.net:6768"] "address": ["alexmindustryv7.servegame.com:25588", "alexmindustryv7.servegame.com:41962", "alexmindustrypvp.ddns.net:6767", "alexmindustrypvp.ddns.net:6768"]
},
{
"name": "Open PVP",
"address": ["185.104.114.140:6567"]
} }
] ]