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

v2.4.0: added trinkets to rankings page

Browse Source
This commit is contained in:
Evan Debenham
2024-04-25 14:06:03 -04:00
parent f6f9f5eb61
commit a44b158328
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Rankings.java
+2 -1
View File
@@ -33,6 +33,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion;
import com.shatteredpixel.shatteredpixeldungeon.items.quest.CorpseDust; import com.shatteredpixel.shatteredpixeldungeon.items.quest.CorpseDust;
import com.shatteredpixel.shatteredpixeldungeon.items.rings.Ring; import com.shatteredpixel.shatteredpixeldungeon.items.rings.Ring;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll;
import com.shatteredpixel.shatteredpixeldungeon.items.trinkets.Trinket;
import com.shatteredpixel.shatteredpixeldungeon.journal.Notes; import com.shatteredpixel.shatteredpixeldungeon.journal.Notes;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton; 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); belongings.backpack.items.remove(item);
} }
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java
+15 -3
View File
@@ -33,6 +33,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Statistics;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Belongings; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Belongings;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.trinkets.Trinket;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.HeroSprite; 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)); float slotWidth = Math.min(28, ((WIDTH - slotsActive + 1) / (float)slotsActive));
for (int i = 0; i < QuickSlot.SIZE; i++){ for (int i = -1; i < QuickSlot.SIZE; i++){
if (Dungeon.quickslot.isNonePlaceholder(i)){ Item item = null;
QuickSlotButton slot = new QuickSlotButton(Dungeon.quickslot.getItem(i)); 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 ); slot.setRect( pos, 120, slotWidth, 23 );
PixelScene.align(slot); PixelScene.align(slot);