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

Merge pull request #2806 from genNAowl/burning-affects-tiles

Browse Source 
Incendiary Bullets Make Fires When Hitting Tiles
This commit is contained in:
Anuken
2020-10-05 16:35:13 -04:00
committed by GitHub
parent c24112e405 60d5048140
commit 93e21c6bf9
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ai/BlockIndexer.java
View File

@@ -192,7 +192,7 @@ public class BlockIndexer{
if(other == null) continue; if(other == null) continue;
if(other.team == team && pred.get(other) && intSet.add(other.pos())){ if((team == null || other.team == team) && pred.get(other) && intSet.add(other.pos())){
cons.get(other); cons.get(other);
any = true; any = true;
} }

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

@@ -143,6 +143,9 @@ public abstract class BulletType extends Content{
} }
public void hitTile(Bullet b, Building tile, float initialHealth){ public void hitTile(Bullet b, Building tile, float initialHealth){
if(status == StatusEffects.burning) {
Fires.create(tile.tile);
}
hit(b); hit(b);
} }
@@ -185,6 +188,12 @@ public abstract class BulletType extends Content{
if(status != StatusEffects.none){ if(status != StatusEffects.none){
Damage.status(b.team, x, y, splashDamageRadius, status, statusDuration, collidesAir, collidesGround); Damage.status(b.team, x, y, splashDamageRadius, status, statusDuration, collidesAir, collidesGround);
} }
if(status == StatusEffects.burning) {
indexer.eachBlock(null, x, y, splashDamageRadius, other -> other.team != b.team, other -> {
Fires.create(other.tile);
});
}
} }
for(int i = 0; i < lightning; i++){ for(int i = 0; i < lightning; i++){