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

Collisions, lots of bugfixes

Browse Source
This commit is contained in:
Anuken
2020-02-10 09:58:00 -05:00
parent fbadb9f4aa
commit 0ad8408ba9
7 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/mindustry/entities/def/UnitComp.java
View File

@@ -150,8 +150,6 @@ abstract class UnitComp implements Healthc, Velc, Statusc, Teamc, Itemsc, Hitbox
float flammability = item().flammability * stack().amount;
Damage.dynamicExplosion(x, y, flammability, explosiveness, 0f, bounds() / 2f, Pal.darkFlame);
//TODO cleanup
//ScorchDecal.create(getX(), getY());
Effects.scorch(x, y, (int)(hitSize() / 5));
Fx.explosion.at(this);
Effects.shake(2f, 2f, this);
@@ -159,9 +157,8 @@ abstract class UnitComp implements Healthc, Velc, Statusc, Teamc, Itemsc, Hitbox
Events.fire(new UnitDestroyEvent(this));
//TODO implement suicide bomb trigger
//if(explosiveness > 7f && this == player){
// Events.fire(Trigger.suicideBomb);
//}
if(explosiveness > 7f && isLocal()){
Events.fire(Trigger.suicideBomb);
}
}
}