Minor move adjustments

2019-09-22 18:46:13 -03:00 · 2019-09-22 18:46:13 -03:00 · 2b0ca66bbf
parent 9a166d3e42
commit 2b0ca66bbf
7 changed files with 103 additions and 13 deletions
--- a/P3D/Pokemon/Attacks/Dark/HyperspaceFury.vb
+++ b/P3D/Pokemon/Attacks/Dark/HyperspaceFury.vb
@ -76,17 +76,35 @@
            Dim op As Pokemon = BattleScreen.OppPokemon

            If own = True Then
+                If BattleScreen.FieldEffects.OppDetectCounter > 0 OrElse BattleScreen.FieldEffects.OppProtectCounter > 0 OrElse BattleScreen.FieldEffects.OppKingsShieldCounter > 0 OrElse BattleScreen.FieldEffects.OppSpikyShieldCounter > 0 OrElse BattleScreen.FieldEffects.OppBanefulBunkerCounter > 0 OrElse BattleScreen.FieldEffects.OppCraftyShieldCounter > 0 OrElse BattleScreen.FieldEffects.OppMatBlockCounter > 0 OrElse BattleScreen.FieldEffects.OppWideGuardCounter > 0 OrElse BattleScreen.FieldEffects.OppQuickGuardCounter > 0 Then
+                    BattleScreen.BattleQuery.Add(New TextQueryObject("Hyperspace Fury lifted " & op.GetDisplayName() & "'s protection!"))
+                End If
                BattleScreen.FieldEffects.OppDetectCounter = 0
                BattleScreen.FieldEffects.OppProtectCounter = 0
+                BattleScreen.FieldEffects.OppKingsShieldCounter = 0
+                BattleScreen.FieldEffects.OppSpikyShieldCounter = 0
+                BattleScreen.FieldEffects.OppBanefulBunkerCounter = 0
+                BattleScreen.FieldEffects.OppCraftyShieldCounter = 0
+                BattleScreen.FieldEffects.OppMatBlockCounter = 0
+                BattleScreen.FieldEffects.OppWideGuardCounter = 0
+                BattleScreen.FieldEffects.OppQuickGuardCounter = 0
            Else
                op = BattleScreen.OwnPokemon
-
+                If BattleScreen.FieldEffects.OwnDetectCounter > 0 OrElse BattleScreen.FieldEffects.OwnProtectCounter > 0 OrElse BattleScreen.FieldEffects.OwnKingsShieldCounter > 0 OrElse BattleScreen.FieldEffects.OwnSpikyShieldCounter > 0 OrElse BattleScreen.FieldEffects.OwnBanefulBunkerCounter > 0 OrElse BattleScreen.FieldEffects.OwnCraftyShieldCounter > 0 OrElse BattleScreen.FieldEffects.OwnMatBlockCounter > 0 OrElse BattleScreen.FieldEffects.OwnWideGuardCounter > 0 OrElse BattleScreen.FieldEffects.OwnQuickGuardCounter > 0 Then
+                    BattleScreen.BattleQuery.Add(New TextQueryObject("Hyperspace Fury lifted " & op.GetDisplayName() & "'s protection!"))
+                End If
                BattleScreen.FieldEffects.OwnDetectCounter = 0
                BattleScreen.FieldEffects.OwnProtectCounter = 0
+                BattleScreen.FieldEffects.OwnKingsShieldCounter = 0
+                BattleScreen.FieldEffects.OwnSpikyShieldCounter = 0
+                BattleScreen.FieldEffects.OwnBanefulBunkerCounter = 0
+                BattleScreen.FieldEffects.OwnCraftyShieldCounter = 0
+                BattleScreen.FieldEffects.OwnMatBlockCounter = 0
+                BattleScreen.FieldEffects.OwnWideGuardCounter = 0
+                BattleScreen.FieldEffects.OwnQuickGuardCounter = 0
            End If

            BattleScreen.Battle.LowerStat(own, own, BattleScreen, "Defense", 1, "", "move:hyperspacefury")
-            BattleScreen.BattleQuery.Add(New TextQueryObject("Hyperspace Fury lifted " & op.GetDisplayName() & "'s protection!"))
        End Sub

    End Class
