From 022d0a7464f1c9f90bfb19393da8fc392082ccad Mon Sep 17 00:00:00 2001 From: nilllzz Date: Thu, 15 Sep 2016 18:30:10 +0200 Subject: [PATCH] Takedown to MoveRecoil --- 2.5DHero/2.5DHero/Pokemon/Attacks/Attack.vb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Attack.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Attack.vb index 04283219b..addf3df56 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Attack.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Attack.vb @@ -1594,8 +1594,9 @@ 'DO NOTHING HERE (will do secondary effect if moves overrides it) End If End Sub + Public Overridable Sub MoveRecoil(ByVal own As Boolean, ByVal BattleScreen As BattleScreen) - 'DO NOTHING HERE (will do recoil if moves overrides it) + 'DO NOTHING HERE (will do recoil if moves overrides it) End Sub ''' @@ -1643,7 +1644,7 @@ If p.Ability.Name.ToLower() = "normalize" Then Return New Element(Element.Types.Normal) End If - + If Me.Type.Type = Element.Types.Normal Then If p.Ability.Name.ToLower() = "pixilate" Then Return New Element(Element.Types.Fairy) @@ -1654,7 +1655,7 @@ If p.Ability.Name.ToLower() = "aerilate" Then Return New Element(Element.Types.Flying) End If - End If + End If Return Me.Type End Function