v0.6.1: large ring refactor, moved functionality to within their class

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java

@@ -34,7 +34,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Brimstone;
 import com.shatteredpixel.shatteredpixeldungeon.items.food.ChargrilledMeat;
 import com.shatteredpixel.shatteredpixeldungeon.items.food.MysteryMeat;
-import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements.Resistance;
+import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicalInfusion;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade;
@@ -183,8 +183,7 @@ public class Burning extends Buff implements Hero.Doom {
 	}
 
 	public static float duration( Char ch ) {
-		Resistance r = ch.buff( Resistance.class );
+		return DURATION * RingOfElements.durationFactor( ch );
-		return r != null ? r.durationFactor() * DURATION : DURATION;
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Charm.java

@@ -22,7 +22,7 @@
 package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
 
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
-import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements.Resistance;
+import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
 import com.watabou.utils.Bundle;
@@ -60,8 +60,7 @@ public class Charm extends FlavourBuff {
 	}
 	
 	public static float durationFactor( Char ch ) {
-		Resistance r = ch.buff( Resistance.class );
+		return RingOfElements.durationFactor( ch );
-		return r != null ? r.durationFactor() : 1;
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Frost.java

@@ -31,7 +31,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.food.MysteryMeat;
 import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion;
 import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfMight;
 import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength;
-import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements.Resistance;
+import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements;
 import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
@@ -123,7 +123,6 @@ public class Frost extends FlavourBuff {
 	}
 
 	public static float duration( Char ch ) {
-		Resistance r = ch.buff( Resistance.class );
+		return DURATION * RingOfElements.durationFactor( ch );
-		return r != null ? r.durationFactor() * DURATION : DURATION;
 	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Paralysis.java

@@ -22,7 +22,7 @@
 package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
 
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
-import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements.Resistance;
+import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
@@ -79,7 +79,6 @@ public class Paralysis extends FlavourBuff {
 	}
 
 	public static float duration( Char ch ) {
-		Resistance r = ch.buff( Resistance.class );
+		return DURATION * RingOfElements.durationFactor( ch );
-		return r != null ? r.durationFactor() * DURATION : DURATION;
 	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Poison.java

@@ -27,7 +27,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
 import com.shatteredpixel.shatteredpixeldungeon.effects.particles.PoisonParticle;
-import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements.Resistance;
+import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
 import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
@@ -114,8 +114,7 @@ public class Poison extends Buff implements Hero.Doom {
 	}
 
 	public static float durationFactor( Char ch ) {
-		Resistance r = ch.buff( Resistance.class );
+		return RingOfElements.durationFactor( ch );
-		return r != null ? r.durationFactor() : 1;
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Slow.java

@@ -22,7 +22,7 @@
 package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
 
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
-import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements.Resistance;
+import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
 
@@ -50,7 +50,6 @@ public class Slow extends FlavourBuff {
 	}
 
 	public static float duration( Char ch ) {
-		Resistance r = ch.buff( Resistance.class );
+		return DURATION * RingOfElements.durationFactor( ch );
-		return r != null ? r.durationFactor() * DURATION : DURATION;
 	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Vertigo.java

@@ -22,7 +22,7 @@
 package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
 
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
-import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements.Resistance;
+import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
 
@@ -50,7 +50,6 @@ public class Vertigo extends FlavourBuff {
 	}
 
 	public static float duration( Char ch ) {
-		Resistance r = ch.buff( Resistance.class );
+		return DURATION * RingOfElements.durationFactor( ch );
-		return r != null ? r.durationFactor() * DURATION : DURATION;
 	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Weakness.java

@@ -23,7 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
 
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
-import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements.Resistance;
+import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
 
@@ -64,8 +64,7 @@ public class Weakness extends FlavourBuff {
 	}
 	
 	public static float duration( Char ch ) {
-		Resistance r = ch.buff( Resistance.class );
+		return DURATION * RingOfElements.durationFactor( ch );
-		return r != null ? r.durationFactor() * DURATION : DURATION;
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java

@@ -183,7 +183,7 @@ public class Hero extends Char {
 	public int STR() {
 		int STR = this.STR;
 
-		STR += RingOfMight.getBonus(this, RingOfMight.Might.class);
+		STR += RingOfMight.strengthBonus( this );
 
 		return weakened ? STR - 2 : STR;
 	}
@@ -281,9 +281,8 @@ public class Hero extends Char {
 	@Override
 	public int defenseSkill( Char enemy ) {
 		
-		int bonus = RingOfEvasion.getBonus(this, RingOfEvasion.Evasion.class);
+		float evasion = 1f * RingOfEvasion.evasionMultiplier( this );
-
+		
-		float evasion = (float)Math.pow( 1.125, bonus );
 		if (paralysed > 0) {
 			evasion /= 2;
 		}
@@ -294,7 +293,7 @@ public class Hero extends Char {
 			return (int)(defenseSkill * evasion / Math.pow( 1.5, aEnc ));
 		} else {
 
-			bonus = 0;
+			int bonus = 0;
 			if (heroClass == HeroClass.ROGUE) bonus += -aEnc;
 
 			if (belongings.armor != null && belongings.armor.hasGlyph(Swiftness.class))
@@ -326,16 +325,11 @@ public class Hero extends Char {
 	public int damageRoll() {
 		KindOfWeapon wep = rangedWeapon != null ? rangedWeapon : belongings.weapon;
 		int dmg;
-		int bonus = RingOfForce.getBonus(this, RingOfForce.Force.class);
 
 		if (wep != null) {
-			dmg = wep.damageRoll( this ) + bonus;
+			dmg = wep.damageRoll( this ) + RingOfForce.armedDamageBonus(this);
 		} else {
-			if (bonus != 0){
+			dmg = RingOfForce.damageRoll(this);
-				dmg = RingOfForce.damageRoll(this);
-			} else {
-				dmg = Random.NormalIntRange(1, Math.max(STR()-8, 1));
-			}
 		}
 		if (dmg < 0) dmg = 0;
 		if (subClass == HeroSubClass.BERSERKER){
@@ -350,10 +344,7 @@ public class Hero extends Char {
 
 		float speed = super.speed();
 
-		int hasteLevel = RingOfHaste.getBonus(this, RingOfHaste.Haste.class);
+		speed *= RingOfHaste.speedMultiplier(this);
-
-		if (hasteLevel != 0)
-			speed *= Math.pow(1.2, hasteLevel);
 
 		Armor armor = belongings.armor;
 
@@ -430,8 +421,7 @@ public class Hero extends Char {
 			//Normally putting furor speed on unarmed attacks would be unnecessary
 			//But there's going to be that one guy who gets a furor+force ring combo
 			//This is for that one guy, you shall get your fists of fury!
-			int bonus = RingOfFuror.getBonus(this, RingOfFuror.Furor.class);
+			return RingOfFuror.modifyAttackDelay(1f, this);
-			return (float)(0.2 + (1 - 0.2)*Math.pow(0.85, bonus));
 		}
 	}
 
@@ -958,9 +948,7 @@ public class Hero extends Char {
 			dmg = thorns.proc(dmg, (src instanceof Char ? (Char)src : null),  this);
 		}
 
-		int tenacity = RingOfTenacity.getBonus(this, RingOfTenacity.Tenacity.class);
+		dmg = (int)Math.ceil(dmg * RingOfTenacity.damageMultiplier( this ));
-		if (tenacity != 0) //(HT - HP)/HT = heroes current % missing health.
-			dmg = (int)Math.ceil((float)dmg * Math.pow(0.85, tenacity*((float)(HT - HP)/HT)));
 
 		//TODO improve this when I have proper damage source logic
 		if (belongings.armor != null && belongings.armor.hasGlyph(AntiMagic.class)
@@ -1280,7 +1268,7 @@ public class Hero extends Char {
 	public int stealth() {
 		int stealth = super.stealth();
 
-		stealth += RingOfEvasion.getBonus(this, RingOfEvasion.Evasion.class);
+		stealth += RingOfEvasion.stealthBonus( this );
 
 		if (belongings.armor != null && belongings.armor.hasGlyph(Obfuscation.class)){
 			stealth += belongings.armor.level();
@@ -1594,8 +1582,7 @@ public class Hero extends Char {
 	
 	@Override
 	public HashSet<Class<?>> resistances() {
-		RingOfElements.Resistance r = buff( RingOfElements.Resistance.class );
+		return RingOfElements.resistances( this );
-		return r == null ? super.resistances() : r.resistances();
 	}
 	
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java

@@ -443,9 +443,7 @@ public abstract class Mob extends Char {
 		boolean seen = enemySeen || (enemy == Dungeon.hero && !Dungeon.hero.canSurpriseAttack());
 		if (seen && paralysed == 0) {
 			int defenseSkill = this.defenseSkill;
-			int penalty = RingOfAccuracy.getBonus(enemy, RingOfAccuracy.Accuracy.class);
+			defenseSkill *= RingOfAccuracy.enemyEvasionMultiplier( enemy );
-			if (penalty != 0 && enemy == Dungeon.hero)
-				defenseSkill *= Math.pow(0.75, penalty);
 			return defenseSkill;
 		} else {
 			return 0;
@@ -546,8 +544,7 @@ public abstract class Mob extends Char {
 		super.die( cause );
 
 		float lootChance = this.lootChance;
-		int bonus = RingOfWealth.getBonus(Dungeon.hero, RingOfWealth.Wealth.class);
+		lootChance *= RingOfWealth.dropChanceMultiplier( Dungeon.hero );
-		lootChance *= Math.pow(1.15, bonus);
 		
 		if (Random.Float() < lootChance && Dungeon.hero.lvl <= maxLvl + 2) {
 			Item loot = createLoot();

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

@@ -21,6 +21,8 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
+import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
+
 public class RingOfAccuracy extends Ring {
 	
 	@Override
@@ -28,6 +30,12 @@ public class RingOfAccuracy extends Ring {
 		return new Accuracy();
 	}
 	
+	//The ring of accuracy reduces enemy evasion
+	// this makes it more powerful against more evasive enemies
+	public static float enemyEvasionMultiplier( Char target ){
+		return (float)Math.pow(0.75, getBonus(target, Accuracy.class));
+	}
+	
 	public class Accuracy extends RingBuff {
 	}
 }

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

@@ -21,6 +21,7 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
+import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison;
@@ -54,15 +55,20 @@ public class RingOfElements extends Ring {
 		FULL.add( Yog.BurningFist.class );
 	}
 	
-	public class Resistance extends RingBuff {
+	public static HashSet<Class<?>> resistances( Char target ){
-		
+		if (Random.Int( getBonus(target, Resistance.class) + 2 ) >= 2) {
-		public HashSet<Class<?>> resistances() {
+			return FULL;
-			if (Random.Int( level() + 2 ) >= 2) {
+		} else {
-				return FULL;
+			return EMPTY;
-			} else {
-				return EMPTY;
-			}
 		}
+	}
+	
+	public static float durationFactor( Char target ){
+		int level = getBonus( target, Resistance.class);
+		return level <= 0 ? 1 : (1 + 0.5f * level) / (1 + level);
+	}
+	
+	public class Resistance extends RingBuff {
 		
 		public float durationFactor() {
 			return level() < 0 ? 1 : (1 + 0.5f * level()) / (1 + level());

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

@@ -21,12 +21,22 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
+import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
+
 public class RingOfEvasion extends Ring {
 	
 	@Override
 	protected RingBuff buff( ) {
 		return new Evasion();
 	}
+	
+	public static float evasionMultiplier( Char target ){
+		return (float) Math.pow( 1.15, getBonus(target, Evasion.class));
+	}
+	
+	public static int stealthBonus( Char target ){
+		return getBonus( target, Evasion.class );
+	}
 
 	public class Evasion extends RingBuff {
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfForce.java

@@ -22,6 +22,7 @@
 package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
+import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.watabou.utils.Random;
@@ -32,6 +33,13 @@ public class RingOfForce extends Ring {
 	protected RingBuff buff( ) {
 		return new Force();
 	}
+	
+	public static int armedDamageBonus( Char ch ){
+		return getBonus( ch, Force.class);
+	}
+	
+	
+	// *** Weapon-like properties ***
 
 	private static float tier(int str){
 		float tier = Math.max(1, (str - 8)/2f);
@@ -43,9 +51,14 @@ public class RingOfForce extends Ring {
 	}
 
 	public static int damageRoll( Hero hero ){
-		int level = getBonus(hero, Force.class);
+		if (hero.buff(Force.class) != null) {
-		float tier = tier(hero.STR());
+			int level = getBonus(hero, Force.class);
-		return Random.NormalIntRange(min(level, tier), max(level, tier));
+			float tier = tier(hero.STR());
+			return Random.NormalIntRange(min(level, tier), max(level, tier));
+		} else {
+			//attack without any ring of force influence
+			return Random.NormalIntRange(1, Math.max(hero.STR()-8, 1));
+		}
 	}
 
 	//same as equivalent tier weapon

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfFuror.java

@@ -21,12 +21,19 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
+import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
+
 public class RingOfFuror extends Ring {
 
 	@Override
 	protected RingBuff buff( ) {
 		return new Furor();
 	}
+	
+	public static float modifyAttackDelay( float delay, Char target){
+		//furor bonus only affects delay after 0.2
+		return (float)(0.2 + (delay - 0.2)*Math.pow(0.85, getBonus(target, Furor.class)));
+	}
 
 	public class Furor extends RingBuff {
 	}

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

@@ -21,6 +21,8 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
+import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
+
 public class RingOfHaste extends Ring {
 	
 	@Override
@@ -28,6 +30,10 @@ public class RingOfHaste extends Ring {
 		return new Haste();
 	}
 	
+	public static float speedMultiplier( Char target ){
+		return (float)Math.pow(1.2, getBonus(target, Haste.class));
+	}
+	
 	public class Haste extends RingBuff {
 	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMight.java

@@ -22,6 +22,7 @@
 package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
 
+import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 
@@ -75,6 +76,10 @@ public class RingOfMight extends Ring {
 	protected RingBuff buff( ) {
 		return new Might();
 	}
+	
+	public static int strengthBonus( Char target ){
+		return getBonus( target, Might.class );
+	}
 
 	public class Might extends RingBuff {
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfSharpshooting.java

@@ -21,12 +21,18 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
+import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
+
 public class RingOfSharpshooting extends Ring {
 
 	@Override
 	protected RingBuff buff( ) {
 		return new Aim();
 	}
+	
+	public static float accuracyMultiplier( Char target ){
+		return (float)(Math.pow(1.2, getBonus(target, Aim.class)));
+	}
 
 	public class Aim extends RingBuff {
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfTenacity.java

@@ -21,12 +21,19 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
+import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
+
 public class RingOfTenacity extends Ring {
 
 	@Override
 	protected RingBuff buff( ) {
 		return new Tenacity();
 	}
+	
+	public static float damageMultiplier( Char t ){
+		//(HT - HP)/HT = heroes current % missing health.
+		return (float)Math.pow(0.85, getBonus( t, Tenacity.class)*((float)(t.HT - t.HP)/t.HT));
+	}
 
 	public class Tenacity extends RingBuff {
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfWealth.java

@@ -21,12 +21,27 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
+import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
+
 public class RingOfWealth extends Ring {
 
 	@Override
 	protected RingBuff buff( ) {
 		return new Wealth();
 	}
+	
+	public static float dropChanceMultiplier( Char target ){
+		return (float)Math.pow(1.15, getBonus(target, Wealth.class));
+	}
+	
+	//caps at a 50% bonus
+	public static float regularLootChanceBonus( Char target ){
+		return Math.min(0.5f, 0.05f* getBonus(target, Wealth.class));
+	}
+	
+	public static float specialLootChance( Char target ){
+		return 1f - (float)Math.pow(0.925, getBonus(target, Wealth.class));
+	}
 
 	public class Wealth extends RingBuff {
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java

@@ -146,8 +146,7 @@ abstract public class Weapon extends KindOfWeapon {
 		float ACC = this.ACC;
 		
 		if (this instanceof MissileWeapon) {
-			int bonus = RingOfSharpshooting.getBonus(hero, RingOfSharpshooting.Aim.class);
+			ACC *= RingOfSharpshooting.accuracyMultiplier( hero );
-			ACC *= (float)(Math.pow(1.2, bonus));
 		}
 
 		return encumbrance > 0 ? (float)(ACC / Math.pow( 1.5, encumbrance )) : ACC;
@@ -163,9 +162,7 @@ abstract public class Weapon extends KindOfWeapon {
 
 		float DLY = imbue.delayFactor(this.DLY);
 
-		int bonus = RingOfFuror.getBonus(hero, RingOfFuror.Furor.class);
+		DLY = RingOfFuror.modifyAttackDelay(DLY, hero);
-
-		DLY = (float)(0.2 + (DLY - 0.2)*Math.pow(0.85, bonus));
 
 		return
 				(encumrance > 0 ? (float)(DLY * Math.pow( 1.2, encumrance )) : DLY);

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java

@@ -178,24 +178,22 @@ public abstract class Level implements Bundlable {
 		if (!(Dungeon.bossLevel() || Dungeon.depth == 21) /*final shop floor*/) {
 			addItemToSpawn( Generator.random( Generator.Category.FOOD ) );
 
-			int bonus = RingOfWealth.getBonus(Dungeon.hero, RingOfWealth.Wealth.class);
-
 			if (Dungeon.posNeeded()) {
-				if (Random.Float() > Math.pow(0.925, bonus))
+				if (Random.Float() < RingOfWealth.specialLootChance( Dungeon.hero ))
 					addItemToSpawn( new PotionOfMight() );
 				else
 					addItemToSpawn( new PotionOfStrength() );
 				Dungeon.limitedDrops.strengthPotions.count++;
 			}
 			if (Dungeon.souNeeded()) {
-				if (Random.Float() > Math.pow(0.925, bonus))
+				if (Random.Float() < RingOfWealth.specialLootChance( Dungeon.hero ))
 					addItemToSpawn( new ScrollOfMagicalInfusion() );
 				else
 					addItemToSpawn( new ScrollOfUpgrade() );
 				Dungeon.limitedDrops.upgradeScrolls.count++;
 			}
 			if (Dungeon.asNeeded()) {
-				if (Random.Float() > Math.pow(0.925, bonus))
+				if (Random.Float() < RingOfWealth.specialLootChance( Dungeon.hero ))
 					addItemToSpawn( new Stylus() );
 				addItemToSpawn( new Stylus() );
 				Dungeon.limitedDrops.arcaneStyli.count++;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java

@@ -312,11 +312,8 @@ public abstract class RegularLevel extends Level {
 	protected void createItems() {
 		
 		int nItems = 3;
-		int bonus = RingOfWealth.getBonus(Dungeon.hero, RingOfWealth.Wealth.class);
+		
-
+		while (Random.Float() < (0.3f + RingOfWealth.regularLootChanceBonus( Dungeon.hero ))) {
-		//just incase someone gets a ridiculous ring, cap this at 80%
-		bonus = Math.min(bonus, 10);
-		while (Random.Float() < (0.3f + bonus*0.05f)) {
 			nItems++;
 		}