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

v2.1.0: fixed targeted traps firing on dead targets in very rare cases

Browse Source
This commit is contained in:
Evan Debenham
2023-05-04 13:59:36 -04:00
parent e10189928e
commit abf3cd5a0d
4 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisintegrationTrap.java
View File

@@ -55,6 +55,7 @@ public class DisintegrationTrap extends Trap {
if (target == null){ if (target == null){
float closestDist = Float.MAX_VALUE; float closestDist = Float.MAX_VALUE;
for (Char ch : Actor.chars()){ for (Char ch : Actor.chars()){
if (!ch.isAlive()) continue;
float curDist = Dungeon.level.trueDistance(pos, ch.pos); float curDist = Dungeon.level.trueDistance(pos, ch.pos);
if (ch.invisible > 0) curDist += 1000; if (ch.invisible > 0) curDist += 1000;
Ballistica bolt = new Ballistica(pos, ch.pos, Ballistica.PROJECTILE); Ballistica bolt = new Ballistica(pos, ch.pos, Ballistica.PROJECTILE);

1
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrimTrap.java
View File

@@ -65,6 +65,7 @@ public class GrimTrap extends Trap {
if (target == null){ if (target == null){
float closestDist = Float.MAX_VALUE; float closestDist = Float.MAX_VALUE;
for (Char ch : Actor.chars()){ for (Char ch : Actor.chars()){
if (!ch.isAlive()) continue;
float curDist = Dungeon.level.trueDistance(pos, ch.pos); float curDist = Dungeon.level.trueDistance(pos, ch.pos);
if (ch.invisible > 0) curDist += 1000; if (ch.invisible > 0) curDist += 1000;
Ballistica bolt = new Ballistica(pos, ch.pos, Ballistica.PROJECTILE); Ballistica bolt = new Ballistica(pos, ch.pos, Ballistica.PROJECTILE);

1
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PoisonDartTrap.java
View File

@@ -77,6 +77,7 @@ public class PoisonDartTrap extends Trap {
if (target == null){ if (target == null){
float closestDist = Float.MAX_VALUE; float closestDist = Float.MAX_VALUE;
for (Char ch : Actor.chars()){ for (Char ch : Actor.chars()){
if (!ch.isAlive()) continue;
float curDist = Dungeon.level.trueDistance(pos, ch.pos); float curDist = Dungeon.level.trueDistance(pos, ch.pos);
if (ch.invisible > 0) curDist += 1000; if (ch.invisible > 0) curDist += 1000;
Ballistica bolt = new Ballistica(pos, ch.pos, Ballistica.PROJECTILE); Ballistica bolt = new Ballistica(pos, ch.pos, Ballistica.PROJECTILE);

1
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WornDartTrap.java
View File

@@ -62,6 +62,7 @@ public class WornDartTrap extends Trap {
if (target == null){ if (target == null){
float closestDist = Float.MAX_VALUE; float closestDist = Float.MAX_VALUE;
for (Char ch : Actor.chars()){ for (Char ch : Actor.chars()){
if (!ch.isAlive()) continue;
float curDist = Dungeon.level.trueDistance(pos, ch.pos); float curDist = Dungeon.level.trueDistance(pos, ch.pos);
if (ch.invisible > 0) curDist += 1000; if (ch.invisible > 0) curDist += 1000;
Ballistica bolt = new Ballistica(pos, ch.pos, Ballistica.PROJECTILE); Ballistica bolt = new Ballistica(pos, ch.pos, Ballistica.PROJECTILE);