LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Evan Debenham 2014-09-15 09:43:57 -04:00
parent 4dcb086ea8
commit 3885a0f039
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Regeneration.java
View File

@ -35,7 +35,7 @@ public class Regeneration extends Buff {
ChaliceOfBlood.chaliceRegen regenBuff = Dungeon.hero.buff( ChaliceOfBlood.chaliceRegen.class); ChaliceOfBlood.chaliceRegen regenBuff = Dungeon.hero.buff( ChaliceOfBlood.chaliceRegen.class);
if (regenBuff != null) if (regenBuff != null)
spend( REGENERATION_DELAY - regenBuff.level() ); spend( Math.max(REGENERATION_DELAY - regenBuff.level(), 0.5f) );
else else
spend( REGENERATION_DELAY ); spend( REGENERATION_DELAY );

6
src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java
View File

@ -21,8 +21,6 @@ import java.util.ArrayList;
*/ */
public class ChaliceOfBlood extends Artifact { public class ChaliceOfBlood extends Artifact {
//TODO: add polish //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_CHALICE = "Chalice of Blood";
private static final String TXT_YES = "Yes, I know what I'm doing"; 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"; name = "Chalice of Blood";
image = ItemSpriteSheet.ARTIFACT_CHALICE1; image = ItemSpriteSheet.ARTIFACT_CHALICE1;
level = 0; level = 0;
levelCap = 8; levelCap = 10;
//charge & chargecap are unused //charge & chargecap are unused
} }
@ -114,7 +112,7 @@ public class ChaliceOfBlood extends Artifact {
GLog.n("The Chalice sucks your life essence dry..."); GLog.n("The Chalice sucks your life essence dry...");
} else { } else {
upgrade(); upgrade();
if (level >= 5) if (level >= 6)
image = ItemSpriteSheet.ARTIFACT_CHALICE3; image = ItemSpriteSheet.ARTIFACT_CHALICE3;
else if (level >= 3) else if (level >= 3)
image = ItemSpriteSheet.ARTIFACT_CHALICE2; image = ItemSpriteSheet.ARTIFACT_CHALICE2;