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-12-13 22:37:39 -05:00
parent 3a485eb338 175153e870
commit 13b78927f4
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/mindustry/logic/LExecutor.java
View File

@@ -1360,13 +1360,20 @@ public class LExecutor{
exec.setobj(result, i < 0 || i >= builds.size ? null : builds.get(i));
}
}
case unitCount -> exec.setnum(result, data.units.size);
case unitCount -> {
UnitType type = exec.obj(extra) instanceof UnitType u ? u : null;
if(type == null){
exec.setnum(result, data.units.size);
}else{
exec.setnum(result, data.unitsByType[type.id].size);
}
}
case coreCount -> exec.setnum(result, data.cores.size);
case playerCount -> exec.setnum(result, data.players.size);
case buildCount -> {
Block block = exec.obj(extra) instanceof Block b ? b : null;
if(block == null){
exec.setobj(result, null);
exec.setnum(result, data.buildings.size);
}else{
exec.setnum(result, data.getBuildings(block).size);
}

2
core/src/mindustry/logic/LStatements.java
View File

@@ -1748,7 +1748,7 @@ public class LStatements{
fields(table, index, i -> index = i);
}
if(type == FetchType.buildCount || type == FetchType.build){
if(type == FetchType.buildCount || type == FetchType.build || type == FetchType.unitCount){
row(table);
fields(table, "block", extra, i -> extra = i);