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

v0.9.3b: quickslotted bags now support targeting

Browse Source
This commit is contained in:
Evan Debenham 2021-06-17 17:30:40 -04:00
parent c89181ea18
commit d41a870e1b
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,6 +205,10 @@ public class QuickSlotButton extends Button implements WndBag.Listener {
slot.enable(Dungeon.quickslot.isNonePlaceholder( slotNum )); slot.enable(Dungeon.quickslot.isNonePlaceholder( slotNum ));
} }
public static void useTargeting(int idx){
instance[idx].useTargeting();
}
private void useTargeting() { private void useTargeting() {
if (lastTarget != null && if (lastTarget != null &&

12
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndQuickBag.java
View File

@ -3,6 +3,7 @@ package com.shatteredpixel.shatteredpixeldungeon.windows;
import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Chrome; import com.shatteredpixel.shatteredpixeldungeon.Chrome;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.QuickSlot;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent;
import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem; import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem;
import com.shatteredpixel.shatteredpixeldungeon.items.Generator; import com.shatteredpixel.shatteredpixeldungeon.items.Generator;
@ -16,6 +17,7 @@ import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
import com.shatteredpixel.shatteredpixeldungeon.ui.ItemSlot; import com.shatteredpixel.shatteredpixeldungeon.ui.ItemSlot;
import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton;
import com.shatteredpixel.shatteredpixeldungeon.ui.RenderedTextBlock; import com.shatteredpixel.shatteredpixeldungeon.ui.RenderedTextBlock;
import com.shatteredpixel.shatteredpixeldungeon.ui.Window; import com.shatteredpixel.shatteredpixeldungeon.ui.Window;
import com.watabou.gltextures.TextureCache; import com.watabou.gltextures.TextureCache;
@ -29,6 +31,8 @@ import java.util.Comparator;
public class WndQuickBag extends Window { public class WndQuickBag extends Window {
private static Item bag;
public WndQuickBag(Bag bag){ public WndQuickBag(Bag bag){
super(0, 0, 0, Chrome.get(Chrome.Type.TOAST_TR)); super(0, 0, 0, Chrome.get(Chrome.Type.TOAST_TR));
@ -37,6 +41,8 @@ public class WndQuickBag extends Window {
} }
WndBag.INSTANCE = this; WndBag.INSTANCE = this;
WndQuickBag.bag = bag;
float width = 0, height = 0; float width = 0, height = 0;
int maxWidth = PixelScene.landscape() ? 240 : 135; int maxWidth = PixelScene.landscape() ? 240 : 135;
int left = 0; int left = 0;
@ -211,6 +217,12 @@ public class WndQuickBag extends Window {
protected void onClick() { protected void onClick() {
hide(); hide();
item.execute(Dungeon.hero); //TODO targeting? item.execute(Dungeon.hero); //TODO targeting?
if (item.usesTargeting && bag != null){
int idx = Dungeon.quickslot.getSlot(WndQuickBag.bag);
if (idx != -1){
QuickSlotButton.useTargeting(idx);
}
}
} }
@Override @Override