mirror of
https://github.com/P3D-Legacy/P3D-Legacy.git
synced 2025-07-26 23:34:58 +02:00
Fixed sec. effect values (water)
This commit is contained in:
Capt_Segis
GitHub
parent
7cd7eda310
commit
093a266a85
@ -1,92 +1,92 @@
|
|||||||
Namespace BattleSystem.Moves.Water
|
Namespace BattleSystem.Moves.Water
|
||||||
|
|
||||||
Public Class Clamp
|
Public Class Clamp
|
||||||
|
|
||||||
Inherits Attack
|
Inherits Attack
|
||||||
|
|
||||||
Public Sub New()
|
Public Sub New()
|
||||||
'#Definitions
|
'#Definitions
|
||||||
Me.Type = New Element(Element.Types.Water)
|
Me.Type = New Element(Element.Types.Water)
|
||||||
Me.ID = 128
|
Me.ID = 128
|
||||||
Me.OriginalPP = 10
|
Me.OriginalPP = 10
|
||||||
Me.CurrentPP = 10
|
Me.CurrentPP = 10
|
||||||
Me.MaxPP = 10
|
Me.MaxPP = 10
|
||||||
Me.Power = 35
|
Me.Power = 35
|
||||||
Me.Accuracy = 85
|
Me.Accuracy = 85
|
||||||
Me.Category = Categories.Physical
|
Me.Category = Categories.Physical
|
||||||
Me.ContestCategory = ContestCategories.Tough
|
Me.ContestCategory = ContestCategories.Tough
|
||||||
Me.Name = "Clamp"
|
Me.Name = "Clamp"
|
||||||
Me.Description = "The target is clamped and squeezed by the user's very thick and sturdy shell for four to five turns."
|
Me.Description = "The target is clamped and squeezed by the user's very thick and sturdy shell for four to five turns."
|
||||||
Me.CriticalChance = 1
|
Me.CriticalChance = 1
|
||||||
Me.IsHMMove = False
|
Me.IsHMMove = False
|
||||||
Me.Target = Targets.OneAdjacentTarget
|
Me.Target = Targets.OneAdjacentTarget
|
||||||
Me.Priority = 0
|
Me.Priority = 0
|
||||||
Me.TimesToAttack = 1
|
Me.TimesToAttack = 1
|
||||||
'#End
|
'#End
|
||||||
|
|
||||||
'#SpecialDefinitions
|
'#SpecialDefinitions
|
||||||
Me.MakesContact = True
|
Me.MakesContact = True
|
||||||
Me.ProtectAffected = True
|
Me.ProtectAffected = True
|
||||||
Me.MagicCoatAffected = False
|
Me.MagicCoatAffected = False
|
||||||
Me.SnatchAffected = False
|
Me.SnatchAffected = False
|
||||||
Me.MirrorMoveAffected = True
|
Me.MirrorMoveAffected = True
|
||||||
Me.KingsrockAffected = True
|
Me.KingsrockAffected = True
|
||||||
Me.CounterAffected = True
|
Me.CounterAffected = True
|
||||||
|
|
||||||
Me.DisabledWhileGravity = False
|
Me.DisabledWhileGravity = False
|
||||||
Me.UseEffectiveness = True
|
Me.UseEffectiveness = True
|
||||||
Me.ImmunityAffected = True
|
Me.ImmunityAffected = True
|
||||||
Me.HasSecondaryEffect = True
|
Me.HasSecondaryEffect = False
|
||||||
Me.RemovesFrozen = False
|
Me.RemovesFrozen = False
|
||||||
|
|
||||||
Me.IsHealingMove = False
|
Me.IsHealingMove = False
|
||||||
Me.IsRecoilMove = False
|
Me.IsRecoilMove = False
|
||||||
Me.IsPunchingMove = False
|
Me.IsPunchingMove = False
|
||||||
Me.IsDamagingMove = True
|
Me.IsDamagingMove = True
|
||||||
Me.IsProtectMove = False
|
Me.IsProtectMove = False
|
||||||
Me.IsSoundMove = False
|
Me.IsSoundMove = False
|
||||||
|
|
||||||
Me.IsAffectedBySubstitute = True
|
Me.IsAffectedBySubstitute = True
|
||||||
Me.IsOneHitKOMove = False
|
Me.IsOneHitKOMove = False
|
||||||
Me.IsWonderGuardAffected = True
|
Me.IsWonderGuardAffected = True
|
||||||
'#End
|
'#End
|
||||||
|
|
||||||
Me.AIField1 = AIField.Damage
|
Me.AIField1 = AIField.Damage
|
||||||
Me.AIField2 = AIField.Trap
|
Me.AIField2 = AIField.Trap
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Public Overrides Sub MoveHits(own As Boolean, BattleScreen As BattleScreen)
|
Public Overrides Sub MoveHits(own As Boolean, BattleScreen As BattleScreen)
|
||||||
Dim p As Pokemon = BattleScreen.OwnPokemon
|
Dim p As Pokemon = BattleScreen.OwnPokemon
|
||||||
Dim op As Pokemon = BattleScreen.OppPokemon
|
Dim op As Pokemon = BattleScreen.OppPokemon
|
||||||
If own = False Then
|
If own = False Then
|
||||||
p = BattleScreen.OppPokemon
|
p = BattleScreen.OppPokemon
|
||||||
op = BattleScreen.OwnPokemon
|
op = BattleScreen.OwnPokemon
|
||||||
End If
|
End If
|
||||||
|
|
||||||
Dim turns As Integer = 4
|
Dim turns As Integer = 4
|
||||||
If Core.Random.Next(0, 100) < 50 Then
|
If Core.Random.Next(0, 100) < 50 Then
|
||||||
turns = 5
|
turns = 5
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If Not p.Item Is Nothing Then
|
If Not p.Item Is Nothing Then
|
||||||
If p.Item.Name.ToLower() = "grip claw" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
|
If p.Item.Name.ToLower() = "grip claw" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
|
||||||
turns = 5
|
turns = 5
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If own = True Then
|
If own = True Then
|
||||||
If BattleScreen.FieldEffects.OppClamp = 0 Then
|
If BattleScreen.FieldEffects.OppClamp = 0 Then
|
||||||
BattleScreen.FieldEffects.OppClamp = turns
|
BattleScreen.FieldEffects.OppClamp = turns
|
||||||
BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & " clamped " & op.GetDisplayName() & "!"))
|
BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & " clamped " & op.GetDisplayName() & "!"))
|
||||||
End If
|
End If
|
||||||
Else
|
Else
|
||||||
If BattleScreen.FieldEffects.OwnClamp = 0 Then
|
If BattleScreen.FieldEffects.OwnClamp = 0 Then
|
||||||
BattleScreen.FieldEffects.OwnClamp = turns
|
BattleScreen.FieldEffects.OwnClamp = turns
|
||||||
BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & " clamped " & op.GetDisplayName() & "!"))
|
BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & " clamped " & op.GetDisplayName() & "!"))
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
End Class
|
End Class
|
||||||
|
|
||||||
End Namespace
|
End Namespace
|
||||||
@ -1,92 +1,92 @@
|
|||||||
Namespace BattleSystem.Moves.Water
|
Namespace BattleSystem.Moves.Water
|
||||||
|
|
||||||
Public Class Whirlpool
|
Public Class Whirlpool
|
||||||
|
|
||||||
Inherits Attack
|
Inherits Attack
|
||||||
|
|
||||||
Public Sub New()
|
Public Sub New()
|
||||||
'#Definitions
|
'#Definitions
|
||||||
Me.Type = New Element(Element.Types.Water)
|
Me.Type = New Element(Element.Types.Water)
|
||||||
Me.ID = 250
|
Me.ID = 250
|
||||||
Me.OriginalPP = 15
|
Me.OriginalPP = 15
|
||||||
Me.CurrentPP = 15
|
Me.CurrentPP = 15
|
||||||
Me.MaxPP = 15
|
Me.MaxPP = 15
|
||||||
Me.Power = 35
|
Me.Power = 35
|
||||||
Me.Accuracy = 85
|
Me.Accuracy = 85
|
||||||
Me.Category = Categories.Special
|
Me.Category = Categories.Special
|
||||||
Me.ContestCategory = ContestCategories.Beauty
|
Me.ContestCategory = ContestCategories.Beauty
|
||||||
Me.Name = "Whirlpool"
|
Me.Name = "Whirlpool"
|
||||||
Me.Description = "Traps foes in a violent swirling whirlpool for four to five turns."
|
Me.Description = "Traps foes in a violent swirling whirlpool for four to five turns."
|
||||||
Me.CriticalChance = 1
|
Me.CriticalChance = 1
|
||||||
Me.IsHMMove = False
|
Me.IsHMMove = False
|
||||||
Me.Target = Targets.OneAdjacentTarget
|
Me.Target = Targets.OneAdjacentTarget
|
||||||
Me.Priority = 0
|
Me.Priority = 0
|
||||||
Me.TimesToAttack = 1
|
Me.TimesToAttack = 1
|
||||||
'#End
|
'#End
|
||||||
|
|
||||||
'#SpecialDefinitions
|
'#SpecialDefinitions
|
||||||
Me.MakesContact = False
|
Me.MakesContact = False
|
||||||
Me.ProtectAffected = True
|
Me.ProtectAffected = True
|
||||||
Me.MagicCoatAffected = False
|
Me.MagicCoatAffected = False
|
||||||
Me.SnatchAffected = False
|
Me.SnatchAffected = False
|
||||||
Me.MirrorMoveAffected = True
|
Me.MirrorMoveAffected = True
|
||||||
Me.KingsrockAffected = True
|
Me.KingsrockAffected = True
|
||||||
Me.CounterAffected = False
|
Me.CounterAffected = False
|
||||||
|
|
||||||
Me.DisabledWhileGravity = False
|
Me.DisabledWhileGravity = False
|
||||||
Me.UseEffectiveness = True
|
Me.UseEffectiveness = True
|
||||||
Me.ImmunityAffected = True
|
Me.ImmunityAffected = True
|
||||||
Me.HasSecondaryEffect = True
|
Me.HasSecondaryEffect = False
|
||||||
Me.RemovesFrozen = False
|
Me.RemovesFrozen = False
|
||||||
|
|
||||||
Me.IsHealingMove = False
|
Me.IsHealingMove = False
|
||||||
Me.IsRecoilMove = False
|
Me.IsRecoilMove = False
|
||||||
Me.IsPunchingMove = False
|
Me.IsPunchingMove = False
|
||||||
Me.IsDamagingMove = True
|
Me.IsDamagingMove = True
|
||||||
Me.IsProtectMove = False
|
Me.IsProtectMove = False
|
||||||
Me.IsSoundMove = False
|
Me.IsSoundMove = False
|
||||||
|
|
||||||
Me.IsAffectedBySubstitute = True
|
Me.IsAffectedBySubstitute = True
|
||||||
Me.IsOneHitKOMove = False
|
Me.IsOneHitKOMove = False
|
||||||
Me.IsWonderGuardAffected = True
|
Me.IsWonderGuardAffected = True
|
||||||
'#End
|
'#End
|
||||||
|
|
||||||
Me.AIField1 = AIField.Damage
|
Me.AIField1 = AIField.Damage
|
||||||
Me.AIField2 = AIField.Trap
|
Me.AIField2 = AIField.Trap
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Public Overrides Sub MoveHits(own As Boolean, BattleScreen As BattleScreen)
|
Public Overrides Sub MoveHits(own As Boolean, BattleScreen As BattleScreen)
|
||||||
Dim p As Pokemon = BattleScreen.OwnPokemon
|
Dim p As Pokemon = BattleScreen.OwnPokemon
|
||||||
Dim op As Pokemon = BattleScreen.OppPokemon
|
Dim op As Pokemon = BattleScreen.OppPokemon
|
||||||
If own = False Then
|
If own = False Then
|
||||||
p = BattleScreen.OppPokemon
|
p = BattleScreen.OppPokemon
|
||||||
op = BattleScreen.OwnPokemon
|
op = BattleScreen.OwnPokemon
|
||||||
End If
|
End If
|
||||||
|
|
||||||
Dim turns As Integer = 4
|
Dim turns As Integer = 4
|
||||||
If Core.Random.Next(0, 100) < 50 Then
|
If Core.Random.Next(0, 100) < 50 Then
|
||||||
turns = 5
|
turns = 5
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If Not p.Item Is Nothing Then
|
If Not p.Item Is Nothing Then
|
||||||
If p.Item.Name.ToLower() = "grip claw" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
|
If p.Item.Name.ToLower() = "grip claw" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
|
||||||
turns = 5
|
turns = 5
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If own = True Then
|
If own = True Then
|
||||||
If BattleScreen.FieldEffects.OppWhirlpool = 0 Then
|
If BattleScreen.FieldEffects.OppWhirlpool = 0 Then
|
||||||
BattleScreen.FieldEffects.OppWhirlpool = turns
|
BattleScreen.FieldEffects.OppWhirlpool = turns
|
||||||
BattleScreen.BattleQuery.Add(New TextQueryObject(op.GetDisplayName() & " was trapped in the vortex!"))
|
BattleScreen.BattleQuery.Add(New TextQueryObject(op.GetDisplayName() & " was trapped in the vortex!"))
|
||||||
End If
|
End If
|
||||||
Else
|
Else
|
||||||
If BattleScreen.FieldEffects.OwnWhirlpool = 0 Then
|
If BattleScreen.FieldEffects.OwnWhirlpool = 0 Then
|
||||||
BattleScreen.FieldEffects.OwnWhirlpool = turns
|
BattleScreen.FieldEffects.OwnWhirlpool = turns
|
||||||
BattleScreen.BattleQuery.Add(New TextQueryObject(op.GetDisplayName() & " was trapped in the vortex!"))
|
BattleScreen.BattleQuery.Add(New TextQueryObject(op.GetDisplayName() & " was trapped in the vortex!"))
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
End Class
|
End Class
|
||||||
|
|
||||||
End Namespace
|
End Namespace
|
||||||
Loading…
x
Reference in New Issue
Block a user