From 69a24db7947bc71bb08739eb8004d37a31edd625 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 16 Nov 2022 17:17:15 -0500 Subject: [PATCH] v2.0.0: fixed lethal momentum not counting enemies that die via enchant --- .../shatteredpixeldungeon/actors/mobs/Mob.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java index fae3821d9..49a6044b0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java @@ -60,7 +60,9 @@ import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.TimekeepersHourg import com.shatteredpixel.shatteredpixeldungeon.items.rings.Ring; import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfWealth; import com.shatteredpixel.shatteredpixeldungeon.items.stones.StoneOfAggression; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.SpiritBow; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Lucky; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.MissileWeapon; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.darts.Dart; @@ -735,10 +737,10 @@ public abstract class Mob extends Char { if (alignment == Alignment.ENEMY){ rollToDropLoot(); - if (cause == Dungeon.hero + if ((cause == Dungeon.hero || cause instanceof Weapon || cause instanceof Weapon.Enchantment) && Dungeon.hero.hasTalent(Talent.LETHAL_MOMENTUM) && Random.Float() < 0.34f + 0.33f* Dungeon.hero.pointsInTalent(Talent.LETHAL_MOMENTUM)){ - Buff.affect(Dungeon.hero, Talent.LethalMomentumTracker.class, 1f); + Buff.affect(Dungeon.hero, Talent.LethalMomentumTracker.class, 0f); } }