Procedural scorch marks / Bugfixes

core/src/mindustry/entities/AllEntities.java

@@ -26,6 +26,9 @@ class AllEntities{
     @EntityDef({Unitc.class})
     class GenericUnitDef{}
 
+    @EntityDef(value = {Firec.class}, pooled = true)
+    class FireDef{}
+
     @GroupDef(Entityc.class)
     void all(){
 

core/src/mindustry/entities/Effects.java

@@ -55,7 +55,7 @@ public class Effects{
     }
 
     public static void decal(TextureRegion region, float x, float y, float rotation, float lifetime, Color color){
-        if(headless || region == null) return;
+        if(headless || region == null || !Core.atlas.isFound(region)) return;
 
         Decalc decal = DecalEntity.create();
         decal.set(x, y);
@@ -66,12 +66,20 @@ public class Effects{
         decal.add();
     }
 
+    public static void scorch(float x, float y, int size){
+        if(headless) return;
+
+        size = Mathf.clamp(size, 0, 9);
+
+        TextureRegion region = Core.atlas.find("scorch-" + size + "-" + Mathf.random(2));
+        decal(region, x, y, Mathf.random(4) * 90, 3600, Pal.rubble);
+
+    }
+
     public static void rubble(float x, float y, int blockSize){
         if(headless) return;
 
-        TextureRegion region = Core.atlas.find("rubble-" + blockSize + "-" + Mathf.random(0, 1));
-        if(!Core.atlas.isFound(region)) return;
-
-        decal(region, x, y, Mathf.random(0, 4) * 90, 3600, Pal.rubble);
+        TextureRegion region = Core.atlas.find("rubble-" + blockSize + "-" + (Core.atlas.has("rubble-" + blockSize + "-1") ? Mathf.random(0, 1) : "0"));
+        decal(region, x, y, Mathf.random(4) * 90, 3600, Pal.rubble);
     }
 }

core/src/mindustry/entities/def/FireComp.java

@@ -0,0 +1,8 @@
+package mindustry.entities.def;
+
+import mindustry.annotations.Annotations.*;
+import mindustry.gen.*;
+
+@Component
+abstract class FireComp implements Timedc{
+}

core/src/mindustry/entities/def/HealthComp.java

@@ -34,8 +34,12 @@ abstract class HealthComp implements Entityc{
     }
 
     void kill(){
+        if(dead) return;
+
         health = 0;
         dead = true;
+        killed();
+        remove();
     }
 
     void heal(){
@@ -50,8 +54,7 @@ abstract class HealthComp implements Entityc{
     void damage(float amount){
         health -= amount;
         if(health <= 0 && !dead){
-            dead = true;
-            killed();
+            kill();
         }
     }
 

core/src/mindustry/entities/def/PlayerComp.java

@@ -59,6 +59,10 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc{
     }
 
     public void update(){
+        if(unit.dead()){
+            clearUnit();
+        }
+
         if(!dead()){
             x(unit.x());
             y(unit.y());

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

@@ -152,6 +152,7 @@ abstract class UnitComp implements Healthc, Velc, Statusc, Teamc, Itemsc, Hitbox
 
         //TODO cleanup
         //ScorchDecal.create(getX(), getY());
+        Effects.scorch(x, y, (int)(hitSize() / 5));
         Fx.explosion.at(this);
         Effects.shake(2f, 2f, this);
         type.deathSound.at(this);