Partial 7.0 merge - API preview

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

@@ -1,5 +1,7 @@
 package mindustry.entities.comp;
 
+import arc.*;
+import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.util.*;
@@ -9,6 +11,7 @@ import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.game.*;
 import mindustry.gen.*;
+import mindustry.graphics.*;
 import mindustry.world.*;
 import mindustry.world.meta.*;
 
@@ -16,24 +19,30 @@ import static mindustry.Vars.*;
 
 @EntityDef(value = {Firec.class}, pooled = true)
 @Component(base = true)
-abstract class FireComp implements Timedc, Posc, Firec, Syncc{
-    private static final float spreadChance = 0.04f, fireballChance = 0.06f;
+abstract class FireComp implements Timedc, Posc, Syncc, Drawc{
+    public static final int frames = 40, duration = 90;
+
+    private static final float spreadDelay = 22f, fireballDelay = 40f,
+        ticksPerFrame = (float)duration / frames, warmupDuration = 20f, damageDelay = 40f, tileDamage = 1.8f, unitDamage = 3f;
+
+    public static final TextureRegion[] regions = new TextureRegion[frames];
 
     @Import float time, lifetime, x, y;
 
     Tile tile;
     private transient Block block;
-    private transient float baseFlammability = -1, puddleFlammability;
+    private transient float
+        baseFlammability = -1, puddleFlammability, damageTimer = Mathf.random(40f),
+        spreadTimer = Mathf.random(spreadDelay), fireballTimer = Mathf.random(fireballDelay),
+        warmup = 0f,
+        animation = Mathf.random(frames);
 
     @Override
     public void update(){
-        if(Mathf.chance(0.09 * Time.delta)){
-            Fx.fire.at(x + Mathf.range(4f), y + Mathf.range(4f));
-        }
 
-        if(Mathf.chance(0.05 * Time.delta)){
-            Fx.fireSmoke.at(x + Mathf.range(4f), y + Mathf.range(4f));
-        }
+        animation += Time.delta / ticksPerFrame;
+        warmup += Time.delta;
+        animation %= frames;
 
         if(!headless){
             control.sound.loop(Sounds.fire, this, 0.07f);
@@ -55,46 +64,71 @@ abstract class FireComp implements Timedc, Posc, Firec, Syncc{
         Building entity = tile.build;
         boolean damage = entity != null;
 
+        if(baseFlammability < 0 || block != tile.block()){
+            baseFlammability = tile.getFlammability();
+            block = tile.block();
+        }
+
         float flammability = baseFlammability + puddleFlammability;
 
         if(!damage && flammability <= 0){
             time += Time.delta * 8;
         }
 
-        if(baseFlammability < 0 || block != tile.block()){
-            baseFlammability = tile.build == null ? 0 : tile.getFlammability();
-            block = tile.block();
-        }
-
         if(damage){
             lifetime += Mathf.clamp(flammability / 8f, 0f, 0.6f) * Time.delta;
         }
 
-        if(flammability > 1f && Mathf.chance(spreadChance * Time.delta * Mathf.clamp(flammability / 5f, 0.3f, 2f))){
+        if(flammability > 1f && (spreadTimer += Time.delta * Mathf.clamp(flammability / 5f, 0.3f, 2f)) >= spreadDelay){
+            spreadTimer = 0f;
             Point2 p = Geometry.d4[Mathf.random(3)];
             Tile other = world.tile(tile.x + p.x, tile.y + p.y);
             Fires.create(other);
-
-            if(Mathf.chance(fireballChance * Time.delta * Mathf.clamp(flammability / 10f))){
-                Bullets.fireball.createNet(Team.derelict, x, y, Mathf.random(360f), -1f, 1, 1);
-            }
         }
 
-        if(Mathf.chance(0.025 * Time.delta)){
+        if(flammability > 0 && (fireballTimer += Time.delta * Mathf.clamp(flammability / 10f, 0f, 0.5f)) >= fireballDelay){
+            fireballTimer = 0f;
+            Bullets.fireball.createNet(Team.derelict, x, y, Mathf.random(360f), -1f, 1, 1);
+        }
+
+        //apply damage to nearby units & building
+        if((damageTimer += Time.delta) >= damageDelay){
+            damageTimer = 0f;
             Puddlec p = Puddles.get(tile);
             puddleFlammability = p != null ? p.getFlammability() / 3f : 0;
 
             if(damage){
-                entity.damage(1.6f);
+                entity.damage(tileDamage);
             }
-            Damage.damageUnits(null, tile.worldx(), tile.worldy(), tilesize, 3f,
+            Damage.damageUnits(null, tile.worldx(), tile.worldy(), tilesize, unitDamage,
             unit -> !unit.isFlying() && !unit.isImmune(StatusEffects.burning),
             unit -> unit.apply(StatusEffects.burning, 60 * 5));
         }
     }
 
+    @Override
+    public void draw(){
+        if(regions[0] == null){
+            for(int i = 0; i < frames; i++){
+                regions[i] = Core.atlas.find("fire" + i);
+            }
+        }
+
+        Draw.alpha(Mathf.clamp(warmup / warmupDuration));
+        Draw.z(Layer.effect);
+        Draw.rect(regions[(int)animation], x, y);
+        Draw.reset();
+    }
+
+    @Replace
+    @Override
+    public float clipSize(){
+        return 25;
+    }
+
     @Override
     public void remove(){
+        Fx.fireRemove.at(x, y, animation);
         Fires.remove(tile);
     }