--- a/P3D/Pokemon/Attacks/Ghost/PhantomForce.vb
+++ b/P3D/Pokemon/Attacks/Ghost/PhantomForce.vb
@ -183,16 +183,34 @@ Namespace BattleSystem.Moves.Ghost
            Dim op As Pokemon = BattleScreen.OppPokemon

            If own = True Then
+                If BattleScreen.FieldEffects.OppDetectCounter > 0 OrElse BattleScreen.FieldEffects.OppProtectCounter > 0 OrElse BattleScreen.FieldEffects.OppKingsShieldCounter > 0 OrElse BattleScreen.FieldEffects.OppSpikyShieldCounter > 0 OrElse BattleScreen.FieldEffects.OppBanefulBunkerCounter > 0 OrElse BattleScreen.FieldEffects.OppCraftyShieldCounter > 0 OrElse BattleScreen.FieldEffects.OppMatBlockCounter > 0 OrElse BattleScreen.FieldEffects.OppWideGuardCounter > 0 OrElse BattleScreen.FieldEffects.OppQuickGuardCounter > 0 Then
+                    BattleScreen.BattleQuery.Add(New TextQueryObject("Phantom Force lifted " & op.GetDisplayName() & "'s protection!"))
+                End If
                BattleScreen.FieldEffects.OppDetectCounter = 0
                BattleScreen.FieldEffects.OppProtectCounter = 0
+                BattleScreen.FieldEffects.OppKingsShieldCounter = 0
+                BattleScreen.FieldEffects.OppSpikyShieldCounter = 0
+                BattleScreen.FieldEffects.OppBanefulBunkerCounter = 0
+                BattleScreen.FieldEffects.OppCraftyShieldCounter = 0
+                BattleScreen.FieldEffects.OppMatBlockCounter = 0
+                BattleScreen.FieldEffects.OppWideGuardCounter = 0
+                BattleScreen.FieldEffects.OppQuickGuardCounter = 0
            Else
                op = BattleScreen.OwnPokemon
-
+                If BattleScreen.FieldEffects.OwnDetectCounter > 0 OrElse BattleScreen.FieldEffects.OwnProtectCounter > 0 OrElse BattleScreen.FieldEffects.OwnKingsShieldCounter > 0 OrElse BattleScreen.FieldEffects.OwnSpikyShieldCounter > 0 OrElse BattleScreen.FieldEffects.OwnBanefulBunkerCounter > 0 OrElse BattleScreen.FieldEffects.OwnCraftyShieldCounter > 0 OrElse BattleScreen.FieldEffects.OwnMatBlockCounter > 0 OrElse BattleScreen.FieldEffects.OwnWideGuardCounter > 0 OrElse BattleScreen.FieldEffects.OwnQuickGuardCounter > 0 Then
+                    BattleScreen.BattleQuery.Add(New TextQueryObject("Phantom Force lifted " & op.GetDisplayName() & "'s protection!"))
+                End If
                BattleScreen.FieldEffects.OwnDetectCounter = 0
                BattleScreen.FieldEffects.OwnProtectCounter = 0
+                BattleScreen.FieldEffects.OwnKingsShieldCounter = 0
+                BattleScreen.FieldEffects.OwnSpikyShieldCounter = 0
+                BattleScreen.FieldEffects.OwnBanefulBunkerCounter = 0
+                BattleScreen.FieldEffects.OwnCraftyShieldCounter = 0
+                BattleScreen.FieldEffects.OwnMatBlockCounter = 0
+                BattleScreen.FieldEffects.OwnWideGuardCounter = 0
+                BattleScreen.FieldEffects.OwnQuickGuardCounter = 0
            End If

-            BattleScreen.BattleQuery.Add(New TextQueryObject("Phantom Force lifted " & op.GetDisplayName() & "'s protection!"))
        End Sub

    End Class
--- a/P3D/Pokemon/Attacks/Ghost/ShadowForce.vb
+++ b/P3D/Pokemon/Attacks/Ghost/ShadowForce.vb
@ -183,16 +183,34 @@ Namespace BattleSystem.Moves.Ghost
            Dim op As Pokemon = BattleScreen.OppPokemon

            If own = True Then
