Attempt on fixing sleep infliction interaction with multi turn moves counters.

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

@@ -1105,6 +1105,7 @@
             End If
 
             If p.Status = Pokemon.StatusProblems.Sleep Then
+                moveUsed.IsSleeping(own, BattleScreen)
                 Dim sleepTurns As Integer = BattleScreen.FieldEffects.OwnSleepTurns
                 If Not own Then
                     sleepTurns = BattleScreen.FieldEffects.OppSleepTurns
@@ -2747,7 +2748,6 @@
                                                 End If
                                             End If
                                         End If
-
                                         Return True
                                     End If
                                 End If

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

@@ -1726,6 +1726,15 @@
             'DO NOTHING
         End Sub
 
+        ''' <summary>
+        ''' Event that occurs when a the pokemon has been put to sleep.
+        ''' </summary>
+        ''' <param name="Own">If the own Pokémon used the move.</param>
+        ''' <param name="BattleScreen">Reference to the BattleScreen.</param>
+        Public Overridable Sub IsSleeping(ByVal own As Boolean, ByVal BattleScreen As BattleScreen)
+            'DO NOTHING
+        End Sub
+
         ''' <summary>
         ''' Returns the attack stat of a Pokémon (Physical or Special).
         ''' </summary>

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

@@ -109,6 +109,10 @@
         Public Overrides Sub InflictedFlinch(own As Boolean, BattleScreen As BattleScreen)
             Interruption(own, BattleScreen)
         End Sub
+
+        Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
+            Interruption(own, BattleScreen)
+        End Sub
     End Class
 
 End Namespace

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

@@ -165,6 +165,10 @@
             MoveFails(own, BattleScreen)
         End Sub
 
+        Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
+
     End Class
 
 End Namespace

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

@@ -163,6 +163,9 @@
             MoveFails(own, BattleScreen)
         End Sub
 
+        Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
     End Class
 
 End Namespace

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

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

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

@@ -109,6 +109,10 @@
         Public Overrides Sub InflictedFlinch(own As Boolean, BattleScreen As BattleScreen)
             Interruption(own, BattleScreen)
         End Sub
+
+        Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
+            Interruption(own, BattleScreen)
+        End Sub
     End Class
 
 End Namespace

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

@@ -184,6 +184,10 @@
             MoveFails(own, BattleScreen)
         End Sub
 
+        Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
+
     End Class
 
 End Namespace

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

@@ -167,6 +167,9 @@
             MoveFails(own, BattleScreen)
         End Sub
 
+        Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
     End Class
 
 End Namespace

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

@@ -126,6 +126,9 @@
             Interruption(own, BattleScreen)
         End Sub
 
+        Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
+            Interruption(own, BattleScreen)
+        End Sub
     End Class
 
 End Namespace

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

@@ -133,6 +133,10 @@
             MoveFails(own, BattleScreen)
         End Sub
 
+        Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
+
     End Class
 
 End Namespace

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

@@ -164,6 +164,10 @@
         Public Overrides Sub InflictedFlinch(own As Boolean, BattleScreen As BattleScreen)
             MoveFails(own, BattleScreen)
         End Sub
+
+        Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
+            MoveFails(own, BattleScreen)
+        End Sub
     End Class
 
 End Namespace

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

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

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

@@ -109,6 +109,10 @@
         Public Overrides Sub InflictedFlinch(own As Boolean, BattleScreen As BattleScreen)
             Interruption(own, BattleScreen)
         End Sub
+
+        Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
+            Interruption(own, BattleScreen)
+        End Sub
     End Class
 
 End Namespace

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

@@ -98,6 +98,9 @@
             Interruption(own, BattleScreen)
         End Sub
 
+        Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
+            Interruption(own, BattleScreen)
+        End Sub
     End Class
 
 End Namespace

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

@@ -126,6 +126,9 @@ Namespace BattleSystem.Moves.Rock
             Interruption(own, BattleScreen)
         End Sub
 
+        Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
+            Interruption(own, BattleScreen)
+        End Sub
     End Class
 
 End Namespace

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

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