diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleCalculation.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleCalculation.vb index 5af3fef13..78dcb2ed1 100644 --- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleCalculation.vb +++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleCalculation.vb @@ -1170,8 +1170,13 @@ Dim IM As Single = 1.0F If Attack.Category = Attack.Categories.Physical Then - AStat = Attack.GetUseAttackStat(p) - ASM = GetMultiplierFromStat(p.StatAttack) + If Attack.ID = 492 Then + AStat = Attack.GetUseAttackStat(Op) 'When the move is Foul Play + ASM = GetMultiplierFromStat(Op.StatAttack) + Else + AStat = Attack.GetUseAttackStat(p) + ASM = GetMultiplierFromStat(p.StatAttack) + End If If BattleScreen.FieldEffects.CanUseAbility(Not Own, BattleScreen) = True Then If Op.Ability.Name.ToLower() = "unaware" Then diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Attack.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Attack.vb index 5f01d77b6..57d53da79 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Attack.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Attack.vb @@ -1230,8 +1230,8 @@ returnMove = New Moves.Fighting.LowSweep() Case 491 returnMove = New Moves.Poison.AcidSpray() - 'Case 492 - 'Foul Play + Case 492 + returnMove = New Moves.Dark.FoulPlay() 'Case 493 'Simple Beam 'Case 494 diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Dark/FoulPlay.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Dark/FoulPlay.vb new file mode 100644 index 000000000..a78592206 --- /dev/null +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Dark/FoulPlay.vb @@ -0,0 +1,58 @@ +Namespace BattleSystem.Moves.Dark + + Public Class FoulPlay + + Inherits Attack + + Public Sub New() + '#Definitions + Me.Type = New Element(Element.Types.Dark) + Me.ID = 492 + Me.OriginalPP = 15 + Me.CurrentPP = 15 + Me.MaxPP = 15 + Me.Power = 95 + Me.Accuracy = 100 + Me.Category = Categories.Physical + Me.ContestCategory = ContestCategories.Smart + Me.Name = "Foul Play" + Me.Description = " The user turns the target's power against it. The higher the target's Attack stat, the greater the move's power." + Me.CriticalChance = 1 + Me.IsHMMove = False + Me.Target = Targets.OneAdjacentTarget + Me.Priority = 0 + Me.TimesToAttack = 1 + '#End + + '#SpecialDefinitions + Me.MakesContact = True + Me.ProtectAffected = True + Me.MagicCoatAffected = False + Me.SnatchAffected = False + Me.MirrorMoveAffected = True + Me.KingsrockAffected = False + Me.CounterAffected = True + + Me.DisabledWhileGravity = False + Me.UseEffectiveness = True + Me.ImmunityAffected = True + Me.HasSecondaryEffect = True + Me.RemovesFrozen = False + + Me.IsHealingMove = False + Me.IsRecoilMove = False + Me.IsPunchingMove = False + Me.IsDamagingMove = True + Me.IsProtectMove = False + Me.IsSoundMove = False + + Me.IsAffectedBySubstitute = True + Me.IsOneHitKOMove = False + Me.IsWonderGuardAffected = True + Me.IsJawMove = False + '#End + + End Sub + End Class + +End Namespace