diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java index 707455b07..3dde16d46 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java @@ -223,7 +223,7 @@ public class CloakOfShadows extends Artifact { if (exp >= (level+1)*50 && level < levelCap) { upgrade(); exp -= level*50; - GLog.p("Your Cloak Grows Stronger!"); + GLog.p("Your cloak grows stronger!"); } updateQuickslot(); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java index db0536055..effbf35c0 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java @@ -131,7 +131,7 @@ public class DriedRose extends Artifact { "could snap any moment."; else if (level < 10) desc+= "\n\nYou have reattached many petals and the rose has started to somehow come back to life."+ - " It almost looks like it's read to bloom."; + " It almost looks like it's ready to bloom."; else desc+= "\n\nThe rose has blossomed again through some kind of magic, its connection to your spirit"+ " friend is stronger than ever."; @@ -153,12 +153,17 @@ public class DriedRose extends Artifact { image = ItemSpriteSheet.ARTIFACT_ROSE3; else if (level >= 4) image = ItemSpriteSheet.ARTIFACT_ROSE2; + + //For upgrade transferring via well of transmutation + droppedPetals = Math.max( level, droppedPetals ); + return super.upgrade(); } private static final String TALKEDTO = "talkedto"; private static final String FIRSTSUMMON = "firstsummon"; private static final String SPAWNED = "spawned"; + private static final String PETALS = "petals"; @Override public void storeInBundle( Bundle bundle ) { @@ -167,6 +172,7 @@ public class DriedRose extends Artifact { bundle.put( TALKEDTO, talkedTo ); bundle.put( FIRSTSUMMON, firstSummon ); bundle.put( SPAWNED, spawned ); + bundle.put( PETALS, droppedPetals ); } @Override @@ -176,6 +182,7 @@ public class DriedRose extends Artifact { talkedTo = bundle.getBoolean( TALKEDTO ); firstSummon = bundle.getBoolean( FIRSTSUMMON ); spawned = bundle.getBoolean( SPAWNED ); + droppedPetals = bundle.getInt( PETALS ); } public class roseRecharge extends ArtifactBuff { @@ -232,7 +239,13 @@ public class DriedRose extends Artifact { public boolean doPickUp( Hero hero ) { DriedRose rose = hero.belongings.getItem( DriedRose.class ); - if (rose != null && rose.level < rose.levelCap){ + if (rose == null){ + GLog.w("You have no rose to add this petal to."); + return false; + } if ( rose.level >= rose.levelCap ){ + GLog.i("There is no room left for this petal, so you discard it."); + return true; + } else { rose.upgrade(); if (rose.level == rose.levelCap) { @@ -246,11 +259,6 @@ public class DriedRose extends Artifact { hero.spendAndNext(TIME_TO_PICK_UP); return true; - } else { - - GLog.w("You have no rose to add this petal to."); - return false; - } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfEvasion.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfEvasion.java index 675f48a84..c1ddc2c12 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfEvasion.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfEvasion.java @@ -35,9 +35,9 @@ public class RingOfEvasion extends Ring { @Override public String desc() { return isKnown() ? - "This ring obfuscates the true position of the wearer, making them harder to detect and attack." + + "This ring obfuscates the true position of the wearer, making them harder to detect and attack. " + "This ring is much stronger while the user remains undetected, and if the user is targeted the power of " + - "evasion will slowly fade away, remaining undetected will restore the ring's effectiveness." + + "evasion will slowly fade away, remaining undetected will restore the ring's effectiveness. " + "A degraded ring will instead make the user easier to detect and strike.": super.desc(); } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java index 3c4b8a6f7..de8492fbe 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java @@ -223,7 +223,8 @@ public abstract class Level implements Bundlable { int petalsNeeded = (int) Math.ceil((float)((Dungeon.depth / 2) - rose.droppedPetals) / 3); for (int i=1; i <= petalsNeeded; i++) { - if (rose.droppedPetals < 10) { + //the player may miss a single petal and still max their rose. + if (rose.droppedPetals < 11) { addItemToSpawn(new DriedRose.Petal()); rose.droppedPetals++; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/ResumeIndicator.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/ResumeIndicator.java index 77831e413..379d5b0b2 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/ResumeIndicator.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/ResumeIndicator.java @@ -1,7 +1,6 @@ package com.shatteredpixel.shatteredpixeldungeon.ui; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; -import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; import com.watabou.noosa.Image; /** @@ -41,7 +40,9 @@ public class ResumeIndicator extends Tag { @Override public void update() { - if (visible != (Dungeon.hero.lastAction != null)){ + if (!Dungeon.hero.isAlive()) + visible = false; + else if (visible != (Dungeon.hero.lastAction != null)){ visible = Dungeon.hero.lastAction != null; if (visible) flash();