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

v1.2.1: fixed autotargeting not working with right click menus

Browse Source
This commit is contained in:
Evan Debenham 2022-03-28 22:12:59 -04:00
parent e8d33abb73
commit 1a4378d1b7
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java
View File

@ -372,7 +372,9 @@ public class InventoryPane extends Component {
} }
public static void useTargeting(){ public static void useTargeting(){
if (lastTarget != null && if (instance != null &&
instance.visible &&
lastTarget != null &&
Actor.chars().contains( lastTarget ) && Actor.chars().contains( lastTarget ) &&
lastTarget.isAlive() && lastTarget.isAlive() &&
lastTarget.alignment != Char.Alignment.ALLY && lastTarget.alignment != Char.Alignment.ALLY &&
@ -531,6 +533,7 @@ public class InventoryPane extends Component {
} }
if (selector == null){ if (selector == null){
targetingSlot = this;
RightClickMenu r = new RightClickMenu(item); RightClickMenu r = new RightClickMenu(item);
parent.addToFront(r); parent.addToFront(r);
r.camera = camera(); r.camera = camera();

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/RightClickMenu.java
View File

@ -104,6 +104,10 @@ public class RightClickMenu extends Component {
super.onClick(); super.onClick();
if (item != null){ if (item != null){
item.execute(Dungeon.hero, options[finalI]); item.execute(Dungeon.hero, options[finalI]);
if (options[finalI].equals(item.defaultAction) && item.usesTargeting){
InventoryPane.useTargeting();
}
} }
onSelect(finalI); onSelect(finalI);
RightClickMenu.this.destroy(); RightClickMenu.this.destroy();