mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-11 11:17:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Pierce damage decay (#8416)

Browse Source
This commit is contained in:
MEEPofFaith 2023-03-25 11:06:14 -07:00 committed by GitHub
parent 9c3ddc398c
commit 0122b735a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,8 @@ public class BulletType extends Content implements Cloneable{
public boolean pierceBuilding; public boolean pierceBuilding;
/** Maximum # of pierced objects. */ /** Maximum # of pierced objects. */
public int pierceCap = -1; public int pierceCap = -1;
/** Multiplier of damage decreased per health pierced. */
public float pierceDamageFactor = 0f;
/** If false, this bullet isn't removed after pierceCap is exceeded. Expert usage only. */ /** If false, this bullet isn't removed after pierceCap is exceeded. Expert usage only. */
public boolean removeAfterPierce = true; public boolean removeAfterPierce = true;
/** For piercing lasers, setting this to true makes it get absorbed by plastanium walls. */ /** For piercing lasers, setting this to true makes it get absorbed by plastanium walls. */
@ -360,6 +362,8 @@ public class BulletType extends Content implements Cloneable{
}else if(build.team != b.team && direct){ }else if(build.team != b.team && direct){
hit(b); hit(b);
} }
handlePierce(b, initialHealth, x, y);
} }
public void hitEntity(Bullet b, Hitboxc entity, float health){ public void hitEntity(Bullet b, Hitboxc entity, float health){
@ -385,6 +389,19 @@ public class BulletType extends Content implements Cloneable{
if(!wasDead && entity instanceof Unit unit && unit.dead){ if(!wasDead && entity instanceof Unit unit && unit.dead){
Events.fire(new UnitBulletDestroyEvent(unit, b)); Events.fire(new UnitBulletDestroyEvent(unit, b));
} }
handlePierce(b, health, entity.x(), entity.y());
}
public void handlePierce(Bullet b, float initialHealth, float x, float y){
float sub = Math.max(initialHealth*pierceDamageFactor, 0);
//subtract health from each consecutive pierce
b.damage -= Math.min(b.damage, sub);
if(removeAfterPierce && b.damage <= 0){
b.hit = true;
b.remove();
}
} }
public float damageMultiplier(Bullet b){ public float damageMultiplier(Bullet b){

15
core/src/mindustry/entities/bullet/RailBulletType.java
View File

@ -13,8 +13,6 @@ public class RailBulletType extends BulletType{
public Effect pierceEffect = Fx.hitBulletSmall, pointEffect = Fx.none, lineEffect = Fx.none; public Effect pierceEffect = Fx.hitBulletSmall, pointEffect = Fx.none, lineEffect = Fx.none;
public Effect endEffect = Fx.none; public Effect endEffect = Fx.none;
/** Multiplier of damage decreased per health pierced. */
public float pierceDamageFactor = 1f;
public float length = 100f; public float length = 100f;
@ -37,8 +35,9 @@ public class RailBulletType extends BulletType{
return length; return length;
} }
void handle(Bullet b, float initialHealth, float x, float y){ @Override
float sub = Math.max(initialHealth*pierceDamageFactor, 0); public void handlePierce(Bullet b, float initialHealth, float x, float y){
float sub = Math.max(initialHealth * pierceDamageFactor, 0);
if(b.damage <= 0){ if(b.damage <= 0){
b.fdata = Math.min(b.fdata, b.dst(x, y)); b.fdata = Math.min(b.fdata, b.dst(x, y));
@ -93,14 +92,8 @@ public class RailBulletType extends BulletType{
return bullet.team != tile.team; return bullet.team != tile.team;
} }
@Override
public void hitEntity(Bullet b, Hitboxc entity, float health){
super.hitEntity(b, entity, health);
handle(b, health, entity.getX(), entity.getY());
}
@Override @Override
public void hitTile(Bullet b, Building build, float x, float y, float initialHealth, boolean direct){ public void hitTile(Bullet b, Building build, float x, float y, float initialHealth, boolean direct){
handle(b, initialHealth, x, y); handlePierce(b, initialHealth, x, y);
} }
} }