From e754a4009e1a4f38cedc3e3f2f1398d0f1ed6eec Mon Sep 17 00:00:00 2001 From: jianmingyong Date: Fri, 21 Oct 2016 13:12:48 +0800 Subject: [PATCH] Revert "Updated to 7th Gen Standards" This reverts commit 351b5ff1dc0c3f1ecf198f2652f3b4407cd751f5 4cb1844ae608729513ee75a7779889ff3345036d af158713835d31e2fbf2a98591ab4c35ecb261a6 761d6e8e2d771cb202f3c4188a344ba79f1d6745 c6b61393893d7e743eeec43af6cc5c2d950c5890 d64f4dcb835222c6c8634ef9d9f8f76ce1e5c1c3 6ff5fd71976906083a606e9835251f7781a6a519 --- 2.5DHero/2.5DHero/Pokemon/Abilities/KeenEye.vb | 4 ++-- 2.5DHero/2.5DHero/Pokemon/Abilities/SkillLink.vb | 4 ++-- 2.5DHero/2.5DHero/Pokemon/Abilities/Static.vb | 4 ++-- 2.5DHero/2.5DHero/Pokemon/Abilities/StrongJaw.vb | 4 ++-- 2.5DHero/2.5DHero/Pokemon/Abilities/VitalSpirit.vb | 4 ++-- 2.5DHero/2.5DHero/Pokemon/Attacks/Water/WaterShuriken.vb | 4 ++-- 2.5DHero/2.5DHero/Pokemon/Items/Medicine/SuperPotion.vb | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/2.5DHero/2.5DHero/Pokemon/Abilities/KeenEye.vb b/2.5DHero/2.5DHero/Pokemon/Abilities/KeenEye.vb index e0c0b02ff..0353bf42a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Abilities/KeenEye.vb +++ b/2.5DHero/2.5DHero/Pokemon/Abilities/KeenEye.vb @@ -5,9 +5,9 @@ Namespace Abilities Inherits Ability Public Sub New() - MyBase.New(51, "Keen Eye", "Keen eyes prevent other Pokémon from lowering this Pokémon's accuracy.") + MyBase.New(51, "Keen Eye", "Prevents other Pokémon from lowering accuracy.") End Sub End Class -End Namespace +End Namespace \ No newline at end of file diff --git a/2.5DHero/2.5DHero/Pokemon/Abilities/SkillLink.vb b/2.5DHero/2.5DHero/Pokemon/Abilities/SkillLink.vb index bcf51e620..dfa41f4cd 100644 --- a/2.5DHero/2.5DHero/Pokemon/Abilities/SkillLink.vb +++ b/2.5DHero/2.5DHero/Pokemon/Abilities/SkillLink.vb @@ -5,9 +5,9 @@ Namespace Abilities Inherits Ability Public Sub New() - MyBase.New(92, "Skill Link", "Maximizes the number of times multi-strike moves hit.") + MyBase.New(92, "Skill Link", "Increases the frequency of multi-strike moves.") End Sub End Class -End Namespace +End Namespace \ No newline at end of file diff --git a/2.5DHero/2.5DHero/Pokemon/Abilities/Static.vb b/2.5DHero/2.5DHero/Pokemon/Abilities/Static.vb index 5666f6f71..5b546e3d8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Abilities/Static.vb +++ b/2.5DHero/2.5DHero/Pokemon/Abilities/Static.vb @@ -5,9 +5,9 @@ Namespace Abilities Inherits Ability Public Sub New() - MyBase.New(9, "Static", "The Pokémon is charged with static electricity, so contact with it may cause paralysis.") + MyBase.New(9, "Static", "Contact with the Pokémon may cause paralysis.") End Sub End Class -End Namespace +End Namespace \ No newline at end of file diff --git a/2.5DHero/2.5DHero/Pokemon/Abilities/StrongJaw.vb b/2.5DHero/2.5DHero/Pokemon/Abilities/StrongJaw.vb index 94d7a03c4..681465ad9 100644 --- a/2.5DHero/2.5DHero/Pokemon/Abilities/StrongJaw.vb +++ b/2.5DHero/2.5DHero/Pokemon/Abilities/StrongJaw.vb @@ -5,9 +5,9 @@ Namespace Abilities Inherits Ability Public Sub New() - MyBase.New(173, "Strong Jaw", "The Pokémon's strong jaw boosts the power of its biting moves.") + MyBase.New(173, "Strong Jaw", "The Pokémon's strong jaw gives it tremendous biting power.") End Sub End Class -End Namespace +End Namespace \ No newline at end of file diff --git a/2.5DHero/2.5DHero/Pokemon/Abilities/VitalSpirit.vb b/2.5DHero/2.5DHero/Pokemon/Abilities/VitalSpirit.vb index 1965c16a2..c60a2bef8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Abilities/VitalSpirit.vb +++ b/2.5DHero/2.5DHero/Pokemon/Abilities/VitalSpirit.vb @@ -5,9 +5,9 @@ Namespace Abilities Inherits Ability Public Sub New() - MyBase.New(72, "Vital Spirit", "The Pokémon is full of vitality, and that prevents it from falling asleep.") + MyBase.New(72, "Vital Spirit", "Prevents the Pokémon from falling asleep.") End Sub End Class -End Namespace +End Namespace \ No newline at end of file diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Water/WaterShuriken.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Water/WaterShuriken.vb index 51417b53c..786d3f04c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Water/WaterShuriken.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Water/WaterShuriken.vb @@ -13,7 +13,7 @@ Namespace BattleSystem.Moves.Water Me.MaxPP = 20 Me.Power = 15 Me.Accuracy = 100 - Me.Category = Categories.Special + Me.Category = Categories.Physical Me.ContestCategory = ContestCategories.Cool Me.Name = "Water Shuriken" Me.Description = "The user hits the target with throwing stars two to five times in a row. This move always goes first." @@ -83,4 +83,4 @@ Namespace BattleSystem.Moves.Water End Class -End Namespace +End Namespace \ No newline at end of file diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/SuperPotion.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/SuperPotion.vb index 86a730db7..7829b5720 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/SuperPotion.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/SuperPotion.vb @@ -6,7 +6,7 @@ Namespace Items.Medicine Inherits MedicineItem Public Overrides ReadOnly Property IsHealingItem As Boolean = True - Public Overrides ReadOnly Property Description As String = "A spray-type medicine for treating wounds. It can be used to restore 60 HP to an injured Pokémon." + Public Overrides ReadOnly Property Description As String = "A spray-type medicine for treating wounds. It can be used to restore 50 HP to an injured Pokémon." Public Overrides ReadOnly Property PokeDollarPrice As Integer = 700 Public Sub New() @@ -22,7 +22,7 @@ Namespace Items.Medicine End Sub Public Overrides Function UseOnPokemon(ByVal PokeIndex As Integer) As Boolean - Return HealPokemon(PokeIndex, 60) + Return HealPokemon(PokeIndex, 50) End Function End Class