From 2a7525cdf1ed66d61e5de485e287ca3586385d35 Mon Sep 17 00:00:00 2001 From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com> Date: Sun, 28 Mar 2021 15:38:16 -0700 Subject: [PATCH] Allow for dynamic counting (#4988) --- core/src/mindustry/core/Logic.java | 2 +- core/src/mindustry/entities/comp/UnitComp.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index aa6b19e2b5..5f39ad8017 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -368,7 +368,7 @@ public class Logic implements ApplicationListener{ if(state.isGame()){ 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()){ diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index d221d6d97a..aaaf58ac0a 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -186,6 +186,10 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I return !disarmed && !(type.canBoost && isFlying()); } + public boolean isCounted(){ + return type.isCounted; + } + @Override public int itemCapacity(){ return type.itemCapacity;