diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index 2e98d4e539..9797160948 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -224,6 +224,8 @@ public class BulletType extends Content implements Cloneable{ /** Use a negative value to disable splash damage. */ public float splashDamageRadius = -1f; + /** If true, splash damage pierces through tiles. */ + public boolean splashDamagePierce = false; /** Amount of fires attempted around bullet. */ public int incendAmount = 0; @@ -457,7 +459,7 @@ public class BulletType extends Content implements Cloneable{ public void createSplashDamage(Bullet b, float x, float y){ if(splashDamageRadius > 0 && !b.absorbed){ - Damage.damage(b.team, x, y, splashDamageRadius, splashDamage * b.damageMultiplier(), false, collidesAir, collidesGround, scaledSplashDamage, b); + Damage.damage(b.team, x, y, splashDamageRadius, splashDamage * b.damageMultiplier(), splashDamagePierce, collidesAir, collidesGround, scaledSplashDamage, b); if(status != StatusEffects.none){ Damage.status(b.team, x, y, splashDamageRadius, status, statusDuration, collidesAir, collidesGround); diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java index 083e03b951..6fddddf503 100644 --- a/core/src/mindustry/graphics/MinimapRenderer.java +++ b/core/src/mindustry/graphics/MinimapRenderer.java @@ -222,7 +222,7 @@ public class MinimapRenderer{ Vec2 v = transform(Tmp.v1.set((ix + 0.5f + offset) * tilesize, (iy + 0.5f + offset) * tilesize)); - Draw.color(Color.orange, Color.scarlet, Mathf.clamp(time / 50f)); + Draw.color(Color.orange, Color.scarlet, Mathf.clamp(time / 70f)); Lines.square(v.x, v.y, rad); }