From dc26fdd75d4abf92bc492ced33aa9e737f8544b9 Mon Sep 17 00:00:00 2001 From: CaptainSegis Date: Wed, 2 Nov 2016 18:32:25 -0500 Subject: [PATCH] Fixed Immunity ability typo, fixed Lum Berry not curing confusion. --- 2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb index e8909c0f2..de1270516 100644 --- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb +++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb @@ -2590,7 +2590,7 @@ Else If p.Ability.Name.ToLower() = "immunity" And BattleScreen.FieldEffects.CanUseAbility(own, BattleScreen) = True Then Me.ChangeCameraAngel(1, own, BattleScreen) - BattleScreen.BattleQuery.Add(New TextQueryObject("Immunity prevented the sleep.")) + BattleScreen.BattleQuery.Add(New TextQueryObject("Immunity prevented the poison.")) Return False Else Dim safeGuard As Integer = BattleScreen.FieldEffects.OwnSafeguard @@ -2723,6 +2723,18 @@ End If p.RemoveVolatileStatus(Pokemon.VolatileStatus.Confusion) End If + ElseIf p.Item.Name.ToLower() = "lum" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then + If RemoveHeldItem(own, own, BattleScreen, "", "berry:lum") = True Then + Me.ChangeCameraAngel(1, own, BattleScreen) + BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("single_heal", False)) + BattleScreen.BattleQuery.Add(New TextQueryObject("The Lum Berry cured the confusion of " & p.GetDisplayName() & "!")) + If own = True Then + BattleScreen.FieldEffects.OwnConfusionTurns = 0 + Else + BattleScreen.FieldEffects.OppConfusionTurns = 0 + End If + p.RemoveVolatileStatus(Pokemon.VolatileStatus.Confusion) + End If End If End If