Merge remote-tracking branch 'origin/master'

src/com/shatteredpixel/shatteredpixeldungeon/items/Ankh.java

@@ -128,9 +128,7 @@ public class Ankh extends Item {
     @Override
     public void restoreFromBundle( Bundle bundle ) {
         super.restoreFromBundle( bundle );
-        //TODO: remove when saves from 0.1.1 are invalidated
-        if (bundle.contains( BLESSED ))
-            blessed	= bundle.getBoolean( BLESSED );
+        blessed	= bundle.getBoolean( BLESSED );
     }
 	
 	@Override

src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java

@@ -15,7 +15,7 @@ import java.util.ArrayList;
  * Created by Evan on 24/08/2014.
  */
 public class Artifact extends KindofMisc {
-
+//TODO: add artifact transform method and tie it into well of transformation
     {
         levelKnown = true;
     }

src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java

@@ -16,7 +16,7 @@ import com.watabou.utils.Random;
  * Created by debenhame on 03/09/2014.
  */
 public class CapeOfThorns extends Artifact {
-    //TODO: add polish, testing
+    //TODO: add polish, testing, numbers tweaking
 
     {
         name = "Cape of Thorns";

src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java

@@ -22,6 +22,7 @@ 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";

src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java

@@ -19,7 +19,7 @@ import java.util.ArrayList;
  * Created by debenhame on 25/08/2014.
  */
 public class CloakOfShadows extends Artifact {
-    //TODO: testing, add polish
+    //TODO: final numbers tweaking, add polish
 
     {
         name = "Cloak of Shadows";

src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java

@@ -26,7 +26,7 @@ import java.util.ArrayList;
  */
 public class HornOfPlenty extends Artifact {
 
-    //TODO: tune numbers, add sprite switching, add polish.
+    //TODO: add sprite switching, add polish.
 
     {
         name = "Horn of Plenty";

src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java

@@ -26,6 +26,7 @@ import java.util.Collections;
  * Created by debenhame on 08/09/2014.
  */
 public class SandalsOfNature extends Artifact {
+    //todo: test, add sprite switching, number tweaking.
 
     {
         name = "Sandals of Nature";

src/com/shatteredpixel/shatteredpixeldungeon/items/food/Blandfruit.java

@@ -233,7 +233,6 @@ public class Blandfruit extends Food {
         if (name.equals("Healthfruit"))
             cook(new Sungrass.Seed());
         else if (name.equals("Powerfruit"))
-            //TODO: make sure this doesn't break anything
             cook(new Wandmaker.Rotberry.Seed());
         else if (name.equals("Paralyzefruit"))
             cook(new Earthroot.Seed());

src/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java

@@ -223,8 +223,6 @@ public class Potion extends Item {
     @Override
     public void cast( final Hero user, int dst ) {
             super.cast(user, dst);
-            //if this potion is owned by a fruit, finds it and detaches it.
-            //TODO: add remove code here
     }
 	
 	public boolean isKnown() {

src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfAccuracy.java

@@ -18,6 +18,7 @@
 package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
 public class RingOfAccuracy extends Ring {
+    //TODO: numbers tweaking
 
 	{
 		name = "Ring of Accuracy";

src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfElements.java

@@ -29,6 +29,7 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.traps.LightningTrap;
 import com.watabou.utils.Random;
 
 public class RingOfElements extends Ring {
+    //TODO: need to rebalance this
 
 	{
 		name = "Ring of Elements";

src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfEvasion.java

@@ -24,6 +24,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass;
 import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
 
 public class RingOfEvasion extends Ring {
+    //todo: testing, numbers tweaking
 
 	{
 		name = "Ring of Evasion";

src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHaste.java

@@ -18,6 +18,7 @@
 package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
 public class RingOfHaste extends Ring {
+    //TODO: numbers tweaking
 
 	{
 		name = "Ring of Haste";

src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMagic.java

@@ -18,6 +18,7 @@
 package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
 public class RingOfMagic extends Ring {
+    //TODO: evaluate functionality, decide on numbers
 	
 	{
 		name = "Ring of Magic";

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java

@@ -32,7 +32,6 @@ public class Quarterstaff extends MeleeWeapon {
 	
 	@Override
 	public String desc() {
-		// TODO Auto-generated method stub
 		return "A staff of hardwood, its ends are shod with iron.";
 	}
 }