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

Fixed #3447

Browse Source
This commit is contained in:
Anuken
2020-11-18 09:26:31 -05:00
parent adc7b30eab
commit f4a7288633
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/content/UnitTypes.java
View File

@@ -421,6 +421,7 @@ public class UnitTypes implements ContentList{
armor = 7f; armor = 7f;
canBoost = true; canBoost = true;
landShake = 4f; landShake = 4f;
immunities = ObjectSet.with(StatusEffects.burning);
commandLimit = 8; commandLimit = 8;

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

@@ -161,16 +161,16 @@ public abstract class BulletType extends Content{
return healPercent <= 0.001f || tile.team != bullet.team || tile.healthf() < 1f; return healPercent <= 0.001f || tile.team != bullet.team || tile.healthf() < 1f;
} }
public void hitTile(Bullet b, Building tile, float initialHealth){ public void hitTile(Bullet b, Building build, float initialHealth){
if(makeFire && tile.team != b.team){ if(makeFire && build.team != b.team){
Fires.create(tile.tile); Fires.create(build.tile);
} }
if(healPercent > 0f && tile.team == b.team && !(tile.block instanceof ConstructBlock)){ if(healPercent > 0f && build.team == b.team && !(build.block instanceof ConstructBlock)){
Fx.healBlockFull.at(tile.x, tile.y, tile.block.size, Pal.heal); Fx.healBlockFull.at(build.x, build.y, build.block.size, Pal.heal);
tile.heal(healPercent / 100f * tile.maxHealth()); build.heal(healPercent / 100f * build.maxHealth());
}else if(tile.team != b.team){ }else if(build.team != b.team){
hit(b); hit(b, build.x, build.y);
} }
} }

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

@@ -54,7 +54,7 @@ public class RailBulletType extends BulletType{
} }
@Override @Override
public void hitTile(Bullet b, Building tile, float initialHealth){ public void hitTile(Bullet b, Building build, float initialHealth){
handle(b, tile, initialHealth); handle(b, build, initialHealth);
} }
} }