From fe99e22abc95c5b4e43f226240e26cfbe7f7965c Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 29 Jan 2023 13:02:00 -0500 Subject: [PATCH] v2.0.0: heavily nerfed lightweight charge --- core/src/main/assets/messages/actors/actors.properties | 4 ++-- .../shatteredpixeldungeon/actors/hero/Hero.java | 4 ++-- .../shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index ac92de2c2..ed5d31e44 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -849,8 +849,8 @@ actors.hero.talent.swift_equip.title=swift equip actors.hero.talent.swift_equip.desc=_+1:_ The Duelist can switch her equipped weapon instantly _one time_, with a 50 turn cooldown.\n\n_+2:_ The Duelist can switch her equipped weapon instantly _twice within 5 turns_, with a 50 turn cooldown.\n\nIf the Duelist has this talent and it is not on cooldown, quick-using an unequipped weapon will equip it. actors.hero.talent.lightweight_charge.title=lightweight charge -actors.hero.talent.lightweight_charge.desc=_+1:_ When the Duelist uses the ability of a tier 1/2/3 melee weapon, it consumes _17/11/8% less charge_.\n\n_+2:_ When the Duelist uses the ability of a tier 1/2/3 melee weapon, it consumes _33/22/17% less charge_.\n\n_+3:_ When the Duelist uses the ability of a tier 1/2/3 melee weapon, it consumes _50/33/25% less charge_. -actors.hero.talent.lightweight_charge.meta_desc=_If this talent is gained by a different hero_ it will instead increase the damage of tier 2/3 melee weapons by 10/5% at +1, 20/10% at +2, or 30/15% at +3. Tier 1 weapons are unaffected. +actors.hero.talent.lightweight_charge.desc=_+1:_ When the Duelist uses the ability of a tier 1/2/3 melee weapon, it consumes _7/5/3% less charge_.\n\n_+2:_ When the Duelist uses the ability of a tier 1/2/3 melee weapon, it consumes _13/10/7% less charge_.\n\n_+3:_ When the Duelist uses the ability of a tier 1/2/3 melee weapon, it consumes _20/15/10% less charge_. +actors.hero.talent.lightweight_charge.meta_desc=_If this talent is gained by a different hero_ it will instead increase the damage of tier 2/3 melee weapons by 7/3% at +1, 14/7% at +2, or 20/10% at +3. Tier 1 weapons are unaffected. actors.hero.talent.deadly_followup.title=deadly followup actors.hero.talent.deadly_followup.desc=_+1:_ When the Duelist hits an enemy with a thrown weapon, she will deal _7% more melee damage_ to them for 5 turns.\n\n_+2:_ When the Duelist hits an enemy with a thrown weapon, she will deal _13% more melee damage_ to them for 5 turns.\n\n_+3:_ When the Duelist hits an enemy with a thrown weapon, she will deal _20% more melee damage_ to them for 5 turns. 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 4a0444045..b0e738127 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 @@ -581,9 +581,9 @@ public class Hero extends Char { && hasTalent(Talent.LIGHTWEIGHT_CHARGE) && wep instanceof MeleeWeapon) { if (((MeleeWeapon) wep).tier == 2) { - dmg = Math.round(dmg * (1f + 0.1f*pointsInTalent(Talent.LIGHTWEIGHT_CHARGE))); + dmg = Math.round(dmg * (1f + 0.067f*pointsInTalent(Talent.LIGHTWEIGHT_CHARGE))); } else if (((MeleeWeapon) wep).tier == 3) { - dmg = Math.round(dmg * (1f + 0.05f*pointsInTalent(Talent.LIGHTWEIGHT_CHARGE))); + dmg = Math.round(dmg * (1f + 0.033f*pointsInTalent(Talent.LIGHTWEIGHT_CHARGE))); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java index 922957760..7649cab8d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java @@ -221,8 +221,8 @@ public class MeleeWeapon extends Weapon { public float abilityChargeUse( Hero hero ){ float chargeUse = 1f; if (hero.hasTalent(Talent.LIGHTWEIGHT_CHARGE) && tier <= 3){ - // T1/2/3 get 50/33/25% charge use reduction at +3 - float chargeUseReduction = 1/(1f+tier) * (hero.pointsInTalent(Talent.LIGHTWEIGHT_CHARGE)/3f); + // T1/2/3 get 20/15/10% charge use reduction at +3 + float chargeUseReduction = (0.25f-.05f*tier) * (hero.pointsInTalent(Talent.LIGHTWEIGHT_CHARGE)/3f); chargeUse *= 1f - chargeUseReduction; } return chargeUse;