+                If BattleScreen.FieldEffects.OppDetectCounter > 0 OrElse BattleScreen.FieldEffects.OppProtectCounter > 0 OrElse BattleScreen.FieldEffects.OppKingsShieldCounter > 0 OrElse BattleScreen.FieldEffects.OppSpikyShieldCounter > 0 OrElse BattleScreen.FieldEffects.OppBanefulBunkerCounter > 0 OrElse BattleScreen.FieldEffects.OppCraftyShieldCounter > 0 OrElse BattleScreen.FieldEffects.OppMatBlockCounter > 0 OrElse BattleScreen.FieldEffects.OppWideGuardCounter > 0 OrElse BattleScreen.FieldEffects.OppQuickGuardCounter > 0 Then
+                    BattleScreen.BattleQuery.Add(New TextQueryObject("Shadow Force lifted " & op.GetDisplayName() & "'s protection!"))
+                End If
                BattleScreen.FieldEffects.OppDetectCounter = 0
                BattleScreen.FieldEffects.OppProtectCounter = 0
+                BattleScreen.FieldEffects.OppKingsShieldCounter = 0
+                BattleScreen.FieldEffects.OppSpikyShieldCounter = 0
+                BattleScreen.FieldEffects.OppBanefulBunkerCounter = 0
+                BattleScreen.FieldEffects.OppCraftyShieldCounter = 0
+                BattleScreen.FieldEffects.OppMatBlockCounter = 0
+                BattleScreen.FieldEffects.OppWideGuardCounter = 0
+                BattleScreen.FieldEffects.OppQuickGuardCounter = 0
            Else
                op = BattleScreen.OwnPokemon
-
+                If BattleScreen.FieldEffects.OwnDetectCounter > 0 OrElse BattleScreen.FieldEffects.OwnProtectCounter > 0 OrElse BattleScreen.FieldEffects.OwnKingsShieldCounter > 0 OrElse BattleScreen.FieldEffects.OwnSpikyShieldCounter > 0 OrElse BattleScreen.FieldEffects.OwnBanefulBunkerCounter > 0 OrElse BattleScreen.FieldEffects.OwnCraftyShieldCounter > 0 OrElse BattleScreen.FieldEffects.OwnMatBlockCounter > 0 OrElse BattleScreen.FieldEffects.OwnWideGuardCounter > 0 OrElse BattleScreen.FieldEffects.OwnQuickGuardCounter > 0 Then
+                    BattleScreen.BattleQuery.Add(New TextQueryObject("Shadow Force lifted " & op.GetDisplayName() & "'s protection!"))
+                End If
                BattleScreen.FieldEffects.OwnDetectCounter = 0
                BattleScreen.FieldEffects.OwnProtectCounter = 0
+                BattleScreen.FieldEffects.OwnKingsShieldCounter = 0
+                BattleScreen.FieldEffects.OwnSpikyShieldCounter = 0
+                BattleScreen.FieldEffects.OwnBanefulBunkerCounter = 0
+                BattleScreen.FieldEffects.OwnCraftyShieldCounter = 0
+                BattleScreen.FieldEffects.OwnMatBlockCounter = 0
+                BattleScreen.FieldEffects.OwnWideGuardCounter = 0
+                BattleScreen.FieldEffects.OwnQuickGuardCounter = 0
            End If

-            BattleScreen.BattleQuery.Add(New TextQueryObject("Shadow Force lifted " & op.GetDisplayName() & "'s protection!"))
        End Sub

    End Class
--- a/P3D/Pokemon/Attacks/Normal/FakeOut.vb
+++ b/P3D/Pokemon/Attacks/Normal/FakeOut.vb
@ -51,8 +51,8 @@
            Me.IsWonderGuardAffected = True
            '#End

-            Me.AIField1 = AIField.Flinch
-            Me.AIField2 = AIField.Nothing
+            Me.AIField1 = AIField.Damage
+            Me.AIField2 = AIField.Flinch
        End Sub

        Public Overrides Function MoveFailBeforeAttack(Own As Boolean, BattleScreen As BattleScreen) As Boolean
