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

v1.2.1: fixed rankings not showing more than 4 quickslot items

Browse Source
This commit is contained in:
Evan Debenham 2022-03-27 14:02:41 -04:00 committed by Evan Debenham
parent 47d9f3219d
commit 200e0a3b16
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java
View File

@ -24,6 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.windows;
import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Badges; import com.shatteredpixel.shatteredpixeldungeon.Badges;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.QuickSlot;
import com.shatteredpixel.shatteredpixeldungeon.Rankings; import com.shatteredpixel.shatteredpixeldungeon.Rankings;
import com.shatteredpixel.shatteredpixeldungeon.Statistics; import com.shatteredpixel.shatteredpixeldungeon.Statistics;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Belongings; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Belongings;
@ -287,21 +288,28 @@ public class WndRanking extends WndTabbed {
} }
pos = 0; pos = 0;
for (int i = 0; i < 4; i++){
if (Dungeon.quickslot.getItem(i) != null){ int slotsActive = 0;
for (int i = 0; i < QuickSlot.SIZE; i++){
if (Dungeon.quickslot.isNonePlaceholder(i)){
slotsActive++;
}
}
float slotWidth = Math.min(28, ((WIDTH - slotsActive + 1) / (float)slotsActive));
for (int i = 0; i < slotsActive; i++){
if (Dungeon.quickslot.isNonePlaceholder(i)){
QuickSlotButton slot = new QuickSlotButton(Dungeon.quickslot.getItem(i)); QuickSlotButton slot = new QuickSlotButton(Dungeon.quickslot.getItem(i));
slot.setRect( pos, 120, 28, 23 ); slot.setRect( pos, 120, slotWidth, 23 );
PixelScene.align(slot);
add(slot); add(slot);
} else { pos += slotWidth + 1;
ColorBlock bg = new ColorBlock( 28, 23, 0x9953564D );
bg.x = pos;
bg.y = 120;
add(bg);
} }
pos += 29;
} }
} }
@ -410,8 +418,6 @@ public class WndRanking extends WndTabbed {
private class QuickSlotButton extends ItemSlot{ private class QuickSlotButton extends ItemSlot{
public static final int HEIGHT = 23;
private Item item; private Item item;
private ColorBlock bg; private ColorBlock bg;
@ -422,7 +428,7 @@ public class WndRanking extends WndTabbed {
@Override @Override
protected void createChildren() { protected void createChildren() {
bg = new ColorBlock( 28, HEIGHT, 0x9953564D ); bg = new ColorBlock( 1, 1, 0x9953564D );
add( bg ); add( bg );
super.createChildren(); super.createChildren();
@ -433,6 +439,8 @@ public class WndRanking extends WndTabbed {
bg.x = x; bg.x = x;
bg.y = y; bg.y = y;
bg.size( width(), height() );
super.layout(); super.layout();
} }