From 3885a0f0396cda28c57f86c10aea99de0e4d2b16 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 15 Sep 2014 09:43:57 -0400 Subject: [PATCH] V0.2.0: Chalice of Blood now caps at level 10, up from 8. Updated Regen buff logic to account for a level 10 chalice --- .../shatteredpixeldungeon/actors/buffs/Regeneration.java | 2 +- .../items/artifacts/ChaliceOfBlood.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Regeneration.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Regeneration.java index 71dda68c6..9a1dc3bb6 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Regeneration.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Regeneration.java @@ -35,7 +35,7 @@ public class Regeneration extends Buff { ChaliceOfBlood.chaliceRegen regenBuff = Dungeon.hero.buff( ChaliceOfBlood.chaliceRegen.class); if (regenBuff != null) - spend( REGENERATION_DELAY - regenBuff.level() ); + spend( Math.max(REGENERATION_DELAY - regenBuff.level(), 0.5f) ); else spend( REGENERATION_DELAY ); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java index 302cc0a26..a039d8b27 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java @@ -21,8 +21,6 @@ import java.util.ArrayList; */ public class ChaliceOfBlood extends Artifact { //TODO: add polish - //TODO: add sprite switching - //TODO: decide on max level 8 or 10. balance accordingly. private static final String TXT_CHALICE = "Chalice of Blood"; private static final String TXT_YES = "Yes, I know what I'm doing"; @@ -36,7 +34,7 @@ public class ChaliceOfBlood extends Artifact { name = "Chalice of Blood"; image = ItemSpriteSheet.ARTIFACT_CHALICE1; level = 0; - levelCap = 8; + levelCap = 10; //charge & chargecap are unused } @@ -114,7 +112,7 @@ public class ChaliceOfBlood extends Artifact { GLog.n("The Chalice sucks your life essence dry..."); } else { upgrade(); - if (level >= 5) + if (level >= 6) image = ItemSpriteSheet.ARTIFACT_CHALICE3; else if (level >= 3) image = ItemSpriteSheet.ARTIFACT_CHALICE2;