From a870b2459d9dafd2633757f615fabc3e4239acff Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Thu, 6 May 2021 17:58:18 -0400
Subject: [PATCH] v0.9.3: armor abilities now have a universal charge cost
 talent

---
 .../main/assets/interfaces/talent_icons.png   | Bin 4428 -> 4419 bytes
 .../assets/messages/actors/actors.properties  |  35 ++++++------------
 .../actors/hero/Talent.java                   |  29 +++++++++------
 .../actors/hero/abilities/ArmorAbility.java   |   7 +++-
 .../hero/abilities/huntress/Huntress2.java    |   2 +-
 .../hero/abilities/huntress/Huntress3.java    |   2 +-
 .../abilities/huntress/SpectralBlades.java    |   2 +-
 .../actors/hero/abilities/mage/Mage2.java     |   2 +-
 .../actors/hero/abilities/mage/Mage3.java     |   2 +-
 .../hero/abilities/mage/MoltenEarth.java      |   2 +-
 .../actors/hero/abilities/rogue/Rogue2.java   |   2 +-
 .../actors/hero/abilities/rogue/Rogue3.java   |   2 +-
 .../hero/abilities/rogue/SmokeBomb.java       |   6 +--
 .../hero/abilities/warrior/HeroicLeap.java    |   6 +--
 .../hero/abilities/warrior/Shockwave.java     |   4 +-
 .../hero/abilities/warrior/Warrior3.java      |   2 +-
 16 files changed, 51 insertions(+), 54 deletions(-)

diff --git a/core/src/main/assets/interfaces/talent_icons.png b/core/src/main/assets/interfaces/talent_icons.png
index 7211ae371bc6484b98ea05278c676ac7e4a29b08..fed5d69bae52d9d76eedac22ea1d3e31c18bd48b 100644
GIT binary patch
delta 4219
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
TGftBq3E;A3<LbLB1CRX|_X4pE

delta 4228
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
XuCxEzfAf^z3BY}gr|ZMjfyw^^##^;k

diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties
index 51790e3b9..8ceac1123 100644
--- a/core/src/main/assets/messages/actors/actors.properties
+++ b/core/src/main/assets/messages/actors/actors.properties
@@ -470,8 +470,6 @@ actors.hero.talent.impact_wave.title=impact wave
 actors.hero.talent.impact_wave.desc=_+1:_ When the Warrior lands after jumping, all adjacent enemies are knocked _2 tiles_ back.\n\n_+2:_ When the Warrior lands after jumping, all adjacent enemies are knocked _4 tiles_ back.\n\n_+3:_ When the Warrior lands after jumping, all adjacent enemies are knocked _6 tiles_ back.\n\n_+4:_ When the Warrior lands after jumping, all adjacent enemies are knocked _8 tiles_ back.
 actors.hero.talent.double_jump.title=double jump
 actors.hero.talent.double_jump.desc=_+1:_ If the Warrior performs a second leap within 5 turns, that leap has a _24% reduced_ charge cost.\n\n_+2:_ If the Warrior performs a second leap within 5 turns, that leap has a _42% reduced_ charge cost.\n\n_+3:_ If the Warrior performs a second leap within 5 turns, that leap has a _56% reduced_ charge cost.\n\n_+4:_ If the Warrior performs a second leap within 5 turns, that leap has a _67% reduced_ charge cost.
-actors.hero.talent.heroic_leap_4.title=TODO NAME
-actors.hero.talent.heroic_leap_4.desc=_+1:_ \n\n_+2:_ \n\n_+3:_ \n\n_+4:_ 
 
 actors.hero.talent.expanding_wave.title=expanding wave
 actors.hero.talent.expanding_wave.desc=_+1:_ Shockwave's range is increased to _6 tiles_ from 5, and its width is increased to _75 degrees_ from 60.\n\n_+2:_ Shockwave's range is increased to _7 tiles_ from 5, and its width is increased to _90 degrees_ from 60.\n\n_+3:_ Shockwave's range is increased to _8 tiles_ from 5, and its width is increased to _105 degrees_ from 60.\n\n_+4:_ Shockwave's range is increased to _9 tiles_ from 5, and its width is increased to _120 degrees_ from 60.
