From 5ec0e9dc9f66e6a5eb84326f7288430cbe251a87 Mon Sep 17 00:00:00 2001 From: BalaM314 <71201189+BalaM314@users.noreply.github.com> Date: Sat, 13 May 2023 19:23:47 +0530 Subject: [PATCH] Use shouldExplode, explosionMinWarmup in generators (#8600) --- core/src/mindustry/world/blocks/power/ImpactReactor.java | 8 +------- core/src/mindustry/world/blocks/power/NuclearReactor.java | 6 ++---- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/core/src/mindustry/world/blocks/power/ImpactReactor.java b/core/src/mindustry/world/blocks/power/ImpactReactor.java index e0336abb53..136cf66b46 100644 --- a/core/src/mindustry/world/blocks/power/ImpactReactor.java +++ b/core/src/mindustry/world/blocks/power/ImpactReactor.java @@ -36,6 +36,7 @@ public class ImpactReactor extends PowerGenerator{ explosionShake = 6f; explosionShakeDuration = 16f; explosionDamage = 1900 * 4; + explosionMinWarmup = 0.3f; explodeEffect = Fx.impactReactorExplosion; explodeSound = Sounds.explosionbig; } @@ -110,13 +111,6 @@ public class ImpactReactor extends PowerGenerator{ return super.sense(sensor); } - @Override - public void createExplosion(){ - if(warmup >= 0.3f){ - super.createExplosion(); - } - } - @Override public void write(Writes write){ super.write(write); diff --git a/core/src/mindustry/world/blocks/power/NuclearReactor.java b/core/src/mindustry/world/blocks/power/NuclearReactor.java index 63b4c90d57..8e28d5b331 100644 --- a/core/src/mindustry/world/blocks/power/NuclearReactor.java +++ b/core/src/mindustry/world/blocks/power/NuclearReactor.java @@ -128,10 +128,8 @@ public class NuclearReactor extends PowerGenerator{ } @Override - public void createExplosion(){ - if(items.get(fuelItem) >= 5 || heat >= 0.5f){ - super.createExplosion(); - } + public boolean shouldExplode(){ + return super.shouldExplode() && (items.get(fuelItem) >= 5 || heat >= 0.5f); } @Override