diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Rankings.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Rankings.java index d75a3ae67..816639bd0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Rankings.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Rankings.java @@ -33,6 +33,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion; import com.shatteredpixel.shatteredpixeldungeon.items.quest.CorpseDust; import com.shatteredpixel.shatteredpixeldungeon.items.rings.Ring; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll; +import com.shatteredpixel.shatteredpixeldungeon.items.trinkets.Trinket; import com.shatteredpixel.shatteredpixeldungeon.journal.Notes; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton; @@ -263,7 +264,7 @@ public enum Rankings { } } } - if (!Dungeon.quickslot.contains(item)) { + if (!(item instanceof Trinket) && !Dungeon.quickslot.contains(item)) { belongings.backpack.items.remove(item); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java index 87dfb5d15..01fca2c57 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java @@ -33,6 +33,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Statistics; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Belongings; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass; import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.trinkets.Trinket; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; import com.shatteredpixel.shatteredpixeldungeon.sprites.HeroSprite; @@ -366,11 +367,22 @@ public class WndRanking extends WndTabbed { } } + Trinket trinket = stuff.getItem(Trinket.class); + if (trinket != null){ + slotsActive++; + } + float slotWidth = Math.min(28, ((WIDTH - slotsActive + 1) / (float)slotsActive)); - for (int i = 0; i < QuickSlot.SIZE; i++){ - if (Dungeon.quickslot.isNonePlaceholder(i)){ - QuickSlotButton slot = new QuickSlotButton(Dungeon.quickslot.getItem(i)); + for (int i = -1; i < QuickSlot.SIZE; i++){ + Item item = null; + if (i == -1){ + item = trinket; + } else if (Dungeon.quickslot.isNonePlaceholder(i)) { + item = Dungeon.quickslot.getItem(i); + } + if (item != null){ + QuickSlotButton slot = new QuickSlotButton(item); slot.setRect( pos, 120, slotWidth, 23 ); PixelScene.align(slot);