LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.9.2b: fixed combo leap placing glad onto visible traps or chasms

Browse Source
This commit is contained in:
Evan Debenham 2021-03-18 16:55:05 -04:00
parent 3b1d93abef
commit 8c51d26a0a
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java
View File

@ -455,22 +455,27 @@ public class Combo extends Buff implements ActionIndicator.Action {
} else {
Ballistica c = new Ballistica(target.pos, enemy.pos, Ballistica.PROJECTILE);
if (c.collisionPos == enemy.pos){
Dungeon.hero.busy();
target.sprite.jump(target.pos, c.path.get(c.dist-1), new Callback() {
@Override
public void call() {
target.move(c.path.get(c.dist-1));
Dungeon.level.occupyCell(target);
Dungeon.observe();
GameScene.updateFog();
target.sprite.attack(cell, new Callback() {
@Override
public void call() {
doAttack(enemy);
}
});
}
});
final int leapPos = c.path.get(c.dist-1);
if (!Dungeon.level.passable[leapPos]){
GLog.w(Messages.get(Combo.class, "bad_target"));
} else {
Dungeon.hero.busy();
target.sprite.jump(target.pos, leapPos, new Callback() {
@Override
public void call() {
target.move(leapPos);
Dungeon.level.occupyCell(target);
Dungeon.observe();
GameScene.updateFog();
target.sprite.attack(cell, new Callback() {
@Override
public void call() {
doAttack(enemy);
}
});
}
});
}
} else {
GLog.w(Messages.get(Combo.class, "bad_target"));
}