From 472b92e6fbffcae6aa6d0b21b429e444de4ad7f5 Mon Sep 17 00:00:00 2001 From: Capt_Segis Date: Wed, 14 Sep 2016 02:43:44 -0500 Subject: [PATCH] Fixed LifeOrb and MagicGuard interaction Magic Guard users are now not affected by recoil --- 2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb index 3690a2c12..63b3508cd 100644 --- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb +++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb @@ -1857,7 +1857,9 @@ EndSleepCheck: GainHP(CInt(AllDamage / 8), own, own, BattleScreen, p.GetDisplayName() & " gains some HP due to the Shell Bell.", "shellbell") End If Case "life orb" - ReduceHP(CInt(p.MaxHP / 10), own, own, BattleScreen, p.GetDisplayName() & " loses HP due to Life Orb.", "lifeorb") + If p.Ability.ToLower <> "magic guard" Then + ReduceHP(CInt(p.MaxHP / 10), own, own, BattleScreen, p.GetDisplayName() & " loses HP due to Life Orb.", "lifeorb") + End If End Select End If End If