--- a/P3D/Pokemon/Attacks/Normal/Feint.vb
+++ b/P3D/Pokemon/Attacks/Normal/Feint.vb
@ -59,16 +59,34 @@ Namespace BattleSystem.Moves.Normal
            Dim op As Pokemon = BattleScreen.OppPokemon

            If own = True Then
+                If BattleScreen.FieldEffects.OppDetectCounter > 0 OrElse BattleScreen.FieldEffects.OppProtectCounter > 0 OrElse BattleScreen.FieldEffects.OppKingsShieldCounter > 0 OrElse BattleScreen.FieldEffects.OppSpikyShieldCounter > 0 OrElse BattleScreen.FieldEffects.OppBanefulBunkerCounter > 0 OrElse BattleScreen.FieldEffects.OppCraftyShieldCounter > 0 OrElse BattleScreen.FieldEffects.OppMatBlockCounter > 0 OrElse BattleScreen.FieldEffects.OppWideGuardCounter > 0 OrElse BattleScreen.FieldEffects.OppQuickGuardCounter > 0 Then
+                    BattleScreen.BattleQuery.Add(New TextQueryObject("Feint lifted " & op.GetDisplayName() & "'s protection!"))
+                End If
                BattleScreen.FieldEffects.OppDetectCounter = 0
                BattleScreen.FieldEffects.OppProtectCounter = 0
+                BattleScreen.FieldEffects.OppKingsShieldCounter = 0
+                BattleScreen.FieldEffects.OppSpikyShieldCounter = 0
+                BattleScreen.FieldEffects.OppBanefulBunkerCounter = 0
+                BattleScreen.FieldEffects.OppCraftyShieldCounter = 0
+                BattleScreen.FieldEffects.OppMatBlockCounter = 0
+                BattleScreen.FieldEffects.OppWideGuardCounter = 0
+                BattleScreen.FieldEffects.OppQuickGuardCounter = 0
            Else
                op = BattleScreen.OwnPokemon
-
+                If BattleScreen.FieldEffects.OwnDetectCounter > 0 OrElse BattleScreen.FieldEffects.OwnProtectCounter > 0 OrElse BattleScreen.FieldEffects.OwnKingsShieldCounter > 0 OrElse BattleScreen.FieldEffects.OwnSpikyShieldCounter > 0 OrElse BattleScreen.FieldEffects.OwnBanefulBunkerCounter > 0 OrElse BattleScreen.FieldEffects.OwnCraftyShieldCounter > 0 OrElse BattleScreen.FieldEffects.OwnMatBlockCounter > 0 OrElse BattleScreen.FieldEffects.OwnWideGuardCounter > 0 OrElse BattleScreen.FieldEffects.OwnQuickGuardCounter > 0 Then
+                    BattleScreen.BattleQuery.Add(New TextQueryObject("Feint lifted " & op.GetDisplayName() & "'s protection!"))
+                End If
                BattleScreen.FieldEffects.OwnDetectCounter = 0
                BattleScreen.FieldEffects.OwnProtectCounter = 0
+                BattleScreen.FieldEffects.OwnKingsShieldCounter = 0
+                BattleScreen.FieldEffects.OwnSpikyShieldCounter = 0
+                BattleScreen.FieldEffects.OwnBanefulBunkerCounter = 0
+                BattleScreen.FieldEffects.OwnCraftyShieldCounter = 0
+                BattleScreen.FieldEffects.OwnMatBlockCounter = 0
+                BattleScreen.FieldEffects.OwnWideGuardCounter = 0
+                BattleScreen.FieldEffects.OwnQuickGuardCounter = 0
            End If

-            BattleScreen.BattleQuery.Add(New TextQueryObject("Feint lifted " & op.GetDisplayName() & "'s protection!"))
        End Sub

    End Class
--- a/P3D/Pokemon/Attacks/Normal/TriAttack.vb
+++ b/P3D/Pokemon/Attacks/Normal/TriAttack.vb
@ -15,7 +15,7 @@
            Me.Accuracy = 100
            Me.Category = Categories.Special
            Me.ContestCategory = ContestCategories.Beauty
