diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Vulnerable.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Vulnerable.java index 7ff65eaba..76134ba28 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Vulnerable.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Vulnerable.java @@ -26,7 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; public class Vulnerable extends FlavourBuff { - public static final float DURATION = 30f; + public static final float DURATION = 20f; { type = buffType.NEGATIVE; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Weakness.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Weakness.java index 88a23eae8..2607a2fdf 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Weakness.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Weakness.java @@ -24,11 +24,9 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; -//TODO need to re-evaluate various cases cases where this was used -// now that warlocks give a different debuff and shamen have 3 different ones public class Weakness extends FlavourBuff { - public static final float DURATION = 30f; + public static final float DURATION = 20f; { type = buffType.NEGATIVE; 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 1778f2f67..c6b02c627 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 @@ -49,7 +49,7 @@ public class Bat extends Mob { @Override public int damageRoll() { - return Random.NormalIntRange( 6, 16 ); + return Random.NormalIntRange( 5, 15 ); } @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 d6cdf05e1..291268794 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 @@ -53,10 +53,9 @@ public class Brute extends Mob { @Override public int damageRoll() { - //TODO final balance decisions on these numbers return buff(BruteRage.class) != null ? - Random.NormalIntRange( 15, 45 ) : - Random.NormalIntRange( 6, 26 ); + Random.NormalIntRange( 15, 40 ) : + Random.NormalIntRange( 5, 25 ); } @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 97295ad9b..84c5167c4 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 @@ -54,7 +54,7 @@ public class Ghoul extends Mob { @Override public int damageRoll() { - return Random.NormalIntRange( 14, 22 ); + return Random.NormalIntRange( 16, 22 ); } @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 16f85a610..98cd177d9 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 @@ -52,7 +52,7 @@ public abstract class Shaman extends Mob { @Override public int damageRoll() { - return Random.NormalIntRange( 5, 12 ); + return Random.NormalIntRange( 5, 10 ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRetribution.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRetribution.java index 1cc7a9d4b..ba24b95f9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRetribution.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRetribution.java @@ -59,7 +59,7 @@ public class ScrollOfRetribution extends Scroll { } } - Buff.prolong(curUser, Weakness.class, Weakness.DURATION/2f); + Buff.prolong(curUser, Weakness.class, Weakness.DURATION); Buff.prolong(curUser, Blindness.class, Math.round(6 + power)); Dungeon.observe(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WeakeningTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WeakeningTrap.java index f809f5c97..4f9c752c6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WeakeningTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WeakeningTrap.java @@ -48,7 +48,7 @@ public class WeakeningTrap extends Trap{ || ch.properties().contains(Char.Property.MINIBOSS)){ Buff.prolong( ch, Weakness.class, Weakness.DURATION/2f ); } - Buff.prolong( ch, Weakness.class, Weakness.DURATION*2f ); + Buff.prolong( ch, Weakness.class, Weakness.DURATION*3f ); } } }