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

splashDamagePierce

Browse Source
This commit is contained in:
Anuken
2023-04-20 01:03:18 -04:00
parent 6a3638c3c2
commit 7a01be6dba
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/entities/bullet/BulletType.java
View File

@@ -224,6 +224,8 @@ public class BulletType extends Content implements Cloneable{
/** Use a negative value to disable splash damage. */ /** Use a negative value to disable splash damage. */
public float splashDamageRadius = -1f; public float splashDamageRadius = -1f;
/** If true, splash damage pierces through tiles. */
public boolean splashDamagePierce = false;
/** Amount of fires attempted around bullet. */ /** Amount of fires attempted around bullet. */
public int incendAmount = 0; public int incendAmount = 0;
@@ -457,7 +459,7 @@ public class BulletType extends Content implements Cloneable{
public void createSplashDamage(Bullet b, float x, float y){ public void createSplashDamage(Bullet b, float x, float y){
if(splashDamageRadius > 0 && !b.absorbed){ 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){ if(status != StatusEffects.none){
Damage.status(b.team, x, y, splashDamageRadius, status, statusDuration, collidesAir, collidesGround); Damage.status(b.team, x, y, splashDamageRadius, status, statusDuration, collidesAir, collidesGround);

2
core/src/mindustry/graphics/MinimapRenderer.java
View File

@@ -222,7 +222,7 @@ public class MinimapRenderer{
Vec2 v = transform(Tmp.v1.set((ix + 0.5f + offset) * tilesize, (iy + 0.5f + offset) * tilesize)); 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); Lines.square(v.x, v.y, rad);
} }