Merging Source v1.7.2: UI changes

This commit is contained in:
Evan Debenham
2014-10-18 21:30:38 -04:00
parent 9f9e117c95
commit 735af276c8
7 changed files with 347 additions and 206 deletions
@@ -47,7 +47,6 @@ public class ItemSlot extends Button {
private static final String TXT_TYPICAL_STR = "%d?";
private static final String TXT_LEVEL = "%+d";
private static final String TXT_CURSED = "";
// Special items for containers
public static final Item CHEST = new Item() {
@@ -164,7 +163,7 @@ public class ItemSlot extends Button {
int level = item.visiblyUpgraded();
if (level != 0 || (item.cursed && item.cursedKnown)) {
bottomRight.text( item.levelKnown ? Utils.format( TXT_LEVEL, level ) : TXT_CURSED );
bottomRight.text( item.levelKnown ? Utils.format( TXT_LEVEL, level ) : "" );
bottomRight.measure();
bottomRight.hardlight( level > 0 ? UPGRADED : DEGRADED );
} else {