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

v3.0.0: fixed smite's bonus damage triggering twice in most cases

Browse Source
This commit is contained in:
Evan Debenham
2025-01-21 19:32:39 -05:00
committed by Evan Debenham
parent a6abd58e4e
commit aa20a33460
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
View File

@@ -1448,13 +1448,14 @@ public class Hero extends Char {
if (wep != null) {
damage = wep.proc( this, enemy, damage );
} else if (buff(HolyWeapon.HolyWepBuff.class) != null) {
int dmg = subClass == HeroSubClass.PALADIN ? 6 : 2;
enemy.damage(Math.round(dmg * Weapon.Enchantment.genericProcChanceMultiplier(this)), HolyWeapon.INSTANCE);
}
if (buff(Smite.SmiteTracker.class) != null){
enemy.damage(Smite.bonusDmg(this, enemy), Smite.INSTANCE);
} else {
if (buff(HolyWeapon.HolyWepBuff.class) != null) {
int dmg = subClass == HeroSubClass.PALADIN ? 6 : 2;
enemy.damage(Math.round(dmg * Weapon.Enchantment.genericProcChanceMultiplier(this)), HolyWeapon.INSTANCE);
}
if (buff(Smite.SmiteTracker.class) != null){
enemy.damage(Smite.bonusDmg(this, enemy), Smite.INSTANCE);
}
}
switch (subClass) {