konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Evan Debenham
2023-07-03 14:27:18 -04:00
parent 534d161bb0
commit 9067a486cd
18 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -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;
}
}

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

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

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

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

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

@@ -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;
}
}

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

@@ -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;
}
}

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

@@ -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;
}
}

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

@@ -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;
}
}

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

@@ -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;
}
}

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

@@ -262,8 +262,12 @@ public class MeleeWeapon extends Weapon {
}
}
public float abilityChargeUse(Hero hero, Char target){
float chargeUse = 1f;
protected int baseChargeUse(Hero hero, Char target){
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));
}

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

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

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

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

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

@@ -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;
}
}

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

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

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

@@ -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;
}
}

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

@@ -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;
}
}

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

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

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

@@ -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;
}
}