tyler.durden
/
P3D-Legacy
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed Immunity ability typo, fixed Lum Berry not curing confusion.

This commit is contained in:
CaptainSegis 2016-11-02 18:32:25 -05:00
parent 0f5b0f64cb
commit dc26fdd75d
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb
View File

@ -2590,7 +2590,7 @@
Else Else
If p.Ability.Name.ToLower() = "immunity" And BattleScreen.FieldEffects.CanUseAbility(own, BattleScreen) = True Then If p.Ability.Name.ToLower() = "immunity" And BattleScreen.FieldEffects.CanUseAbility(own, BattleScreen) = True Then
Me.ChangeCameraAngel(1, own, BattleScreen) 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 Return False
Else Else
Dim safeGuard As Integer = BattleScreen.FieldEffects.OwnSafeguard Dim safeGuard As Integer = BattleScreen.FieldEffects.OwnSafeguard
@ -2723,6 +2723,18 @@
End If End If
p.RemoveVolatileStatus(Pokemon.VolatileStatus.Confusion) p.RemoveVolatileStatus(Pokemon.VolatileStatus.Confusion)
End If 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
End If End If