v0.2.3: artifact refactoring, pulled some display logic into superclass

This commit is contained in:
Evan Debenham
2014-12-10 13:58:20 -05:00
parent 7940bc78ec
commit e359b5f9ef
12 changed files with 73 additions and 103 deletions
@@ -12,7 +12,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlot;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
import com.shatteredpixel.shatteredpixeldungeon.windows.WndOptions;
import com.watabou.noosa.audio.Sample;
import com.watabou.utils.Bundle;
@@ -32,18 +31,19 @@ public class TimekeepersHourglass extends Artifact {
"...";
{
name = "timekeeper's hourglass";
name = "Timekeeper's Hourglass";
image = ItemSpriteSheet.ARTIFACT_HOURGLASS;
level = 0;
levelCap = 5;
charge = 10+level*2;
partialCharge = 0;
chargeCap = 10+level*2;
defaultAction = AC_ACTIVATE;
}
private static final String TXT_CHARGE = "%d/%d";
public static final String AC_ACTIVATE = "ACTIVATE";
//keeps track of generated sandbags.
@@ -113,11 +113,6 @@ public class TimekeepersHourglass extends Artifact {
return "";
}
@Override
public String status() {
return Utils.format(TXT_CHARGE, charge, chargeCap);
}
//needs to bundle chargecap as it is dynamic.
private static final String CHARGECAP = "chargecap";