From 59170f5678ca73467e570ba99ec4443fe05c9f61 Mon Sep 17 00:00:00 2001 From: CaptainSegis Date: Mon, 12 Dec 2016 00:47:37 -0500 Subject: [PATCH] Fixed most moves interactions with Protect and Two turn moves. (fly, dive, etc.) --- .../2.5DHero/Battle/BattleSystemV2/Battle.vb | 21 ++++++++++++----- .../Battle/BattleSystemV2/PokemonProfile.vb | 12 ++++++++++ 2.5DHero/2.5DHero/Pokemon/Attacks/Attack.vb | 2 ++ .../Pokemon/Attacks/Bug/QuiverDance.vb | Bin 5194 -> 5196 bytes .../Pokemon/Attacks/Electric/ZapCannon.vb | 2 +- .../Pokemon/Attacks/Fairy/DisarmingVoice.vb | 2 +- .../Pokemon/Attacks/Fighting/BulkUp.vb | 2 +- .../2.5DHero/Pokemon/Attacks/Flying/Defog.vb | 2 +- .../Pokemon/Attacks/Flying/Tailwind.vb | 2 +- .../Pokemon/Attacks/Grass/Aromatherapy.vb | 2 +- 2.5DHero/2.5DHero/Pokemon/Attacks/Ice/Mist.vb | 2 +- .../Pokemon/Attacks/Normal/HealBell.vb | 2 +- .../Pokemon/Attacks/Normal/NaturePower.vb | 2 +- .../2.5DHero/Pokemon/Attacks/Normal/Roar.vb | 2 +- .../Pokemon/Attacks/Normal/Safeguard.vb | 2 +- .../Pokemon/Attacks/Normal/Selfdestruct.vb | 2 +- .../Pokemon/Attacks/Normal/ShellSmash.vb | 2 +- .../Pokemon/Attacks/Normal/Whirlwind.vb | 2 +- .../2.5DHero/Pokemon/Attacks/Normal/WorkUp.vb | Bin 4770 -> 4772 bytes .../2.5DHero/Pokemon/Attacks/Poison/Coil.vb | Bin 5082 -> 5084 bytes .../Pokemon/Attacks/Psychic/CalmMind.vb | 2 +- .../Pokemon/Attacks/Psychic/HealBlock.vb | 4 ++-- .../Pokemon/Attacks/Psychic/HeartSwap.vb | Bin 7520 -> 7544 bytes .../Pokemon/Attacks/Psychic/LightScreen.vb | 2 +- .../Pokemon/Attacks/Psychic/PowerSwap.vb | Bin 5696 -> 5694 bytes .../Pokemon/Attacks/Psychic/Reflect.vb | 2 +- .../Pokemon/Attacks/Steel/MetalBurst.vb | 22 ++++++++++++++++-- .../2.5DHero/Pokemon/Attacks/Water/Dive.vb | 2 +- .../Pokemon/Attacks/Water/Muddywater.vb | 2 +- 29 files changed, 70 insertions(+), 29 deletions(-) diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb index f72027116..7739b36db 100644 --- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb +++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb @@ -1387,7 +1387,16 @@ DoesNotMiss = True End If - If DoesNotMiss = True And moveUsed.Target <> Attack.Targets.Self Then 'Dig check + Dim UseTwoTurnCheck As Boolean = True + If moveUsed.ProtectAffected = False Then + UseTwoTurnCheck = False + Select Case moveUsed.Name.ToLower + Case "psych up", "play nice", "role play" + UseTwoTurnCheck = True + End Select + End If + + If DoesNotMiss = True And UseTwoTurnCheck Then 'Dig check Dim dig As Integer = BattleScreen.FieldEffects.OppDigCounter If own = False Then dig = BattleScreen.FieldEffects.OwnDigCounter @@ -1398,7 +1407,7 @@ End If End If - If DoesNotMiss = True And moveUsed.Target <> Attack.Targets.Self Then 'Fly check + If DoesNotMiss = True And UseTwoTurnCheck Then 'Fly check Dim fly As Integer = BattleScreen.FieldEffects.OppFlyCounter If own = False Then fly = BattleScreen.FieldEffects.OwnFlyCounter @@ -1409,7 +1418,7 @@ End If End If - If DoesNotMiss = True And moveUsed.Target <> Attack.Targets.Self Then 'bounce check + If DoesNotMiss = True And UseTwoTurnCheck Then 'bounce check Dim bounce As Integer = BattleScreen.FieldEffects.OppBounceCounter If own = False Then bounce = BattleScreen.FieldEffects.OwnBounceCounter @@ -1420,7 +1429,7 @@ End If End If - If DoesNotMiss = True And moveUsed.Target <> Attack.Targets.Self Then 'dive check + If DoesNotMiss = True And UseTwoTurnCheck Then 'dive check Dim dive As Integer = BattleScreen.FieldEffects.OppDiveCounter If own = False Then dive = BattleScreen.FieldEffects.OwnDiveCounter @@ -1431,7 +1440,7 @@ End If End If - If DoesNotMiss = True And moveUsed.Target <> Attack.Targets.Self Then 'shadowforce check + If DoesNotMiss = True And UseTwoTurnCheck Then 'shadowforce check Dim shadowforce As Integer = BattleScreen.FieldEffects.OppShadowForceCounter If own = False Then shadowforce = BattleScreen.FieldEffects.OwnShadowForceCounter @@ -1442,7 +1451,7 @@ End If End If - If DoesNotMiss = True And moveUsed.Target <> Attack.Targets.Self Then 'sky drop check + If DoesNotMiss = True And UseTwoTurnCheck Then 'sky drop check Dim skydrop As Integer = BattleScreen.FieldEffects.OppSkyDropCounter If own = False Then skydrop = BattleScreen.FieldEffects.OwnSkyDropCounter diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/PokemonProfile.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/PokemonProfile.vb index 0abec3fbe..81eb2a3ad 100644 --- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/PokemonProfile.vb +++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/PokemonProfile.vb @@ -668,6 +668,8 @@ Return {OppLeft, OppCenter, OppRight}.ToList() Case Attack.Targets.OneAlly, Attack.Targets.AllAllies Return {OwnCenter, OwnRight}.ToList() + Case Attack.Targets.AllOwn + Return {OwnCenter, OwnRight, OwnLeft}.ToList() End Select Case Targets.OwnCenter Select Case AttackTarget @@ -677,6 +679,8 @@ Return {OppLeft, OppCenter, OppRight}.ToList() Case Attack.Targets.OneAdjacentAlly, Attack.Targets.OneAlly, Attack.Targets.AllAdjacentAllies, Attack.Targets.AllAllies Return {OwnLeft, OwnRight}.ToList() + Case Attack.Targets.AllOwn + Return {OwnCenter, OwnRight, OwnLeft}.ToList() End Select Case Targets.OwnRight Select Case AttackTarget @@ -692,6 +696,8 @@ Return {OppLeft, OppCenter, OppRight}.ToList() Case Attack.Targets.OneAlly, Attack.Targets.AllAllies Return {OwnLeft, OwnCenter}.ToList() + Case Attack.Targets.AllOwn + Return {OwnCenter, OwnRight, OwnLeft}.ToList() End Select Case Targets.OppLeft Select Case AttackTarget @@ -707,6 +713,8 @@ Return {OwnLeft, OwnCenter, OwnRight}.ToList() Case Attack.Targets.OneAlly, Attack.Targets.AllAllies Return {OppCenter, OppRight}.ToList() + Case Attack.Targets.AllOwn + Return {OppCenter, OppRight, OppLeft}.ToList() End Select Case Targets.OppCenter Select Case AttackTarget @@ -716,6 +724,8 @@ Return {OwnLeft, OwnCenter, OwnRight}.ToList() Case Attack.Targets.OneAdjacentAlly, Attack.Targets.OneAlly, Attack.Targets.AllAdjacentAllies, Attack.Targets.AllAllies Return {OppLeft, OppRight}.ToList() + Case Attack.Targets.AllOwn + Return {OppCenter, OppRight, OppLeft}.ToList() End Select Case Targets.OppRight Select Case AttackTarget @@ -731,6 +741,8 @@ Return {OwnLeft, OwnCenter, OwnRight}.ToList() Case Attack.Targets.OneAlly, Attack.Targets.AllAllies Return {OppLeft, OppCenter}.ToList() + Case Attack.Targets.AllOwn + Return {OppCenter, OppRight, OppLeft}.ToList() End Select End Select diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Attack.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Attack.vb index 395121a28..3a33ab0f2 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Attack.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Attack.vb @@ -46,6 +46,8 @@ AllAllies 'All allies, excluding itself. All 'All Pokémon, including itself + + AllOwn 'All allies, including itself. End Enum Public Enum AIField diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Bug/QuiverDance.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Bug/QuiverDance.vb index 68bba5f4496195864f7c8d2d92d2017a78d90558..5b9cf6857c8b2e83be2d9bc43060e05179dd4d3c 100644 GIT binary patch delta 16 YcmX@5aYkc9A^T*04!zBD+1K&_05|pp_W%F@ delta 16 YcmX@3aY|!DA^YT=99o;_vaja>06jJap8x;= diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Electric/ZapCannon.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Electric/ZapCannon.vb index f6e188113..40520ea20 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Electric/ZapCannon.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Electric/ZapCannon.vb @@ -11,7 +11,7 @@ Me.OriginalPP = 5 Me.CurrentPP = 5 Me.MaxPP = 5 - Me.Power = 120 + Me.Power = 100 Me.Accuracy = 50 Me.Category = Categories.Special Me.ContestCategory = ContestCategories.Cool diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Fairy/DisarmingVoice.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Fairy/DisarmingVoice.vb index 734a1125a..c3c769516 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Fairy/DisarmingVoice.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Fairy/DisarmingVoice.vb @@ -44,7 +44,7 @@ Namespace BattleSystem.Moves.Fairy Me.IsPunchingMove = False Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsSoundMove = True Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Fighting/BulkUp.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Fighting/BulkUp.vb index d2de643d5..2591b803d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Fighting/BulkUp.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Fighting/BulkUp.vb @@ -26,7 +26,7 @@ Namespace BattleSystem.Moves.Fighting '#SpecialDefinitions Me.MakesContact = False - Me.ProtectAffected = True + Me.ProtectAffected = False Me.MagicCoatAffected = True Me.SnatchAffected = False Me.MirrorMoveAffected = True diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Flying/Defog.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Flying/Defog.vb index f9ef99cce..56fba8c7d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Flying/Defog.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Flying/Defog.vb @@ -26,7 +26,7 @@ '#SpecialDefinitions Me.MakesContact = False - Me.ProtectAffected = False + Me.ProtectAffected = True Me.MagicCoatAffected = True Me.SnatchAffected = True Me.MirrorMoveAffected = True diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Flying/Tailwind.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Flying/Tailwind.vb index eb09efd30..486acc68e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Flying/Tailwind.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Flying/Tailwind.vb @@ -19,7 +19,7 @@ Namespace BattleSystem.Moves.Flying Me.Description = "The user whips up a turbulent whirlwind that ups the Speed stat of the user and its allies for four turns." Me.CriticalChance = 1 Me.IsHMMove = False - Me.Target = Targets.AllAllies + Me.Target = Targets.AllOwn Me.Priority = 0 Me.TimesToAttack = 1 '#End diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Grass/Aromatherapy.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Grass/Aromatherapy.vb index d037e53c9..9844f42ac 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Grass/Aromatherapy.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Grass/Aromatherapy.vb @@ -19,7 +19,7 @@ Me.Description = "The user releases a soothing scent that heals all status conditions affecting the user's party." Me.CriticalChance = 0 Me.IsHMMove = False - Me.Target = Targets.AllAllies + Me.Target = Targets.AllOwn Me.Priority = 0 Me.TimesToAttack = 1 '#End diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Ice/Mist.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Ice/Mist.vb index 43e311cae..473130568 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Ice/Mist.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Ice/Mist.vb @@ -19,7 +19,7 @@ Me.Description = "The user cloaks its body with a white mist that prevents any of its stats from being cut for five turns." Me.CriticalChance = 0 Me.IsHMMove = False - Me.Target = Targets.AllAllies + Me.Target = Targets.AllOwn Me.Priority = 0 Me.TimesToAttack = 1 '#End diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/HealBell.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/HealBell.vb index d722876c9..eba0283d6 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/HealBell.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/HealBell.vb @@ -19,7 +19,7 @@ Me.Description = "The user makes a soothing bell chime to heal the status problems of all the party Pokémon." Me.CriticalChance = 0 Me.IsHMMove = False - Me.Target = Targets.AllAllies + Me.Target = Targets.AllOwn Me.Priority = 0 Me.TimesToAttack = 1 '#End diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/NaturePower.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/NaturePower.vb index 5235bc3fe..e7ea5cc6d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/NaturePower.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/NaturePower.vb @@ -26,7 +26,7 @@ '#SpecialDefinitions Me.MakesContact = False - Me.ProtectAffected = False + Me.ProtectAffected = True Me.MagicCoatAffected = False Me.SnatchAffected = False Me.MirrorMoveAffected = True diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/Roar.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/Roar.vb index 7926c055c..1f45a0a03 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/Roar.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/Roar.vb @@ -26,7 +26,7 @@ '#SpecialDefinitions Me.MakesContact = False - Me.ProtectAffected = False + Me.ProtectAffected = True Me.MagicCoatAffected = True Me.SnatchAffected = False Me.MirrorMoveAffected = True diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/Safeguard.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/Safeguard.vb index 457dd8764..6ea7c1a2c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/Safeguard.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/Safeguard.vb @@ -19,7 +19,7 @@ Me.Description = "The user creates a protective field that prevents status problems for five turns." Me.CriticalChance = 0 Me.IsHMMove = False - Me.Target = Targets.AllAllies + Me.Target = Targets.AllOwn Me.Priority = 0 Me.TimesToAttack = 1 '#End diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/Selfdestruct.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/Selfdestruct.vb index 4043d0f38..201ef42e9 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/Selfdestruct.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/Selfdestruct.vb @@ -19,7 +19,7 @@ Me.Description = "The user attacks everything around it by causing an explosion. The user faints upon using this move." Me.CriticalChance = 1 Me.IsHMMove = False - Me.Target = Targets.OneAdjacentTarget + Me.Target = Targets.AllTargets Me.Priority = 0 Me.TimesToAttack = 1 '#End diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/ShellSmash.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/ShellSmash.vb index bb26d27e0..3162185c9 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/ShellSmash.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/ShellSmash.vb @@ -19,7 +19,7 @@ Me.Description = "The user breaks its shell, lowering its Defense and Sp. Def stats but sharply raising Attack, Sp. Atk, and Speed stats." Me.CriticalChance = 1 Me.IsHMMove = False - Me.Target = Targets.OneAdjacentTarget + Me.Target = Targets.Self Me.Priority = 0 Me.TimesToAttack = 1 '#End diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/Whirlwind.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/Whirlwind.vb index 5d94f74b4..ddbbb08bb 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/Whirlwind.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/Whirlwind.vb @@ -26,7 +26,7 @@ '#SpecialDefinitions Me.MakesContact = False - Me.ProtectAffected = False + Me.ProtectAffected = True Me.MagicCoatAffected = True Me.SnatchAffected = False Me.MirrorMoveAffected = True diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/WorkUp.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Normal/WorkUp.vb index 61e617d9262e36cd04fe714484e1fb376406f172..5639c6e92f7924c9e03dded5fdbe56abe2e0805b 100644 GIT binary patch delta 16 XcmZ3axLdg delta 16 XcmcbkeoK9WFZ<-F99o+z*^_wyJ0=DN diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Psychic/CalmMind.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Psychic/CalmMind.vb index 4a3d0990a..505442a48 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Psychic/CalmMind.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Psychic/CalmMind.vb @@ -26,7 +26,7 @@ Namespace BattleSystem.Moves.Psychic '#SpecialDefinitions Me.MakesContact = False - Me.ProtectAffected = True + Me.ProtectAffected = False Me.MagicCoatAffected = True Me.SnatchAffected = False Me.MirrorMoveAffected = True diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Psychic/HealBlock.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Psychic/HealBlock.vb index 6988e3f34..6ac2aca1d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Psychic/HealBlock.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Psychic/HealBlock.vb @@ -19,14 +19,14 @@ Me.Description = "For five turns, the user prevents the opposing team from using any moves, Abilities, or held items that recover HP." Me.CriticalChance = 0 Me.IsHMMove = False - Me.Target = Targets.OneFoe + Me.Target = Targets.AllFoes Me.Priority = 0 Me.TimesToAttack = 1 '#End '#SpecialDefinitions Me.MakesContact = False - Me.ProtectAffected = True + Me.ProtectAffected = False Me.MagicCoatAffected = True Me.SnatchAffected = False Me.MirrorMoveAffected = True diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Psychic/HeartSwap.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Psychic/HeartSwap.vb index 75861f9c07b3796effed719100ad2de78ed7e433..62443a8c0444787d2f75110ed2a001c7fcaa484a 100644 GIT binary patch delta 59 zcmaE0^}}kzc2-4yhCGH;21kYzhAf6ehGZZ+kD-Ji1jsI8NC)ytCSPDw-u#d?ig9v3 LyVmA(_Mf5v1Aq~F delta 33 pcmexi^}uSwc2@RahE#?ehP25S7?n5wW{qN;{FYN^b3OY{Q2^d^4BG$z diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Psychic/LightScreen.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Psychic/LightScreen.vb index f6dd1d86f..a60e11320 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Psychic/LightScreen.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Psychic/LightScreen.vb @@ -19,7 +19,7 @@ Namespace BattleSystem.Moves.Psychic Me.Description = "A wondrous wall of light is put up to suppress damage from special attacks for five turns." Me.CriticalChance = 0 Me.IsHMMove = False - Me.Target = Targets.Self + Me.Target = Targets.AllOwn Me.Priority = 0 Me.TimesToAttack = 1 '#End diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Psychic/PowerSwap.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Psychic/PowerSwap.vb index efb2ce33ce4737b7eab0f2745ef941446873577d..d199248c9f106cb371f97f7483aea9a8a92fd1ee 100644 GIT binary patch delta 16 YcmX@0vrlJ3I{V~U4z10T+1K&`064}59{>OV delta 16 Ycmdm|b3kW9I{W1RoI0B)vajU>06pCX!T 0 Then + Dim lastMove As Attack = BattleScreen.FieldEffects.OwnLastMove + If Own = True Then + lastMove = BattleScreen.FieldEffects.OppLastMove + End If + If Not lastMove Is Nothing Then + If lastMove.Category = Categories.Special Or lastMove.Category = Categories.Physical Then + Return False + End If + End If + End If + Return True End Function Public Overrides Function GetDamage(Critical As Boolean, Own As Boolean, targetPokemon As Boolean, BattleScreen As BattleScreen) As Integer diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Water/Dive.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Water/Dive.vb index ed794d170..24e62bae4 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Water/Dive.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Water/Dive.vb @@ -19,7 +19,7 @@ Me.Description = "Diving on the first turn, the user floats up and attacks on the next turn." Me.CriticalChance = 1 Me.IsHMMove = False - Me.Target = Targets.AllAdjacentTargets + Me.Target = Targets.OneAdjacentTarget Me.Priority = 0 Me.TimesToAttack = 1 '#End diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Water/Muddywater.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Water/Muddywater.vb index 7899809f8..5ccad1323 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Water/Muddywater.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Water/Muddywater.vb @@ -19,7 +19,7 @@ Me.Description = "The user attacks by shooting muddy water at the opposing team. It may also lower the targets' accuracy." Me.CriticalChance = 1 Me.IsHMMove = False - Me.Target = Targets.OneAdjacentTarget + Me.Target = Targets.AllAdjacentFoes Me.Priority = 0 Me.TimesToAttack = 1 '#End