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

v0.9.1: fixed errors when DK or some fists would take negative dmg

Browse Source
This commit is contained in:
Evan Debenham
2020-10-21 15:40:55 -04:00
parent 0d9bd47ba6
commit 0bfcd5e4a3
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DwarfKing.java
+5 -3
View File
@@ -362,10 +362,12 @@ public class DwarfKing extends Mob {
super.damage(dmg, src); super.damage(dmg, src);
return; return;
} else if (phase == 3 && !(src instanceof Viscosity.DeferedDamage)){ } else if (phase == 3 && !(src instanceof Viscosity.DeferedDamage)){
Viscosity.DeferedDamage deferred = Buff.affect( this, Viscosity.DeferedDamage.class ); if (dmg >= 0) {
deferred.prolong( dmg ); Viscosity.DeferedDamage deferred = Buff.affect( this, Viscosity.DeferedDamage.class );
deferred.prolong( dmg );
sprite.showStatus( CharSprite.WARNING, Messages.get(Viscosity.class, "deferred", dmg) ); sprite.showStatus( CharSprite.WARNING, Messages.get(Viscosity.class, "deferred", dmg) );
}
return; return;
} }
int preHP = HP; int preHP = HP;
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogFist.java
+7 -2
View File
@@ -352,6 +352,9 @@ public abstract class YogFist extends Mob {
@Override @Override
public void damage(int dmg, Object src) { public void damage(int dmg, Object src) {
if (!isInvulnerable(src.getClass()) && !(src instanceof Bleeding)){ if (!isInvulnerable(src.getClass()) && !(src instanceof Bleeding)){
if (dmg < 0){
return;
}
Bleeding b = buff(Bleeding.class); Bleeding b = buff(Bleeding.class);
if (b == null){ if (b == null){
b = new Bleeding(); b = new Bleeding();
@@ -406,8 +409,10 @@ public abstract class YogFist extends Mob {
@Override @Override
public void damage(int dmg, Object src) { public void damage(int dmg, Object src) {
if (!isInvulnerable(src.getClass()) && !(src instanceof Viscosity.DeferedDamage)){ if (!isInvulnerable(src.getClass()) && !(src instanceof Viscosity.DeferedDamage)){
Buff.affect(this, Viscosity.DeferedDamage.class).prolong(dmg); if (dmg >= 0) {
sprite.showStatus( CharSprite.WARNING, Messages.get(Viscosity.class, "deferred", dmg) ); Buff.affect(this, Viscosity.DeferedDamage.class).prolong(dmg);
sprite.showStatus(CharSprite.WARNING, Messages.get(Viscosity.class, "deferred", dmg));
}
} else{ } else{
super.damage(dmg, src); super.damage(dmg, src);
} }