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

v2.0.0: fixed bugs with kinetic and elemental strike

Browse Source
This commit is contained in:
Evan Debenham
2023-02-12 22:29:47 -05:00
parent cc143e0fcb
commit bc3166e400
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/duelist/ElementalStrike.java
View File

@@ -244,8 +244,8 @@ public class ElementalStrike extends ArmorAbility {
//*** Kinetic *** //*** Kinetic ***
if (ench instanceof Kinetic){ if (ench instanceof Kinetic){
if (hero.buff(Kinetic.KineticTracker.class) != null) { if (hero.buff(Kinetic.ConservedDamage.class) != null) {
storedKineticDamage = hero.buff(Kinetic.KineticTracker.class).conservedDamage; storedKineticDamage = hero.buff(Kinetic.ConservedDamage.class).damageBonus();
} }
//*** Blocking *** //*** Blocking ***
@@ -348,10 +348,17 @@ public class ElementalStrike extends ArmorAbility {
//*** Kinetic *** //*** Kinetic ***
} else if (ench instanceof Kinetic){ } else if (ench instanceof Kinetic){
for (Char ch : affected){ if (storedKineticDamage > 0) {
if (ch != primaryTarget) { for (Char ch : affected) {
ch.damage(Math.round(storedKineticDamage * 0.33f * powerMulti), ench); if (ch != primaryTarget) {
ch.damage(Math.round(storedKineticDamage * 0.33f * powerMulti), ench);
}
} }
storedKineticDamage = 0;
}
//clear stored damage if there was no primary target
if (primaryTarget == null && hero.buff(Kinetic.ConservedDamage.class) != null){
hero.buff(Kinetic.ConservedDamage.class).detach();
} }
//*** Blooming *** //*** Blooming ***