V0.2.0: updated sprites, reworked some class hierarchies (probably adds some bugs!)

This commit is contained in:
Evan Debenham
2014-08-24 23:55:10 -04:00
parent ac1e6ff8f3
commit c96c3c5bed
10 changed files with 75 additions and 50 deletions
@@ -154,8 +154,8 @@ public class WndBag extends WndTabbed {
Belongings stuff = Dungeon.hero.belongings;
placeItem( stuff.weapon != null ? stuff.weapon : new Placeholder( ItemSpriteSheet.WEAPON ) );
placeItem( stuff.armor != null ? stuff.armor : new Placeholder( ItemSpriteSheet.ARMOR ) );
placeItem( stuff.ring1 != null ? stuff.ring1 : new Placeholder( ItemSpriteSheet.RING ) );
placeItem( stuff.ring2 != null ? stuff.ring2 : new Placeholder( ItemSpriteSheet.RING ) );
placeItem( stuff.misc1 != null ? stuff.misc1 : new Placeholder( ItemSpriteSheet.RING ) );
placeItem( stuff.misc2 != null ? stuff.misc2 : new Placeholder( ItemSpriteSheet.RING ) );
// Unequipped items
for (Item item : container.items) {
@@ -219,11 +219,11 @@ public class WndRanking extends WndTabbed {
if (stuff.armor != null) {
addItem( stuff.armor );
}
if (stuff.ring1 != null) {
addItem( stuff.ring1 );
if (stuff.misc1 != null) {
addItem( stuff.misc1);
}
if (stuff.ring2 != null) {
addItem( stuff.ring2 );
if (stuff.misc2 != null) {
addItem( stuff.misc2);
}
if (Dungeon.quickslot instanceof Item &&