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
@@ -10,7 +10,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlot;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
import com.watabou.noosa.audio.Sample;
import com.watabou.noosa.tweeners.AlphaTweener;
import com.watabou.utils.Bundle;
@@ -25,11 +24,17 @@ public class CloakOfShadows extends Artifact {
{
name = "Cloak of Shadows";
image = ItemSpriteSheet.ARTIFACT_CLOAK;
level = 0;
levelCap = 15;
charge = level+5;
chargeCap = level+5;
exp = 0;
levelCap = 15;
charge = level+5;
partialCharge = 0;
chargeCap = level+5;
cooldown = 0;
defaultAction = AC_STEALTH;
bones = false;
@@ -39,11 +44,6 @@ public class CloakOfShadows extends Artifact {
public static final String AC_STEALTH = "STEALTH";
private static final String TXT_CHARGE = "%d/%d";
private static final String TXT_CD = "%d";
private int cooldown = 0;
@Override
public ArrayList<String> actions( Hero hero ) {
ArrayList<String> actions = super.actions( hero );
@@ -143,14 +143,6 @@ public class CloakOfShadows extends Artifact {
return desc;
}
@Override
public String status() {
if (cooldown == 0)
return Utils.format(TXT_CHARGE, charge, chargeCap);
else
return Utils.format(TXT_CD, cooldown);
}
//Note: cloak needs to bundle chargecap as it is dynamic.
private static final String CHARGECAP = "chargecap";
private static final String STEALTHED = "stealthed";