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

v2.4.1: adjusted damage multiplier order, mainly fixing harvest bug

Browse Source
This commit is contained in:
Evan Debenham
2024-05-22 12:47:18 -04:00
parent 849fc81a91
commit 56e1410fbc
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java
View File

@@ -690,10 +690,6 @@ public abstract class Char extends Actor {
return;
}
for (ChampionEnemy buff : buffs(ChampionEnemy.class)){
dmg = (int) Math.ceil(dmg * buff.damageTakenFactor());
}
if (!(src instanceof LifeLink) && buff(LifeLink.class) != null){
HashSet<LifeLink> links = buffs(LifeLink.class);
for (LifeLink link : links.toArray(new LifeLink[0])){
@@ -738,19 +734,6 @@ public abstract class Char extends Actor {
if (alignment != Alignment.ALLY && this.buff(DeathMark.DeathMarkTracker.class) != null){
dmg *= 1.25f;
}
Class<?> srcClass = src.getClass();
if (isImmune( srcClass )) {
dmg = 0;
} else {
dmg = Math.round( dmg * resist( srcClass ));
}
//TODO improve this when I have proper damage source logic
if (AntiMagic.RESISTS.contains(src.getClass()) && buff(ArcaneArmor.class) != null){
dmg -= combatRoll(0, buff(ArcaneArmor.class).level());
if (dmg < 0) dmg = 0;
}
if (buff(Sickle.HarvestBleedTracker.class) != null){
if (isImmune(Bleeding.class)){
@@ -770,6 +753,23 @@ public abstract class Char extends Actor {
buff(Sickle.HarvestBleedTracker.class).detach();
return;
}
for (ChampionEnemy buff : buffs(ChampionEnemy.class)){
dmg = (int) Math.ceil(dmg * buff.damageTakenFactor());
}
Class<?> srcClass = src.getClass();
if (isImmune( srcClass )) {
dmg = 0;
} else {
dmg = Math.round( dmg * resist( srcClass ));
}
//TODO improve this when I have proper damage source logic
if (AntiMagic.RESISTS.contains(src.getClass()) && buff(ArcaneArmor.class) != null){
dmg -= combatRoll(0, buff(ArcaneArmor.class).level());
if (dmg < 0) dmg = 0;
}
if (buff( Paralysis.class ) != null) {
buff( Paralysis.class ).processDamage(dmg);