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

Move damage and knockback to hitEntity (#5000)

Browse Source 
* Move damge and knockback to `hitEntity`

* b.damage, not damage
This commit is contained in:
MEEP of Faith
2021-04-10 06:15:34 -07:00
committed by GitHub
parent 7e7e6b70e2
commit 0d8f95354f
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,8 +185,15 @@ public abstract class BulletType extends Content{
} }
} }
public void hitEntity(Bullet b, Hitboxc other, float initialHealth){ public void hitEntity(Bullet b, Hitboxc entity, float initialHealth){
if(entity instanceof Healthc h){
h.damage(b.damage);
}
if(entity instanceof Unit unit){
unit.impulse(Tmp.v3.set(unit).sub(b.x, b.y).nor().scl(knockback * 80f));
unit.apply(status, statusDuration);
}
} }
public void hit(Bullet b){ public void hit(Bullet b){

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

@@ -71,6 +71,7 @@ public class RailBulletType extends BulletType{
@Override @Override
public void hitEntity(Bullet b, Hitboxc entity, float initialHealth){ public void hitEntity(Bullet b, Hitboxc entity, float initialHealth){
handle(b, entity, initialHealth); handle(b, entity, initialHealth);
super.hitEntity(b, entity, initialHealth);
} }
@Override @Override

6
core/src/mindustry/entities/comp/BulletComp.java
View File

@@ -93,12 +93,6 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
if(other instanceof Healthc h){ if(other instanceof Healthc h){
health = h.health(); health = h.health();
h.damage(damage);
}
if(other instanceof Unit unit){
unit.impulse(Tmp.v3.set(unit).sub(this.x, this.y).nor().scl(type.knockback * 80f));
unit.apply(type.status, type.statusDuration);
} }
//must be last. //must be last.