@@ -479,8 +477,6 @@ actors.hero.talent.striking_wave.title=striking wave
 actors.hero.talent.striking_wave.desc=_+1:_ Damage from shockwave has a _25% chance_ to also trigger on-hit effects like enchantments and combo.\n\n_+2:_ Damage from shockwave has a _50% chance_ to also trigger on-hit effects like enchantments and combo.\n\n_+3:_ Damage from shockwave has a _75% chance_ to also trigger on-hit effects like enchantments and combo.\n\n_+4:_ Shockwave has a _100% chance_ to also trigger on-hit effects like enchantments and combo.
 actors.hero.talent.shock_force.title=shock force
 actors.hero.talent.shock_force.desc=_+1:_ Shockwave deals _20% more damage_ and has a _25% chance_ to stun instead of cripple.\n\n_+2:_ Shockwave deals _50% more damage_ and has a _50% chance_ to stun instead of cripple.\n\n_+3:_ Shockwave deals _60% more damage_ and has a _75% chance_ to stun instead of cripple.\n\n_+4:_ Shockwave deals _80% more damage_ and has a _100% chance_ to stun instead of cripple.
-actors.hero.talent.warrior_2_4.title=TODO NAME
-actors.hero.talent.warrior_2_4.desc=TODO DESC
 
 actors.hero.talent.warrior_3_1.title=TODO NAME
 actors.hero.talent.warrior_3_1.desc=TODO DESC
@@ -488,8 +484,6 @@ actors.hero.talent.warrior_3_2.title=TODO NAME
 actors.hero.talent.warrior_3_2.desc=TODO DESC
 actors.hero.talent.warrior_3_3.title=TODO NAME
 actors.hero.talent.warrior_3_3.desc=TODO DESC
-actors.hero.talent.warrior_3_4.title=TODO NAME
-actors.hero.talent.warrior_3_4.desc=TODO DESC
 
 #mage
 actors.hero.talent.empowering_meal.title=empowering meal
@@ -537,8 +531,6 @@ actors.hero.talent.molten_earth_2.title=TODO NAME
 actors.hero.talent.molten_earth_2.desc=TODO DESC
 actors.hero.talent.molten_earth_3.title=TODO NAME
 actors.hero.talent.molten_earth_3.desc=TODO DESC
-actors.hero.talent.molten_earth_4.title=TODO NAME
-actors.hero.talent.molten_earth_4.desc=TODO DESC
 
 actors.hero.talent.mage_2_1.title=TODO NAME
 actors.hero.talent.mage_2_1.desc=TODO DESC
@@ -546,8 +538,6 @@ actors.hero.talent.mage_2_2.title=TODO NAME
 actors.hero.talent.mage_2_2.desc=TODO DESC
 actors.hero.talent.mage_2_3.title=TODO NAME
 actors.hero.talent.mage_2_3.desc=TODO DESC
-actors.hero.talent.mage_2_4.title=TODO NAME
-actors.hero.talent.mage_2_4.desc=TODO DESC
 
 actors.hero.talent.mage_3_1.title=TODO NAME
 actors.hero.talent.mage_3_1.desc=TODO DESC
@@ -555,8 +545,6 @@ actors.hero.talent.mage_3_2.title=TODO NAME
 actors.hero.talent.mage_3_2.desc=TODO DESC
 actors.hero.talent.mage_3_3.title=TODO NAME
 actors.hero.talent.mage_3_3.desc=TODO DESC
-actors.hero.talent.mage_3_4.title=TODO NAME
-actors.hero.talent.mage_3_4.desc=TODO DESC
 
 #rogue
 actors.hero.talent.cached_rations.title=cached rations
