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

v2.5.4: fixed instakill effects not working on raging brutes

Browse Source 
(they are working on healthy brutes. i.e. they set health to 0 and trigger enraging)
This commit is contained in:
Evan Debenham
2024-10-06 13:50:07 -04:00
parent 7215fc999d
commit b8e68533b9
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java
+7
View File
@@ -80,6 +80,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.duelist.Challenge; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.duelist.Challenge;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.rogue.DeathMark; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.rogue.DeathMark;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.warrior.Endure; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.warrior.Endure;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Brute;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.CrystalSpire; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.CrystalSpire;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.DwarfKing; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.DwarfKing;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Elemental; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Elemental;
@@ -480,6 +481,9 @@ public abstract class Char extends Actor {
if (enemy.isAlive() && enemy.alignment != alignment && prep != null && prep.canKO(enemy)){ if (enemy.isAlive() && enemy.alignment != alignment && prep != null && prep.canKO(enemy)){
enemy.HP = 0; enemy.HP = 0;
if (enemy.buff(Brute.BruteRage.class) != null){
enemy.buff(Brute.BruteRage.class).detach();
}
if (!enemy.isAlive()) { if (!enemy.isAlive()) {
enemy.die(this); enemy.die(this);
} else { } else {
@@ -498,6 +502,9 @@ public abstract class Char extends Actor {
&& !Char.hasProp(enemy, Property.MINIBOSS) && && !Char.hasProp(enemy, Property.MINIBOSS) &&
(enemy.HP/(float)enemy.HT) <= 0.4f*((Hero)this).pointsInTalent(Talent.COMBINED_LETHALITY)/3f) { (enemy.HP/(float)enemy.HT) <= 0.4f*((Hero)this).pointsInTalent(Talent.COMBINED_LETHALITY)/3f) {
enemy.HP = 0; enemy.HP = 0;
if (enemy.buff(Brute.BruteRage.class) != null){
enemy.buff(Brute.BruteRage.class).detach();
}
if (!enemy.isAlive()) { if (!enemy.isAlive()) {
enemy.die(this); enemy.die(this);
} else { } else {