diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java index aa2bcc15d..7e4d84295 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java @@ -325,9 +325,6 @@ public abstract class Char extends Actor { } else if (hit( this, enemy, accMulti )) { int dr = Math.round(enemy.drRoll() * AscensionChallenge.statModifier(enemy)); - - Barkskin bark = enemy.buff(Barkskin.class); - if (bark != null) dr += Random.NormalIntRange( 0 , bark.level() ); if (this instanceof Hero){ Hero h = (Hero)this; @@ -524,7 +521,12 @@ public abstract class Char extends Actor { } public int drRoll() { - return 0; + int dr = 0; + + Barkskin bark = buff(Barkskin.class); + if (bark != null) dr += Random.NormalIntRange( 0 , bark.level() ); + + return dr; } public int damageRoll() { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java index 1ffd32929..91857e098 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java @@ -538,7 +538,7 @@ public class Hero extends Char { @Override public int drRoll() { - int dr = 0; + int dr = super.drRoll(); if (belongings.armor() != null) { int armDr = Random.NormalIntRange( belongings.armor().DRMin(), belongings.armor().DRMax()); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/SmokeBomb.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/SmokeBomb.java index b13ef955b..503e049ff 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/SmokeBomb.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/SmokeBomb.java @@ -170,8 +170,12 @@ public class SmokeBomb extends ArmorAbility { @Override public int drRoll() { - return Random.NormalIntRange(Dungeon.hero.pointsInTalent(Talent.BODY_REPLACEMENT), + int dr = super.drRoll(); + + dr += Random.NormalIntRange(Dungeon.hero.pointsInTalent(Talent.BODY_REPLACEMENT), 3*Dungeon.hero.pointsInTalent(Talent.BODY_REPLACEMENT)); + + return dr; } { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/ArmoredBrute.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/ArmoredBrute.java index 02a72bedf..3d45d7015 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/ArmoredBrute.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/ArmoredBrute.java @@ -44,7 +44,7 @@ public class ArmoredBrute extends Brute { @Override public int drRoll() { - return Random.NormalIntRange(6, 10); + return super.drRoll() + Random.NormalIntRange(6, 10); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bat.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bat.java index 9bc9dc657..e14a7ec93 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bat.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bat.java @@ -59,7 +59,7 @@ public class Bat extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 4); + return super.drRoll() + Random.NormalIntRange(0, 4); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Brute.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Brute.java index b3c3cb821..628825be9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Brute.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Brute.java @@ -67,7 +67,7 @@ public class Brute extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 8); + return super.drRoll() + Random.NormalIntRange(0, 8); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Crab.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Crab.java index 62a7717cf..c17f7d960 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Crab.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Crab.java @@ -54,6 +54,6 @@ public class Crab extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 4); + return super.drRoll() + Random.NormalIntRange(0, 4); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM100.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM100.java index c307ac250..9699c44b8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM100.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM100.java @@ -69,7 +69,7 @@ public class DM100 extends Mob implements Callback { @Override public int drRoll() { - return Random.NormalIntRange(0, 4); + return super.drRoll() + Random.NormalIntRange(0, 4); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM200.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM200.java index 843a363bc..92a445da6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM200.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM200.java @@ -68,7 +68,7 @@ public class DM200 extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 8); + return super.drRoll() + Random.NormalIntRange(0, 8); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java index db38d9f51..618a0afe6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java @@ -103,7 +103,7 @@ public class DM300 extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 10); + return super.drRoll() + Random.NormalIntRange(0, 10); } public int pylonsActivated = 0; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DemonSpawner.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DemonSpawner.java index b680c8184..dfc499c07 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DemonSpawner.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DemonSpawner.java @@ -67,7 +67,7 @@ public class DemonSpawner extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 12); + return super.drRoll() + Random.NormalIntRange(0, 12); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DwarfKing.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DwarfKing.java index 74f89b167..25473d62a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DwarfKing.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DwarfKing.java @@ -96,7 +96,7 @@ public class DwarfKing extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 10); + return super.drRoll() + Random.NormalIntRange(0, 10); } private int phase = 1; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java index abbcaff78..b04e293e5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java @@ -96,7 +96,7 @@ public abstract class Elemental extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 5); + return super.drRoll() + Random.NormalIntRange(0, 5); } protected int rangedCooldown = Random.NormalIntRange( 3, 5 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Eye.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Eye.java index f39a0eb3e..e0044f644 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Eye.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Eye.java @@ -79,7 +79,7 @@ public class Eye extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 10); + return super.drRoll() + Random.NormalIntRange(0, 10); } private Ballistica beam; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/FetidRat.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/FetidRat.java index a794710c3..33399ef24 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/FetidRat.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/FetidRat.java @@ -54,7 +54,7 @@ public class FetidRat extends Rat { @Override public int drRoll() { - return Random.NormalIntRange(0, 2); + return super.drRoll() + Random.NormalIntRange(0, 2); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Ghoul.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Ghoul.java index 05039daf2..b510b9e37 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Ghoul.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Ghoul.java @@ -72,7 +72,7 @@ public class Ghoul extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 4); + return super.drRoll() + Random.NormalIntRange(0, 4); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Gnoll.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Gnoll.java index 925b9657c..d3c777860 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Gnoll.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Gnoll.java @@ -53,6 +53,6 @@ public class Gnoll extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 2); + return super.drRoll() + Random.NormalIntRange(0, 2); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Golem.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Golem.java index 301bfca65..e67fbd7b1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Golem.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Golem.java @@ -70,7 +70,7 @@ public class Golem extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 12); + return super.drRoll() + Random.NormalIntRange(0, 12); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java index 57f600919..07340dedd 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java @@ -95,7 +95,7 @@ public class Goo extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 2); + return super.drRoll() + Random.NormalIntRange(0, 2); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Guard.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Guard.java index 71fa039ca..ac4c76eb0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Guard.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Guard.java @@ -137,7 +137,7 @@ public class Guard extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 7); + return super.drRoll() + Random.NormalIntRange(0, 7); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mimic.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mimic.java index 189fca406..a7e6d2084 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mimic.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mimic.java @@ -198,7 +198,7 @@ public class Mimic extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 1 + level/2); + return super.drRoll() + Random.NormalIntRange(0, 1 + level/2); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Monk.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Monk.java index 643d2fcf1..9e4619e6f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Monk.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Monk.java @@ -68,7 +68,7 @@ public class Monk extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 2); + return super.drRoll() + Random.NormalIntRange(0, 2); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Necromancer.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Necromancer.java index 71e347224..2636891bf 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Necromancer.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Necromancer.java @@ -81,7 +81,7 @@ public class Necromancer extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 5); + return super.drRoll() + Random.NormalIntRange(0, 5); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Piranha.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Piranha.java index 7e5af25a8..c13893916 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Piranha.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Piranha.java @@ -85,7 +85,7 @@ public class Piranha extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, Dungeon.depth); + return super.drRoll() + Random.NormalIntRange(0, Dungeon.depth); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Rat.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Rat.java index 81694dd7f..f9246f7c3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Rat.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Rat.java @@ -60,7 +60,7 @@ public class Rat extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 1); + return super.drRoll() + Random.NormalIntRange(0, 1); } private static final String RAT_ALLY = "rat_ally"; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RipperDemon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RipperDemon.java index 5a58f7d9a..d364cc88e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RipperDemon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RipperDemon.java @@ -83,7 +83,7 @@ public class RipperDemon extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 4); + return super.drRoll() + Random.NormalIntRange(0, 4); } private static final String LAST_ENEMY_POS = "last_enemy_pos"; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RotHeart.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RotHeart.java index b09f10d05..d0552762d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RotHeart.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RotHeart.java @@ -122,7 +122,7 @@ public class RotHeart extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 5); + return super.drRoll() + Random.NormalIntRange(0, 5); } { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RotLasher.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RotLasher.java index ca0152064..9279dfa9d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RotLasher.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RotLasher.java @@ -102,7 +102,7 @@ public class RotLasher extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 8); + return super.drRoll() + Random.NormalIntRange(0, 8); } { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Scorpio.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Scorpio.java index 80dfc42d0..48f075a80 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Scorpio.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Scorpio.java @@ -66,7 +66,7 @@ public class Scorpio extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 16); + return super.drRoll() + Random.NormalIntRange(0, 16); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Shaman.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Shaman.java index 8133bc7ff..0fa895b34 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Shaman.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Shaman.java @@ -66,7 +66,7 @@ public abstract class Shaman extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 6); + return super.drRoll() + Random.NormalIntRange(0, 6); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java index 926b96048..700fb5d19 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java @@ -109,7 +109,7 @@ public class Skeleton extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 5); + return super.drRoll() + Random.NormalIntRange(0, 5); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Spinner.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Spinner.java index ca7ebc174..28dd31d39 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Spinner.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Spinner.java @@ -68,7 +68,7 @@ public class Spinner extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 6); + return super.drRoll() + Random.NormalIntRange(0, 6); } private int webCoolDown = 0; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java index db91b0654..22c3a910f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java @@ -108,7 +108,7 @@ public class Statue extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, Dungeon.depth + weapon.defenseFactor(this)); + return super.drRoll() + Random.NormalIntRange(0, Dungeon.depth + weapon.defenseFactor(this)); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Succubus.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Succubus.java index e5f965204..dec89ef1b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Succubus.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Succubus.java @@ -159,7 +159,7 @@ public class Succubus extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 10); + return super.drRoll() + Random.NormalIntRange(0, 10); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java index cdb8023cf..535e3fb7d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java @@ -114,7 +114,7 @@ public class Tengu extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 5); + return super.drRoll() + Random.NormalIntRange(0, 5); } boolean loading = false; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Thief.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Thief.java index bee2cbb78..509848d22 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Thief.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Thief.java @@ -123,7 +123,7 @@ public class Thief extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 3); + return super.drRoll() + Random.NormalIntRange(0, 3); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java index 4d9ee2029..ecf2c01cd 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java @@ -72,7 +72,7 @@ public class Warlock extends Mob implements Callback { @Override public int drRoll() { - return Random.NormalIntRange(0, 8); + return super.drRoll() + Random.NormalIntRange(0, 8); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogDzewa.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogDzewa.java index 0697b215a..db9fc681e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogDzewa.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogDzewa.java @@ -643,7 +643,7 @@ public class YogDzewa extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 4); + return super.drRoll() + Random.NormalIntRange(0, 4); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogFist.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogFist.java index 56f84f64a..47c4dbe53 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogFist.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogFist.java @@ -158,7 +158,7 @@ public abstract class YogFist extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 15); + return super.drRoll() + Random.NormalIntRange(0, 15); } { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/MirrorImage.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/MirrorImage.java index ee955b2bb..fa5fd04c7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/MirrorImage.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/MirrorImage.java @@ -141,10 +141,11 @@ public class MirrorImage extends NPC { @Override public int drRoll() { + int dr = super.drRoll(); if (hero != null && hero.belongings.weapon() != null){ - return Random.NormalIntRange(0, hero.belongings.weapon().defenseFactor(this)/2); + return dr + Random.NormalIntRange(0, hero.belongings.weapon().defenseFactor(this)/2); } else { - return 0; + return dr; } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/PrismaticImage.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/PrismaticImage.java index e049e4f90..016c98a84 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/PrismaticImage.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/PrismaticImage.java @@ -176,10 +176,11 @@ public class PrismaticImage extends NPC { @Override public int drRoll() { + int dr = super.drRoll(); if (hero != null){ - return hero.drRoll(); + return dr + hero.drRoll(); } else { - return 0; + return dr; } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java index 92c82f6f3..48a3629d2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java @@ -700,14 +700,14 @@ public class DriedRose extends Artifact { @Override public int drRoll() { - int block = 0; + int dr = super.drRoll(); if (rose != null && rose.armor != null){ - block += Random.NormalIntRange( rose.armor.DRMin(), rose.armor.DRMax()); + dr += Random.NormalIntRange( rose.armor.DRMin(), rose.armor.DRMax()); } if (rose != null && rose.weapon != null){ - block += Random.NormalIntRange( 0, rose.weapon.defenseFactor( this )); + dr += Random.NormalIntRange( 0, rose.weapon.defenseFactor( this )); } - return block; + return dr; } //used in some glyph calculations diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLivingEarth.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLivingEarth.java index fa56973ff..27d4659b9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLivingEarth.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLivingEarth.java @@ -346,10 +346,11 @@ public class WandOfLivingEarth extends DamageWand { @Override public int drRoll() { + int dr = super.drRoll(); if (Dungeon.isChallenged(Challenges.NO_ARMOR)){ - return Random.NormalIntRange(wandLevel, 2 + wandLevel); + return dr + Random.NormalIntRange(wandLevel, 2 + wandLevel); } else { - return Random.NormalIntRange(wandLevel, 3 + 3 * wandLevel); + return dr + Random.NormalIntRange(wandLevel, 3 + 3 * wandLevel); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfWarding.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfWarding.java index aa43cff4e..0c36bf23c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfWarding.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfWarding.java @@ -301,10 +301,11 @@ public class WandOfWarding extends Wand { @Override public int drRoll() { + int dr = super.drRoll(); if (tier > 3){ - return Math.round(Random.NormalIntRange(0, 3 + Dungeon.scalingDepth()/2) / (7f - tier)); + return dr + Math.round(Random.NormalIntRange(0, 3 + Dungeon.scalingDepth()/2) / (7f - tier)); } else { - return 0; + return dr; } }