From 74ef66cc28825138ecaac902309680caf6ce59cb Mon Sep 17 00:00:00 2001 From: FantaX1911 Date: Wed, 30 Jan 2019 16:57:18 +0200 Subject: [PATCH] Updated all medicine to GenVII --- P3D/Pokemon/Items/Medicine/EnergyPowder.vb | 4 +-- P3D/Pokemon/Items/Medicine/EnergyRoot.vb | 4 +-- P3D/Pokemon/Items/Medicine/FreshWater.vb | 2 +- P3D/Pokemon/Items/Medicine/HyperPotion.vb | 2 +- P3D/Pokemon/Items/Medicine/Lemonade.vb | 2 +- P3D/Pokemon/Items/Medicine/RageCandyBar.vb | 35 ++++++++++++++++++++-- P3D/Pokemon/Items/Medicine/SodaPop.vb | 2 +- P3D/Pokemon/Items/Medicine/SuperPotion.vb | 2 +- 8 files changed, 42 insertions(+), 11 deletions(-) diff --git a/P3D/Pokemon/Items/Medicine/EnergyPowder.vb b/P3D/Pokemon/Items/Medicine/EnergyPowder.vb index 3f8592216..c0cc8d002 100644 --- a/P3D/Pokemon/Items/Medicine/EnergyPowder.vb +++ b/P3D/Pokemon/Items/Medicine/EnergyPowder.vb @@ -6,7 +6,7 @@ Namespace Items.Medicine Inherits MedicineItem Public Overrides ReadOnly Property PokeDollarPrice As Integer = 500 - Public Overrides ReadOnly Property Description As String = "A bitter medicine powder. When consumed, it restores 50 HP to an injured Pokémon." + Public Overrides ReadOnly Property Description As String = "A bitter medicine powder. When consumed, it restores 60 HP to an injured Pokémon." Public Overrides ReadOnly Property IsHealingItem As Boolean = True Public Sub New() @@ -25,7 +25,7 @@ Namespace Items.Medicine End Sub Public Overrides Function UseOnPokemon(ByVal PokeIndex As Integer) As Boolean - Dim success As Boolean = HealPokemon(PokeIndex, 50) + Dim success As Boolean = HealPokemon(PokeIndex, 60) If success Then Core.Player.Pokemons(PokeIndex).ChangeFriendShip(Pokemon.FriendShipCauses.EnergyPowder) End If diff --git a/P3D/Pokemon/Items/Medicine/EnergyRoot.vb b/P3D/Pokemon/Items/Medicine/EnergyRoot.vb index 599c383ef..fa8e74f9f 100644 --- a/P3D/Pokemon/Items/Medicine/EnergyRoot.vb +++ b/P3D/Pokemon/Items/Medicine/EnergyRoot.vb @@ -6,7 +6,7 @@ Namespace Items.Medicine Inherits MedicineItem Public Overrides ReadOnly Property PokeDollarPrice As Integer = 800 - Public Overrides ReadOnly Property Description As String = "An extremely bitter medicinal root. When consumed, it restores 200 HP to an injured Pokémon." + Public Overrides ReadOnly Property Description As String = "An extremely bitter medicinal root. When consumed, it restores 120 HP to an injured Pokémon." Public Overrides ReadOnly Property IsHealingItem As Boolean = True Public Sub New() @@ -25,7 +25,7 @@ Namespace Items.Medicine End Sub Public Overrides Function UseOnPokemon(ByVal PokeIndex As Integer) As Boolean - Dim r As Boolean = HealPokemon(PokeIndex, 200) + Dim r As Boolean = HealPokemon(PokeIndex, 120) If r = True Then Core.Player.Pokemons(PokeIndex).ChangeFriendShip(Pokemon.FriendShipCauses.EnergyRoot) End If diff --git a/P3D/Pokemon/Items/Medicine/FreshWater.vb b/P3D/Pokemon/Items/Medicine/FreshWater.vb index 5db2abed2..138422a83 100644 --- a/P3D/Pokemon/Items/Medicine/FreshWater.vb +++ b/P3D/Pokemon/Items/Medicine/FreshWater.vb @@ -6,7 +6,7 @@ Namespace Items.Medicine Inherits MedicineItem Public Overrides ReadOnly Property PokeDollarPrice As Integer = 200 - Public Overrides ReadOnly Property Description As String = "Water with a high mineral content. When consumed, it restores 50 HP to an injured Pokémon." + Public Overrides ReadOnly Property Description As String = "Water with a high mineral content. When consumed, it restores 30 HP to an injured Pokémon." Public Overrides ReadOnly Property IsHealingItem As Boolean = True Public Sub New() diff --git a/P3D/Pokemon/Items/Medicine/HyperPotion.vb b/P3D/Pokemon/Items/Medicine/HyperPotion.vb index 352ef04bd..d8a3547b0 100644 --- a/P3D/Pokemon/Items/Medicine/HyperPotion.vb +++ b/P3D/Pokemon/Items/Medicine/HyperPotion.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 200 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 120 HP to an injured Pokémon." Public Overrides ReadOnly Property PokeDollarPrice As Integer = 1500 Public Sub New() diff --git a/P3D/Pokemon/Items/Medicine/Lemonade.vb b/P3D/Pokemon/Items/Medicine/Lemonade.vb index d87b9de10..34a9c3533 100644 --- a/P3D/Pokemon/Items/Medicine/Lemonade.vb +++ b/P3D/Pokemon/Items/Medicine/Lemonade.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 very sweet and refreshing drink. When consumed, it restores 80 HP to an injured Pokémon." + Public Overrides ReadOnly Property Description As String = "A very sweet and refreshing drink. When consumed, it restores 70 HP to an injured Pokémon." Public Overrides ReadOnly Property PokeDollarPrice As Integer = 350 Public Sub New() diff --git a/P3D/Pokemon/Items/Medicine/RageCandyBar.vb b/P3D/Pokemon/Items/Medicine/RageCandyBar.vb index 13076e66c..fe5098d00 100644 --- a/P3D/Pokemon/Items/Medicine/RageCandyBar.vb +++ b/P3D/Pokemon/Items/Medicine/RageCandyBar.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 famous Mahogany Town candy tourists like to buy and take home. It restores the HP of one Pokémon by 20 points." + Public Overrides ReadOnly Property Description As String = "A famous Mahogany Town candy tourists like to buy and take home. It can be used once to heal all the status conditions of a Pokémon." Public Overrides ReadOnly Property PokeDollarPrice As Integer = 300 Public Sub New() @@ -25,7 +25,38 @@ Namespace Items.Medicine End Sub Public Overrides Function UseOnPokemon(ByVal PokeIndex As Integer) As Boolean - Return HealPokemon(PokeIndex, 20) + Dim Pokemon As Pokemon = Core.Player.Pokemons(PokeIndex) + + If Pokemon.Status = P3D.Pokemon.StatusProblems.Fainted Then + Screen.TextBox.reDelay = 0.0F + Screen.TextBox.Show(Pokemon.GetDisplayName() & "~is fainted!", {}) + + Return False + Else + If Pokemon.Status <> P3D.Pokemon.StatusProblems.None Or Pokemon.HasVolatileStatus(P3D.Pokemon.VolatileStatus.Confusion) = True Then + Pokemon.Status = P3D.Pokemon.StatusProblems.None + + If Pokemon.HasVolatileStatus(P3D.Pokemon.VolatileStatus.Confusion) = True Then + Pokemon.RemoveVolatileStatus(P3D.Pokemon.VolatileStatus.Confusion) + End If + + Screen.TextBox.reDelay = 0.0F + + Dim t As String = Pokemon.GetDisplayName() & "~gets healed up!" + t &= RemoveItem() + + SoundManager.PlaySound("single_heal", False) + Screen.TextBox.Show(t, {}) + PlayerStatistics.Track("[17]Medicine Items used", 1) + + Return True + Else + Screen.TextBox.reDelay = 0.0F + Screen.TextBox.Show(Pokemon.GetDisplayName() & "~is fully healed!", {}, True, True) + + Return False + End If + End If End Function End Class diff --git a/P3D/Pokemon/Items/Medicine/SodaPop.vb b/P3D/Pokemon/Items/Medicine/SodaPop.vb index 696f5f405..90a005dbd 100644 --- a/P3D/Pokemon/Items/Medicine/SodaPop.vb +++ b/P3D/Pokemon/Items/Medicine/SodaPop.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 highly carbonated soda drink. When consumed, it restores 60 HP to an injured Pokémon." + Public Overrides ReadOnly Property Description As String = "A highly carbonated soda drink. When consumed, it restores 50 HP to an injured Pokémon." Public Overrides ReadOnly Property PokeDollarPrice As Integer = 300 Public Sub New() diff --git a/P3D/Pokemon/Items/Medicine/SuperPotion.vb b/P3D/Pokemon/Items/Medicine/SuperPotion.vb index 6cb6cffa5..14887d122 100644 --- a/P3D/Pokemon/Items/Medicine/SuperPotion.vb +++ b/P3D/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 50 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 60 HP to an injured Pokémon." Public Overrides ReadOnly Property PokeDollarPrice As Integer = 700 Public Sub New()