From a5d50bd8a96fde4c74f54037cc13c50c4dcb7f57 Mon Sep 17 00:00:00 2001 From: darkfire006 Date: Fri, 6 May 2022 17:45:59 -0500 Subject: [PATCH] item plurals --- P3D/Pokemon/Items/Berry.vb | 1 + P3D/Pokemon/Items/Fossils/FossilizedFish.vb | 1 + P3D/Pokemon/Items/Medicine/PPMax.vb | 1 + P3D/Pokemon/Items/Medicine/PewterCrunchies.vb | 1 + P3D/Pokemon/Items/Medicine/RareCandy.vb | 1 + P3D/Pokemon/Items/Medicine/SacredAsh.vb | 1 + P3D/Pokemon/Items/Medicine/ShinyCandy.vb | 1 + P3D/Pokemon/Items/Standard/BlackGlasses.vb | 1 + P3D/Pokemon/Items/Standard/CellBattery.vb | 1 + P3D/Pokemon/Items/Standard/ChoiceScarf.vb | 1 + P3D/Pokemon/Items/Standard/ChoiceSpecs.vb | 1 + P3D/Pokemon/Items/Standard/DeepSeaTooth.vb | 1 + P3D/Pokemon/Items/Standard/GoldLeaf.vb | 2 +- P3D/Pokemon/Items/Standard/Leftovers.vb | 1 + P3D/Pokemon/Items/Standard/PowerLens.vb | 1 + P3D/Pokemon/Items/Standard/ScopeLens.vb | 1 + P3D/Pokemon/Items/Standard/SilkScarf.vb | 1 + P3D/Pokemon/Items/Standard/SilverLeaf.vb | 1 + P3D/Pokemon/Items/Standard/WideLens.vb | 1 + P3D/Pokemon/Items/Standard/ZoomLens.vb | 1 + P3D/Pokemon/Items/Vitamins/Carbos.vb | 1 + P3D/Pokemon/Items/XItems/XAccuracy.vb | 1 + 22 files changed, 22 insertions(+), 1 deletion(-) diff --git a/P3D/Pokemon/Items/Berry.vb b/P3D/Pokemon/Items/Berry.vb index 111a8392f..ad0b73ebd 100644 --- a/P3D/Pokemon/Items/Berry.vb +++ b/P3D/Pokemon/Items/Berry.vb @@ -39,6 +39,7 @@ Public Overrides ReadOnly Property ItemType As ItemTypes = ItemTypes.Plants Public Overrides ReadOnly Property SortValue As Integer Public Overrides ReadOnly Property Description As String + Public Overrides ReadOnly Property PluralName As String = Name & " Berries" Public Sub New(ByVal PhaseTime As Integer, ByVal Description As String, ByVal Size As String, ByVal Firmness As String, ByVal minBerries As Integer, ByVal maxBerries As Integer) SortValue = ID - 1999 diff --git a/P3D/Pokemon/Items/Fossils/FossilizedFish.vb b/P3D/Pokemon/Items/Fossils/FossilizedFish.vb index 2a87d7ce8..4940d88e9 100644 --- a/P3D/Pokemon/Items/Fossils/FossilizedFish.vb +++ b/P3D/Pokemon/Items/Fossils/FossilizedFish.vb @@ -6,6 +6,7 @@ Namespace Items.Standard Inherits FossilItem Public Overrides ReadOnly Property Description As String = "The fossil of an ancient Pokémon that once lived in the sea. What it looked like is a mystery." + Public Overrides ReadOnly Property PluralName As String = "Fossilized Fishes" Public Sub New() _textureRectangle = New Rectangle(48, 72, 24, 24) diff --git a/P3D/Pokemon/Items/Medicine/PPMax.vb b/P3D/Pokemon/Items/Medicine/PPMax.vb index 65e9975a5..91b0b3522 100644 --- a/P3D/Pokemon/Items/Medicine/PPMax.vb +++ b/P3D/Pokemon/Items/Medicine/PPMax.vb @@ -6,6 +6,7 @@ Namespace Items.Medicine Inherits MedicineItem Public Overrides ReadOnly Property Description As String = "A medicine that can optimally raise the maximum PP of a single move that has been learned by the target Pokémon." Public Overrides ReadOnly Property PokeDollarPrice As Integer = 9800 + Public Overrides ReadOnly Property PluralName As String = "PP Maxes" Public Sub New() _textureRectangle = New Rectangle(120, 240, 24, 24) diff --git a/P3D/Pokemon/Items/Medicine/PewterCrunchies.vb b/P3D/Pokemon/Items/Medicine/PewterCrunchies.vb index 8c9551403..c3bc3ac34 100644 --- a/P3D/Pokemon/Items/Medicine/PewterCrunchies.vb +++ b/P3D/Pokemon/Items/Medicine/PewterCrunchies.vb @@ -8,6 +8,7 @@ Namespace Items.Medicine Public Overrides ReadOnly Property IsHealingItem As Boolean = True Public Overrides ReadOnly Property Description As String = "Pewter City's famous crunchy snack. They can be used to heal all status conditions of a single Pokémon." Public Overrides ReadOnly Property PokeDollarPrice As Integer = 250 + Public Overrides ReadOnly Property PluralName As String = "Pewter Crunchies" Public Sub New() _textureRectangle = New Rectangle(96, 312, 24, 24) diff --git a/P3D/Pokemon/Items/Medicine/RareCandy.vb b/P3D/Pokemon/Items/Medicine/RareCandy.vb index 04ab4aa3f..effae2dc5 100644 --- a/P3D/Pokemon/Items/Medicine/RareCandy.vb +++ b/P3D/Pokemon/Items/Medicine/RareCandy.vb @@ -9,6 +9,7 @@ Namespace Items.Medicine Public Overrides ReadOnly Property PokeDollarPrice As Integer = 4800 Public Overrides ReadOnly Property BattlePointsPrice As Integer = 48 Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property PluralName As String = "Rare Candies" Public Sub New() _textureRectangle = New Rectangle(192, 24, 24, 24) diff --git a/P3D/Pokemon/Items/Medicine/SacredAsh.vb b/P3D/Pokemon/Items/Medicine/SacredAsh.vb index bc5df8eee..4b4fd4d42 100644 --- a/P3D/Pokemon/Items/Medicine/SacredAsh.vb +++ b/P3D/Pokemon/Items/Medicine/SacredAsh.vb @@ -7,6 +7,7 @@ Namespace Items.Medicine Public Overrides ReadOnly Property Description As String = "It revives all fainted Pokémon. In doing so, it also fully restores their HP." Public Overrides ReadOnly Property PokeDollarPrice As Integer = 200 + Public Overrides ReadOnly Property PluralName As String = "Sacred Ashes" Public Sub New() _textureRectangle = New Rectangle(24, 144, 24, 24) diff --git a/P3D/Pokemon/Items/Medicine/ShinyCandy.vb b/P3D/Pokemon/Items/Medicine/ShinyCandy.vb index dcd93c681..ac48b895d 100644 --- a/P3D/Pokemon/Items/Medicine/ShinyCandy.vb +++ b/P3D/Pokemon/Items/Medicine/ShinyCandy.vb @@ -9,6 +9,7 @@ Namespace Items.Medicine Public Overrides ReadOnly Property PokeDollarPrice As Integer = 4800 Public Overrides ReadOnly Property MaxStack As Integer = 1 Public Overrides ReadOnly Property CanBeHold As Boolean = False + Public Overrides ReadOnly Property PluralName As String = "Shiny Candies" Public Sub New() _textureRectangle = New Rectangle(96, 240, 24, 24) diff --git a/P3D/Pokemon/Items/Standard/BlackGlasses.vb b/P3D/Pokemon/Items/Standard/BlackGlasses.vb index 20bcf111a..e2465d3c1 100644 --- a/P3D/Pokemon/Items/Standard/BlackGlasses.vb +++ b/P3D/Pokemon/Items/Standard/BlackGlasses.vb @@ -9,6 +9,7 @@ Namespace Items.Standard Public Overrides ReadOnly Property PokeDollarPrice As Integer = 100 Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property PluralName As String = "Black Glasses" Public Sub New() _textureRectangle = New Rectangle(96, 96, 24, 24) diff --git a/P3D/Pokemon/Items/Standard/CellBattery.vb b/P3D/Pokemon/Items/Standard/CellBattery.vb index 55bcd7fdf..22caa7d45 100644 --- a/P3D/Pokemon/Items/Standard/CellBattery.vb +++ b/P3D/Pokemon/Items/Standard/CellBattery.vb @@ -9,6 +9,7 @@ Namespace Items.Standard Public Overrides ReadOnly Property PokeDollarPrice As Integer = 200 Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property PluralName As String = "Cell Batteries" Public Sub New() _textureRectangle = New Rectangle(192, 312, 24, 24) diff --git a/P3D/Pokemon/Items/Standard/ChoiceScarf.vb b/P3D/Pokemon/Items/Standard/ChoiceScarf.vb index 9e27843c0..0a7c9ed74 100644 --- a/P3D/Pokemon/Items/Standard/ChoiceScarf.vb +++ b/P3D/Pokemon/Items/Standard/ChoiceScarf.vb @@ -9,6 +9,7 @@ Namespace Items.Standard Public Overrides ReadOnly Property PokeDollarPrice As Integer = 4000 Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property PluralName As String = "Choice Scarves" Public Sub New() _textureRectangle = New Rectangle(24, 288, 24, 24) diff --git a/P3D/Pokemon/Items/Standard/ChoiceSpecs.vb b/P3D/Pokemon/Items/Standard/ChoiceSpecs.vb index 716c4c6cf..e05e81c84 100644 --- a/P3D/Pokemon/Items/Standard/ChoiceSpecs.vb +++ b/P3D/Pokemon/Items/Standard/ChoiceSpecs.vb @@ -9,6 +9,7 @@ Namespace Items.Standard Public Overrides ReadOnly Property PokeDollarPrice As Integer = 4000 Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property PluralName As String = Name Public Sub New() _textureRectangle = New Rectangle(48, 288, 24, 24) diff --git a/P3D/Pokemon/Items/Standard/DeepSeaTooth.vb b/P3D/Pokemon/Items/Standard/DeepSeaTooth.vb index 62e4b7574..42f2db614 100644 --- a/P3D/Pokemon/Items/Standard/DeepSeaTooth.vb +++ b/P3D/Pokemon/Items/Standard/DeepSeaTooth.vb @@ -10,6 +10,7 @@ Namespace Items.Standard Public Overrides ReadOnly Property FlingDamage As Integer = 90 Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property PluralName As String = "Deep Sea Teeth" Public Sub New() _textureRectangle = New Rectangle(312, 216, 24, 24) diff --git a/P3D/Pokemon/Items/Standard/GoldLeaf.vb b/P3D/Pokemon/Items/Standard/GoldLeaf.vb index 83a6d0332..3c0228018 100644 --- a/P3D/Pokemon/Items/Standard/GoldLeaf.vb +++ b/P3D/Pokemon/Items/Standard/GoldLeaf.vb @@ -9,7 +9,7 @@ Namespace Items.Standard Public Overrides ReadOnly Property PokeDollarPrice As Integer = 2000 Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False Public Overrides ReadOnly Property CanBeUsed As Boolean = False - + Public Overrides ReadOnly Property PluralName As String = "Gold Leaves" Public Sub New() _textureRectangle = New Rectangle(120, 72, 24, 24) End Sub diff --git a/P3D/Pokemon/Items/Standard/Leftovers.vb b/P3D/Pokemon/Items/Standard/Leftovers.vb index 8676a8681..ee0467fc7 100644 --- a/P3D/Pokemon/Items/Standard/Leftovers.vb +++ b/P3D/Pokemon/Items/Standard/Leftovers.vb @@ -11,6 +11,7 @@ Namespace Items.Standard Public Overrides ReadOnly Property FlingDamage As Integer = 10 Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property PluralName As String = Name Public Sub New() _textureRectangle = New Rectangle(456, 120, 24, 24) diff --git a/P3D/Pokemon/Items/Standard/PowerLens.vb b/P3D/Pokemon/Items/Standard/PowerLens.vb index 10f36fa54..2306c0f2e 100644 --- a/P3D/Pokemon/Items/Standard/PowerLens.vb +++ b/P3D/Pokemon/Items/Standard/PowerLens.vb @@ -9,6 +9,7 @@ Namespace Items.Standard Public Overrides ReadOnly Property PokeDollarPrice As Integer = 3000 Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property PluralName As String = "Power Lenses" Public Sub New() _textureRectangle = New Rectangle(192, 288, 24, 24) diff --git a/P3D/Pokemon/Items/Standard/ScopeLens.vb b/P3D/Pokemon/Items/Standard/ScopeLens.vb index 7d383db70..938530f94 100644 --- a/P3D/Pokemon/Items/Standard/ScopeLens.vb +++ b/P3D/Pokemon/Items/Standard/ScopeLens.vb @@ -10,6 +10,7 @@ Namespace Items.Standard Public Overrides ReadOnly Property BattlePointsPrice As Integer = 64 Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property PluralName As String = "Scope Lenses" Public Sub New() _textureRectangle = New Rectangle(384, 120, 24, 24) diff --git a/P3D/Pokemon/Items/Standard/SilkScarf.vb b/P3D/Pokemon/Items/Standard/SilkScarf.vb index a03393530..7d5083981 100644 --- a/P3D/Pokemon/Items/Standard/SilkScarf.vb +++ b/P3D/Pokemon/Items/Standard/SilkScarf.vb @@ -10,6 +10,7 @@ Namespace Items.Standard Public Overrides ReadOnly Property FlingDamage As Integer = 10 Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property PluralName As String = "Silk Scarves" Public Sub New() _textureRectangle = New Rectangle(264, 192, 24, 24) diff --git a/P3D/Pokemon/Items/Standard/SilverLeaf.vb b/P3D/Pokemon/Items/Standard/SilverLeaf.vb index 44bfbb311..f845b29ce 100644 --- a/P3D/Pokemon/Items/Standard/SilverLeaf.vb +++ b/P3D/Pokemon/Items/Standard/SilverLeaf.vb @@ -9,6 +9,7 @@ Namespace Items.Standard Public Overrides ReadOnly Property PokeDollarPrice As Integer = 1000 Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property PluralName As String = "Silver Leaves" Public Sub New() _textureRectangle = New Rectangle(288, 48, 24, 24) diff --git a/P3D/Pokemon/Items/Standard/WideLens.vb b/P3D/Pokemon/Items/Standard/WideLens.vb index d8e94054d..c367f4aed 100644 --- a/P3D/Pokemon/Items/Standard/WideLens.vb +++ b/P3D/Pokemon/Items/Standard/WideLens.vb @@ -10,6 +10,7 @@ Namespace Items.Standard Public Overrides ReadOnly Property FlingDamage As Integer = 10 Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property PluralName As String = "Wide Lenses" Public Sub New() _textureRectangle = New Rectangle(144, 216, 24, 24) diff --git a/P3D/Pokemon/Items/Standard/ZoomLens.vb b/P3D/Pokemon/Items/Standard/ZoomLens.vb index 9530177b8..22e8fd6f6 100644 --- a/P3D/Pokemon/Items/Standard/ZoomLens.vb +++ b/P3D/Pokemon/Items/Standard/ZoomLens.vb @@ -10,6 +10,7 @@ Namespace Items.Standard Public Overrides ReadOnly Property FlingDamage As Integer = 10 Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property PluralName As String = "Zoom Lenses" Public Sub New() _textureRectangle = New Rectangle(264, 144, 24, 24) diff --git a/P3D/Pokemon/Items/Vitamins/Carbos.vb b/P3D/Pokemon/Items/Vitamins/Carbos.vb index 6a60c0a72..2c4a11c61 100644 --- a/P3D/Pokemon/Items/Vitamins/Carbos.vb +++ b/P3D/Pokemon/Items/Vitamins/Carbos.vb @@ -6,6 +6,7 @@ Namespace Items.Vitamins Inherits VitaminItem Public Overrides ReadOnly Property Description As String = "A nutritious drink for Pokémon. When consumed, it raises the base Speed stat of a single Pokémon." + Public Overrides ReadOnly Property PluralName As String = "Carboses" Public Sub New() _textureRectangle = New Rectangle(120, 24, 24, 24) diff --git a/P3D/Pokemon/Items/XItems/XAccuracy.vb b/P3D/Pokemon/Items/XItems/XAccuracy.vb index 6ffb11acc..2f2bfbfa5 100644 --- a/P3D/Pokemon/Items/XItems/XAccuracy.vb +++ b/P3D/Pokemon/Items/XItems/XAccuracy.vb @@ -7,6 +7,7 @@ Namespace Items.XItems Public Overrides ReadOnly Property PokeDollarPrice As Integer = 950 Public Overrides ReadOnly Property Description As String = "An item that boosts the accuracy of a Pokémon during a battle. It wears off once the Pokémon is withdrawn." + Public Overrides ReadOnly Property PluralName As String = "X Accuracies" Public Sub New() _textureRectangle = New Rectangle(216, 24, 24, 24)