diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java index 3028c4f22..b5c381a54 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java @@ -16,8 +16,6 @@ import com.watabou.utils.Random; * Created by debenhame on 03/09/2014. */ public class CapeOfThorns extends Artifact { - //TODO: testing, numbers tweaking - //TODO: final surface test { name = "Cape of Thorns"; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java index 2dc96fb6e..f31c20c3b 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java @@ -20,7 +20,6 @@ import java.util.ArrayList; * Created by debenhame on 27/08/2014. */ public class ChaliceOfBlood extends Artifact { - //TODO: final surface test private static final String TXT_CHALICE = "Chalice of Blood"; private static final String TXT_YES = "Yes, I know what I'm doing"; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java index a6f9a946e..94a0e146e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java @@ -20,7 +20,6 @@ import java.util.ArrayList; * Created by debenhame on 25/08/2014. */ public class CloakOfShadows extends Artifact { - //TODO: final surface testing { name = "Cloak of Shadows"; @@ -117,11 +116,10 @@ public class CloakOfShadows extends Artifact { @Override public String desc() { String desc = "This light silken cloak shimmers in and out of your vision as it sways in the air. When worn, " + - "it can be used to hide your presence for a short time. The cloak's magic is finicky, and it will " + - "both run out of power quickly, and require a short cooldown between uses.\n\n"; + "it can be used to hide your presence for a short time.\n\n"; if (level < 5) - desc += "The cloak's magic has faded and it is not very powerful, perhaps it will regan strength though use"; + desc += "The cloak's magic has faded and it is not very powerful, perhaps it will regain strength through use."; else if (level < 10) desc += "The cloak's power has begun to return."; else if (level < 15) @@ -131,7 +129,7 @@ public class CloakOfShadows extends Artifact { if ( isEquipped (Dungeon.hero) ) - desc += "\n\nThe cloak rests around your shoulders, shrouding you from the world."; + desc += "\n\nThe cloak rests around your shoulders."; return desc; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java index 8b2b6d28e..90cc1a473 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java @@ -92,6 +92,7 @@ public class HornOfPlenty extends Artifact { hero.busy(); SpellSprite.show(hero, SpellSprite.FOOD); Sample.INSTANCE.play( Assets.SND_EAT ); + GLog.i("You eat from the horn."); hero.spend( TIME_TO_EAT ); @@ -126,17 +127,10 @@ public class HornOfPlenty extends Artifact { desc += "The horn is overflowing! A delicious array of fruit and veg is filling the horn up to its brim."; if ( isEquipped( Dungeon.hero ) ){ - desc += "\n\nThe horn rests as your side, and is surprisingly lightweight, even with food in it. "; + desc += "\n\nThe horn rests at your side and is surprisingly lightweight, even with food in it."; if (level < 15) - desc += "It seems to have lost most of its power though, filling up very slowly."; - else if (level < 30) - desc += "It seems to have regained some of it's power, it fills up more quickly now."; - else - desc += "The horn seems to be at full power, generating food very quickly."; - - if (level < 15) - desc += " Perhaps there is a way to regain the horn's power by giving it food energy."; + desc += " Perhaps there is a way to increase the horn's power by giving it food energy."; } return desc; @@ -155,8 +149,7 @@ public class HornOfPlenty extends Artifact { //generates 0.2 food value every round, +0.02 value per level //to a max of 0.8 food value per round (0.2+0.6, at level 30) - //TODO: revert this to proper logic after testing - partialCharge += 18; + partialCharge += 0.2f + (0.02f*level); //charge is in increments of 36 food value. if (partialCharge >= 36) { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/MasterThievesArmband.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/MasterThievesArmband.java index 8680d7f63..68ac015ae 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/MasterThievesArmband.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/MasterThievesArmband.java @@ -12,7 +12,6 @@ import com.watabou.utils.Random; * Created by debenhame on 03/09/2014. */ public class MasterThievesArmband extends Artifact { - //TODO: final surface test { name = "Master Thieves' Armband"; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java index f9653fae4..f0d075cce 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java @@ -27,8 +27,6 @@ import java.util.Collections; */ public class SandalsOfNature extends Artifact { //TODO: tweak the greaves sprite a little, it's too neat/needs to be more messy. - //TODO: test the description to this one, it's massive =S. - //TODO: final surface testing { name = "Sandals of Nature"; @@ -121,12 +119,12 @@ public class SandalsOfNature extends Artifact { desc += " You feel more attuned with nature while wearing them."; if (level > 0) - desc += " The footwear has gained the ability to form up into a sort of immobile armour temporarily, " + + desc += "\n\nThe footwear has gained the ability to form up into a sort of immobile natural armour, " + "but will need to charge up for it."; } if (!seeds.isEmpty()){ - desc += "\n\nYou have recently fed this Artifact the following seeds:"; + desc += "\n\nRecently Fed Seeds:"; String[] seedsArray = seeds.toArray(new String[seeds.size()]); for (int i = 0; i < seedsArray.length-1; i++) @@ -179,7 +177,7 @@ public class SandalsOfNature extends Artifact { hero.sprite.operate( hero.pos ); hero.busy(); hero.spend( 2f ); - if (seeds.size() >= 2){ + if (seeds.size() >= 5+level){ seeds.clear(); upgrade(); if (level >= 1 && level <= 3) { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java index f1dbb994b..32af433ff 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java @@ -25,7 +25,6 @@ import java.util.ArrayList; */ public class TalismanOfForesight extends Artifact { //TODO: shade sprite. - //TODO: final surface test { name = "Talisman of Foresight"; @@ -89,12 +88,10 @@ public class TalismanOfForesight extends Artifact { @Override public String desc() { - String desc = "A smooth stone, almost too big for your pocket or hand, with strange markings on it. " + - "The engravings look to be done with a tool and painted to look like an eye. " + + String desc = "A smooth stone, almost too big for your pocket or hand, with strange engravings on it. " + "You feel like it's watching you, assessing your every move."; if ( isEquipped( Dungeon.hero ) ){ - desc += "\n\nWhen you hold the talisman you feel like your senses are heightened. Sometimes there is a " + - "seemingly random sense of dread, perhaps the talisman is telling you something when this happens?"; + desc += "\n\nWhen you hold the talisman you feel like your senses are heightened."; if (charge == 100) desc += "\n\nThe talisman is radiating energy, prodding at your mind. You wonder what would " + "happen if you let it in.";