Merge remote-tracking branch 'origin/master'

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";