@@ -604,8 +592,6 @@ actors.hero.talent.body_replacement.title=body replacement
 actors.hero.talent.body_replacement.desc=_+1:_ After blinking, the Rogue leaves a wooden decoy behind that has _30 health and 1-5 armor_.\n\n_+2:_ After blinking, the Rogue leaves a wooden decoy behind that has _60 health and 2-10 armor_.\n\n_+3:_ After blinking, the Rogue leaves a wooden decoy behind that has _90 health and 3-15 armor_.\n\n_+4:_ After blinking, the Rogue leaves a wooden decoy behind that has _120 health and 4-20 armor_.\n\nOnly one decoy can be active at a time.
 actors.hero.talent.shadow_step.title=shadow step
 actors.hero.talent.shadow_step.desc=_+1:_ If the rogue uses smoke bomb while invisible, it occurs instantly and has a _24% reduced_ charge cost, but it also doesn't blind enemies or trigger other talents.\n\n_+2:_ If the rogue uses smoke bomb while invisible, it occurs instantly and has a _42% reduced_ charge cost, but it also doesn't blind enemies or trigger other talents.\n\n_+3:_ If the rogue uses smoke bomb while invisible, it occurs instantly and has a _56% reduced_ charge cost, but it also doesn't blind enemies or trigger other talents.\n\n_+4:_ If the rogue uses smoke bomb while invisible, it occurs instantly and has a _67% reduced_ charge cost, but it also doesn't blind enemies or trigger other talents.
-actors.hero.talent.smoke_bomb_4.title=TODO NAME
-actors.hero.talent.smoke_bomb_4.desc=TODO DESC
 
 actors.hero.talent.rogue_2_1.title=TODO NAME
 actors.hero.talent.rogue_2_1.desc=TODO DESC
@@ -613,8 +599,6 @@ actors.hero.talent.rogue_2_2.title=TODO NAME
 actors.hero.talent.rogue_2_2.desc=TODO DESC
 actors.hero.talent.rogue_2_3.title=TODO NAME
 actors.hero.talent.rogue_2_3.desc=TODO DESC
-actors.hero.talent.rogue_2_4.title=TODO NAME
-actors.hero.talent.rogue_2_4.desc=TODO DESC
 
 actors.hero.talent.rogue_3_1.title=TODO NAME
 actors.hero.talent.rogue_3_1.desc=TODO DESC
@@ -622,8 +606,6 @@ actors.hero.talent.rogue_3_2.title=TODO NAME
 actors.hero.talent.rogue_3_2.desc=TODO DESC
 actors.hero.talent.rogue_3_3.title=TODO NAME
 actors.hero.talent.rogue_3_3.desc=TODO DESC
-actors.hero.talent.rogue_3_4.title=TODO NAME
-actors.hero.talent.rogue_3_4.desc=TODO DESC
 
 #huntress
 actors.hero.talent.natures_bounty.title=nature's bounty
@@ -671,8 +653,6 @@ actors.hero.talent.spectral_blades_2.title=TODO NAME
 actors.hero.talent.spectral_blades_2.desc=TODO DESC
 actors.hero.talent.spectral_blades_3.title=TODO NAME
 actors.hero.talent.spectral_blades_3.desc=TODO DESC
-actors.hero.talent.spectral_blades_4.title=TODO NAME
-actors.hero.talent.spectral_blades_4.desc=TODO DESC
 
 actors.hero.talent.huntress_2_1.title=TODO NAME
 actors.hero.talent.huntress_2_1.desc=TODO DESC
@@ -680,8 +660,6 @@ actors.hero.talent.huntress_2_2.title=TODO NAME
 actors.hero.talent.huntress_2_2.desc=TODO DESC
 actors.hero.talent.huntress_2_3.title=TODO NAME
 actors.hero.talent.huntress_2_3.desc=TODO DESC
-actors.hero.talent.huntress_2_4.title=TODO NAME
-actors.hero.talent.huntress_2_4.desc=TODO DESC
 
 actors.hero.talent.huntress_3_1.title=TODO NAME
 actors.hero.talent.huntress_3_1.desc=TODO DESC
@@ -689,8 +667,17 @@ actors.hero.talent.huntress_3_2.title=TODO NAME
 actors.hero.talent.huntress_3_2.desc=TODO DESC
 actors.hero.talent.huntress_3_3.title=TODO NAME
 actors.hero.talent.huntress_3_3.desc=TODO DESC