-            Me.Name = "Tri attack"
+            Me.Name = "Tri Attack"
            Me.Description = "The user strikes with a simultaneous three-beam attack. May also burn, freeze, or leave the target with paralysis."
            Me.CriticalChance = 1
            Me.IsHMMove = False
--- a/P3D/Pokemon/Attacks/Psychic/HyperspaceHole.vb
+++ b/P3D/Pokemon/Attacks/Psychic/HyperspaceHole.vb
@ -63,16 +63,34 @@
            Dim op As Pokemon = BattleScreen.OppPokemon

            If own = True Then
+                If BattleScreen.FieldEffects.OppDetectCounter > 0 OrElse BattleScreen.FieldEffects.OppProtectCounter > 0 OrElse BattleScreen.FieldEffects.OppKingsShieldCounter > 0 OrElse BattleScreen.FieldEffects.OppSpikyShieldCounter > 0 OrElse BattleScreen.FieldEffects.OppBanefulBunkerCounter > 0 OrElse BattleScreen.FieldEffects.OppCraftyShieldCounter > 0 OrElse BattleScreen.FieldEffects.OppMatBlockCounter > 0 OrElse BattleScreen.FieldEffects.OppWideGuardCounter > 0 OrElse BattleScreen.FieldEffects.OppQuickGuardCounter > 0 Then
+                    BattleScreen.BattleQuery.Add(New TextQueryObject("Hyperspace Hole lifted " & op.GetDisplayName() & "'s protection!"))
+                End If
                BattleScreen.FieldEffects.OppDetectCounter = 0
                BattleScreen.FieldEffects.OppProtectCounter = 0
+                BattleScreen.FieldEffects.OppKingsShieldCounter = 0
+                BattleScreen.FieldEffects.OppSpikyShieldCounter = 0
+                BattleScreen.FieldEffects.OppBanefulBunkerCounter = 0
+                BattleScreen.FieldEffects.OppCraftyShieldCounter = 0
+                BattleScreen.FieldEffects.OppMatBlockCounter = 0
+                BattleScreen.FieldEffects.OppWideGuardCounter = 0
+                BattleScreen.FieldEffects.OppQuickGuardCounter = 0
            Else
                op = BattleScreen.OwnPokemon
-
+                If BattleScreen.FieldEffects.OwnDetectCounter > 0 OrElse BattleScreen.FieldEffects.OwnProtectCounter > 0 OrElse BattleScreen.FieldEffects.OwnKingsShieldCounter > 0 OrElse BattleScreen.FieldEffects.OwnSpikyShieldCounter > 0 OrElse BattleScreen.FieldEffects.OwnBanefulBunkerCounter > 0 OrElse BattleScreen.FieldEffects.OwnCraftyShieldCounter > 0 OrElse BattleScreen.FieldEffects.OwnMatBlockCounter > 0 OrElse BattleScreen.FieldEffects.OwnWideGuardCounter > 0 OrElse BattleScreen.FieldEffects.OwnQuickGuardCounter > 0 Then
+                    BattleScreen.BattleQuery.Add(New TextQueryObject("Hyperspace Hole lifted " & op.GetDisplayName() & "'s protection!"))
+                End If
                BattleScreen.FieldEffects.OwnDetectCounter = 0
                BattleScreen.FieldEffects.OwnProtectCounter = 0
+                BattleScreen.FieldEffects.OwnKingsShieldCounter = 0
+                BattleScreen.FieldEffects.OwnSpikyShieldCounter = 0
+                BattleScreen.FieldEffects.OwnBanefulBunkerCounter = 0
+                BattleScreen.FieldEffects.OwnCraftyShieldCounter = 0
+                BattleScreen.FieldEffects.OwnMatBlockCounter = 0
+                BattleScreen.FieldEffects.OwnWideGuardCounter = 0
+                BattleScreen.FieldEffects.OwnQuickGuardCounter = 0
            End If

-            BattleScreen.BattleQuery.Add(New TextQueryObject("Hyperspace Hole lifted " & op.GetDisplayName() & "'s protection!"))
        End Sub

    End Class