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

v2.0.0: grim traps now use the same dmg formula as psi blast

Browse Source
This commit is contained in:
Evan Debenham
2023-01-17 14:01:53 -05:00
parent bb2d489073
commit 870111c2a9
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrimTrap.java
View File

@@ -69,12 +69,12 @@ public class GrimTrap extends Trap {
final GrimTrap trap = this;
int damage;
//almost kill the player
if (finalTarget == Dungeon.hero && ((float)finalTarget.HP/finalTarget.HT) >= 0.9f){
damage = finalTarget.HP-1;
//kill 'em
} else {
damage = finalTarget.HP;
//instant kill, use a mix of current HP and max HP, just like psi blast (for resistances)
damage = Math.round(finalTarget.HT/2f + finalTarget.HP/2f);
//can't do more than 90% HT for the hero specifically
if (finalTarget == Dungeon.hero){
damage = (int)Math.min(damage, finalTarget.HT*0.9f);
}
final int finalDmg = damage;