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

Allow for dynamic counting (#4988)

Browse Source
This commit is contained in:
MEEP of Faith
2021-03-28 15:38:16 -07:00
committed by GitHub
parent 43602caab2
commit 2a7525cdf1
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/core/Logic.java
View File

@@ -368,7 +368,7 @@ public class Logic implements ApplicationListener{
if(state.isGame()){ if(state.isGame()){
if(!net.client()){ if(!net.client()){
state.enemies = Groups.unit.count(u -> u.team() == state.rules.waveTeam && u.type.isCounted); state.enemies = Groups.unit.count(u -> u.team() == state.rules.waveTeam && u.isCounted());
} }
if(!state.isPaused()){ if(!state.isPaused()){

4
core/src/mindustry/entities/comp/UnitComp.java
View File

@@ -186,6 +186,10 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
return !disarmed && !(type.canBoost && isFlying()); return !disarmed && !(type.canBoost && isFlying());
} }
public boolean isCounted(){
return type.isCounted;
}
@Override @Override
public int itemCapacity(){ public int itemCapacity(){
return type.itemCapacity; return type.itemCapacity;