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

v0.9.2a: fixed bounty hunter talent not triggering in all cases

Browse Source
This commit is contained in:
Evan Debenham
2021-03-02 23:03:24 -05:00
parent dded52030a
commit 71d1d3cade
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java
+3
View File
@@ -295,6 +295,9 @@ public abstract class Char extends Actor {
Preparation prep = buff(Preparation.class); Preparation prep = buff(Preparation.class);
if (prep != null){ if (prep != null){
dmg = prep.damageRoll(this); dmg = prep.damageRoll(this);
if (this == Dungeon.hero && Dungeon.hero.hasTalent(Talent.BOUNTY_HUNTER)) {
Buff.affect(Dungeon.hero, Talent.BountyHunterTracker.class, 0.0f);
}
} else { } else {
dmg = damageRoll(); dmg = damageRoll();
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Preparation.java
-4
View File
@@ -262,10 +262,6 @@ public class Preparation extends Buff implements ActionIndicator.Action {
GLog.w(Messages.get(Preparation.class, "no_target")); GLog.w(Messages.get(Preparation.class, "no_target"));
} else { } else {
if (Dungeon.hero.hasTalent(Talent.BOUNTY_HUNTER)) {
Buff.affect(Dungeon.hero, Talent.BountyHunterTracker.class, 0.0f);
}
//just attack them then! //just attack them then!
if (Dungeon.hero.canAttack(enemy)){ if (Dungeon.hero.canAttack(enemy)){
Dungeon.hero.curAction = new HeroAction.Attack( enemy ); Dungeon.hero.curAction = new HeroAction.Attack( enemy );