From f30ed7af8fc6659c3433643cedba964c050c9af7 Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Thu, 2 Feb 2023 13:54:33 +0100
Subject: [PATCH] Fix some multiturn moves using pp every time

Outrage, Petal Dance, Thrash, Uproar & Rollout now only use pp the first time
---
 P3D/Pokemon/Attacks/Dragon/Outrage.vb   | 12 ++++++++++++
 P3D/Pokemon/Attacks/Grass/PetalDance.vb | 11 +++++++++++
 P3D/Pokemon/Attacks/Normal/Thrash.vb    | 11 +++++++++++
 P3D/Pokemon/Attacks/Normal/Uproar.vb    | 12 ++++++++++++
 P3D/Pokemon/Attacks/Rock/Rollout.vb     | 12 ++++++++++++
 5 files changed, 58 insertions(+)

diff --git a/P3D/Pokemon/Attacks/Dragon/Outrage.vb b/P3D/Pokemon/Attacks/Dragon/Outrage.vb
index 0634fb5f9..0b6e4630c 100644
--- a/P3D/Pokemon/Attacks/Dragon/Outrage.vb
+++ b/P3D/Pokemon/Attacks/Dragon/Outrage.vb
@@ -71,6 +71,18 @@
                 End If
             End If
         End Sub
+        Public Overrides Function DeductPP(own As Boolean, BattleScreen As BattleScreen) As Boolean
+            Dim outrage As Integer = BattleScreen.FieldEffects.OwnOutrage
+            If own = False Then
+                outrage = BattleScreen.FieldEffects.OppOutrage
+            End If
+
+            If outrage > 0 Then
+                Return False
+            Else
+                Return True
+            End If
+        End Function
 
         Private Sub Interruption(ByVal own As Boolean, ByVal BattleScreen As BattleScreen)
             Dim outrage As Integer = 0
diff --git a/P3D/Pokemon/Attacks/Grass/PetalDance.vb b/P3D/Pokemon/Attacks/Grass/PetalDance.vb
index 19e0fafab..125ed9a97 100644
--- a/P3D/Pokemon/Attacks/Grass/PetalDance.vb
+++ b/P3D/Pokemon/Attacks/Grass/PetalDance.vb
@@ -94,7 +94,18 @@
                 BattleScreen.FieldEffects.OppPetalDance = 0
             End If
         End Sub
+        Public Overrides Function DeductPP(own As Boolean, BattleScreen As BattleScreen) As Boolean
+            Dim petalDance As Integer = BattleScreen.FieldEffects.OwnPetalDance
+            If own = False Then
+                petalDance = BattleScreen.FieldEffects.OppPetalDance
+            End If
 
+            If petalDance > 0 Then
+                Return False
+            Else
+                Return True
+            End If
+        End Function
         Public Overrides Sub MoveHasNoEffect(own As Boolean, BattleScreen As BattleScreen)
             Interruption(own, BattleScreen)
         End Sub
diff --git a/P3D/Pokemon/Attacks/Normal/Thrash.vb b/P3D/Pokemon/Attacks/Normal/Thrash.vb
index bebd8678e..c10945d94 100644
--- a/P3D/Pokemon/Attacks/Normal/Thrash.vb
+++ b/P3D/Pokemon/Attacks/Normal/Thrash.vb
@@ -93,7 +93,18 @@
             End If
 
         End Sub
+        Public Overrides Function DeductPP(own As Boolean, BattleScreen As BattleScreen) As Boolean
+            Dim thrash As Integer = BattleScreen.FieldEffects.OwnThrash
+            If own = False Then
+                thrash = BattleScreen.FieldEffects.OppThrash
+            End If
 
+            If thrash > 0 Then
+                Return False
+            Else
+                Return True
+            End If
+        End Function
         Public Overrides Sub MoveHasNoEffect(own As Boolean, BattleScreen As BattleScreen)
             Interruption(own, BattleScreen)
         End Sub
diff --git a/P3D/Pokemon/Attacks/Normal/Uproar.vb b/P3D/Pokemon/Attacks/Normal/Uproar.vb
index 26bccb4d9..ddba44c9b 100644
--- a/P3D/Pokemon/Attacks/Normal/Uproar.vb
+++ b/P3D/Pokemon/Attacks/Normal/Uproar.vb
@@ -63,6 +63,18 @@
                 End If
             End If
         End Sub
+        Public Overrides Function DeductPP(own As Boolean, BattleScreen As BattleScreen) As Boolean
+            Dim uproar As Integer = BattleScreen.FieldEffects.OwnUproar
+            If own = False Then
+                uproar = BattleScreen.FieldEffects.OwnUproar
+            End If
+
+            If uproar > 0 Then
+                Return False
+            Else
+                Return True
+            End If
+        End Function
 
         Private Sub Interruption(own As Boolean, BattleScreen As BattleScreen)
             Dim p As Pokemon = BattleScreen.OwnPokemon
diff --git a/P3D/Pokemon/Attacks/Rock/Rollout.vb b/P3D/Pokemon/Attacks/Rock/Rollout.vb
index 0ad764cb4..2dc7d6c03 100644
--- a/P3D/Pokemon/Attacks/Rock/Rollout.vb
+++ b/P3D/Pokemon/Attacks/Rock/Rollout.vb
@@ -101,6 +101,18 @@ Namespace BattleSystem.Moves.Rock
                 End If
             End If
         End Sub
+        Public Overrides Function DeductPP(own As Boolean, BattleScreen As BattleScreen) As Boolean
+            Dim rollout As Integer = BattleScreen.FieldEffects.OwnRolloutCounter
+            If own = False Then
+                rollout = BattleScreen.FieldEffects.OppRolloutCounter
+            End If
+
+            If rollout > 0 Then
+                Return False
+            Else
+                Return True
+            End If
+        End Function
 
         Private Sub Interruption(ByVal own As Boolean, ByVal BattleScreen As BattleScreen)
             If own = True Then