Fixed sec. effect values (rock)

This commit is contained in:
Capt_Segis 2016-09-14 20:34:54 -05:00 committed by GitHub
parent 89ec6ef33e
commit 9cda9cbaf0
2 changed files with 199 additions and 199 deletions

View File

@ -1,73 +1,73 @@
Namespace BattleSystem.Moves.Rock Namespace BattleSystem.Moves.Rock
Public Class HeadSmash Public Class HeadSmash
Inherits Attack Inherits Attack
Public Sub New() Public Sub New()
'#Definitions '#Definitions
Me.Type = New Element(Element.Types.Rock) Me.Type = New Element(Element.Types.Rock)
Me.ID = 457 Me.ID = 457
Me.OriginalPP = 5 Me.OriginalPP = 5
Me.CurrentPP = 5 Me.CurrentPP = 5
Me.MaxPP = 5 Me.MaxPP = 5
Me.Power = 150 Me.Power = 150
Me.Accuracy = 80 Me.Accuracy = 80
Me.Category = Categories.Physical Me.Category = Categories.Physical
Me.ContestCategory = ContestCategories.Tough Me.ContestCategory = ContestCategories.Tough
Me.Name = "Head Smash" Me.Name = "Head Smash"
Me.Description = "The user attacks the target with a hazardous, full-power headbutt. This also damages the user terribly." Me.Description = "The user attacks the target with a hazardous, full-power headbutt. This also damages the user terribly."
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 = False Me.HasSecondaryEffect = False
Me.RemovesFrozen = False Me.RemovesFrozen = False
Me.IsHealingMove = False Me.IsHealingMove = False
Me.IsRecoilMove = True Me.IsRecoilMove = True
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.Recoil Me.AIField2 = AIField.Recoil
End Sub End Sub
Public Overrides Sub MoveHits(own As Boolean, BattleScreen As BattleScreen) Public Overrides Sub MoveRecoil(own As Boolean, BattleScreen As BattleScreen)
Dim lastDamage As Integer = BattleScreen.FieldEffects.OwnLastDamage Dim lastDamage As Integer = BattleScreen.FieldEffects.OwnLastDamage
If own = False Then If own = False Then
lastDamage = BattleScreen.FieldEffects.OppLastDamage lastDamage = BattleScreen.FieldEffects.OppLastDamage
End If End If
Dim recoilDamage As Integer = CInt(Math.Floor(lastDamage / 2)) Dim recoilDamage As Integer = CInt(Math.Floor(lastDamage / 2))
If recoilDamage <= 0 Then If recoilDamage <= 0 Then
recoilDamage = 1 recoilDamage = 1
End If End If
BattleScreen.Battle.InflictRecoil(own, own, BattleScreen, Me, recoilDamage, "", "move:headsmash") BattleScreen.Battle.InflictRecoil(own, own, BattleScreen, Me, recoilDamage, "", "move:headsmash")
End Sub End Sub
End Class End Class
End Namespace End Namespace

View File

