From ec16f3995c830fb271c4a29a7af8e385e3daf36e Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 10 Sep 2014 15:29:42 -0400 Subject: [PATCH] V0.2.0: Deleted all seven unused rings (each one is replaced by an artifact) --- .../shatteredpixeldungeon/Badges.java | 12 ++++++------ .../actors/buffs/Hunger.java | 10 ++-------- .../items/Generator.java | 19 ++++++++++--------- .../items/rings/Ring.java | 14 +++++++------- .../windows/WndTradeItem.java | 4 ---- 5 files changed, 25 insertions(+), 34 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/Badges.java b/src/com/shatteredpixel/shatteredpixeldungeon/Badges.java index 681640b3c..8d8836855 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/Badges.java +++ b/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 ); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Hunger.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Hunger.java index d185c6601..83663a57e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Hunger.java +++ b/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; - for (Buff buff : target.buffs( RingOfSatiety.Satiety.class )) { - bonus += ((RingOfSatiety.Satiety)buff).level; - } - - float newLevel = level + STEP - bonus; + float newLevel = level + STEP; boolean statusUpdated = false; if (newLevel >= STARVING) { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java index da2c4a15a..000c1bed4 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java +++ b/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, - RingOfDetection.class, - RingOfShadows.class, + //RingOfMending.class, + //RingOfDetection.class, + //RingOfShadows.class, RingOfPower.class, - RingOfHerbalism.class, + //RingOfHerbalism.class, RingOfAccuracy.class, RingOfEvasion.class, - RingOfSatiety.class, + //RingOfSatiety.class, RingOfHaste.class, - RingOfElements.class, - RingOfHaggler.class, - RingOfThorns.class }; - Category.RING.probs = new float[]{ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 }; + RingOfElements.class + //RingOfHaggler.class, + //RingOfThorns.class + }; + Category.RING.probs = new float[]{ 1, 1, 1, 1, 1 }; Category.SEED.classes = new Class[]{ Firebloom.Seed.class, diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java index 0d4e87f96..99819d370 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java +++ b/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, - RingOfDetection.class, - RingOfShadows.class, + //RingOfMending.class, + //RingOfDetection.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"}; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndTradeItem.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndTradeItem.java index 2fc8f3271..ad29f7df6 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndTradeItem.java +++ b/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; }