-actors.hero.talent.huntress_3_4.title=TODO NAME
-actors.hero.talent.huntress_3_4.desc=TODO DESC
+
+#universal
+actors.hero.talent.heroic_energy.title=heroic energy
+actors.hero.talent.heroic_energy.desc=_+1:_ The hero's armor ability has a _13% reduced_ charge cost.\n\n_+2:_ The hero's armor ability has a _24% reduced_ charge cost.\n\n_+3:_ The hero's armor ability has a _34% reduced_ charge cost.\n\n_+4:_ The hero's armor ability has a _43% reduced_ charge cost
+
+actors.hero.talent.rk_1.title=TODO NAME
+actors.hero.talent.rk_1.desc=TODO DESC
+actors.hero.talent.rk_2.title=TODO NAME
+actors.hero.talent.rk_2.desc=TODO DESC
+actors.hero.talent.rk_3.title=TODO NAME
+actors.hero.talent.rk_3.desc=TODO DESC
 
 
 
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java
index 2caa7c96c..12ded4379 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java
@@ -79,11 +79,11 @@ public enum Talent {
 	//Gladiator T3
 	CLEAVE(14, 3), LETHAL_DEFENSE(15, 3), ENHANCED_COMBO(16, 3),
 	//Heroic Leap T4
-	BODY_SLAM(17, 4), IMPACT_WAVE(18, 4), DOUBLE_JUMP(19, 4), HEROIC_LEAP_4(20, 4),
+	BODY_SLAM(17, 4), IMPACT_WAVE(18, 4), DOUBLE_JUMP(19, 4),
 	//Shockwave T4
-	EXPANDING_WAVE(21, 4), STRIKING_WAVE(22, 4), SHOCK_FORCE(23, 4), WARRIOR_2_4(24, 4),
+	EXPANDING_WAVE(20, 4), STRIKING_WAVE(21, 4), SHOCK_FORCE(22, 4),
 	//??? T4
-	WARRIOR_3_1(25, 4), WARRIOR_3_2(26, 4), WARRIOR_3_3(27, 4), WARRIOR_3_4(28, 4),
+	WARRIOR_3_1(23, 4), WARRIOR_3_2(24, 4), WARRIOR_3_3(25, 4),
 
 	//Mage T1
 	EMPOWERING_MEAL(32), SCHOLARS_INTUITION(33), TESTED_HYPOTHESIS(34), BACKUP_BARRIER(35),
@@ -96,11 +96,11 @@ public enum Talent {
 	//Warlock T3
 	SOUL_EATER(46, 3), SOUL_SIPHON(47, 3), NECROMANCERS_MINIONS(48, 3),
 	//Molten Earth T4
-	MOLTEN_EARTH_1(49, 4), MOLTEN_EARTH_2(50, 4), MOLTEN_EARTH_3(51, 4), MOLTEN_EARTH_4(52, 4),
+	MOLTEN_EARTH_1(49, 4), MOLTEN_EARTH_2(50, 4), MOLTEN_EARTH_3(51, 4),
 	//??? T4
-	MAGE_2_1(53, 4), MAGE_2_2(54, 4), MAGE_2_3(55, 4), MAGE_2_4(56, 4),
+	MAGE_2_1(52, 4), MAGE_2_2(53, 4), MAGE_2_3(54, 4),
 	//??? T4
-	MAGE_3_1(57, 4), MAGE_3_2(58, 4), MAGE_3_3(59, 4), MAGE_3_4(60, 4),
+	MAGE_3_1(55, 4), MAGE_3_2(56, 4), MAGE_3_3(57, 4),
 
 	//Rogue T1
 	CACHED_RATIONS(64), THIEFS_INTUITION(65), SUCKER_PUNCH(66), PROTECTIVE_SHADOWS(67),
@@ -113,11 +113,11 @@ public enum Talent {
 	//Freerunner T3
 	EVASIVE_ARMOR(78, 3), PROJECTILE_MOMENTUM(79, 3), SPEEDY_STEALTH(80, 3),
 	//Smoke Bomb T4
-	HASTY_RETREAT(81, 4), BODY_REPLACEMENT(82, 4), SHADOW_STEP(83, 4), SMOKE_BOMB_4(84, 4),
+	HASTY_RETREAT(81, 4), BODY_REPLACEMENT(82, 4), SHADOW_STEP(83, 4),
 	//??? T4
-	ROGUE_2_1(85, 4), ROGUE_2_2(86, 4), ROGUE_2_3(87, 4), ROGUE_2_4(88, 4),
+	ROGUE_2_1(84, 4), ROGUE_2_2(85, 4), ROGUE_2_3(86, 4),
 	//??? T4
-	ROGUE_3_1(89, 4), ROGUE_3_2(90, 4), ROGUE_3_3(91, 4), ROGUE_3_4(92, 4),
+	ROGUE_3_1(87, 4), ROGUE_3_2(88, 4), ROGUE_3_3(89, 4),
 
 	//Huntress T1
 	NATURES_BOUNTY(96), SURVIVALISTS_INTUITION(97), FOLLOWUP_STRIKE(98), NATURES_AID(99),
@@ -130,11 +130,16 @@ public enum Talent {
 	//Warden T3
 	DURABLE_TIPS(110, 3), BARKSKIN(111, 3), SHIELDING_DEW(112, 3),
 	//Spectral Blades T4
-	SPECTRAL_BLADES_1(113, 4), SPECTRAL_BLADES_2(114, 4), SPECTRAL_BLADES_3(115, 4), SPECTRAL_BLADES_4(116, 4),
+	SPECTRAL_BLADES_1(113, 4), SPECTRAL_BLADES_2(114, 4), SPECTRAL_BLADES_3(115, 4),
 	//??? T4
-	HUNTRESS_2_1(117, 4), HUNTRESS_2_2(118, 4), HUNTRESS_2_3(119, 4), HUNTRESS_2_4(120, 4),
+	HUNTRESS_2_1(116, 4), HUNTRESS_2_2(117, 4), HUNTRESS_2_3(118, 4),
 	//??? T4
-	HUNTRESS_3_1(121, 4), HUNTRESS_3_2(122, 4), HUNTRESS_3_3(123, 4), HUNTRESS_3_4(124, 4);
+	HUNTRESS_3_1(119, 4), HUNTRESS_3_2(120, 4), HUNTRESS_3_3(121, 4),
+
+	//universal T4
+	HEROIC_ENERGY(123, 4),
+	//??? T4
+	RK_1(125, 4), RK_2(126, 4), RK_3(127, 4);
 
 	public static class ImprovisedProjectileCooldown extends FlavourBuff{};
 	public static class LethalMomentumTracker extends FlavourBuff{};
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/ArmorAbility.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/ArmorAbility.java
index 8e2237e67..54017aef6 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/ArmorAbility.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/ArmorAbility.java
@@ -56,7 +56,12 @@ public abstract class ArmorAbility implements Bundlable {
 	}
 
 	public float chargeUse( Hero hero ){
-		return 35;
+		float chargeUse = 35;
+		if (hero.hasTalent(Talent.HEROIC_ENERGY)){
+			//reduced charge use by 13%/24%/34%/43%
+			chargeUse *= Math.pow( 0.869, hero.pointsInTalent(Talent.HEROIC_ENERGY));
+		}
+		return chargeUse;
 	}
 
 	protected abstract void activate( ClassArmor armor, Hero hero, Integer target );
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/huntress/Huntress2.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/huntress/Huntress2.java
index 18ad8de56..91714398b 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/huntress/Huntress2.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/huntress/Huntress2.java
@@ -35,6 +35,6 @@ public class Huntress2 extends ArmorAbility {
 
 	@Override
 	public Talent[] talents() {
-		return new Talent[]{Talent.HUNTRESS_2_1, Talent.HUNTRESS_2_2, Talent.HUNTRESS_2_3, Talent.HUNTRESS_2_4};
+		return new Talent[]{Talent.HUNTRESS_2_1, Talent.HUNTRESS_2_2, Talent.HUNTRESS_2_3, Talent.HEROIC_ENERGY};
 	}
 }
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/huntress/Huntress3.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/huntress/Huntress3.java
index f6e212626..4a0d363af 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/huntress/Huntress3.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/huntress/Huntress3.java
@@ -35,6 +35,6 @@ public class Huntress3 extends ArmorAbility {
 
 	@Override
 	public Talent[] talents() {
-		return new Talent[]{Talent.HUNTRESS_3_1, Talent.HUNTRESS_3_2, Talent.HUNTRESS_3_3, Talent.HUNTRESS_3_4};
+		return new Talent[]{Talent.HUNTRESS_3_1, Talent.HUNTRESS_3_2, Talent.HUNTRESS_3_3, Talent.HEROIC_ENERGY};
 	}
 }
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/huntress/SpectralBlades.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/huntress/SpectralBlades.java
index d7417def0..079a1565b 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/huntress/SpectralBlades.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/huntress/SpectralBlades.java
@@ -84,6 +84,6 @@ public class SpectralBlades extends ArmorAbility {
 
 	@Override
 	public Talent[] talents() {
-		return new Talent[]{Talent.SPECTRAL_BLADES_1, Talent.SPECTRAL_BLADES_2, Talent.SPECTRAL_BLADES_3, Talent.SPECTRAL_BLADES_4};
+		return new Talent[]{Talent.SPECTRAL_BLADES_1, Talent.SPECTRAL_BLADES_2, Talent.SPECTRAL_BLADES_3, Talent.HEROIC_ENERGY};
 	}
 }
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/mage/Mage2.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/mage/Mage2.java
index 100b9bd2d..8da04487d 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/mage/Mage2.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/mage/Mage2.java
@@ -35,6 +35,6 @@ public class Mage2 extends ArmorAbility {
 
 	@Override
 	public Talent[] talents() {
-		return new Talent[]{Talent.MAGE_2_1, Talent.MAGE_2_2, Talent.MAGE_2_3, Talent.MAGE_2_4};
+		return new Talent[]{Talent.MAGE_2_1, Talent.MAGE_2_2, Talent.MAGE_2_3, Talent.HEROIC_ENERGY};
 	}
 }
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/mage/Mage3.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/mage/Mage3.java
index 4a0875d37..893e33b95 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/mage/Mage3.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/mage/Mage3.java
@@ -35,6 +35,6 @@ public class Mage3 extends ArmorAbility {
 
 	@Override
 	public Talent[] talents() {
-		return new Talent[]{Talent.MAGE_3_1, Talent.MAGE_3_2, Talent.MAGE_3_3, Talent.MAGE_3_4};
+		return new Talent[]{Talent.MAGE_3_1, Talent.MAGE_3_2, Talent.MAGE_3_3, Talent.HEROIC_ENERGY};
 	}
 }
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/mage/MoltenEarth.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/mage/MoltenEarth.java
index 4d5752b8f..225a5af16 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/mage/MoltenEarth.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/mage/MoltenEarth.java
@@ -68,6 +68,6 @@ public class MoltenEarth extends ArmorAbility {
 
 	@Override
 	public Talent[] talents() {
-		return new Talent[]{Talent.MOLTEN_EARTH_1, Talent.MOLTEN_EARTH_2, Talent.MOLTEN_EARTH_3, Talent.MOLTEN_EARTH_4};
+		return new Talent[]{Talent.MOLTEN_EARTH_1, Talent.MOLTEN_EARTH_2, Talent.MOLTEN_EARTH_3, Talent.HEROIC_ENERGY};
 	}
 }
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/Rogue2.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/Rogue2.java
index bb537fb15..f6eacf97b 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/Rogue2.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/Rogue2.java
@@ -35,6 +35,6 @@ public class Rogue2 extends ArmorAbility {
 
 	@Override
 	public Talent[] talents() {
-		return new Talent[]{Talent.ROGUE_2_1, Talent.ROGUE_2_2, Talent.ROGUE_2_3, Talent.ROGUE_2_4};
+		return new Talent[]{Talent.ROGUE_2_1, Talent.ROGUE_2_2, Talent.ROGUE_2_3, Talent.HEROIC_ENERGY};
 	}
 }
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/Rogue3.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/Rogue3.java
index e7f7f5c51..c2b700223 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/Rogue3.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/Rogue3.java
@@ -35,6 +35,6 @@ public class Rogue3 extends ArmorAbility {
 
 	@Override
 	public Talent[] talents() {
-		return new Talent[]{Talent.ROGUE_3_1, Talent.ROGUE_3_2, Talent.ROGUE_3_3, Talent.ROGUE_3_4};
+		return new Talent[]{Talent.ROGUE_3_1, Talent.ROGUE_3_2, Talent.ROGUE_3_3, Talent.HEROIC_ENERGY};
 	}
 }
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/SmokeBomb.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/SmokeBomb.java
index 62ad4e5b6..7453f002e 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/SmokeBomb.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/SmokeBomb.java
@@ -61,8 +61,8 @@ public class SmokeBomb extends ArmorAbility {
 		if (!hero.hasTalent(Talent.SHADOW_STEP) || hero.invisible <= 0){
 			return super.chargeUse(hero);
 		} else {
-			//reduced charge cost by 24%/42%/56%/67%
-			return (float)(35f * Math.pow(0.76, hero.pointsInTalent(Talent.SHADOW_STEP)));
+			//reduced charge use by 24%/42%/56%/67%
+			return (float)(super.chargeUse(hero) * Math.pow(0.76, hero.pointsInTalent(Talent.SHADOW_STEP)));
 		}
 	}
 
@@ -130,7 +130,7 @@ public class SmokeBomb extends ArmorAbility {
 
 	@Override
 	public Talent[] talents() {
-		return new Talent[]{Talent.HASTY_RETREAT, Talent.BODY_REPLACEMENT, Talent.SHADOW_STEP, Talent.SMOKE_BOMB_4};
+		return new Talent[]{Talent.HASTY_RETREAT, Talent.BODY_REPLACEMENT, Talent.SHADOW_STEP, Talent.HEROIC_ENERGY};
 	}
 
 	public static class NinjaLog extends NPC {
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/warrior/HeroicLeap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/warrior/HeroicLeap.java
index 68bd33cd3..2455be5fd 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/warrior/HeroicLeap.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/warrior/HeroicLeap.java
@@ -50,9 +50,9 @@ public class HeroicLeap extends ArmorAbility {
 
 	@Override
 	public float chargeUse( Hero hero ) {
-		float chargeUse = 35;
+		float chargeUse = super.chargeUse(hero);
 		if (hero.buff(DoubleJumpTracker.class) != null){
-			//reduced charge by 24%/42%/56%/67%
+			//reduced charge use by 24%/42%/56%/67%
 			chargeUse *= Math.pow(0.76, hero.pointsInTalent(Talent.DOUBLE_JUMP));
 		}
 		return chargeUse;
@@ -121,6 +121,6 @@ public class HeroicLeap extends ArmorAbility {
 
 	@Override
 	public Talent[] talents() {
-		return new Talent[]{Talent.BODY_SLAM, Talent.IMPACT_WAVE, Talent.DOUBLE_JUMP, Talent.HEROIC_LEAP_4};
+		return new Talent[]{Talent.BODY_SLAM, Talent.IMPACT_WAVE, Talent.DOUBLE_JUMP, Talent.HEROIC_ENERGY};
 	}
 }
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/warrior/Shockwave.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/warrior/Shockwave.java
index 8f1cb4092..96645d1ac 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/warrior/Shockwave.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/warrior/Shockwave.java
@@ -62,7 +62,7 @@ public class Shockwave extends ArmorAbility {
 		}
 		hero.busy();
 
-		//armor.charge -= chargeUse(hero);
+		armor.charge -= chargeUse(hero);
 		Item.updateQuickslot();
 
 		Ballistica aim = new Ballistica(hero.pos, target, Ballistica.WONT_STOP);
@@ -133,6 +133,6 @@ public class Shockwave extends ArmorAbility {
 
 	@Override
 	public Talent[] talents() {
-		return new Talent[]{Talent.EXPANDING_WAVE, Talent.STRIKING_WAVE, Talent.SHOCK_FORCE, Talent.WARRIOR_2_4};
+		return new Talent[]{Talent.EXPANDING_WAVE, Talent.STRIKING_WAVE, Talent.SHOCK_FORCE, Talent.HEROIC_ENERGY};
 	}
 }
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/warrior/Warrior3.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/warrior/Warrior3.java
index fc9fa12ed..9e5a4d02e 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/warrior/Warrior3.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/warrior/Warrior3.java
@@ -35,6 +35,6 @@ public class Warrior3 extends ArmorAbility {
 
 	@Override
 	public Talent[] talents() {
-		return new Talent[]{Talent.WARRIOR_3_1, Talent.WARRIOR_3_2, Talent.WARRIOR_3_3, Talent.WARRIOR_3_4};
+		return new Talent[]{Talent.WARRIOR_3_1, Talent.WARRIOR_3_2, Talent.WARRIOR_3_3, Talent.HEROIC_ENERGY};
 	}
 }