konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.4.0: fixed fireblast sometimes not igniting close heaps or barricades

Browse Source
This commit is contained in:
Evan Debenham
2022-08-05 13:51:32 -04:00
parent ac318cb0ca
commit 00bc4ef473
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java
+15 -5
View File
@@ -88,9 +88,14 @@ public class WandOfFireblast extends DamageWand {
GameScene.updateMap(cell); GameScene.updateMap(cell);
} }
//only ignite cells directly near caster if they are flammable //only ignite cells directly near caster if they are flammable or solid
if (Dungeon.level.adjacent(bolt.sourcePos, cell) && !Dungeon.level.flamable[cell]){ if (Dungeon.level.adjacent(bolt.sourcePos, cell)
&& !(Dungeon.level.flamable[cell] || Dungeon.level.solid[cell])){
adjacentCells.add(cell); adjacentCells.add(cell);
//do burn any heaps located here though
if (Dungeon.level.heaps.get(cell) != null){
Dungeon.level.heaps.get(cell).burn();
}
} else { } else {
GameScene.add( Blob.seed( cell, 1+chargesPerCast(), Fire.class ) ); GameScene.add( Blob.seed( cell, 1+chargesPerCast(), Fire.class ) );
} }
@@ -101,11 +106,16 @@ public class WandOfFireblast extends DamageWand {
} }
} }
//ignite cells that share a side with an adjacent cell, are flammable, and are further from the source pos //if wand was shot right at a wall
if (cone.cells.isEmpty()){
adjacentCells.add(bolt.sourcePos);
}
//ignite cells that share a side with an adjacent cell, are flammable, and are closer to the collision pos
//This prevents short-range casts not igniting barricades or bookshelves //This prevents short-range casts not igniting barricades or bookshelves
for (int cell : adjacentCells){ for (int cell : adjacentCells){
for (int i : PathFinder.NEIGHBOURS4){ for (int i : PathFinder.NEIGHBOURS8){
if (Dungeon.level.trueDistance(cell+i, bolt.sourcePos) > Dungeon.level.trueDistance(cell, bolt.sourcePos) if (Dungeon.level.trueDistance(cell+i, bolt.collisionPos) < Dungeon.level.trueDistance(cell, bolt.collisionPos)
&& Dungeon.level.flamable[cell+i] && Dungeon.level.flamable[cell+i]
&& Fire.volumeAt(cell+i, Fire.class) == 0){ && Fire.volumeAt(cell+i, Fire.class) == 0){
GameScene.add( Blob.seed( cell+i, 1+chargesPerCast(), Fire.class ) ); GameScene.add( Blob.seed( cell+i, 1+chargesPerCast(), Fire.class ) );