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

v0.9.0: fixed on-id talents proccing when the hero is dead

Browse Source
This commit is contained in:
Evan Debenham
2020-09-25 02:40:25 -04:00
parent 46165bd10c
commit 3575480d61
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java
+1 -1
View File
@@ -374,7 +374,7 @@ public class Potion extends Item {
setKnown(); setKnown();
//3/5 HP healed //3/5 HP healed
Hero hero = Dungeon.hero; Hero hero = Dungeon.hero;
if (hero.hasTalent(Talent.TEST_SUBJECT)) { if (hero.isAlive() && hero.hasTalent(Talent.TEST_SUBJECT)) {
hero.HP = Math.min(hero.HP + 1 + (2 * hero.pointsInTalent(Talent.TEST_SUBJECT)), hero.HT); hero.HP = Math.min(hero.HP + 1 + (2 * hero.pointsInTalent(Talent.TEST_SUBJECT)), hero.HT);
Emitter e = hero.sprite.emitter(); Emitter e = hero.sprite.emitter();
if (e != null) e.burst(Speck.factory(Speck.HEALING), hero.pointsInTalent(Talent.TEST_SUBJECT)); if (e != null) e.burst(Speck.factory(Speck.HEALING), hero.pointsInTalent(Talent.TEST_SUBJECT));
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java
+1 -1
View File
@@ -225,7 +225,7 @@ public abstract class Scroll extends Item {
setKnown(); setKnown();
//6/9 HP barrier //6/9 HP barrier
Hero hero = Dungeon.hero; Hero hero = Dungeon.hero;
if (hero.hasTalent(Talent.TESTED_HYPOTHESIS)) { if (hero.isAlive() && hero.hasTalent(Talent.TESTED_HYPOTHESIS)) {
Buff.affect(hero, Barrier.class).setShield(3 + (3 * hero.pointsInTalent(Talent.TESTED_HYPOTHESIS))); Buff.affect(hero, Barrier.class).setShield(3 + (3 * hero.pointsInTalent(Talent.TESTED_HYPOTHESIS)));
ScrollOfRecharging.charge(hero); ScrollOfRecharging.charge(hero);
} }