v2.1.4: fixed Counter Ability talent incorrectly applying 0 charge at +2

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/AssassinsBlade.java

@@ -66,8 +66,8 @@ public class AssassinsBlade extends MeleeWeapon {
 	}
 
 	@Override
-	public float abilityChargeUse(Hero hero, Char target) {
+	protected int baseChargeUse(Hero hero, Char target){
-		return 2*super.abilityChargeUse(hero, target);
+		return 2;
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BattleAxe.java

@@ -51,11 +51,11 @@ public class BattleAxe extends MeleeWeapon {
 	}
 
 	@Override
-	public float abilityChargeUse(Hero hero, Char target) {
+	protected int baseChargeUse(Hero hero, Char target){
 		if (target == null || (target instanceof Mob && ((Mob) target).surprisedBy(hero))) {
-			return super.abilityChargeUse(hero, target);
+			return 1;
 		} else {
-			return 2*super.abilityChargeUse(hero, target);
+			return 2;
 		}
 	}
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Dagger.java

@@ -75,8 +75,8 @@ public class Dagger extends MeleeWeapon {
 	}
 
 	@Override
-	public float abilityChargeUse(Hero hero, Char target) {
+	protected int baseChargeUse(Hero hero, Char target){
-		return 2*super.abilityChargeUse(hero, target);
+		return 2;
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Dirk.java

@@ -66,8 +66,8 @@ public class Dirk extends MeleeWeapon {
 	}
 
 	@Override
-	public float abilityChargeUse(Hero hero, Char target) {
+	protected int baseChargeUse(Hero hero, Char target){
-		return 2*super.abilityChargeUse(hero, target);
+		return 2;
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Flail.java

@@ -89,11 +89,12 @@ public class Flail extends MeleeWeapon {
 		}
 	}
 
-	public float abilityChargeUse(Hero hero, Char target) {
+	@Override
+	protected int baseChargeUse(Hero hero, Char target){
 		if (Dungeon.hero.buff(SpinAbilityTracker.class) != null){
 			return 0;
 		} else {
-			return 2*super.abilityChargeUse(hero, target);
+			return 2;
 		}
 	}
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greatsword.java

@@ -38,11 +38,11 @@ public class Greatsword extends MeleeWeapon {
 	}
 
 	@Override
-	public float abilityChargeUse(Hero hero, Char target) {
+	protected int baseChargeUse(Hero hero, Char target){
 		if (hero.buff(Sword.CleaveTracker.class) != null){
 			return 0;
 		} else {
-			return super.abilityChargeUse( hero, target);
+			return 1;
 		}
 	}
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/HandAxe.java

@@ -51,11 +51,11 @@ public class HandAxe extends MeleeWeapon {
 	}
 
 	@Override
-	public float abilityChargeUse(Hero hero, Char target) {
+	protected int baseChargeUse(Hero hero, Char target){
 		if (target == null || (target instanceof Mob && ((Mob) target).surprisedBy(hero))) {
-			return super.abilityChargeUse(hero, target);
+			return 1;
 		} else {
-			return 2*super.abilityChargeUse(hero, target);
+			return 2;
 		}
 	}
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Longsword.java

@@ -38,11 +38,11 @@ public class Longsword extends MeleeWeapon {
 	}
 
 	@Override
-	public float abilityChargeUse(Hero hero, Char target) {
+	protected int baseChargeUse(Hero hero, Char target){
 		if (hero.buff(Sword.CleaveTracker.class) != null){
 			return 0;
 		} else {
-			return super.abilityChargeUse( hero, target);
+			return 1;
 		}
 	}
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Mace.java

@@ -60,11 +60,11 @@ public class Mace extends MeleeWeapon {
 	}
 
 	@Override
-	public float abilityChargeUse(Hero hero, Char target) {
+	protected int baseChargeUse(Hero hero, Char target){
 		if (target == null || (target instanceof Mob && ((Mob) target).surprisedBy(hero))) {
-			return super.abilityChargeUse(hero, target);
+			return 1;
 		} else {
-			return 2*super.abilityChargeUse(hero, target);
+			return 2;
 		}
 	}
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java

@@ -262,8 +262,12 @@ public class MeleeWeapon extends Weapon {
 		}
 	}
 
-	public float abilityChargeUse(Hero hero, Char target){
+	protected int baseChargeUse(Hero hero, Char target){
-		float chargeUse = 1f;
+		return 1; //abilities use 1 charge by default
+	}
+
+	public final float abilityChargeUse(Hero hero, Char target){
+		float chargeUse = baseChargeUse(hero, target);
 		if (hero.buff(Talent.CounterAbilityTacker.class) != null){
 			chargeUse = Math.max(0, chargeUse-0.5f*hero.pointsInTalent(Talent.COUNTER_ABILITY));
 		}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java

@@ -51,8 +51,8 @@ public class Quarterstaff extends MeleeWeapon {
 	}
 
 	@Override
-	public float abilityChargeUse(Hero hero, Char target) {
+	protected int baseChargeUse(Hero hero, Char target){
-		return 2*super.abilityChargeUse(hero, target);
+		return 2;
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Scimitar.java

@@ -47,8 +47,8 @@ public class Scimitar extends MeleeWeapon {
 	}
 
 	@Override
-	public float abilityChargeUse(Hero hero, Char target) {
+	protected int baseChargeUse(Hero hero, Char target){
-		return 2*super.abilityChargeUse(hero, target);
+		return 2;
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Shortsword.java

@@ -38,11 +38,11 @@ public class Shortsword extends MeleeWeapon {
 	}
 
 	@Override
-	public float abilityChargeUse(Hero hero, Char target) {
+	protected int baseChargeUse(Hero hero, Char target){
 		if (hero.buff(Sword.CleaveTracker.class) != null){
 			return 0;
 		} else {
-			return super.abilityChargeUse( hero, target);
+			return 1;
 		}
 	}
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sickle.java

@@ -53,8 +53,9 @@ public class Sickle extends MeleeWeapon {
 				lvl*(tier+1);                   //scaling unchanged
 	}
 
-	public float abilityChargeUse(Hero hero, Char target) {
+	@Override
-		return 2*super.abilityChargeUse(hero, target);
+	protected int baseChargeUse(Hero hero, Char target){
+		return 2;
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sword.java

@@ -48,11 +48,11 @@ public class Sword extends MeleeWeapon {
 	}
 
 	@Override
-	public float abilityChargeUse(Hero hero, Char target) {
+	protected int baseChargeUse(Hero hero, Char target){
 		if (hero.buff(Sword.CleaveTracker.class) != null){
 			return 0;
 		} else {
-			return super.abilityChargeUse( hero, target);
+			return 1;
 		}
 	}
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WarHammer.java

@@ -51,11 +51,11 @@ public class WarHammer extends MeleeWeapon {
 	}
 
 	@Override
-	public float abilityChargeUse(Hero hero, Char target) {
+	protected int baseChargeUse(Hero hero, Char target){
 		if (target == null || (target instanceof Mob && ((Mob) target).surprisedBy(hero))) {
-			return super.abilityChargeUse(hero, target);
+			return 1;
 		} else {
-			return 2*super.abilityChargeUse(hero, target);
+			return 2;
 		}
 	}
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WarScythe.java

@@ -44,8 +44,9 @@ public class WarScythe extends MeleeWeapon {
 				lvl*(tier+1);                   //scaling unchanged
 	}
 
-	public float abilityChargeUse(Hero hero, Char target) {
+	@Override
-		return 2*super.abilityChargeUse(hero, target);
+	protected int baseChargeUse(Hero hero, Char target){
+		return 2;
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WornShortsword.java

@@ -40,11 +40,11 @@ public class WornShortsword extends MeleeWeapon {
 	}
 
 	@Override
-	public float abilityChargeUse(Hero hero, Char target) {
+	protected int baseChargeUse(Hero hero, Char target){
 		if (hero.buff(Sword.CleaveTracker.class) != null){
 			return 0;
 		} else {
-			return super.abilityChargeUse( hero, target);
+			return 1;
 		}
 	}