V0.2.0: Deleted all seven unused rings (each one is replaced by an artifact)

src/com/shatteredpixel/shatteredpixeldungeon/Badges.java

@@ -39,8 +39,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.bags.SeedPouch;
 import com.shatteredpixel.shatteredpixeldungeon.items.bags.WandHolster;
 import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion;
 import com.shatteredpixel.shatteredpixeldungeon.items.rings.Ring;
-import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfHaggler;
-import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfThorns;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll;
 import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
@@ -706,17 +704,19 @@ public class Badges {
 			displayBadge( badge );
 		}
 	}
-	
+
+    //TODO: Replace this badge
 	public static void validateRingOfHaggler() {
-		if (!local.contains( Badge.RING_OF_HAGGLER ) && new RingOfHaggler().isKnown()) {
+		if (!local.contains( Badge.RING_OF_HAGGLER )/* && new RingOfThorns().isKnown()*/) {
 			Badge badge = Badge.RING_OF_HAGGLER;
 			local.add( badge );
 			displayBadge( badge );
 		}
 	}
-	
+
+    //TODO: Replace this badge
 	public static void validateRingOfThorns() {
-		if (!local.contains( Badge.RING_OF_THORNS ) && new RingOfThorns().isKnown()) {
+		if (!local.contains( Badge.RING_OF_THORNS )/* && new RingOfThorns().isKnown()*/) {
 			Badge badge = Badge.RING_OF_THORNS;
 			local.add( badge );
 			displayBadge( badge );

src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Hunger.java

@@ -22,7 +22,6 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass;
-import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfSatiety;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
 import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
 import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
@@ -71,14 +70,9 @@ public class Hunger extends Buff implements Hero.Doom {
 					
 					hero.interrupt();
 				}
-			} else {	
+			} else {
 				
-				int bonus = 0;
+				float newLevel = level + STEP;
-				for (Buff buff : target.buffs( RingOfSatiety.Satiety.class )) {
-					bonus += ((RingOfSatiety.Satiety)buff).level;
-				}
-				
-				float newLevel = level + STEP - bonus;
 				boolean statusUpdated = false;
 				if (newLevel >= STARVING) {
 					

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

@@ -162,19 +162,20 @@ public class Generator {
 		Category.FOOD.probs = new float[]{ 4, 1, 0 };
 			
 		Category.RING.classes = new Class<?>[]{ 
-			RingOfMending.class,
+			//RingOfMending.class,
-			RingOfDetection.class,
+			//RingOfDetection.class,
-			RingOfShadows.class,
+			//RingOfShadows.class,
 			RingOfPower.class,
-			RingOfHerbalism.class,
+			//RingOfHerbalism.class,
 			RingOfAccuracy.class,
 			RingOfEvasion.class,
-			RingOfSatiety.class,
+			//RingOfSatiety.class,
 			RingOfHaste.class,
-			RingOfElements.class,
+			RingOfElements.class
-			RingOfHaggler.class,
+			//RingOfHaggler.class,
-			RingOfThorns.class };
+			//RingOfThorns.class
-		Category.RING.probs = new float[]{ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 };
+			};
+		Category.RING.probs = new float[]{ 1, 1, 1, 1, 1 };
 		
 		Category.SEED.classes = new Class<?>[]{ 
 			Firebloom.Seed.class,

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

@@ -43,18 +43,18 @@ public class Ring extends KindofMisc {
 	protected Buff buff;
 	
 	private static final Class<?>[] rings = { 
-		RingOfMending.class, 
+		//RingOfMending.class,
-		RingOfDetection.class, 
+		//RingOfDetection.class,
-		RingOfShadows.class,
+		//RingOfShadows.class,
 		RingOfPower.class,
-		RingOfHerbalism.class,
+		//RingOfHerbalism.class,
 		RingOfAccuracy.class,
 		RingOfEvasion.class,
-		RingOfSatiety.class,
+		//RingOfSatiety.class,
 		RingOfHaste.class,
-		RingOfHaggler.class,
+		//RingOfHaggler.class,
 		RingOfElements.class,
-		RingOfThorns.class
+		//RingOfThorns.class
 	};
 	private static final String[] gems = 
 		{"diamond", "opal", "garnet", "ruby", "amethyst", "topaz", "onyx", "tourmaline", "emerald", "sapphire", "quartz", "agate"};

src/com/shatteredpixel/shatteredpixeldungeon/windows/WndTradeItem.java

@@ -27,7 +27,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem;
 import com.shatteredpixel.shatteredpixeldungeon.items.Gold;
 import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
-import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfHaggler;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
 import com.shatteredpixel.shatteredpixeldungeon.ui.ItemSlot;
@@ -265,9 +264,6 @@ public class WndTradeItem extends Window {
 	private int price( Item item ) {
 		// This formula is not completely correct...
 		int price = item.price() * 5 * (Dungeon.depth / 5 + 1);
-		if (Dungeon.hero.buff( RingOfHaggler.Haggling.class ) != null && price >= 2) {
-			price /= 2;
-		}
 		return price;
 	}