@ -1,127 +1,127 @@
Namespace BattleSystem.Moves.Rock Namespace BattleSystem.Moves.Rock
Public Class Rollout Public Class Rollout
Inherits Attack Inherits Attack
Public Sub New() Public Sub New()
'#Definitions '#Definitions
Me.Type = New Element(Element.Types.Rock) Me.Type = New Element(Element.Types.Rock)
Me.ID = 205 Me.ID = 205
Me.OriginalPP = 20 Me.OriginalPP = 20
Me.CurrentPP = 20 Me.CurrentPP = 20
Me.MaxPP = 20 Me.MaxPP = 20
Me.Power = 30 Me.Power = 30
Me.Accuracy = 90 Me.Accuracy = 90
Me.Category = Categories.Physical Me.Category = Categories.Physical
Me.ContestCategory = ContestCategories.Tough Me.ContestCategory = ContestCategories.Tough
Me.Name = "Rollout" Me.Name = "Rollout"
Me.Description = "The user continually rolls into the target over five turns. It becomes stronger each time it hits." Me.Description = "The user continually rolls into the target over five turns. It becomes stronger each time it hits."
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.MultiTurn Me.AIField2 = AIField.MultiTurn
End Sub End Sub
Public Overrides Function GetBasePower(own As Boolean, BattleScreen As BattleScreen) As Integer Public Overrides Function GetBasePower(own As Boolean, BattleScreen As BattleScreen) As Integer
Dim rollout As Integer = BattleScreen.FieldEffects.OwnRolloutCounter Dim rollout As Integer = BattleScreen.FieldEffects.OwnRolloutCounter
If own = False Then If own = False Then
rollout = BattleScreen.FieldEffects.OppRolloutCounter rollout = BattleScreen.FieldEffects.OppRolloutCounter
End If End If
Dim p As Integer = Me.Power Dim p As Integer = Me.Power
If rollout > 0 Then If rollout > 0 Then
For i = 1 To rollout For i = 1 To rollout
p *= 2 p *= 2
Next Next
End If End If
Dim defensecurl As Integer = BattleScreen.FieldEffects.OwnDefenseCurl Dim defensecurl As Integer = BattleScreen.FieldEffects.OwnDefenseCurl
If own = False Then If own = False Then
defensecurl = BattleScreen.FieldEffects.OppDefenseCurl defensecurl = BattleScreen.FieldEffects.OppDefenseCurl
End If End If
If defensecurl > 0 Then If defensecurl > 0 Then
p *= 2 p *= 2
End If End If
Return p Return p
End Function End Function
Public Overrides Sub MoveHits(own As Boolean, BattleScreen As BattleScreen) Public Overrides Sub MoveHits(own As Boolean, BattleScreen As BattleScreen)
Dim rollout As Integer = BattleScreen.FieldEffects.OwnRolloutCounter Dim rollout As Integer = BattleScreen.FieldEffects.OwnRolloutCounter
If own = False Then If own = False Then
rollout = BattleScreen.FieldEffects.OppRolloutCounter rollout = BattleScreen.FieldEffects.OppRolloutCounter
End If End If
If rollout = 5 Then If rollout = 5 Then
If own = True Then If own = True Then
BattleScreen.FieldEffects.OwnRolloutCounter = 0 BattleScreen.FieldEffects.OwnRolloutCounter = 0
Else Else
BattleScreen.FieldEffects.OppRolloutCounter = 0 BattleScreen.FieldEffects.OppRolloutCounter = 0
End If End If
Else Else
If own = True Then If own = True Then
BattleScreen.FieldEffects.OwnRolloutCounter += 1 BattleScreen.FieldEffects.OwnRolloutCounter += 1
Else Else
BattleScreen.FieldEffects.OppRolloutCounter += 1 BattleScreen.FieldEffects.OppRolloutCounter += 1
End If End If
End If End If
End Sub End Sub
Private Sub Interruption(ByVal own As Boolean, ByVal BattleScreen As BattleScreen) Private Sub Interruption(ByVal own As Boolean, ByVal BattleScreen As BattleScreen)
If own = True Then If own = True Then
BattleScreen.FieldEffects.OwnRolloutCounter = 0 BattleScreen.FieldEffects.OwnRolloutCounter = 0
Else Else
BattleScreen.FieldEffects.OppRolloutCounter = 0 BattleScreen.FieldEffects.OppRolloutCounter = 0
End If End If
End Sub End Sub
Public Overrides Sub MoveHasNoEffect(own As Boolean, BattleScreen As BattleScreen) Public Overrides Sub MoveHasNoEffect(own As Boolean, BattleScreen As BattleScreen)
Interruption(own, BattleScreen) Interruption(own, BattleScreen)
End Sub End Sub
Public Overrides Sub MoveProtectedDetected(own As Boolean, BattleScreen As BattleScreen) Public Overrides Sub MoveProtectedDetected(own As Boolean, BattleScreen As BattleScreen)
Interruption(own, BattleScreen) Interruption(own, BattleScreen)
End Sub End Sub
Public Overrides Sub MoveMisses(own As Boolean, BattleScreen As BattleScreen) Public Overrides Sub MoveMisses(own As Boolean, BattleScreen As BattleScreen)
Interruption(own, BattleScreen) Interruption(own, BattleScreen)
End Sub End Sub
End Class End Class
End Namespace End Namespace