Make paralysis actually fail moves too
This commit is contained in:
parent
96276520e3
commit
f4f8a63d93
|
@ -1730,6 +1730,7 @@
|
|||
BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Battle\Effects\Paralyzed", False))
|
||||
End If
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & " is fully paralyzed!" & Environment.NewLine & "It cannot move!"))
|
||||
moveUsed.IsParalyzed(own, BattleScreen)
|
||||
Exit Sub
|
||||
End If
|
||||
End If
|
||||
|
|
|
@ -2271,7 +2271,17 @@
|
|||
End If
|
||||
'DO NOTHING
|
||||
End Sub
|
||||
|
||||
''' <summary>
|
||||
''' Event that occurs when the pokemon can't attack because of paralysis.
|
||||
''' </summary>
|
||||
''' <param name="Own">If the own Pokémon is in love.</param>
|
||||
''' <param name="BattleScreen">Reference to the BattleScreen.</param>
|
||||
Public Overridable Sub IsParalyzed(ByVal own As Boolean, ByVal BattleScreen As BattleScreen)
|
||||
If gmCopyMove <> -1 Then
|
||||
GetAttackByID(gmCopyMove).IsParalyzed(own, BattleScreen)
|
||||
End If
|
||||
'DO NOTHING
|
||||
End Sub
|
||||
''' <summary>
|
||||
''' Event that occurs when a the pokemon has been put to sleep.
|
||||
''' </summary>
|
||||
|
|
|
@ -128,6 +128,10 @@
|
|||
ResetCounter(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsParalyzed(own As Boolean, BattleScreen As BattleScreen)
|
||||
ResetCounter(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsAttracted(own As Boolean, BattleScreen As BattleScreen)
|
||||
ResetCounter(own, BattleScreen)
|
||||
End Sub
|
||||
|
|
|
@ -130,6 +130,10 @@
|
|||
Interruption(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsParalyzed(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
|
||||
|
|
|
@ -141,6 +141,10 @@ Namespace BattleSystem.Moves.Fairy
|
|||
MoveFails(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsParalyzed(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
|
||||
|
|
|
@ -169,6 +169,10 @@
|
|||
MoveFails(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsParalyzed(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
|
||||
|
|
|
@ -173,6 +173,10 @@
|
|||
MoveFails(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsParalyzed(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
|
||||
|
|
|
@ -174,6 +174,10 @@
|
|||
MoveFails(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsParalyzed(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
|
||||
|
|
|
@ -175,6 +175,10 @@ Namespace BattleSystem.Moves.Ghost
|
|||
MoveFails(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsParalyzed(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
|
||||
|
|
|
@ -175,6 +175,10 @@ Namespace BattleSystem.Moves.Ghost
|
|||
MoveFails(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsParalyzed(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
|
||||
|
|
|
@ -130,6 +130,10 @@
|
|||
Interruption(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsParalyzed(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
|
||||
|
|
|
@ -192,6 +192,10 @@
|
|||
MoveFails(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsParalyzed(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
|
||||
|
|
|
@ -191,6 +191,10 @@
|
|||
MoveFails(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsParalyzed(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
|
||||
|
|
|
@ -175,6 +175,10 @@
|
|||
MoveFails(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsParalyzed(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
|
||||
|
|
|
@ -135,6 +135,10 @@
|
|||
Interruption(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsParalyzed(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
|
||||
|
|
|
@ -141,6 +141,10 @@
|
|||
MoveFails(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsParalyzed(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
|
||||
|
|
|
@ -129,6 +129,10 @@
|
|||
ResetCounter(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsParalyzed(own As Boolean, BattleScreen As BattleScreen)
|
||||
ResetCounter(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsAttracted(own As Boolean, BattleScreen As BattleScreen)
|
||||
ResetCounter(own, BattleScreen)
|
||||
End Sub
|
||||
|
|
|
@ -173,6 +173,10 @@
|
|||
MoveFails(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsParalyzed(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
|
||||
|
|
|
@ -175,6 +175,10 @@
|
|||
MoveFails(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsParalyzed(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
|
||||
|
|
|
@ -129,6 +129,10 @@
|
|||
Interruption(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsParalyzed(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
|
||||
|
|
|
@ -118,6 +118,10 @@
|
|||
Interruption(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsParalyzed(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
|
||||
|
|
|
@ -146,6 +146,10 @@ Namespace BattleSystem.Moves.Rock
|
|||
Interruption(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsParalyzed(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
|
||||
|
|
|
@ -177,6 +177,10 @@
|
|||
MoveFails(own, BattleScreen)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub IsParalyzed(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
|
||||
|
|
Loading…
Reference in New Issue