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 e82116f0b..6631c96e9 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 @@ -554,7 +554,7 @@ public class Hero extends Char { } if( subClass == HeroSubClass.WARDEN && Dungeon.level.map[pos] == Terrain.FURROWED_GRASS){ - Buff.affect(this, Barkskin.class).set( lvl, 1 ); + Buff.affect(this, Barkskin.class).set( lvl + 5, 1 ); } return actResult; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java index fe5d0116f..69122dda2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java @@ -107,7 +107,7 @@ public class BrokenSeal extends Item { @Override public synchronized boolean act() { if (shielding() < maxShield()) { - partialShield += 1/(35*Math.pow(0.885f, (maxShield() - shielding() - 1))); + partialShield += 1/(35*Math.pow(0.9f, (maxShield() - shielding() - 1))); } while (partialShield >= 1){ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java index 4e3c8c07f..84c58a706 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java @@ -179,8 +179,9 @@ public class CloakOfShadows extends Artifact { if (charge < chargeCap) { LockedFloor lock = target.buff(LockedFloor.class); if (!stealthed && (lock == null || lock.regenOn())) { - float turnsToCharge = (50 - (chargeCap - charge)); - if (level() > 7) turnsToCharge -= 10*(level() - 7)/3f; + float missing = (chargeCap - charge); + if (level() > 7) missing += 5*(level() - 7)/3f; + float turnsToCharge = (45 - missing); partialCharge += (1f / turnsToCharge); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java index 59c84257e..84b3e4983 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java @@ -145,7 +145,8 @@ public abstract class Wand extends Item { protected void processSoulMark(Char target, int chargesUsed){ if (target != Dungeon.hero && Dungeon.hero.subClass == HeroSubClass.WARLOCK && - Random.Float() > Math.pow(0.9f, (level()*chargesUsed)+1)){ + //standard 1 - 0.92^x chance, plus 7%. Starts at 15% + Random.Float() > (Math.pow(0.92f, (level()*chargesUsed)+1) - 0.7f)){ SoulMark.prolong(target, SoulMark.class, SoulMark.DURATION + level()); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java index e501126c8..d69fa3e6b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java @@ -126,12 +126,12 @@ public class SpiritBow extends Weapon { @Override public int min(int lvl) { - return 1 + Dungeon.hero.lvl/6 + RingOfSharpshooting.levelDamageBonus(Dungeon.hero); + return 1 + Dungeon.hero.lvl/5 + RingOfSharpshooting.levelDamageBonus(Dungeon.hero); } @Override public int max(int lvl) { - return 6 + Dungeon.hero.lvl/3 + 2*RingOfSharpshooting.levelDamageBonus(Dungeon.hero); + return 6 + (int)(Dungeon.hero.lvl/2.5f) + 2*RingOfSharpshooting.levelDamageBonus(Dungeon.hero); } private int targetPos; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Gloves.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Gloves.java index e9f583966..65ba6d567 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Gloves.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Gloves.java @@ -36,7 +36,7 @@ public class Gloves extends MeleeWeapon { @Override public int max(int lvl) { - return (int)(2.5f*(tier+1)) + //5 base, down from 10 + return (int)(3f*(tier+1)) + //6 base, down from 10 lvl*tier; //+1 per level, down from +2 }