From 91c50ae1260d72ea1e41bf88ed52f8c936f60878 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 26 Nov 2020 19:25:26 -0500 Subject: [PATCH] Disabled explosion fires for item flammability <= 1 coming soon: spore bombing? --- core/assets/maps/extractionOutpost.msav | Bin 20013 -> 20024 bytes core/src/mindustry/entities/Damage.java | 14 ++++++++++---- .../mindustry/entities/comp/BuildingComp.java | 2 +- .../src/mindustry/entities/comp/UnitComp.java | 7 ++++--- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/core/assets/maps/extractionOutpost.msav b/core/assets/maps/extractionOutpost.msav index dfffe540439702f2695cf5762fb386ea3e14e1f0..7ce6a6904ef7acbd790b88e8055f0dfc9dc11d54 100644 GIT binary patch delta 19581 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 delta 19552 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 PwLky2-ueFk8uD)P(l%%e diff --git a/core/src/mindustry/entities/Damage.java b/core/src/mindustry/entities/Damage.java index a3dd3913f1..9614f895a6 100644 --- a/core/src/mindustry/entities/Damage.java +++ b/core/src/mindustry/entities/Damage.java @@ -2,7 +2,6 @@ package mindustry.entities; import arc.*; import arc.func.*; -import arc.graphics.*; import arc.math.*; import arc.math.geom.*; import arc.struct.*; @@ -33,15 +32,22 @@ public class Damage{ private static Unit tmpUnit; /** Creates a dynamic explosion based on specified parameters. */ - public static void dynamicExplosion(float x, float y, float flammability, float explosiveness, float power, float radius, Color color, boolean damage){ + public static void dynamicExplosion(float x, float y, float flammability, float explosiveness, float power, float radius, boolean damage){ + dynamicExplosion(x, y, flammability, explosiveness, power, radius, damage, true); + } + + /** Creates a dynamic explosion based on specified parameters. */ + public static void dynamicExplosion(float x, float y, float flammability, float explosiveness, float power, float radius, boolean damage, boolean fire){ if(damage){ for(int i = 0; i < Mathf.clamp(power / 20, 0, 6); i++){ int branches = 5 + Mathf.clamp((int)(power / 30), 1, 20); Time.run(i * 2f + Mathf.random(4f), () -> Lightning.create(Team.derelict, Pal.power, 3, x, y, Mathf.random(360f), branches + Mathf.range(2))); } - for(int i = 0; i < Mathf.clamp(flammability / 4, 0, 30); i++){ - Time.run(i / 2f, () -> Call.createBullet(Bullets.fireball, Team.derelict, x, y, Mathf.random(360f), Bullets.fireball.damage, 1, 1)); + if(fire){ + for(int i = 0; i < Mathf.clamp(flammability / 4, 0, 30); i++){ + Time.run(i / 2f, () -> Call.createBullet(Bullets.fireball, Team.derelict, x, y, Mathf.random(360f), Bullets.fireball.damage, 1, 1)); + } } int waves = Mathf.clamp((int)(explosiveness / 4), 0, 30); diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index 533e99b24b..9c971c3272 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -970,7 +970,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, }); } - Damage.dynamicExplosion(x, y, flammability, explosiveness * 3.5f, power, tilesize * block.size / 2f, Pal.darkFlame, state.rules.damageExplosions); + Damage.dynamicExplosion(x, y, flammability, explosiveness * 3.5f, power, tilesize * block.size / 2f, state.rules.damageExplosions); if(!floor().solid && !floor().isLiquid){ Effect.rubble(x, y, block.size); diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index f80a092417..7834898598 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -397,10 +397,11 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I /** Actually destroys the unit, removing it and creating explosions. **/ public void destroy(){ - float explosiveness = 2f + item().explosiveness * stack().amount / 3f; - float flammability = item().flammability * stack().amount / 3f; + float explosiveness = 2f + item().explosiveness * stack().amount * 1.4f; + float flammability = item().flammability * stack().amount / 1.9f; + if(!spawnedByCore){ - Damage.dynamicExplosion(x, y, flammability, explosiveness, 0f, bounds() / 2f, Pal.darkFlame, state.rules.damageExplosions); + Damage.dynamicExplosion(x, y, flammability, explosiveness, 0f, bounds() / 2f, state.rules.damageExplosions, item().flammability > 1); } float shake = hitSize / 3f;