diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index c3d353182..49a5ca53c 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -440,22 +440,22 @@ actors.hero.talent.runic_transference.desc=_+1:_ The Warrior's broken seal can t actors.hero.talent.lethal_momentum.title=lethal momentum actors.hero.talent.lethal_momentum.desc=_+1:_ When the Warrior lands a killing blow with a physical weapon, it has a _67% chance_ to take 0 turns.\n\n_+2:_ When the Warrior lands a killing blow with a physical weapon, it has a _100% chance_ to take 0 turns. actors.hero.talent.improvised_projectiles.title=improvised projectiles -actors.hero.talent.improvised_projectiles.desc=_+1:_ The Warrior can blind an enemy for _2 turns_ by throwing any item that isn’t a thrown weapon at them. This has a 30 turn cooldown.\n\n_+2:_ The Warrior can blind an enemy for _3 turns_ by throwing any item that isn’t a thrown weapon at them. This has a 30 turn cooldown. +actors.hero.talent.improvised_projectiles.desc=_+1:_ The Warrior can blind an enemy for _2 turns_ by throwing any item that isn’t a thrown weapon at them. This has a 50 turn cooldown.\n\n_+2:_ The Warrior can blind an enemy for _3 turns_ by throwing any item that isn’t a thrown weapon at them. This has a 50 turn cooldown. + actors.hero.talent.hold_fast.title=hold fast actors.hero.talent.hold_fast.desc=_+1:_ When the Warrior waits he gains _+2 armor_ until he moves.\n\n_+2:_ When the Warrior waits he gains _+4 armor_ until he moves.\n\n_+3:_ When the Warrior waits he gains _+6 armor_ until he moves. - actors.hero.talent.strongman.title=strongman -actors.hero.talent.strongman.desc=_+1:_ The Warrior needs _1 less strength_ to use armor.\n\n_+2:_ The Warrior needs _1 less strength_ to use armor and _1 less strength_ to use weapons.\n\n_+3:_ The Warrior needs _2 less strength_ to use armor and _1 less strength_ to use weapons. +actors.hero.talent.strongman.desc=_+1:_ The Warrior's strength is _increased by 8%_, rounded down.\n\n_+2:_ The Warrior's strength is _increased by 13%_, rounded down.\n\n_+3:_ The Warrior's strength is _increased by 18%_, rounded down. actors.hero.talent.endless_rage.title=endless rage actors.hero.talent.endless_rage.desc=_+1:_ The Berserker can reach a max of _115% rage_.\n\n_+2:_ The Berserker can reach a max of _130% rage_.\n\n_+3:_ The Berserker can reach a max of _145% rage_.\n\nNote that rage above 100% will not grant more than +50% damage. actors.hero.talent.berserking_stamina.title=berserking stamina -actors.hero.talent.berserking_stamina.desc=_+1:_ The Berserker gains _17% more shield_ when berserking, and the berserking cooldown is reduced to _1.67 levels_ from 2.\n\n_+2:_ The Berserker gains _33% more shield_ when berserking, and the berserking cooldown is reduced to _1.33 levels_ from 2.\n\n_+3:_ The Berserker gains _50% more shield_ when berserking, and the berserking cooldown is reduced to _1 level_ from 2. +actors.hero.talent.berserking_stamina.desc=_+1:_ The Berserker gains _25% more shield_ when berserking, and the berserking cooldown is reduced to _1.67 levels_ from 2.\n\n_+2:_ The Berserker gains _50% more shield_ when berserking, and the berserking cooldown is reduced to _1.33 levels_ from 2.\n\n_+3:_ The Berserker gains _75% more shield_ when berserking, and the berserking cooldown is reduced to _1 level_ from 2. 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 _17% 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 _33% 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 _50% more often_ at 100% rage. actors.hero.talent.cleave.title=cleave -actors.hero.talent.cleave.desc=_+1:_ When the Gladiator kills an enemy, the combo cooldown for his next hit is increased to _10 turns_.\n\n_+2:_ When the Gladiator kills an enemy, the combo cooldown for his next hit is increased to _20 turns_.\n\n_+3:_ When the Gladiator kills an enemy, the combo cooldown for his next hit is increased to _30 turns_. +actors.hero.talent.cleave.desc=_+1:_ When the Gladiator kills an enemy, the combo cooldown for his next hit is increased to _15 turns_.\n\n_+2:_ When the Gladiator kills an enemy, the combo cooldown for his next hit is increased to _30 turns_.\n\n_+3:_ When the Gladiator kills an enemy, the combo cooldown for his next hit is increased to _45 turns_. actors.hero.talent.lethal_defense.title=lethal defense actors.hero.talent.lethal_defense.desc=_+1:_ When the Gladiator kills an enemy with a combo move, he _regains 33%_ of the broken seal's shielding.\n\n_+2:_ When the Gladiator kills an enemy with a combo move, he _regains 67%_ of the broken seal's shielding.\n\n_+3:_ When the Gladiator kills an enemy with a combo move, he _regains 100%_ of the broken seal's shielding. actors.hero.talent.enhanced_combo.title=enhanced combo 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 2c342394e..effbe1881 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 @@ -120,7 +120,7 @@ public class Berserk extends Buff { if (shield != null){ state = State.BERSERK; int shieldAmount = shield.maxShield() * 8; - shieldAmount = Math.round(shieldAmount * (1f + Dungeon.hero.pointsInTalent(Talent.BERSERKING_STAMINA)/6f)); + shieldAmount = Math.round(shieldAmount * (1f + Dungeon.hero.pointsInTalent(Talent.BERSERKING_STAMINA)/4f)); shield.supercharge(shieldAmount); SpellSprite.show(target, SpellSprite.BERSERK); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java index 29a0037ae..d4f9eb4a3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java @@ -88,7 +88,7 @@ public class Combo extends Buff implements ActionIndicator.Action { comboTime = 5f; if (!enemy.isAlive() || (enemy.buff(Corruption.class) != null && enemy.HP == enemy.HT)){ - comboTime = Math.max(comboTime, 10*((Hero)target).pointsInTalent(Talent.CLEAVE)); + comboTime = Math.max(comboTime, 15*((Hero)target).pointsInTalent(Talent.CLEAVE)); } initialComboTime = comboTime; 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 14b052ef3..6184dcd7c 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 @@ -225,6 +225,10 @@ public class Hero extends Char { STR += buff.boost(); } + if (hasTalent(Talent.STRONGMAN)){ + STR = (int)Math.floor(STR * (1f + 0.3f + 0.5f*pointsInTalent(Talent.STRONGMAN))); + } + return STR; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java index d089500ed..f69ca2147 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java @@ -564,7 +564,7 @@ public class Item implements Bundlable { if (enemy != null && enemy.alignment != curUser.alignment){ Sample.INSTANCE.play(Assets.Sounds.HIT); Buff.affect(enemy, Blindness.class, 1f + curUser.pointsInTalent(Talent.IMPROVISED_PROJECTILES)); - Buff.affect(curUser, Talent.ImprovisedProjectileCooldown.class, 30f); + Buff.affect(curUser, Talent.ImprovisedProjectileCooldown.class, 50f); } } if (user.buff(Talent.LethalMomentumTracker.class) != null){ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java index 120fa0748..8e4555d57 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java @@ -537,13 +537,7 @@ public class Armor extends EquipableItem { lvl = Math.max(0, lvl); //strength req decreases at +1,+3,+6,+10,etc. - int req = (8 + Math.round(tier * 2)) - (int)(Math.sqrt(8 * lvl + 1) - 1)/2; - - if (Dungeon.hero.hasTalent(Talent.STRONGMAN)){ - req -= (Dungeon.hero.pointsInTalent(Talent.STRONGMAN)+1)/2; - } - - return req; + return (8 + Math.round(tier * 2)) - (int)(Math.sqrt(8 * lvl + 1) - 1)/2; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java index eb7d82ab2..82c42efb9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java @@ -210,11 +210,7 @@ abstract public class Weapon extends KindOfWeapon { lvl = Math.max(0, lvl); //strength req decreases at +1,+3,+6,+10,etc. - int req = (8 + tier * 2) - (int)(Math.sqrt(8 * lvl + 1) - 1)/2; - - if (Dungeon.hero.pointsInTalent(Talent.STRONGMAN) >= 2) req--; - - return req; + return (8 + tier * 2) - (int)(Math.sqrt(8 * lvl + 1) - 1)/2; } @Override