Merge branch 'master' into formatting

core/src/mindustry/entities/Effect.java

@@ -27,8 +27,8 @@ public class Effect{
     /** Clip size. */
     public float size;
 
-    public boolean ground;
-    public float groundDuration;
+    public float layer = Layer.effect;
+    public float layerDuration;
 
     public Effect(float life, float clipsize, Cons<EffectContainer> renderer){
         this.id = all.size;
@@ -42,14 +42,14 @@ public class Effect{
         this(life,50f, renderer);
     }
 
-    public Effect ground(){
-        ground = true;
+    public Effect layer(float l){
+        layer = l;
         return this;
     }
 
-    public Effect ground(float duration){
-        ground = true;
-        this.groundDuration = duration;
+    public Effect layer(float l, float duration){
+        layer = l;
+        this.layerDuration = duration;
         return this;
     }
 
@@ -87,7 +87,7 @@ public class Effect{
 
     public float render(int id, Color color, float life, float lifetime, float rotation, float x, float y, Object data){
         container.set(id, color, life, lifetime, rotation, x, y, data);
-        Draw.z(ground ? Layer.debris : Layer.effect);
+        Draw.z(layer);
         Draw.reset();
         renderer.get(container);
         Draw.reset();

core/src/mindustry/entities/bullet/BulletType.java

@@ -79,8 +79,10 @@ public abstract class BulletType extends Content{
     public boolean backMove = true;
     /** Bullet range override. */
     public float range = -1f;
-    /** Heal Bullet Percent **/
+    /** % of block health healed **/
     public float healPercent = 0f;
+    /** whether to make fire on impact */
+    public boolean makeFire = false;
 
     //additional effects
 
@@ -158,7 +160,7 @@ public abstract class BulletType extends Content{
     }
 
     public void hitTile(Bullet b, Building tile, float initialHealth){
-        if(status == StatusEffects.burning){
+        if(makeFire){
             Fires.create(tile.tile);
         }
         hit(b);
@@ -216,7 +218,7 @@ public abstract class BulletType extends Content{
                 });
             }
 
-            if(status == StatusEffects.burning){
+            if(makeFire){
                 indexer.eachBlock(null, x, y, splashDamageRadius, other -> other.team != b.team, other -> {
                     Fires.create(other.tile);
                 });

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

@@ -22,9 +22,9 @@ abstract class ShieldComp implements Healthc, Posc{
     @Replace
     @Override
     public void damage(float amount){
-        amount /= healthMultiplier;
         //apply armor
         amount = Math.max(amount - armor, minArmorDamage * amount);
+        amount /= healthMultiplier;
 
         hitTime = 1f;
 

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

@@ -237,12 +237,14 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
 
     @Override
     public void add(){
+        team.data().updateCount(type, 1);
 
         //check if over unit cap
         if(count() > cap() && !spawnedByCore && !dead){
             Call.unitCapDeath(self());
             team.data().updateCount(type, -1);
         }
+
     }
 
     @Override