Fixed multiturn moves interaction with confusion status

2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb

@@ -1228,6 +1228,7 @@
                         Dim a As Attack = New ConfusionAttack()
                         Dim damage As Integer = BattleCalculation.CalculateDamage(a, False, True, True, BattleScreen)
                         ReduceHP(damage, own, own, BattleScreen, p.GetDisplayName() & " hurt itself in confusion.", "confusiondamage")
+                        moveUsed.HurtItselfInConfusion(own, BattleScreen)
                         Exit Sub
                     End If
                 End If

2.5DHero/2.5DHero/Pokemon/Attacks/Attack.vb

@@ -1726,6 +1726,24 @@
             'DO NOTHING
         End Sub
 
+        ''' <summary>
+        ''' Event that occurs when the pokemon has hurt itself in confusion.
+        ''' </summary>
+        ''' <param name="Own">If the own Pokémon is confused.</param>
+        ''' <param name="BattleScreen">Reference to the BattleScreen.</param>
+        Public Overridable Sub HurtItselfInConfusion(ByVal own As Boolean, ByVal BattleScreen As BattleScreen)
+            'DO NOTHING
+        End Sub
+
+        ''' <summary>
+        ''' Event that occurs when the pokemon has falls in love with the opponent.
+        ''' </summary>
+        ''' <param name="Own">If the own Pokémon is in love.</param>
+        ''' <param name="BattleScreen">Reference to the BattleScreen.</param>
+        Public Overridable Sub IsAttracted(ByVal own As Boolean, ByVal BattleScreen As BattleScreen)
+            'DO NOTHING
+        End Sub
+
         ''' <summary>
         ''' Event that occurs when a the pokemon has been put to sleep.
         ''' </summary>

2.5DHero/2.5DHero/Pokemon/Attacks/Dragon/Outrage.vb

@@ -113,6 +113,14 @@
         Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
             Interruption(own, BattleScreen)
         End Sub
+
+        Public Overrides Sub HurtItselfInConfusion(own As Boolean, BattleScreen As BattleScreen)
+            Interruption(own, BattleScreen)
+        End Sub
+
+        Public Overrides Sub IsAttracted(own As Boolean, BattleScreen As BattleScreen)
+            Interruption(own, BattleScreen)
+        End Sub
     End Class
 
 End Namespace

2.5DHero/2.5DHero/Pokemon/Attacks/Flying/Bounce.vb

@@ -169,6 +169,14 @@
             MoveFails(own, BattleScreen)
         End Sub
 
+        Public Overrides Sub HurtItselfInConfusion(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
+
+        Public Overrides Sub IsAttracted(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
+
     End Class
 
 End Namespace

2.5DHero/2.5DHero/Pokemon/Attacks/Flying/Fly.vb

@@ -166,6 +166,14 @@
         Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
             MoveFails(own, BattleScreen)
         End Sub
+
+        Public Overrides Sub HurtItselfInConfusion(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
+
+        Public Overrides Sub IsAttracted(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
     End Class
 
 End Namespace

2.5DHero/2.5DHero/Pokemon/Attacks/Flying/SkyAttack.vb

@@ -169,6 +169,14 @@
         Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
             MoveFails(own, BattleScreen)
         End Sub
+
+        Public Overrides Sub HurtItselfInConfusion(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
+
+        Public Overrides Sub IsAttracted(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
     End Class
 
 End Namespace

2.5DHero/2.5DHero/Pokemon/Attacks/Grass/PetalDance.vb

@@ -113,6 +113,14 @@
         Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
             Interruption(own, BattleScreen)
         End Sub
+
+        Public Overrides Sub HurtItselfInConfusion(own As Boolean, BattleScreen As BattleScreen)
+            Interruption(own, BattleScreen)
+        End Sub
+
+        Public Overrides Sub IsAttracted(own As Boolean, BattleScreen As BattleScreen)
+            Interruption(own, BattleScreen)
+        End Sub
     End Class
 
 End Namespace

2.5DHero/2.5DHero/Pokemon/Attacks/Grass/SolarBeam.vb

@@ -188,6 +188,14 @@
             MoveFails(own, BattleScreen)
         End Sub
 
+        Public Overrides Sub HurtItselfInConfusion(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
+
+        Public Overrides Sub IsAttracted(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
+
     End Class
 
 End Namespace

2.5DHero/2.5DHero/Pokemon/Attacks/Ground/Dig.vb

@@ -170,6 +170,14 @@
         Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
             MoveFails(own, BattleScreen)
         End Sub
+
+        Public Overrides Sub HurtItselfInConfusion(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
+
+        Public Overrides Sub IsAttracted(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
     End Class
 
 End Namespace

2.5DHero/2.5DHero/Pokemon/Attacks/Ice/IceBall.vb

@@ -129,6 +129,14 @@
         Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
             Interruption(own, BattleScreen)
         End Sub
+
+        Public Overrides Sub HurtItselfInConfusion(own As Boolean, BattleScreen As BattleScreen)
+            Interruption(own, BattleScreen)
+        End Sub
+
+        Public Overrides Sub IsAttracted(own As Boolean, BattleScreen As BattleScreen)
+            Interruption(own, BattleScreen)
+        End Sub
     End Class
 
 End Namespace

2.5DHero/2.5DHero/Pokemon/Attacks/Normal/Bide.vb

@@ -137,6 +137,13 @@
             MoveFails(own, BattleScreen)
         End Sub
 
+        Public Overrides Sub HurtItselfInConfusion(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
+
+        Public Overrides Sub IsAttracted(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
     End Class
 
 End Namespace

2.5DHero/2.5DHero/Pokemon/Attacks/Normal/RazorWind.vb

@@ -168,6 +168,14 @@
         Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
             MoveFails(own, BattleScreen)
         End Sub
+
+        Public Overrides Sub HurtItselfInConfusion(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
+
+        Public Overrides Sub IsAttracted(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
     End Class
 
 End Namespace

2.5DHero/2.5DHero/Pokemon/Attacks/Normal/SkullBash.vb

@@ -170,6 +170,14 @@
         Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
             MoveFails(own, BattleScreen)
         End Sub
+
+        Public Overrides Sub HurtItselfInConfusion(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
+
+        Public Overrides Sub IsAttracted(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
     End Class
 
 End Namespace

2.5DHero/2.5DHero/Pokemon/Attacks/Normal/Thrash.vb

@@ -113,6 +113,14 @@
         Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
             Interruption(own, BattleScreen)
         End Sub
+
+        Public Overrides Sub HurtItselfInConfusion(own As Boolean, BattleScreen As BattleScreen)
+            Interruption(own, BattleScreen)
+        End Sub
+
+        Public Overrides Sub IsAttracted(own As Boolean, BattleScreen As BattleScreen)
+            Interruption(own, BattleScreen)
+        End Sub
     End Class
 
 End Namespace

2.5DHero/2.5DHero/Pokemon/Attacks/Normal/Uproar.vb

@@ -101,6 +101,14 @@
         Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
             Interruption(own, BattleScreen)
         End Sub
+
+        Public Overrides Sub HurtItselfInConfusion(own As Boolean, BattleScreen As BattleScreen)
+            Interruption(own, BattleScreen)
+        End Sub
+
+        Public Overrides Sub IsAttracted(own As Boolean, BattleScreen As BattleScreen)
+            Interruption(own, BattleScreen)
+        End Sub
     End Class
 
 End Namespace

2.5DHero/2.5DHero/Pokemon/Attacks/Rock/Rollout.vb

@@ -129,6 +129,14 @@ Namespace BattleSystem.Moves.Rock
         Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
             Interruption(own, BattleScreen)
         End Sub
+
+        Public Overrides Sub HurtItselfInConfusion(own As Boolean, BattleScreen As BattleScreen)
+            Interruption(own, BattleScreen)
+        End Sub
+
+        Public Overrides Sub IsAttracted(own As Boolean, BattleScreen As BattleScreen)
+            Interruption(own, BattleScreen)
+        End Sub
     End Class
 
 End Namespace

2.5DHero/2.5DHero/Pokemon/Attacks/Water/Dive.vb

@@ -172,6 +172,14 @@
         Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
             MoveFails(own, BattleScreen)
         End Sub
+
+        Public Overrides Sub HurtItselfInConfusion(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
+
+        Public Overrides Sub IsAttracted(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
     End Class
 
 End Namespace