diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index bd52baf86..005c864c4 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -566,7 +566,7 @@ actors.hero.talent.strongman.desc=_+1:_ The Warrior's strength is _increased by actors.hero.talent.endless_rage.title=endless rage actors.hero.talent.endless_rage.desc=_+1:_ The Berserker can reach a max of _116% rage_.\n\n_+2:_ The Berserker can reach a max of _133% rage_.\n\n_+3:_ The Berserker can reach a max of _150% rage_.\n\nEach point of rage above 100% increases berserk shielding by 1% and reduces cooldown by 1%, but does not increase the damage bonus beyond +50%. actors.hero.talent.deathless_fury.title=deathless fury -actors.hero.talent.deathless_fury.desc=_+1:_ Berserk automatically triggers if the Berserker is about to die and rage is at or above 100%, but it has a cooldown of _4 hero levels_ when this happens.\n\n_+2:_ Berserk automatically triggers if the Berserker is about to die and rage is at or above 100%, but it has a cooldown of _3 hero levels_ when this happens.\n\n_+3:_ Berserk automatically triggers if the Berserker is about to die and rage is at or above 100%, but it has a cooldown of _2 hero levels_ when this happens.\n\nNote that the Berserker will still die if he has 0 HP when berserking ends. +actors.hero.talent.deathless_fury.desc=_+1:_ Berserk automatically triggers if the Berserker is about to die and rage is at or above 100%, but it has a cooldown of _3 hero levels_ when this happens.\n\n_+2:_ Berserk automatically triggers if the Berserker is about to die and rage is at or above 100%, but it has a cooldown of _2 hero levels_ when this happens.\n\n_+3:_ Berserk automatically triggers if the Berserker is about to die and rage is at or above 100%, but it has a cooldown of _1 hero level_ when this happens.\n\nNote that the Berserker will still die if he has 0 HP when berserking ends. actors.hero.talent.enraged_catalyst.title=enraged catalyst actors.hero.talent.enraged_catalyst.desc=_+1:_ Enchantments and curses on the Berserker's weapon trigger more often the more rage he has, to a maximum of _15% more often_ at 100% rage.\n\n_+2:_ Enchantments and curses on the Berserker's weapon trigger more often the more rage he has, to a maximum of _30% more often_ at 100% rage.\n\n_+3:_ Enchantments and curses on the Berserker's weapon trigger more often the more rage he has, to a maximum of _45% more often_ at 100% rage. @@ -627,7 +627,7 @@ actors.hero.talent.ally_warp.title=ally warp actors.hero.talent.ally_warp.desc=_+1:_ The Mage can tap an ally to instantly swap places with them, with a _2 tile range_.\n\n_+2:_ The Mage can tap an ally to instantly swap places with them, with a _4 tile range_.\n\n_+3:_ The Mage can tap an ally to instantly swap places with them, with a _6 tile range_.\n\nThe Mage cannot swap places with immobile allies. actors.hero.talent.empowered_strike.title=empowered strike -actors.hero.talent.empowered_strike.desc=_+1:_ The Battlemage's first melee strike with his staff after zapping with it deals _+16% damage_ and the staff's bonus effect gets _+33% power_.\n\n_+2:_ The Battlemage's first melee strike with his staff after zapping with it deals _+33% damage_ and the staff's bonus effect gets _+67% power_.\n\n_+3:_ The Battlemage's first melee strike with his staff after zapping with it deals _+50% damage_ and the staff's bonus effect gets _+100% power_. +actors.hero.talent.empowered_strike.desc=_+1:_ The Battlemage's first melee strike with his staff after zapping with it deals _+16% damage_ and the staff's bonus effect gets _+50% power_.\n\n_+2:_ The Battlemage's first melee strike with his staff after zapping with it deals _+33% damage_ and the staff's bonus effect gets _+100% power_.\n\n_+3:_ The Battlemage's first melee strike with his staff after zapping with it deals _+50% damage_ and the staff's bonus effect gets _+150% power_. actors.hero.talent.mystical_charge.title=mystical charge actors.hero.talent.mystical_charge.desc=_+1:_ Striking with his staff grants the Battlemage _0.5 turns_ worth of artifact recharging.\n\n_+2:_ Striking with his staff grants the Battlemage _1 turn_ worth of artifact recharging.\n\n_+3:_ Striking with his staff grants the Battlemage _1.5 turns_ worth of artifact recharging. actors.hero.talent.excess_charge.title=excess charge diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java index 8bdb817bb..9032dfcf7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java @@ -51,7 +51,7 @@ public class Berserk extends Buff implements ActionIndicator.Action { } private State state = State.NORMAL; - private static final float LEVEL_RECOVER_START = 5f; + private static final float LEVEL_RECOVER_START = 4f; private float levelRecovery; private static final int TURN_RECOVERY_START = 100; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java index 58240e7c6..1029f3de0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java @@ -101,18 +101,18 @@ public class SandalsOfNature extends Artifact { private static final HashMap, Integer> seedChargeReqs = new HashMap<>(); static { - seedChargeReqs.put(Rotberry.Seed.class, 10); - seedChargeReqs.put(Firebloom.Seed.class, 25); - seedChargeReqs.put(Swiftthistle.Seed.class, 25); - seedChargeReqs.put(Sungrass.Seed.class, 100); - seedChargeReqs.put(Icecap.Seed.class, 25); - seedChargeReqs.put(Stormvine.Seed.class, 25); - seedChargeReqs.put(Sorrowmoss.Seed.class, 25); - seedChargeReqs.put(Mageroyal.Seed.class, 15); - seedChargeReqs.put(Earthroot.Seed.class, 50); - seedChargeReqs.put(Starflower.Seed.class, 50); - seedChargeReqs.put(Fadeleaf.Seed.class, 15); - seedChargeReqs.put(Blindweed.Seed.class, 15); + seedChargeReqs.put(Rotberry.Seed.class, 8); + seedChargeReqs.put(Firebloom.Seed.class, 20); + seedChargeReqs.put(Swiftthistle.Seed.class, 20); + seedChargeReqs.put(Sungrass.Seed.class, 80); + seedChargeReqs.put(Icecap.Seed.class, 20); + seedChargeReqs.put(Stormvine.Seed.class, 20); + seedChargeReqs.put(Sorrowmoss.Seed.class, 20); + seedChargeReqs.put(Mageroyal.Seed.class, 12); + seedChargeReqs.put(Earthroot.Seed.class, 40); + seedChargeReqs.put(Starflower.Seed.class, 40); + seedChargeReqs.put(Fadeleaf.Seed.class, 12); + seedChargeReqs.put(Blindweed.Seed.class, 12); } @Override @@ -289,7 +289,7 @@ public class SandalsOfNature extends Artifact { Sample.INSTANCE.play( Assets.Sounds.PLANT ); hero.busy(); hero.spend( Actor.TICK ); - if (seeds.size() >= 4+(level()*3)){ + if (seeds.size() >= 3+(level()*3)){ seeds.clear(); upgrade(); 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 e6ef73210..4eaac8c65 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 @@ -128,7 +128,7 @@ public abstract class Wand extends Item { //not affected by enchantment proc chance changers public static float procChanceMultiplier( Char attacker ){ if (attacker.buff(Talent.EmpoweredStrikeTracker.class) != null){ - return 1f + ((Hero)attacker).pointsInTalent(Talent.EMPOWERED_STRIKE)/3f; + return 1f + ((Hero)attacker).pointsInTalent(Talent.EMPOWERED_STRIKE)/2f; } return 1f; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Blocking.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Blocking.java index efe6f6ca3..7e7d3f521 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Blocking.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Blocking.java @@ -47,9 +47,9 @@ public class Blocking extends Weapon.Enchantment { int level = Math.max( 0, weapon.buffedLvl() ); // lvl 0 - 10% - // lvl 1 ~ 14% - // lvl 2 ~ 18% - float procChance = (level+2f)/(level+20f) * procChanceMultiplier(attacker); + // lvl 1 ~ 12% + // lvl 2 ~ 14% + float procChance = (level+4f)/(level+40f) * procChanceMultiplier(attacker); if (Random.Float() < procChance){ BlockBuff b = Buff.affect(attacker, BlockBuff.class); b.setShield(attacker.HT/10);