Merge branch 'master' into formatting

This commit is contained in:
Anuken
2020-10-30 09:26:51 -04:00
committed by GitHub
44 changed files with 508 additions and 382 deletions
@@ -79,8 +79,10 @@ public abstract class BulletType extends Content{
public boolean backMove = true;
/** Bullet range override. */
public float range = -1f;
/** Heal Bullet Percent **/
/** % of block health healed **/
public float healPercent = 0f;
/** whether to make fire on impact */
public boolean makeFire = false;
//additional effects
@@ -158,7 +160,7 @@ public abstract class BulletType extends Content{
}
public void hitTile(Bullet b, Building tile, float initialHealth){
if(status == StatusEffects.burning){
if(makeFire){
Fires.create(tile.tile);
}
hit(b);
@@ -216,7 +218,7 @@ public abstract class BulletType extends Content{
});
}
if(status == StatusEffects.burning){
if(makeFire){
indexer.eachBlock(null, x, y, splashDamageRadius, other -> other.team != b.team, other -> {
Fires.create(other.tile);
});