From dcd4cf13906bae7e6b5a0d87bced164910e52328 Mon Sep 17 00:00:00 2001 From: Capt_Segis Date: Wed, 14 Sep 2016 19:58:32 -0500 Subject: [PATCH] Fixed sec. effect values (poison) --- .../Pokemon/Attacks/Poison/AcidArmor.vb | 130 ++++++++--------- .../Pokemon/Attacks/Poison/PoisonGas.vb | 130 ++++++++--------- .../Pokemon/Attacks/Poison/PoisonPowder.vb | 132 +++++++++--------- .../2.5DHero/Pokemon/Attacks/Poison/Toxic.vb | 130 ++++++++--------- 4 files changed, 261 insertions(+), 261 deletions(-) diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Poison/AcidArmor.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Poison/AcidArmor.vb index bb92a11d3..49230ef41 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Poison/AcidArmor.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Poison/AcidArmor.vb @@ -1,66 +1,66 @@ -Namespace BattleSystem.Moves.Poison - - Public Class AcidArmor - - Inherits Attack - - Public Sub New() - '#Definitions - Me.Type = New Element(Element.Types.Poison) - Me.ID = 151 - Me.OriginalPP = 20 - Me.CurrentPP = 20 - Me.MaxPP = 20 - Me.Power = 0 - Me.Accuracy = 0 - Me.Category = Categories.Status - Me.ContestCategory = ContestCategories.Tough - Me.Name = "Acid Armor" - Me.Description = "The user alters its cellular structure to liquefy itself, sharply raising its Defense stat." - Me.CriticalChance = 0 - Me.IsHMMove = False - Me.Target = Targets.Self - Me.Priority = 0 - Me.TimesToAttack = 1 - '#End - - '#SpecialDefinitions - Me.MakesContact = False - Me.ProtectAffected = False - Me.MagicCoatAffected = False - Me.SnatchAffected = True - Me.MirrorMoveAffected = True - Me.KingsrockAffected = False - Me.CounterAffected = False - - Me.DisabledWhileGravity = False - Me.UseEffectiveness = False - Me.ImmunityAffected = False - Me.RemovesFrozen = False - Me.HasSecondaryEffect = True - - Me.IsHealingMove = False - Me.IsRecoilMove = False - Me.IsPunchingMove = False - Me.IsDamagingMove = False - Me.IsProtectMove = False - Me.IsSoundMove = False - - Me.IsAffectedBySubstitute = False - Me.IsOneHitKOMove = False - Me.IsWonderGuardAffected = False - '#End - - Me.AIField1 = AIField.RaiseDefense - Me.AIField2 = AIField.Nothing - End Sub - - Public Overrides Sub MoveHits(own As Boolean, BattleScreen As BattleScreen) - If BattleScreen.Battle.RaiseStat(own, own, BattleScreen, "Defense", 2, "", "move:acidarmor") = False Then - BattleScreen.BattleQuery.Add(New TextQueryObject(Me.Name & " failed!")) - End If - End Sub - - End Class - +Namespace BattleSystem.Moves.Poison + + Public Class AcidArmor + + Inherits Attack + + Public Sub New() + '#Definitions + Me.Type = New Element(Element.Types.Poison) + Me.ID = 151 + Me.OriginalPP = 20 + Me.CurrentPP = 20 + Me.MaxPP = 20 + Me.Power = 0 + Me.Accuracy = 0 + Me.Category = Categories.Status + Me.ContestCategory = ContestCategories.Tough + Me.Name = "Acid Armor" + Me.Description = "The user alters its cellular structure to liquefy itself, sharply raising its Defense stat." + Me.CriticalChance = 0 + Me.IsHMMove = False + Me.Target = Targets.Self + Me.Priority = 0 + Me.TimesToAttack = 1 + '#End + + '#SpecialDefinitions + Me.MakesContact = False + Me.ProtectAffected = False + Me.MagicCoatAffected = False + Me.SnatchAffected = True + Me.MirrorMoveAffected = True + Me.KingsrockAffected = False + Me.CounterAffected = False + + Me.DisabledWhileGravity = False + Me.UseEffectiveness = False + Me.ImmunityAffected = False + Me.RemovesFrozen = False + Me.HasSecondaryEffect = False + + Me.IsHealingMove = False + Me.IsRecoilMove = False + Me.IsPunchingMove = False + Me.IsDamagingMove = False + Me.IsProtectMove = False + Me.IsSoundMove = False + + Me.IsAffectedBySubstitute = False + Me.IsOneHitKOMove = False + Me.IsWonderGuardAffected = False + '#End + + Me.AIField1 = AIField.RaiseDefense + Me.AIField2 = AIField.Nothing + End Sub + + Public Overrides Sub MoveHits(own As Boolean, BattleScreen As BattleScreen) + If BattleScreen.Battle.RaiseStat(own, own, BattleScreen, "Defense", 2, "", "move:acidarmor") = False Then + BattleScreen.BattleQuery.Add(New TextQueryObject(Me.Name & " failed!")) + End If + End Sub + + End Class + End Namespace \ No newline at end of file diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Poison/PoisonGas.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Poison/PoisonGas.vb index f5cae31d6..61ee68fd1 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Poison/PoisonGas.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Poison/PoisonGas.vb @@ -1,66 +1,66 @@ -Namespace BattleSystem.Moves.Poison - - Public Class PoisonGas - - Inherits Attack - - Public Sub New() - '#Definitions - Me.Type = New Element(Element.Types.Poison) - Me.ID = 139 - Me.OriginalPP = 40 - Me.CurrentPP = 40 - Me.MaxPP = 40 - Me.Power = 0 - Me.Accuracy = 90 - Me.Category = Categories.Status - Me.ContestCategory = ContestCategories.Smart - Me.Name = "Poison Gas" - Me.Description = "A cloud of poison gas is sprayed in the face of opposing Pokémon. It may poison those hit." - Me.CriticalChance = 1 - Me.IsHMMove = False - Me.Target = Targets.AllAdjacentFoes - Me.Priority = 0 - Me.TimesToAttack = 1 - '#End - - '#SpecialDefinitions - Me.MakesContact = False - Me.ProtectAffected = True - Me.MagicCoatAffected = True - Me.SnatchAffected = False - Me.MirrorMoveAffected = True - Me.KingsrockAffected = False - Me.CounterAffected = False - - Me.DisabledWhileGravity = False - Me.UseEffectiveness = False - Me.ImmunityAffected = True - Me.HasSecondaryEffect = True - Me.RemovesFrozen = False - - Me.IsHealingMove = False - Me.IsRecoilMove = False - Me.IsPunchingMove = False - Me.IsDamagingMove = False - Me.IsProtectMove = False - Me.IsSoundMove = False - - Me.IsAffectedBySubstitute = True - Me.IsOneHitKOMove = False - Me.IsWonderGuardAffected = False - '#End - - Me.AIField1 = AIField.Poison - Me.AIField2 = AIField.Nothing - End Sub - - Public Overrides Sub MoveHits(own As Boolean, BattleScreen As BattleScreen) - If BattleScreen.Battle.InflictPoison(Not own, own, BattleScreen, False, "", "move:poisongas") = False Then - BattleScreen.BattleQuery.Add(New TextQueryObject(Me.Name & " failed!")) - End If - End Sub - - End Class - +Namespace BattleSystem.Moves.Poison + + Public Class PoisonGas + + Inherits Attack + + Public Sub New() + '#Definitions + Me.Type = New Element(Element.Types.Poison) + Me.ID = 139 + Me.OriginalPP = 40 + Me.CurrentPP = 40 + Me.MaxPP = 40 + Me.Power = 0 + Me.Accuracy = 90 + Me.Category = Categories.Status + Me.ContestCategory = ContestCategories.Smart + Me.Name = "Poison Gas" + Me.Description = "A cloud of poison gas is sprayed in the face of opposing Pokémon. It may poison those hit." + Me.CriticalChance = 1 + Me.IsHMMove = False + Me.Target = Targets.AllAdjacentFoes + Me.Priority = 0 + Me.TimesToAttack = 1 + '#End + + '#SpecialDefinitions + Me.MakesContact = False + Me.ProtectAffected = True + Me.MagicCoatAffected = True + Me.SnatchAffected = False + Me.MirrorMoveAffected = True + Me.KingsrockAffected = False + Me.CounterAffected = False + + Me.DisabledWhileGravity = False + Me.UseEffectiveness = False + Me.ImmunityAffected = True + Me.HasSecondaryEffect = False + Me.RemovesFrozen = False + + Me.IsHealingMove = False + Me.IsRecoilMove = False + Me.IsPunchingMove = False + Me.IsDamagingMove = False + Me.IsProtectMove = False + Me.IsSoundMove = False + + Me.IsAffectedBySubstitute = True + Me.IsOneHitKOMove = False + Me.IsWonderGuardAffected = False + '#End + + Me.AIField1 = AIField.Poison + Me.AIField2 = AIField.Nothing + End Sub + + Public Overrides Sub MoveHits(own As Boolean, BattleScreen As BattleScreen) + If BattleScreen.Battle.InflictPoison(Not own, own, BattleScreen, False, "", "move:poisongas") = False Then + BattleScreen.BattleQuery.Add(New TextQueryObject(Me.Name & " failed!")) + End If + End Sub + + End Class + End Namespace \ No newline at end of file diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Poison/PoisonPowder.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Poison/PoisonPowder.vb index e2d1ce496..795cec108 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Poison/PoisonPowder.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Poison/PoisonPowder.vb @@ -1,67 +1,67 @@ -Namespace BattleSystem.Moves.Poison - - Public Class PoisonPowder - - Inherits Attack - - Public Sub New() - '#Definitions - Me.Type = New Element(Element.Types.Poison) - Me.ID = 77 - Me.OriginalPP = 35 - Me.CurrentPP = 35 - Me.MaxPP = 35 - Me.Power = 0 - Me.Accuracy = 75 - Me.Category = Categories.Status - Me.ContestCategory = ContestCategories.Smart - Me.Name = "Poison Powder" - Me.Description = "The user scatters a cloud of poisonous dust on the target. It may poison the target." - Me.CriticalChance = 0 - Me.IsHMMove = False - Me.Target = Targets.OneAdjacentTarget - Me.Priority = 0 - Me.TimesToAttack = 1 - '#End - - '#SpecialDefinitions - Me.MakesContact = False - Me.ProtectAffected = True - Me.MagicCoatAffected = True - Me.SnatchAffected = False - Me.MirrorMoveAffected = True - Me.KingsrockAffected = False - Me.CounterAffected = False - - Me.DisabledWhileGravity = False - Me.UseEffectiveness = False - Me.ImmunityAffected = True - Me.HasSecondaryEffect = True - Me.RemovesFrozen = False - - Me.IsHealingMove = False - Me.IsRecoilMove = False - Me.IsPunchingMove = False - Me.IsDamagingMove = False - Me.IsProtectMove = False - Me.IsSoundMove = False - - Me.IsAffectedBySubstitute = True - Me.IsOneHitKOMove = False - Me.IsWonderGuardAffected = False - Me.IsPowderMove = True - '#End - - Me.AIField1 = AIField.Poison - Me.AIField2 = AIField.Nothing - End Sub - - Public Overrides Sub MoveHits(own As Boolean, BattleScreen As BattleScreen) - If BattleScreen.Battle.InflictPoison(Not own, own, BattleScreen, False, "", "move:poisonpowder") = False Then - BattleScreen.BattleQuery.Add(New TextQueryObject(Me.Name & " failed!")) - End If - End Sub - - End Class - +Namespace BattleSystem.Moves.Poison + + Public Class PoisonPowder + + Inherits Attack + + Public Sub New() + '#Definitions + Me.Type = New Element(Element.Types.Poison) + Me.ID = 77 + Me.OriginalPP = 35 + Me.CurrentPP = 35 + Me.MaxPP = 35 + Me.Power = 0 + Me.Accuracy = 75 + Me.Category = Categories.Status + Me.ContestCategory = ContestCategories.Smart + Me.Name = "Poison Powder" + Me.Description = "The user scatters a cloud of poisonous dust on the target. It may poison the target." + Me.CriticalChance = 0 + Me.IsHMMove = False + Me.Target = Targets.OneAdjacentTarget + Me.Priority = 0 + Me.TimesToAttack = 1 + '#End + + '#SpecialDefinitions + Me.MakesContact = False + Me.ProtectAffected = True + Me.MagicCoatAffected = True + Me.SnatchAffected = False + Me.MirrorMoveAffected = True + Me.KingsrockAffected = False + Me.CounterAffected = False + + Me.DisabledWhileGravity = False + Me.UseEffectiveness = False + Me.ImmunityAffected = True + Me.HasSecondaryEffect = False + Me.RemovesFrozen = False + + Me.IsHealingMove = False + Me.IsRecoilMove = False + Me.IsPunchingMove = False + Me.IsDamagingMove = False + Me.IsProtectMove = False + Me.IsSoundMove = False + + Me.IsAffectedBySubstitute = True + Me.IsOneHitKOMove = False + Me.IsWonderGuardAffected = False + Me.IsPowderMove = True + '#End + + Me.AIField1 = AIField.Poison + Me.AIField2 = AIField.Nothing + End Sub + + Public Overrides Sub MoveHits(own As Boolean, BattleScreen As BattleScreen) + If BattleScreen.Battle.InflictPoison(Not own, own, BattleScreen, False, "", "move:poisonpowder") = False Then + BattleScreen.BattleQuery.Add(New TextQueryObject(Me.Name & " failed!")) + End If + End Sub + + End Class + End Namespace \ No newline at end of file diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Poison/Toxic.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Poison/Toxic.vb index 7eae54b2c..3e3ba02df 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Poison/Toxic.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Poison/Toxic.vb @@ -1,66 +1,66 @@ -Namespace BattleSystem.Moves.Poison - - Public Class Toxic - - Inherits Attack - - Public Sub New() - '#Definitions - Me.Type = New Element(Element.Types.Poison) - Me.ID = 92 - Me.OriginalPP = 10 - Me.CurrentPP = 10 - Me.MaxPP = 10 - Me.Power = 0 - Me.Accuracy = 90 - Me.Category = Categories.Status - Me.ContestCategory = ContestCategories.Smart - Me.Name = "Toxic" - Me.Description = "A move that leaves the target badly poisoned. Its poison damage worsens every turn." - Me.CriticalChance = 0 - Me.IsHMMove = False - Me.Target = Targets.OneAdjacentTarget - Me.Priority = 0 - Me.TimesToAttack = 1 - '#End - - '#SpecialDefinitions - Me.MakesContact = False - Me.ProtectAffected = True - Me.MagicCoatAffected = True - Me.SnatchAffected = False - Me.MirrorMoveAffected = True - Me.KingsrockAffected = False - Me.CounterAffected = False - - Me.DisabledWhileGravity = False - Me.UseEffectiveness = False - Me.ImmunityAffected = True - Me.HasSecondaryEffect = True - Me.RemovesFrozen = False - - Me.IsHealingMove = False - Me.IsRecoilMove = False - Me.IsPunchingMove = False - Me.IsDamagingMove = False - Me.IsProtectMove = False - Me.IsSoundMove = False - - Me.IsAffectedBySubstitute = True - Me.IsOneHitKOMove = False - Me.IsWonderGuardAffected = False - '#End - - Me.AIField1 = AIField.Poison - Me.AIField2 = AIField.Nothing - End Sub - - Public Overrides Sub MoveHits(own As Boolean, BattleScreen As BattleScreen) - If BattleScreen.Battle.InflictPoison(Not own, own, BattleScreen, True, "", "move:toxic") = False Then - BattleScreen.BattleQuery.Add(New TextQueryObject(Me.Name & " failed!")) - End If - End Sub - - End Class - +Namespace BattleSystem.Moves.Poison + + Public Class Toxic + + Inherits Attack + + Public Sub New() + '#Definitions + Me.Type = New Element(Element.Types.Poison) + Me.ID = 92 + Me.OriginalPP = 10 + Me.CurrentPP = 10 + Me.MaxPP = 10 + Me.Power = 0 + Me.Accuracy = 90 + Me.Category = Categories.Status + Me.ContestCategory = ContestCategories.Smart + Me.Name = "Toxic" + Me.Description = "A move that leaves the target badly poisoned. Its poison damage worsens every turn." + Me.CriticalChance = 0 + Me.IsHMMove = False + Me.Target = Targets.OneAdjacentTarget + Me.Priority = 0 + Me.TimesToAttack = 1 + '#End + + '#SpecialDefinitions + Me.MakesContact = False + Me.ProtectAffected = True + Me.MagicCoatAffected = True + Me.SnatchAffected = False + Me.MirrorMoveAffected = True + Me.KingsrockAffected = False + Me.CounterAffected = False + + Me.DisabledWhileGravity = False + Me.UseEffectiveness = False + Me.ImmunityAffected = True + Me.HasSecondaryEffect = False + Me.RemovesFrozen = False + + Me.IsHealingMove = False + Me.IsRecoilMove = False + Me.IsPunchingMove = False + Me.IsDamagingMove = False + Me.IsProtectMove = False + Me.IsSoundMove = False + + Me.IsAffectedBySubstitute = True + Me.IsOneHitKOMove = False + Me.IsWonderGuardAffected = False + '#End + + Me.AIField1 = AIField.Poison + Me.AIField2 = AIField.Nothing + End Sub + + Public Overrides Sub MoveHits(own As Boolean, BattleScreen As BattleScreen) + If BattleScreen.Battle.InflictPoison(Not own, own, BattleScreen, True, "", "move:toxic") = False Then + BattleScreen.BattleQuery.Add(New TextQueryObject(Me.Name & " failed!")) + End If + End Sub + + End Class + End Namespace \ No newline at end of file