Mud tweaks / Unit count tweaks

core/src/mindustry/async/TeamIndexProcess.java

@@ -5,6 +5,7 @@ import mindustry.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.type.*;
+import mindustry.world.blocks.payloads.*;
 
 import java.util.*;
 
@@ -48,6 +49,19 @@ public class TeamIndexProcess implements AsyncProcess{
         activeCounts[team.id][type.id] += amount;
     }
 
+    private void count(Unit unit){
+        updateCount(unit.team, unit.type(), 1);
+        if(!unit.deactivated) updateActiveCount(unit.team, unit.type(), 1);
+
+        if(unit instanceof Payloadc){
+            ((Payloadc)unit).payloads().each(p -> {
+                if(p instanceof UnitPayload){
+                    count(((UnitPayload)p).unit);
+                }
+            });
+        }
+    }
+
     @Override
     public void reset(){
         counts = new int[Team.all.length];
@@ -71,8 +85,7 @@ public class TeamIndexProcess implements AsyncProcess{
         for(Unit unit : Groups.unit){
             tree(unit.team).insert(unit);
 
-            updateCount(unit.team, unit.type(), 1);
-            if(!unit.deactivated) updateActiveCount(unit.team, unit.type(), 1);
+            count(unit);
         }
     }
 

core/src/mindustry/entities/comp/UnitComp.java

@@ -37,7 +37,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
 
     private UnitController controller;
     private UnitType type;
-    boolean spawnedByCore, deactivated;
+    boolean spawnedByCore, deactivated; //TODO remove deactivation boolean
 
     transient Seq<Ability> abilities = new Seq<>(0);
 
@@ -204,7 +204,6 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
 
     @Override
     public void add(){
-        teamIndex.updateCount(team, type, 1);
 
         //check if over unit cap
         if(count() > cap() && !spawnedByCore){
@@ -213,8 +212,6 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
             if(!dead){
                 Call.unitCapDeath(self());
             }
-        }else{
-            teamIndex.updateActiveCount(team, type, 1);
         }
     }