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

Fixed #7495

Browse Source
This commit is contained in:
Anuken
2022-09-01 08:46:31 -04:00
parent 920cedb334
commit 5ecd73bdb0
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/content/Blocks.java
+3 -1
View File
@@ -4471,7 +4471,7 @@ public class Blocks{
deathExplosionEffect = Fx.massiveExplosion; deathExplosionEffect = Fx.massiveExplosion;
shootOnDeath = true; shootOnDeath = true;
shake = 10f; shake = 10f;
bullet = new ExplosionBulletType(500f, 65f){{ bullet = new ExplosionBulletType(600f, 65f){{
hitColor = Pal.redLight; hitColor = Pal.redLight;
shootEffect = new MultiEffect(Fx.massiveExplosion, Fx.scatheExplosion, Fx.scatheLight, new WaveEffect(){{ shootEffect = new MultiEffect(Fx.massiveExplosion, Fx.scatheExplosion, Fx.scatheLight, new WaveEffect(){{
lifetime = 10f; lifetime = 10f;
@@ -4480,11 +4480,13 @@ public class Blocks{
}}); }});
collidesAir = false; collidesAir = false;
buildingDamageMultiplier = 0.3f;
ammoMultiplier = 1f; ammoMultiplier = 1f;
fragLifeMin = 0.1f; fragLifeMin = 0.1f;
fragBullets = 7; fragBullets = 7;
fragBullet = new ArtilleryBulletType(3.4f, 30){{ fragBullet = new ArtilleryBulletType(3.4f, 30){{
buildingDamageMultiplier = 0.3f;
drag = 0.02f; drag = 0.02f;
hitEffect = Fx.massiveExplosion; hitEffect = Fx.massiveExplosion;
despawnEffect = Fx.scatheSlash; despawnEffect = Fx.scatheSlash;
core/src/mindustry/logic/LExecutor.java
+1 -1
View File
@@ -1298,7 +1298,7 @@ public class LExecutor{
//TODO this can be quite laggy... //TODO this can be quite laggy...
switch(layer){ switch(layer){
case ore -> { case ore -> {
if(b instanceof OverlayFloor o && tile.overlay() != o) tile.setOverlayNet(o); if(b instanceof OverlayFloor || b == Blocks.air && tile.overlay() != b) tile.setOverlayNet(b);
} }
case floor -> { case floor -> {
if(b instanceof Floor f && tile.floor() != f && !f.isOverlay()) tile.setFloorNet(f); if(b instanceof Floor f && tile.floor() != f && !f.isOverlay()) tile.setFloorNet(f);