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

v2.4.0: adjusted damage bonus ordering slightly

Browse Source
This commit is contained in:
Evan Debenham
2024-04-14 11:43:42 -04:00
parent 6f173e26fa
commit 6e7175f320
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java
+4 -4
View File
@@ -389,7 +389,10 @@ public abstract class Char extends Actor {
dmg = damageRoll(); dmg = damageRoll();
} }
dmg = Math.round(dmg*dmgMulti); dmg = dmg*dmgMulti;
//flat damage bonus is affected by multipliers
dmg += dmgBonus;
Berserk berserk = buff(Berserk.class); Berserk berserk = buff(Berserk.class);
if (berserk != null) dmg = berserk.damageFactor(dmg); if (berserk != null) dmg = berserk.damageFactor(dmg);
@@ -404,9 +407,6 @@ public abstract class Char extends Actor {
dmg *= AscensionChallenge.statModifier(this); dmg *= AscensionChallenge.statModifier(this);
//flat damage bonus is applied after positive multipliers, but before negative ones
dmg += dmgBonus;
//friendly endure //friendly endure
Endure.EndureTracker endure = buff(Endure.EndureTracker.class); Endure.EndureTracker endure = buff(Endure.EndureTracker.class);
if (endure != null) dmg = endure.damageFactor(dmg); if (endure != null) dmg = endure.damageFactor(dmg);