Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use shouldExplode, explosionMinWarmup in generators (#8600)

Browse Source
This commit is contained in:
BalaM314
2023-05-13 19:23:47 +05:30
committed by GitHub
parent b40615d9e6
commit 5ec0e9dc9f
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/world/blocks/power/ImpactReactor.java
View File

@@ -36,6 +36,7 @@ public class ImpactReactor extends PowerGenerator{
explosionShake = 6f; explosionShake = 6f;
explosionShakeDuration = 16f; explosionShakeDuration = 16f;
explosionDamage = 1900 * 4; explosionDamage = 1900 * 4;
explosionMinWarmup = 0.3f;
explodeEffect = Fx.impactReactorExplosion; explodeEffect = Fx.impactReactorExplosion;
explodeSound = Sounds.explosionbig; explodeSound = Sounds.explosionbig;
} }
@@ -110,13 +111,6 @@ public class ImpactReactor extends PowerGenerator{
return super.sense(sensor); return super.sense(sensor);
} }
@Override
public void createExplosion(){
if(warmup >= 0.3f){
super.createExplosion();
}
}
@Override @Override
public void write(Writes write){ public void write(Writes write){
super.write(write); super.write(write);

6
core/src/mindustry/world/blocks/power/NuclearReactor.java
View File

@@ -128,10 +128,8 @@ public class NuclearReactor extends PowerGenerator{
} }
@Override @Override
public void createExplosion(){ public boolean shouldExplode(){
if(items.get(fuelItem) >= 5 || heat >= 0.5f){ return super.shouldExplode() && (items.get(fuelItem) >= 5 || heat >= 0.5f);
super.createExplosion();
}
} }
@Override @Override