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

v0.9.1a: fixed errors with previous autotargeting changes

Browse Source
This commit is contained in:
Evan Debenham
2020-12-14 20:57:36 -05:00
parent a73656b5ff
commit d78a9b567c
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java
View File

@@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob;
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Web;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.effects.Beam;
import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.PurpleParticle;
@@ -56,6 +57,11 @@ public class WandOfDisintegration extends DamageWand {
return 8+4*lvl;
}
@Override
public int targetingPos(Hero user, int dst) {
return dst;
}
@Override
protected void onZap( Ballistica beam ) {

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java
View File

@@ -244,7 +244,7 @@ public class QuickSlotButton extends Button implements WndBag.Listener {
PathFinder.buildDistanceMap( target.pos, BArray.not( new boolean[Dungeon.level.length()], null ), 2 );
for (int i = 0; i < PathFinder.distance.length; i++) {
if (PathFinder.distance[i] < Integer.MAX_VALUE
&& item.throwPos(Dungeon.hero, i) == target.pos)
&& item.targetingPos(Dungeon.hero, i) == target.pos)
return i;
}