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

v2.3.0: fixed items being assignable to non-visible quickslots

Browse Source
This commit is contained in:
Evan Debenham
2024-01-03 13:27:48 -05:00
parent 95fb84bd75
commit cf6961169e
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java
+3 -1
View File
@@ -258,8 +258,10 @@ public class QuickSlotButton extends Button {
} }
}; };
public static int lastVisible = instance.length;
public static void set(Item item){ public static void set(Item item){
for (int i = 0; i < instance.length; i++) { for (int i = 0; i < lastVisible; i++) {
if (select(i) == null || select(i) == item) { if (select(i) == null || select(i) == item) {
set(i, item); set(i, item);
return; return;
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java
+2
View File
@@ -498,10 +498,12 @@ public class Toolbar extends Component {
startingSlot = swappedQuickslots ? 3 : 0; startingSlot = swappedQuickslots ? 3 : 0;
btnSwap.visible = true; btnSwap.visible = true;
btnSwap.active = lastEnabled; btnSwap.active = lastEnabled;
QuickSlotButton.lastVisible = 6;
} else { } else {
startingSlot = 0; startingSlot = 0;
btnSwap.visible = btnSwap.active = false; btnSwap.visible = btnSwap.active = false;
btnSwap.setPos(0, PixelScene.uiCamera.height); btnSwap.setPos(0, PixelScene.uiCamera.height);
QuickSlotButton.lastVisible = quickslotsToShow;
} }
int endingSlot = startingSlot+quickslotsToShow-1; int endingSlot = startingSlot+quickslotsToShow-1;