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

Merge branch 'master' into healbullets-bullets

Browse Source
This commit is contained in:
genNAowl
2020-10-05 16:04:29 -07:00
committed by GitHub
parent 7722d697c6 5cc6ac0216
commit cba2fd4351
43 changed files with 735 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,6 +146,9 @@ public abstract class BulletType extends Content{
}
public void hitTile(Bullet b, Building tile, float initialHealth){
if(status == StatusEffects.burning) {
Fires.create(tile.tile);
}
hit(b);
if(healPercent > 0f && tile.team == b.team && !(tile.block instanceof ConstructBlock)){
@@ -193,11 +196,16 @@ public abstract class BulletType extends Content{
if(status != StatusEffects.none){
Damage.status(b.team, x, y, splashDamageRadius, status, statusDuration, collidesAir, collidesGround);
}
if(healPercent > 0f) {
indexer.eachBlock(b.team, x, y, splashDamageRadius, other -> other.damaged(), other -> {
Fx.healBlockFull.at(other.x, other.y, other.block.size, Pal.heal);
other.heal(healPercent / 100f * other.maxHealth());
}
if(status == StatusEffects.burning) {
indexer.eachBlock(null, x, y, splashDamageRadius, other -> other.team != b.team, other -> {
Fires.create(other.tile);
});
}
}