diff --git a/2.5DHero/2.5DHero/2.5DHero.vbproj b/2.5DHero/2.5DHero/2.5DHero.vbproj index 20fc822e8..b12f5f5ab 100644 --- a/2.5DHero/2.5DHero/2.5DHero.vbproj +++ b/2.5DHero/2.5DHero/2.5DHero.vbproj @@ -941,6 +941,7 @@ + @@ -948,6 +949,7 @@ + @@ -1037,9 +1039,9 @@ - + @@ -1049,6 +1051,7 @@ + @@ -1388,6 +1391,7 @@ + @@ -1508,6 +1512,7 @@ + diff --git a/2.5DHero/2.5DHero/Content/Data/items.dat b/2.5DHero/2.5DHero/Content/Data/items.dat deleted file mode 100644 index c98bddbaa..000000000 --- a/2.5DHero/2.5DHero/Content/Data/items.dat +++ /dev/null @@ -1 +0,0 @@ - {Id|Name|Price|ItemType|CatchMultiplier|SortValue|Description|TextureRectangle|TextureSource|ScriptBinding|CanBeUsed,CanBeTraded,CanBeHold,isBall} \ No newline at end of file diff --git a/2.5DHero/2.5DHero/Player/Player.vb b/2.5DHero/2.5DHero/Player/Player.vb index ab2f28c02..765945941 100644 --- a/2.5DHero/2.5DHero/Player/Player.vb +++ b/2.5DHero/2.5DHero/Player/Player.vb @@ -350,7 +350,6 @@ Public LastPokemonPosition As Vector3 = New Vector3(999, 999, 999) Public PokeFiles As New List(Of String) Public EarnedAchievements As New List(Of String) - Public FileItems As New List(Of Items.FileItem) Public PokegearModules As New List(Of Integer) Public PhoneContacts As New List(Of String) Public Mails As New List(Of Items.MailItem.MailData) @@ -510,7 +509,6 @@ GameModeManager.SetGameModePointer(GameMode) End If - GameModeManager.LoadFileItems() BattleSystem.GameModeAttackLoader.Load() If IsGameJoltSave = True Then @@ -1832,7 +1830,6 @@ Badges.Clear() PokeFiles.Clear() EarnedAchievements.Clear() - FileItems.Clear() PokegearModules.Clear() PhoneContacts.Clear() Mails.Clear() diff --git a/2.5DHero/2.5DHero/Player/PlayerInventory.vb b/2.5DHero/2.5DHero/Player/PlayerInventory.vb index a697062dd..3464e823e 100644 --- a/2.5DHero/2.5DHero/Player/PlayerInventory.vb +++ b/2.5DHero/2.5DHero/Player/PlayerInventory.vb @@ -43,21 +43,21 @@ Public Class PlayerInventory ''' Public Function GetItemPocketChar(ByVal Item As Item) As String Select Case Item.ItemType - Case Item.ItemTypes.Standard + Case Items.ItemTypes.Standard Return ChrW(128) - Case Item.ItemTypes.BattleItems + Case Items.ItemTypes.BattleItems Return ChrW(135) - Case Item.ItemTypes.KeyItems + Case Items.ItemTypes.KeyItems Return ChrW(129) - Case Item.ItemTypes.Machines + Case Items.ItemTypes.Machines Return ChrW(130) - Case Item.ItemTypes.Mail + Case Items.ItemTypes.Mail Return ChrW(131) - Case Item.ItemTypes.Medicine + Case Items.ItemTypes.Medicine Return ChrW(132) - Case Item.ItemTypes.Plants + Case Items.ItemTypes.Plants Return ChrW(133) - Case Item.ItemTypes.Pokéballs + Case Items.ItemTypes.Pokéballs Return ChrW(134) End Select diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/Apricorn.vb b/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/Apricorn.vb new file mode 100644 index 000000000..e87a94005 --- /dev/null +++ b/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/Apricorn.vb @@ -0,0 +1,13 @@ +Namespace Items.Apricorns + + Public MustInherit Class Apricorn + + Inherits Item + + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 100 + + End Class + +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/BlkApricorn.vb b/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/BlkApricorn.vb index c95680d88..697dcb654 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/BlkApricorn.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/BlkApricorn.vb @@ -3,13 +3,12 @@ Namespace Items.Apricorns Public Class BlkApricorn - Inherits Item + Inherits Apricorn + + Public Overrides ReadOnly Property Description As String = "A black Apricorn It has an indescribable scent." Public Sub New() - MyBase.New("Black Apricorn", 100, ItemTypes.Plants, 99, 1, 71, New Rectangle(48, 96, 24, 24), "A black Apricorn It has an indescribable scent.") - - Me._canBeUsedInBattle = False - Me._canBeUsed = False + _textureRectangle = New Rectangle(48, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/BluApricorn.vb b/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/BluApricorn.vb index 4b5fb3c0b..63297e625 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/BluApricorn.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/BluApricorn.vb @@ -3,13 +3,12 @@ Namespace Items.Apricorns Public Class BluApricorn - Inherits Item + Inherits Apricorn + + Public Overrides ReadOnly Property Description As String = "A blue Apricorn. It smells a bit like grass." Public Sub New() - MyBase.New("Blue Apricorn", 100, ItemTypes.Plants, 89, 1, 70, New Rectangle(336, 72, 24, 24), "A blue Apricorn. It smells a bit like grass.") - - Me._canBeUsedInBattle = False - Me._canBeUsed = False + _textureRectangle = New Rectangle(336, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/GrnApricorn.vb b/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/GrnApricorn.vb index ab54761e4..f1f0d966e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/GrnApricorn.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/GrnApricorn.vb @@ -3,13 +3,12 @@ Namespace Items.Apricorns Public Class GrnApricorn - Inherits Item + Inherits Apricorn + + Public Overrides ReadOnly Property Description As String = "A green Apricorn. It has a mysterious, aromatic scent." Public Sub New() - MyBase.New("Green Apricorn", 100, ItemTypes.Plants, 93, 1, 69, New Rectangle(408, 72, 24, 24), "A green Apricorn. It has a mysterious, aromatic scent.") - - Me._canBeUsedInBattle = False - Me._canBeUsed = False + _textureRectangle = New Rectangle(408, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/PnkApricorn.vb b/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/PnkApricorn.vb index 44e996ded..e10d14122 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/PnkApricorn.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/PnkApricorn.vb @@ -3,13 +3,12 @@ Namespace Items.Apricorns Public Class PnkApricorn - Inherits Item + Inherits Apricorn + + Public Overrides ReadOnly Property Description As String = "A pink Apricorn. It has a nice, sweet scent." Public Sub New() - MyBase.New("Pink Apricorn", 100, ItemTypes.Plants, 101, 1, 68, New Rectangle(72, 96, 24, 24), "A pink Apricorn. It has a nice, sweet scent.") - - Me._canBeUsedInBattle = False - Me._canBeUsed = False + _textureRectangle = New Rectangle(72, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/RedApricorn.vb b/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/RedApricorn.vb index b7e86e620..40cc1f718 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/RedApricorn.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/RedApricorn.vb @@ -3,13 +3,12 @@ Namespace Items.Apricorns Public Class RedApricorn - Inherits Item + Inherits Apricorn + + Public Overrides ReadOnly Property Description As String = "A red Apricorn. It assails your nostrils." Public Sub New() - MyBase.New("Red Apricorn", 100, ItemTypes.Plants, 85, 1, 67, New Rectangle(240, 72, 24, 24), "A red Apricorn. It assails your nostrils.") - - Me._canBeUsedInBattle = False - Me._canBeUsed = False + _textureRectangle = New Rectangle(240, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/WhtApricorn.vb b/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/WhtApricorn.vb index 399efc130..04be6bd9f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/WhtApricorn.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/WhtApricorn.vb @@ -3,13 +3,12 @@ Namespace Items.Apricorns Public Class WhtApricorn - Inherits Item + Inherits Apricorn + + Public Overrides ReadOnly Property Description As String = "A white Apricorn. It doesn't smell like anything." Public Sub New() - MyBase.New("White Apricorn", 100, ItemTypes.Plants, 97, 1, 66, New Rectangle(0, 96, 24, 24), "A white Apricorn. It doesn't smell like anything.") - - Me._canBeUsedInBattle = False - Me._canBeUsed = False + _textureRectangle = New Rectangle(0, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/YlwApricorn.vb b/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/YlwApricorn.vb index 6be897962..f9435106b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/YlwApricorn.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Apricorns/YlwApricorn.vb @@ -3,13 +3,12 @@ Namespace Items.Apricorns Public Class YlwApricorn - Inherits Item + Inherits Apricorn + + Public Overrides ReadOnly Property Description As String = "A yellow Apricorn. It has an invigorating scent." Public Sub New() - MyBase.New("Yellow Apricorn", 100, ItemTypes.Plants, 92, 1, 65, New Rectangle(384, 72, 24, 24), "A yellow Apricorn. It has an invigorating scent.") - - Me._canBeUsedInBattle = False - Me._canBeUsed = False + _textureRectangle = New Rectangle(384, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/BallItem.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/BallItem.vb new file mode 100644 index 000000000..9b8478244 --- /dev/null +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/BallItem.vb @@ -0,0 +1,13 @@ +Namespace Items.Balls + + Public MustInherit Class BallItem + + Inherits Item + + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property ItemType As ItemTypes = ItemTypes.Pokéballs + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 1000 + + End Class + +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/CherishBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/CherishBall.vb index 7722dfcc5..7baac6921 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/CherishBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/CherishBall.vb @@ -3,13 +3,12 @@ Namespace Items.Balls Public Class CherishBall - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "A quite rare Pokéball that has been specially crafted to commemorate an occasion of some sort." Public Sub New() - MyBase.New("Cherish Ball", 1000, ItemTypes.Pokéballs, 45, 1, 0, New Rectangle(216, 192, 24, 24), "A quite rare Pokéball that has been specially crafted to commemorate an occasion of some sort.") - - Me._isBall = True - Me._canBeUsed = False + _textureRectangle = New Rectangle(216, 192, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/DiveBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/DiveBall.vb index 73b316576..d5e9baa27 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/DiveBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/DiveBall.vb @@ -3,13 +3,12 @@ Namespace Items.Balls Public Class DiveBall - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "A somewhat different Pokéball that works especially well when catching Pokémon that live underwater." Public Sub New() - MyBase.New("Dive Ball", 1000, ItemTypes.Pokéballs, 79, 1, 0, New Rectangle(288, 144, 24, 24), "A somewhat different Pokéball that works especially well when catching Pokémon that live underwater.") - - Me._isBall = True - Me._canBeUsed = False + _textureRectangle = New Rectangle(288, 144, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/DuskBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/DuskBall.vb index c608308f8..63307dbd6 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/DuskBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/DuskBall.vb @@ -3,13 +3,12 @@ Namespace Items.Balls Public Class DuskBall - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "A somewhat different Pokéball that makes it easier to catch wild Pokémon at night or in dark places like caves." Public Sub New() - MyBase.New("Dusk Ball", 1000, ItemTypes.Pokéballs, 158, 1, 0, New Rectangle(360, 216, 24, 24), "A somewhat different Pokéball that makes it easier to catch wild Pokémon at night or in dark places like caves.") - - Me._isBall = True - Me._canBeUsed = False + _textureRectangle = New Rectangle(360, 216, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/FastBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/FastBall.vb index 09c1087f0..17e201150 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/FastBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/FastBall.vb @@ -3,13 +3,13 @@ Namespace Items.Balls Public Class FastBall - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "A Pokéball that makes it easier to catch Pokémon which are quick to run away." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 150 Public Sub New() - MyBase.New("Fast Ball", 150, ItemTypes.Pokéballs, 161, 1, 10, New Rectangle(144, 144, 24, 24), "A Pokéball that makes it easier to catch Pokémon which are quick to run away.") - - Me._isBall = True - Me._canBeUsed = False + _textureRectangle = New Rectangle(144, 144, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/FriendBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/FriendBall.vb index b1d2dd51f..88e846d14 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/FriendBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/FriendBall.vb @@ -3,13 +3,13 @@ Namespace Items.Balls Public Class FriendBall - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "A Pokéball that makes caught Pokémon more friendly." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 150 Public Sub New() - MyBase.New("Friend Ball", 150, ItemTypes.Pokéballs, 164, 1.0F, 1, New Rectangle(192, 144, 24, 24), "A Pokéball that makes caught Pokémon more friendly.") - - Me._isBall = True - Me._canBeUsed = False + _textureRectangle = New Rectangle(192, 144, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/GreatBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/GreatBall.vb index 7046459c4..5af882c41 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/GreatBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/GreatBall.vb @@ -3,13 +3,14 @@ Namespace Items.Balls Public Class GreatBall - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "A good, high-performance Pokéball that provides a higher Pokémon catch rate than a standard Pokéball can." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 600 + Public Overrides ReadOnly Property CatchMultiplier As Single = 1.5F Public Sub New() - MyBase.New("Great Ball", 600, ItemTypes.Pokéballs, 4, 1.5F, 1, New Rectangle(72, 0, 24, 24), "A good, high-performance Pokéball that provides a higher Pokémon catch rate than a standard Pokéball can.") - - Me._isBall = True - Me._canBeUsed = False + _textureRectangle = New Rectangle(72, 0, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/HealBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/HealBall.vb index 4db48e7c2..ed7b70a4e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/HealBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/HealBall.vb @@ -3,13 +3,13 @@ Namespace Items.Balls Public Class HealBall - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 300 + Public Overrides ReadOnly Property Description As String = "A remedial Pokéball that restores the HP of a Pokémon caught with it and eliminiates any status conditions. " Public Sub New() - MyBase.New("Heal Ball", 300, ItemTypes.Pokéballs, 186, 1, 0, New Rectangle(456, 216, 24, 24), "A remedial Pokéball that restores the HP of a Pokémon caught with it and eliminiates any status conditions. ") - - Me._isBall = True - Me._canBeUsed = False + _textureRectangle = New Rectangle(456, 216, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/HeavyBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/HeavyBall.vb index dc1fd3e3d..bc6139580 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/HeavyBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/HeavyBall.vb @@ -3,13 +3,13 @@ Namespace Items.Balls Public Class HeavyBall - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "A Pokéball for catching very heavy Pokémon." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 150 Public Sub New() - MyBase.New("Heavy Ball", 150, ItemTypes.Pokéballs, 157, 1.0F, 1, New Rectangle(48, 144, 24, 24), "A Pokéball for catching very heavy Pokémon. ") - - Me._isBall = True - Me._canBeUsed = False + _textureRectangle = New Rectangle(48, 144, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/LevelBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/LevelBall.vb index 4b67dd64a..d87a1d3ba 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/LevelBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/LevelBall.vb @@ -3,13 +3,13 @@ Namespace Items.Balls Public Class LevelBall - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "A Pokéball for catching Pokémon that are a lower level than your own. " + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 150 Public Sub New() - MyBase.New("Level Ball", 150, ItemTypes.Pokéballs, 159, 1, 4, New Rectangle(96, 144, 24, 24), "A Pokéball for catching Pokémon that are a lower level than your own. ") - - Me._isBall = True - Me._canBeUsed = False + _textureRectangle = New Rectangle(96, 144, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/LoveBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/LoveBall.vb index e155a9f7e..04009527f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/LoveBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/LoveBall.vb @@ -3,13 +3,13 @@ Namespace Items.Balls Public Class LoveBall - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "Pokéball for catching Pokémon that are the opposite gender of your Pokémon." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 150 Public Sub New() - MyBase.New("Love Ball", 150, ItemTypes.Pokéballs, 166, 1, 8, New Rectangle(240, 144, 24, 24), "Pokéball for catching Pokémon that are the opposite gender of your Pokémon.") - - Me._isBall = True - Me._canBeUsed = False + _textureRectangle = New Rectangle(240, 144, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/LureBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/LureBall.vb index 45d22a253..75badcbea 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/LureBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/LureBall.vb @@ -3,13 +3,13 @@ Namespace Items.Balls Public Class LureBall - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "A Pokéball for catching Pokémon hooked by a Rod when fishing." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 150 Public Sub New() - MyBase.New("Lure Ball", 150, ItemTypes.Pokéballs, 160, 1, 5, New Rectangle(120, 144, 24, 24), "A Pokéball for catching Pokémon hooked by a Rod when fishing. ") - - Me._isBall = True - Me._canBeUsed = False + _textureRectangle = New Rectangle(120, 144, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/LuxuryBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/LuxuryBall.vb index 03609d512..3caf0b36d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/LuxuryBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/LuxuryBall.vb @@ -3,13 +3,12 @@ Namespace Items.Balls Public Class LuxuryBall - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "A particularly comfortable Pokéball that makes a wild Pokémon quickly grow friendlier after being caught." Public Sub New() - MyBase.New("Luxury Ball", 1000, ItemTypes.Pokéballs, 174, 1, 0, New Rectangle(432, 216, 24, 24), "A particularly comfortable Pokéball that makes a wild Pokémon quickly grow friendlier after being caught.") - - Me._isBall = True - Me._canBeUsed = False + _textureRectangle = New Rectangle(432, 216, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/Masterball.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/Masterball.vb index ac3c791e3..d4c496ca3 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/Masterball.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/Masterball.vb @@ -3,14 +3,14 @@ Namespace Items.Balls Public Class Masterball - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "The best Pokéball with the ultimate level of performance. With it, you will catch any wild Pokémon without fail." + Public Overrides ReadOnly Property CanBeTraded As Boolean = False + Public Overrides ReadOnly Property CatchMultiplier As Single = 255.0F Public Sub New() - MyBase.New("Masterball", 0, ItemTypes.Pokéballs, 1, 255, 3, New Rectangle(0, 0, 24, 24), "The best Pokéball with the ultimate level of performance. With it, you will catch any wild Pokémon without fail.") - - Me._isBall = True - Me._canBeUsed = False - Me._canBeTraded = False + _textureRectangle = New Rectangle(0, 0, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/MoonBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/MoonBall.vb index f17dc6f49..c3026132f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/MoonBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/MoonBall.vb @@ -3,13 +3,13 @@ Namespace Items.Balls Public Class MoonBall - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "A Pokéball for catching Pokémon that evolve using the Moon Stone." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 150 Public Sub New() - MyBase.New("Moon Ball", 150, ItemTypes.Pokéballs, 165, 1, 6, New Rectangle(216, 144, 24, 24), "A Pokéball for catching Pokémon that evolve using the Moon Stone. ") - - Me._isBall = True - Me._canBeUsed = False + _textureRectangle = New Rectangle(216, 144, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/NestBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/NestBall.vb index 48f56a583..dbc09f796 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/NestBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/NestBall.vb @@ -3,13 +3,12 @@ Namespace Items.Balls Public Class NestBall - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "A somewhat different Pokéball that becomes more effective the lower the level of the wild Pokémon." Public Sub New() - MyBase.New("Nest Ball", 1000, ItemTypes.Pokéballs, 188, 1, 0, New Rectangle(24, 240, 24, 24), "A somewhat different Pokéball that becomes more effective the lower the level of the wild Pokémon.") - - Me._isBall = True - Me._canBeUsed = False + _textureRectangle = New Rectangle(24, 240, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/NetBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/NetBall.vb index 95d009ec7..fa4f12423 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/NetBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/NetBall.vb @@ -3,13 +3,12 @@ Namespace Items.Balls Public Class NetBall - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "A somewhat different Pokéball that is more effective when attempting to catch Water- or Bug-type Pokémon." Public Sub New() - MyBase.New("Net Ball", 1000, ItemTypes.Pokéballs, 80, 1, 0, New Rectangle(48, 168, 24, 24), "A somewhat different Pokéball that is more effective when attempting to catch Water- or Bug-type Pokémon.") - - Me._isBall = True - Me._canBeUsed = False + _textureRectangle = New Rectangle(48, 168, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/Pokeball.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/Pokeball.vb index 79681e20b..2378e3720 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/Pokeball.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/Pokeball.vb @@ -3,13 +3,13 @@ Namespace Items.Balls Public Class Pokeball - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "An item for catching Pokémon." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 200 Public Sub New() - MyBase.New("Pokéball", 200, ItemTypes.Pokéballs, 5, 1, 0, New Rectangle(96, 0, 24, 24), "An item for catching Pokémon.") - - Me._isBall = True - Me._canBeUsed = False + _textureRectangle = New Rectangle(96, 0, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/PremierBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/PremierBall.vb index f84f6e82d..cf390b702 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/PremierBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/PremierBall.vb @@ -3,13 +3,13 @@ Namespace Items.Balls Public Class PremierBall - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "A somewhat rare Pokéball that was made as a commemorative item used to celebrate an event of some sort." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 200 Public Sub New() - MyBase.New("Premier Ball", 200, ItemTypes.Pokéballs, 3, 1, 0, New Rectangle(216, 216, 24, 24), "A somewhat rare Pokéball that was made as a commemorative item used to celebrate an event of some sort.") - - Me._isBall = True - Me._canBeUsed = False + _textureRectangle = New Rectangle(216, 216, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/QuickBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/QuickBall.vb index bd7bbef7c..1fe72566b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/QuickBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/QuickBall.vb @@ -3,13 +3,12 @@ Namespace Items.Balls Public Class QuickBall - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "A somewhat different Pokéball that has a more successful catch rate if used at the start of a wild encounter." Public Sub New() - MyBase.New("Quick Ball", 1000, ItemTypes.Pokéballs, 129, 1, 0, New Rectangle(120, 168, 24, 24), "A somewhat different Pokéball that has a more successful catch rate if used at the start of a wild encounter.") - - Me._isBall = True - Me._canBeUsed = False + _textureRectangle = New Rectangle(120, 168, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/RepeatBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/RepeatBall.vb index 7256827be..2ac87084d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/RepeatBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/RepeatBall.vb @@ -3,13 +3,12 @@ Namespace Items.Balls Public Class RepeatBall - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "A somewhat different Pokéball that works especially well on Pokémon species that have been caught before." Public Sub New() - MyBase.New("Repeat Ball", 1000, ItemTypes.Pokéballs, 168, 1, 0, New Rectangle(384, 216, 24, 24), "A somewhat different Pokéball that works especially well on Pokémon species that have been caught before.") - - Me._isBall = True - Me._canBeUsed = False + _textureRectangle = New Rectangle(384, 216, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/SafariBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/SafariBall.vb index ccf37042a..23fe1845d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/SafariBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/SafariBall.vb @@ -3,14 +3,14 @@ Namespace Items.Balls Public Class SafariBall - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "A special Pokéball that is used only in the Great Marsh and the Safari Zone. It is decorated in a camouflage pattern." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 200 + Public Overrides ReadOnly Property CatchMultiplier As Single = 1.5F Public Sub New() - MyBase.New("Safari Ball", 200, ItemTypes.Pokéballs, 181, 1.5F, 0, New Rectangle(72, 144, 24, 24), "A special Pokéball that is used only in the Great Marsh and the Safari Zone. It is decorated in a camouflage pattern.") - - Me._isBall = True - Me._canBeUsed = False - Me._canBeTraded = False + _textureRectangle = New Rectangle(72, 144, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/SportBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/SportBall.vb index 0333bd0d1..302ff57f8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/SportBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/SportBall.vb @@ -3,13 +3,13 @@ Namespace Items.Balls Public Class SportBall - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "A special Pokéball for the Bug-Catching Contest." + Public Overrides ReadOnly Property CatchMultiplier As Single = 1.5F Public Sub New() - MyBase.New("Sport Ball", 1000, ItemTypes.Pokéballs, 177, 1.5F, 0, New Rectangle(384, 144, 24, 24), "A special Pokéball for the Bug-Catching Contest.") - - Me._isBall = True - Me._canBeUsed = False + _textureRectangle = New Rectangle(384, 144, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/TimerBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/TimerBall.vb index 8801c5997..c566e60cc 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/TimerBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/TimerBall.vb @@ -3,13 +3,13 @@ Namespace Items.Balls Public Class TimerBall - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "A somewhat different Pokéball that becomes progressively more effective the more turns that are taken in battle." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 150 Public Sub New() - MyBase.New("Timer Ball", 1000, ItemTypes.Pokéballs, 150, 1, 0, New Rectangle(336, 216, 24, 24), "A somewhat different Pokéball that becomes progressively more effective the more turns that are taken in battle.") - - Me._isBall = True - Me._canBeUsed = False + _textureRectangle = New Rectangle(336, 216, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Balls/UltraBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Balls/UltraBall.vb index cbe31eec5..165db0dd8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Balls/UltraBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Balls/UltraBall.vb @@ -3,13 +3,14 @@ Namespace Items.Balls Public Class UltraBall - Inherits Item + Inherits BallItem + + Public Overrides ReadOnly Property Description As String = "An ultra-high performance Pokéball that provides a higher success rate for catching Pokémon than a Great Ball." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 1200 + Public Overrides ReadOnly Property CatchMultiplier As Single = 2.0F Public Sub New() - MyBase.New("Ultra Ball", 1200, ItemTypes.Pokéballs, 2, 2, 2, New Rectangle(24, 0, 24, 24), "An ultra-high performance Pokéball that provides a higher success rate for catching Pokémon than a Great Ball.") - - Me._isBall = True - Me._canBeUsed = False + _textureRectangle = New Rectangle(24, 0, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/AguavBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/AguavBerry.vb index b3d9eac7e..5acb75555 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/AguavBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/AguavBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2013, "Aguav", 21600, "If held by a Pok�mon, it restores the user's HP in a pinch, but it will cause confusion if the user hates the taste.", "6.4cm", "Super Hard", 2, 3) + MyBase.New(21600, "If held by a Pokémon, it restores the user's HP in a pinch, but it will cause confusion if the user hates the taste.", "6.4cm", "Super Hard", 2, 3) Me.Spicy = 0 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/ApicotBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/ApicotBerry.vb index cab9fbb45..88c2c297d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/ApicotBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/ApicotBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2056, "Apicot", 86400, "A Berry to be consumed by Pok�mon. If a Pok�mon holds one, its Sp. Def stat will increase when it's in a pinch.", "7.6cm", "Very Hard", 1, 2) + MyBase.New(86400, "A Berry to be consumed by Pokémon. If a Pokémon holds one, its Sp. Def stat will increase when it's in a pinch.", "7.6cm", "Very Hard", 1, 2) Me.Spicy = 10 Me.Dry = 30 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/AspearBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/AspearBerry.vb index f84eab7d7..6dca55bab 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/AspearBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/AspearBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2004, "Aspear", 10800, "A Berry to be consumed by Pokémon. If a Pokémon holds one, it can recover from being frozen on its own in battle.", "5.0cm", "Super Hard", 2, 3) + MyBase.New(10800, "A Berry to be consumed by Pokémon. If a Pokémon holds one, it can recover from being frozen on its own in battle.", "5.0cm", "Super Hard", 2, 3) Me.Spicy = 0 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/BabiriBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/BabiriBerry.vb index 36e6ef6e7..cee4f3797 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/BabiriBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/BabiriBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2050, "Babiri", 64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Steel-type attack.", "26.5cm", "Super Hard", 1, 5) + MyBase.New(64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Steel-type attack.", "26.5cm", "Super Hard", 1, 5) Me.Spicy = 25 Me.Dry = 10 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/BelueBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/BelueBerry.vb index a700de8fa..86fa10300 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/BelueBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/BelueBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2034, "Belue", 64800, "Pokéblock ingredient. Plant in loamy soil to grow Belue.", "11.8cm", "Very Soft", 1, 2) + MyBase.New(64800, "Pokéblock ingredient. Plant in loamy soil to grow Belue.", "11.8cm", "Very Soft", 1, 2) Me.Spicy = 10 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/BlukBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/BlukBerry.vb index 1d2d36bc2..46a194c0d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/BlukBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/BlukBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2016, "Bluk", 3600, "Pokéblock ingredient. Plant in loamy soil to grow Bluk.", "10.8cm", "Soft", 3, 6) + MyBase.New(3600, "Pokéblock ingredient. Plant in loamy soil to grow Bluk.", "10.8cm", "Soft", 3, 6) Me.Spicy = 0 Me.Dry = 10 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/ChartiBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/ChartiBerry.vb index 458e6adcf..4416d7171 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/ChartiBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/ChartiBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2046, "Charti", 64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Rock-type attack.", "2.8cm", "Very Soft", 1, 5) + MyBase.New(64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Rock-type attack.", "2.8cm", "Very Soft", 1, 5) Me.Spicy = 10 Me.Dry = 20 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/CheriBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/CheriBerry.vb index a80452015..e7a45066b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/CheriBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/CheriBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2000, "Cheri", 10800, "A Berry to be consumed by Pok�mon. If a Pok�mon holds one, it can recover from paralysis on its own in battle.", "2.0cm", "Soft", 2, 3) + MyBase.New(10800, "A Berry to be consumed by Pokémon. If a Pokémon holds one, it can recover from paralysis on its own in battle.", "2.0cm", "Soft", 2, 3) Me.Spicy = 10 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/ChestoBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/ChestoBerry.vb index 921925708..22c8afdb7 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/ChestoBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/ChestoBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2001, "Chesto", 10800, "A Berry to be consumed by Pokémon. If a Pokémon holds one, it can recover from sleep on its own in battle.", "8.0cm", "Super Hard", 2, 3) + MyBase.New(10800, "A Berry to be consumed by Pokémon. If a Pokémon holds one, it can recover from sleep on its own in battle.", "8.0cm", "Super Hard", 2, 3) Me.Spicy = 0 Me.Dry = 10 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/ChilanBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/ChilanBerry.vb index c8b634146..c10023297 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/ChilanBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/ChilanBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2051, "Chilian", 64800, "If held by a Pokémon, this Berry will lessen the damage taken from one Normal-type attack.", "3.3cm", "Very Soft", 1, 5) + MyBase.New(64800, "If held by a Pokémon, this Berry will lessen the damage taken from one Normal-type attack.", "3.3cm", "Very Soft", 1, 5) Me.Spicy = 0 Me.Dry = 25 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/ChopleBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/ChopleBerry.vb index e8e917133..ead179959 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/ChopleBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/ChopleBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2040, "Chople", 64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Fighting-type attack.", "7.7cm", "Soft", 1, 5) + MyBase.New(64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Fighting-type attack.", "7.7cm", "Soft", 1, 5) Me.Spicy = 15 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/CobaBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/CobaBerry.vb index ebc1b66a8..aa41e0e70 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/CobaBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/CobaBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2043, "Coba", 64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Flying-type attack.", "27.7cm", "Very Hard", 1, 5) + MyBase.New(64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Flying-type attack.", "27.7cm", "Very Hard", 1, 5) Me.Spicy = 0 Me.Dry = 10 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/ColburBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/ColburBerry.vb index 631d32379..96a0627cd 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/ColburBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/ColburBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2049, "Colbur", 64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Dark-type attack.", "3.8cm", "Super Hard", 1, 5) + MyBase.New(64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Dark-type attack.", "3.8cm", "Super Hard", 1, 5) Me.Spicy = 0 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/CornnBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/CornnBerry.vb index 13a52fa05..f146b9123 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/CornnBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/CornnBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2026, "Cornn", 21600, "Pokéblock ingredient. Plant in loamy soil to grow Cornn.", "7.5cm", "Hard", 2, 4) + MyBase.New(21600, "Pokéblock ingredient. Plant in loamy soil to grow Cornn.", "7.5cm", "Hard", 2, 4) Me.Spicy = 0 Me.Dry = 20 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/CustapBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/CustapBerry.vb index a105341f0..1fc5d8f5a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/CustapBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/CustapBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2061, "Custap", 86400, "If held by a Pokémon, it gets to move first just once in a pinch.", "26.7cm", "Super Hard", 1, 5) + MyBase.New(86400, "If held by a Pokémon, it gets to move first just once in a pinch.", "26.7cm", "Super Hard", 1, 5) Me.Spicy = 0 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/DurinBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/DurinBerry.vb index 5a042f4d8..33c82c3fd 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/DurinBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/DurinBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2033, "Durin", 64800, "Pokéblock ingredient. Plant in loamy soil to grow Durin.", "28.0m", "Hard", 1, 2) + MyBase.New(64800, "Pokéblock ingredient. Plant in loamy soil to grow Durin.", "28.0m", "Hard", 1, 2) Me.Spicy = 0 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/EnigmaBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/EnigmaBerry.vb index d2471982a..aff44ef4d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/EnigmaBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/EnigmaBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2059, "Enigma", 86400, "A Berry to be consumed by Pokémon. If a Pokémon holds one, being hit by a supereffective attack will restore its HP.", "15.5cm", "Hard", 1, 2) + MyBase.New(86400, "A Berry to be consumed by Pokémon. If a Pokémon holds one, being hit by a supereffective attack will restore its HP.", "15.5cm", "Hard", 1, 2) Me.Spicy = 40 Me.Dry = 10 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/FigyBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/FigyBerry.vb index 1e706fa1b..9a828096a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/FigyBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/FigyBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2010, "Figy", 18000, "If held by a Pok�mon, it restores the user's HP in a pinch, but it will cause confusion if the user hates the taste.", "10.0cm", "Soft", 2, 3) + MyBase.New(18000, "If held by a Pokémon, it restores the user's HP in a pinch, but it will cause confusion if the user hates the taste.", "10.0cm", "Soft", 2, 3) Me.Spicy = 15 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/GanlonBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/GanlonBerry.vb index 8ad1af726..35029a0e4 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/GanlonBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/GanlonBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2053, "Ganlon", 86400, "A Berry to be consumed by Pok�mon. If a Pok�mon holds one, its Defense stat will increase when it's in a pinch.", "3.3cm", "Very Hard", 1, 2) + MyBase.New(86400, "A Berry to be consumed by Pokémon. If a Pokémon holds one, its Defense stat will increase when it's in a pinch.", "3.3cm", "Very Hard", 1, 2) Me.Spicy = 0 Me.Dry = 30 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/GrepaBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/GrepaBerry.vb index 8520989f1..9714387b0 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/GrepaBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/GrepaBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2024, "Grepa", 10800, "A Berry to be consumed by Pokémon. Using it on a Pokémon makes it more friendly but lowers its base Sp. Def.", "14.9cm", "Soft", 2, 6) + MyBase.New(10800, "A Berry to be consumed by Pokémon. Using it on a Pokémon makes it more friendly but lowers its base Sp. Def.", "14.9cm", "Soft", 2, 6) Me.Spicy = 0 Me.Dry = 10 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/HabanBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/HabanBerry.vb index 4cbd4822c..2d186ccbe 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/HabanBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/HabanBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2048, "Haban", 64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Dragon-type attack.", "2.3cm", "Soft", 1, 5) + MyBase.New(64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Dragon-type attack.", "2.3cm", "Soft", 1, 5) Me.Spicy = 0 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/HondewBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/HondewBerry.vb index 0a7f6379e..f61db8af7 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/HondewBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/HondewBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2023, "Hondew", 10800, "A Berry to be consumed by Pokémon. Using it on a Pokémon makes it more friendly but lowers its base Sp. Atk.", "16.2cm", "Hard", 2, 6) + MyBase.New(10800, "A Berry to be consumed by Pokémon. Using it on a Pokémon makes it more friendly but lowers its base Sp. Atk.", "16.2cm", "Hard", 2, 6) Me.Spicy = 10 Me.Dry = 10 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/IapapaBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/IapapaBerry.vb index 1841ba160..d3b75821b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/IapapaBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/IapapaBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2014, "Iapapa", 21600, "If held by a Pok�mon, it restores the user's HP in a pinch, but it will cause confusion if the user hates the taste.", "22.3cm", "Soft", 2, 3) + MyBase.New(21600, "If held by a Pokémon, it restores the user's HP in a pinch, but it will cause confusion if the user hates the taste.", "22.3cm", "Soft", 2, 3) Me.Spicy = 0 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/JabocaBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/JabocaBerry.vb index abe107583..bb4d4c692 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/JabocaBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/JabocaBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2062, "Jaboca", 86400, "If held by a Pokémon, and if a foe's physical attack lands, the foe also takes damage.", "3.3cm", "Soft", 1, 5) + MyBase.New(86400, "If held by a Pokémon, and if a foe's physical attack lands, the foe also takes damage.", "3.3cm", "Soft", 1, 5) Me.Spicy = 0 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/KasibBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/KasibBerry.vb index 20ad18e60..80df18814 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/KasibBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/KasibBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2047, "Kasib", 64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Ghost-type attack.", "14.4cm", "Hard", 1, 5) + MyBase.New(64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Ghost-type attack.", "14.4cm", "Hard", 1, 5) Me.Spicy = 0 Me.Dry = 10 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/KebiaBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/KebiaBerry.vb index 78ee422c4..4a6cbbc2e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/KebiaBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/KebiaBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2041, "Kebia", 64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Poison-type attack.", "8.9cm", "Hard", 1, 5) + MyBase.New(64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Poison-type attack.", "8.9cm", "Hard", 1, 5) Me.Spicy = 0 Me.Dry = 15 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/KelpsyBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/KelpsyBerry.vb index 8e29a28b9..54ed88b9b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/KelpsyBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/KelpsyBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2021, "Kelpsy", 10800, "A Berry to be consumed by Pokémon. Using it on a Pokémon makes it more friendly but lowers its base Attack.", "38.1cm", "Hard", 2, 6) + MyBase.New(10800, "A Berry to be consumed by Pokémon. Using it on a Pokémon makes it more friendly but lowers its base Attack.", "38.1cm", "Hard", 2, 6) Me.Spicy = 0 Me.Dry = 10 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/LansatBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/LansatBerry.vb index ef5c1322d..e8384e503 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/LansatBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/LansatBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2057, "Lansat", 86400, "A Berry to be consumed by Pok�mon. If a Pok�mon holds one, its critical-hit ratio will increase when it's in a pinch.", "9.7cm", "Soft", 1, 2) + MyBase.New(86400, "A Berry to be consumed by Pokémon. If a Pokémon holds one, its critical-hit ratio will increase when it's in a pinch.", "9.7cm", "Soft", 1, 2) Me.Spicy = 30 Me.Dry = 10 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/LeppaBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/LeppaBerry.vb index 1d5275ef9..b5175539a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/LeppaBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/LeppaBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2005, "Leppa", 14400, "A Berry to be consumed by a Pok�mon. If a Pok�mon holds one, it can restore 10 PP to a depleted move during battle.", "2.8cm", "Very Hard", 2, 3) + MyBase.New(14400, "A Berry to be consumed by a Pokémon. If a Pokémon holds one, it can restore 10 PP to a depleted move during battle.", "2.8cm", "Very Hard", 2, 3) Me.Spicy = 10 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/LiechiBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/LiechiBerry.vb index d6da137ab..ab9061c8f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/LiechiBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/LiechiBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2052, "Liechi", 86400, "A Berry to be consumed by Pok�mon. If a Pok�mon holds one, its Attack stat will increase when it's in a pinch.", "11.1cm", "Very Hard", 1, 2) + MyBase.New(86400, "A Berry to be consumed by Pokémon. If a Pokémon holds one, its Attack stat will increase when it's in a pinch.", "11.1cm", "Very Hard", 1, 2) Me.Spicy = 30 Me.Dry = 10 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/LumBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/LumBerry.vb index 4a119afee..8e0679c6a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/LumBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/LumBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2008, "Lum", 43200, "A berry to be consumed by a Pok�mon. If a Pok�mon holds one, it can recover from any status condition during battle.", "3.4cm", "Super Hard", 1, 2) + MyBase.New(43200, "A berry to be consumed by a Pokémon. If a Pokémon holds one, it can recover from any status condition during battle.", "3.4cm", "Super Hard", 1, 2) Me.Spicy = 10 Me.Dry = 10 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/MagoBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/MagoBerry.vb index aec287dd7..fe488c787 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/MagoBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/MagoBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2012, "Mago", 21600, "If held by a Pok�mon, it restores the user's HP in a pinch, but it will cause confusion if the user hates the taste.", "12.6cm", "Hard", 2, 3) + MyBase.New(21600, "If held by a Pokémon, it restores the user's HP in a pinch, but it will cause confusion if the user hates the taste.", "12.6cm", "Hard", 2, 3) Me.Spicy = 0 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/MagostBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/MagostBerry.vb index 791c939ba..2e52cd01d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/MagostBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/MagostBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2027, "Magost", 21600, "Pokéblock ingredient. Plant in loamy soil to grow Magost.", "14.0cm", "Hard", 2, 4) + MyBase.New(21600, "Pokéblock ingredient. Plant in loamy soil to grow Magost.", "14.0cm", "Hard", 2, 4) Me.Spicy = 0 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/MicleBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/MicleBerry.vb index 21a401354..259cba991 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/MicleBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/MicleBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2060, "Micle", 86400, "If held by a Pok�mon, it raises the accuracy of a move just once in a pinch.", "4.1cm", "Soft", 1, 5) + MyBase.New(86400, "If held by a Pokémon, it raises the accuracy of a move just once in a pinch.", "4.1cm", "Soft", 1, 5) Me.Spicy = 0 Me.Dry = 40 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/NanabBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/NanabBerry.vb index 28944b377..b5142d66c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/NanabBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/NanabBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2017, "Nanab", 3600, "Pokéblock ingredient. Plant in loamy soil to grow Nanab.", "7.7cm", "Very Hard", 2, 3) + MyBase.New(3600, "Pokéblock ingredient. Plant in loamy soil to grow Nanab.", "7.7cm", "Very Hard", 2, 3) Me.Spicy = 0 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/NomelBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/NomelBerry.vb index 10cc6125e..71d84f8ca 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/NomelBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/NomelBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2029, "Nomel", 21600, "Pokéblock ingredient. Plant in loamy soil to grow Nomel.", "28.5cm", "Soft", 2, 4) + MyBase.New(21600, "Pokéblock ingredient. Plant in loamy soil to grow Nomel.", "28.5cm", "Soft", 2, 4) Me.Spicy = 10 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/OccaBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/OccaBerry.vb index c98af47c2..1527b9649 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/OccaBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/OccaBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2035, "Occa", 64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Fire-type attack.", "8.9cm", "Super Hard", 1, 5) + MyBase.New(64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Fire-type attack.", "8.9cm", "Super Hard", 1, 5) Me.Spicy = 15 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/OranBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/OranBerry.vb index cf15048bc..aaf7ec1dc 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/OranBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/OranBerry.vb @@ -5,8 +5,10 @@ Namespace Items.Berries Inherits Berry + Public Overrides ReadOnly Property IsHealingItem As Boolean = True + Public Sub New() - MyBase.New(2006, "Oran", 10800, "A Berry to be consumed by Pok�mon. If a Pok�mon holds one, it can restore its own HP by 10 points during battle.", "3.5cm", "Super Hard", 2, 3) + MyBase.New(10800, "A Berry to be consumed by Pokémon. If a Pokémon holds one, it can restore its own HP by 10 points during battle.", "3.5cm", "Super Hard", 2, 3) Me.Spicy = 10 Me.Dry = 10 @@ -16,8 +18,6 @@ Namespace Items.Berries Me.Type = Element.Types.Poison Me.Power = 60 - - Me._isHealingItem = True End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/PamtreBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/PamtreBerry.vb index c73564675..67d980e8c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/PamtreBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/PamtreBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2031, "Pamtre", 64800, "Pokéblock ingredient. Plant in loamy soil to grow Pamtre.", "24.4cm", "Very Soft", 1, 2) + MyBase.New(64800, "Pokéblock ingredient. Plant in loamy soil to grow Pamtre.", "24.4cm", "Very Soft", 1, 2) Me.Spicy = 0 Me.Dry = 30 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/PasshoBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/PasshoBerry.vb index da39e7ba2..d7d40a6bf 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/PasshoBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/PasshoBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2036, "Passho", 64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Water-type attack.", "3.3cm", "Soft", 1, 5) + MyBase.New(64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Water-type attack.", "3.3cm", "Soft", 1, 5) Me.Spicy = 0 Me.Dry = 15 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/PayapaBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/PayapaBerry.vb index ffb4b08df..9dc08fa93 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/PayapaBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/PayapaBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2044, "Payapa", 64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Psychic-type attack.", "25.1cm", "Soft", 1, 5) + MyBase.New(64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Psychic-type attack.", "25.1cm", "Soft", 1, 5) Me.Spicy = 0 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/PechaBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/PechaBerry.vb index c15c43ffb..6baaa4947 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/PechaBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/PechaBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2002, "Pecha", 10800, "A Berry to be consumed by Pok�mon. If a Pok�mon holds one, it can recover from poisoning on its own in battle.", "4.0cm", "Very Soft", 2, 3) + MyBase.New(10800, "A Berry to be consumed by Pokémon. If a Pokémon holds one, it can recover from poisoning on its own in battle.", "4.0cm", "Very Soft", 2, 3) Me.Spicy = 0 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/PersimBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/PersimBerry.vb index 3bc257adb..2b71010bb 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/PersimBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/PersimBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2007, "Persim", 14400, "A Berry to be consumed by Pok�mon. If a Pok�mon holds one, it can recover from confusion on its own in battle.", "4.7cm", "Hard", 2, 3) + MyBase.New(14400, "A Berry to be consumed by Pokémon. If a Pokémon holds one, it can recover from confusion on its own in battle.", "4.7cm", "Hard", 2, 3) Me.Spicy = 10 Me.Dry = 10 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/PetayaBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/PetayaBerry.vb index 5c036ead3..db7dcaed2 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/PetayaBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/PetayaBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2055, "Petaya", 86400, "A Berry to be consumed by Pok�mon. If a Pok�mon holds one, its Sp. Atk stat will increase when it's in a pinch.", "23.7cm", "Very Hard", 1, 2) + MyBase.New(86400, "A Berry to be consumed by Pokémon. If a Pokémon holds one, its Sp. Atk stat will increase when it's in a pinch.", "23.7cm", "Very Hard", 1, 2) Me.Spicy = 30 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/PinapBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/PinapBerry.vb index 8c977a542..6680731d5 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/PinapBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/PinapBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2019, "Pinap", 3600, "Pokéblock ingredient. Plant in loamy soil to grow Pinap.", "8.0cm", "Hard", 3, 6) + MyBase.New(3600, "Pokéblock ingredient. Plant in loamy soil to grow Pinap.", "8.0cm", "Hard", 3, 6) Me.Spicy = 10 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/PomegBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/PomegBerry.vb index b8286db85..6993ecc45 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/PomegBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/PomegBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2020, "Pomeg", 10800, "A Berry to be consumed by Pokémon. Using it on a Pokémon makes it more friendly but lowers its base HP.", "13.0cm", "Hard", 2, 3) + MyBase.New(10800, "A Berry to be consumed by Pokémon. Using it on a Pokémon makes it more friendly but lowers its base HP.", "13.0cm", "Hard", 2, 3) Me.Spicy = 10 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/QualotBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/QualotBerry.vb index b4771dbf9..d539e3396 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/QualotBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/QualotBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2022, "Qualot", 10800, "A Berry to be consumed by Pokémon. Using it on a Pokémon makes it more friendly but lowers its base Defense.", "11.0cm", "Hard", 2, 6) + MyBase.New(10800, "A Berry to be consumed by Pokémon. Using it on a Pokémon makes it more friendly but lowers its base Defense.", "11.0cm", "Hard", 2, 6) Me.Spicy = 10 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/RabutaBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/RabutaBerry.vb index c6cb9c92a..638071cb9 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/RabutaBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/RabutaBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2028, "Rabuta", 21600, "Pokéblock ingredient. Plant in loamy soil to grow Rabuta.", "22.6cm", "Soft", 2, 4) + MyBase.New(21600, "Pokéblock ingredient. Plant in loamy soil to grow Rabuta.", "22.6cm", "Soft", 2, 4) Me.Spicy = 0 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/RawstBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/RawstBerry.vb index a4bcd84ef..41a263a0e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/RawstBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/RawstBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2003, "Rawst", 10800, "A Berry to be consumed by Pok�mon. If a Pok�mon holds one, it can recover from a burn on its own in battle.", "3.2cm", "Hard", 2, 3) + MyBase.New(10800, "A Berry to be consumed by Pokémon. If a Pokémon holds one, it can recover from a burn on its own in battle.", "3.2cm", "Hard", 2, 3) Me.Spicy = 0 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/RazzBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/RazzBerry.vb index 977bdb70f..0b8307810 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/RazzBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/RazzBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2015, "Razz", 3600, "Pokéblock ingredient. Plant in loamy soil to grow Razz.", "12.0cm", "Very Hard", 2, 3) + MyBase.New(3600, "Pokéblock ingredient. Plant in loamy soil to grow Razz.", "12.0cm", "Very Hard", 2, 3) Me.Spicy = 10 Me.Dry = 10 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/RindoBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/RindoBerry.vb index 74dd4fc24..73bd2a4ba 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/RindoBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/RindoBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2038, "Rindo", 64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Grass-type attack.", "15.5cm", "Soft", 1, 5) + MyBase.New(64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Grass-type attack.", "15.5cm", "Soft", 1, 5) Me.Spicy = 10 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/RowapBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/RowapBerry.vb index 60d97b225..86516217c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/RowapBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/RowapBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2063, "Rowap", 86400, "If held by a Pokémon and a special attack lands, the attacker takes damage. ", "13.2cm", "Very Soft", 1, 5) + MyBase.New(86400, "If held by a Pokémon and a special attack lands, the attacker takes damage. ", "13.2cm", "Very Soft", 1, 5) Me.Spicy = 10 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/SalacBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/SalacBerry.vb index f25e5640d..3ac3e7587 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/SalacBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/SalacBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2054, "Salac", 86400, "A Berry to be held by Pok�mon. If a Pok�mon holds one, its Speed stat will increase when it's in a pinch. ", "9.4cm", "Very Hard", 1, 2) + MyBase.New(86400, "A Berry to be held by Pokémon. If a Pokémon holds one, its Speed stat will increase when it's in a pinch. ", "9.4cm", "Very Hard", 1, 2) Me.Spicy = 0 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/ShucaBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/ShucaBerry.vb index 5c49169cf..7b9917091 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/ShucaBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/ShucaBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2042, "Shuca", 64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Ground-type attack.", "4.2cm", "Soft", 1, 5) + MyBase.New(64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Ground-type attack.", "4.2cm", "Soft", 1, 5) Me.Spicy = 10 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/SitrusBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/SitrusBerry.vb index 8c2473336..cedbc7087 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/SitrusBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/SitrusBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2009, "Sitrus", 21600, "A Berry to be consumed by Pok�mon. If a Pok�mon holds one, it can restore its own HP by a small amount during battle.", "9.5cm", "Very Hard", 2, 3) + MyBase.New(21600, "A Berry to be consumed by Pokémon. If a Pokémon holds one, it can restore its own HP by a small amount during battle.", "9.5cm", "Very Hard", 2, 3) Me.Spicy = 0 Me.Dry = 10 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/SpelonBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/SpelonBerry.vb index 8f2d03787..86fc273a8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/SpelonBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/SpelonBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2030, "Spelon", 64800, "Pokéblock ingredient." & vbNewLine & "Plant in loamy soil to grow Spelon.", "13.2cm", "Soft", 1, 2) + MyBase.New(64800, "Pokéblock ingredient." & vbNewLine & "Plant in loamy soil to grow Spelon.", "13.2cm", "Soft", 1, 2) Me.Spicy = 30 Me.Dry = 10 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/StarfBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/StarfBerry.vb index 9c52d5202..26c1a14da 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/StarfBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/StarfBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2058, "Starf", 86400, "A Berry to be consumed by Pok�mon. If a Pok�mon holds one, one of its stats will sharply increase when it's in a pinch.", "15.2cm", "Super Hard", 1, 2) + MyBase.New(86400, "A Berry to be consumed by Pokémon. If a Pokémon holds one, one of its stats will sharply increase when it's in a pinch.", "15.2cm", "Super Hard", 1, 2) Me.Spicy = 30 Me.Dry = 10 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/TamatoBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/TamatoBerry.vb index ba7244410..a94a130b6 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/TamatoBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/TamatoBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2025, "Tamato", 21600, "A Berry to be consumed by Pokémon. Using it on a Pokémon makes it more friendly but lowers its base Speed.", "20.0m", "Soft", 2, 4) + MyBase.New(21600, "A Berry to be consumed by Pokémon. Using it on a Pokémon makes it more friendly but lowers its base Speed.", "20.0m", "Soft", 2, 4) Me.Spicy = 20 Me.Dry = 10 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/TangaBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/TangaBerry.vb index 38ef3a969..82c32670a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/TangaBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/TangaBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2045, "Tanga", 64800, "If held by a Pokémon, this berry will lessen the damage taken from one supereffective Bug-type attack.", "4.3cm", "Very Soft", 1, 5) + MyBase.New(64800, "If held by a Pokémon, this berry will lessen the damage taken from one supereffective Bug-type attack.", "4.3cm", "Very Soft", 1, 5) Me.Spicy = 20 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/WacanBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/WacanBerry.vb index a2060faa2..a549df708 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/WacanBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/WacanBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2037, "Wacan", 64800, "If held by a Pokémon, this berry will lessen the damage taken from one supereffective Electric-type attack.", "25.0cm", "Very Soft", 1, 5) + MyBase.New(64800, "If held by a Pokémon, this berry will lessen the damage taken from one supereffective Electric-type attack.", "25.0cm", "Very Soft", 1, 5) Me.Spicy = 0 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/WatmelBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/WatmelBerry.vb index fcad4406f..ef2b94b8f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/WatmelBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/WatmelBerry.vb @@ -6,7 +6,7 @@ Public Class WatmelBerry Inherits Berry Public Sub New() - MyBase.New(2032, "Watmel", 64800, "Pokéblock ingredient. Plant in loamy soil to grow Watmel.", "25.0cm", "Soft", 1, 2) + MyBase.New(64800, "Pokéblock ingredient. Plant in loamy soil to grow Watmel.", "25.0cm", "Soft", 1, 2) Me.Spicy = 0 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/WepearBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/WepearBerry.vb index 8659ab89a..6742c0ec0 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/WepearBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/WepearBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2018, "Wepear", 3600, "Pok�block ingredient. Plant in loamy soil to grow Wepear.", "7.4cm", "Super Hard", 3, 6) + MyBase.New(3600, "Pokéblock ingredient. Plant in loamy soil to grow Wepear.", "7.4cm", "Super Hard", 3, 6) Me.Spicy = 0 Me.Dry = 0 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/WikiBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/WikiBerry.vb index 8bb5bef39..7bd09f57d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/WikiBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/WikiBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2011, "Wiki", 21600, "If held by a Pok�mon, it restores the user's HP in a pinch, but it will cause confusion if the user hates the taste.", "11.5cm", "Hard", 2, 3) + MyBase.New(21600, "If held by a Pokémon, it restores the user's HP in a pinch, but it will cause confusion if the user hates the taste.", "11.5cm", "Hard", 2, 3) Me.Spicy = 0 Me.Dry = 15 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berries/YacheBerry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berries/YacheBerry.vb index 8894f8fdc..278b35b5c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berries/YacheBerry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berries/YacheBerry.vb @@ -6,7 +6,7 @@ Namespace Items.Berries Inherits Berry Public Sub New() - MyBase.New(2039, "Yache", 64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Ice-type attack.", "13.5cm", "Very Hard", 1, 5) + MyBase.New(64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Ice-type attack.", "13.5cm", "Very Hard", 1, 5) Me.Spicy = 0 Me.Dry = 10 diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berry.vb index daa6788f7..44b133278 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berry.vb @@ -34,8 +34,14 @@ Public Type As Element.Types Public Power As Integer = 60 - Public Sub New(ByVal ID As Integer, ByVal Name As String, ByVal PhaseTime As Integer, ByVal Description As String, ByVal Size As String, ByVal Firmness As String, ByVal minBerries As Integer, ByVal maxBerries As Integer) - MyBase.New(Name, 100, ItemTypes.Plants, ID, 1, ID - 1999, New Rectangle(0, 0, 32, 32), Description) + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 100 + Public Overrides ReadOnly Property FlingDamage As Integer = 10 + Public Overrides ReadOnly Property ItemType As ItemTypes = ItemTypes.Plants + Public Overrides ReadOnly Property SortValue As Integer + Public Overrides ReadOnly Property Description As String + + 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 Me.PhaseTime = PhaseTime Me.Size = Size @@ -43,8 +49,6 @@ BerryIndex = Me.ID - 2000 Me.minBerries = minBerries Me.maxBerries = maxBerries - _pokeDollarPrice = 100 - _flingDamage = 10 Dim x As Integer = BerryIndex * 128 Dim y As Integer = 0 @@ -53,10 +57,9 @@ y += 32 End While - Dim r As New Rectangle(x, y, 32, 32) - _texture = TextureManager.GetTexture("Berries", r) - - _isBerry = True + _Description = Description + _textureSource = "Textures\Berries" + _textureRectangle = New Rectangle(x, y, 32, 32) End Sub Public ReadOnly Property Flavour() As Flavours diff --git a/2.5DHero/2.5DHero/Pokemon/Items/FileItem.vb b/2.5DHero/2.5DHero/Pokemon/Items/FileItem.vb deleted file mode 100644 index 5342f9bdc..000000000 --- a/2.5DHero/2.5DHero/Pokemon/Items/FileItem.vb +++ /dev/null @@ -1,199 +0,0 @@ -Namespace Items - - ''' - ''' This class enables content creators to create own items with own images, functions and stats. - ''' - Public Class FileItem - - Inherits Item - - Private _isValid As Boolean = True - Private _scriptBinding As String = "" - - ''' - ''' Returns the item of the FileItem class. - ''' - Public ReadOnly Property Item() As Item - Get - Return Me - End Get - End Property - - ''' - ''' Returns if the FileItem is generated in a valid state. - ''' - Public ReadOnly Property IsValid() As Boolean - Get - Return Me._isValid - End Get - End Property - - ''' - ''' This is the script binding that represents the script that gets executed once the item gets used. - ''' - Public Property ScriptBinding() As String - Get - Return Me._scriptBinding - End Get - Set(value As String) - Me._scriptBinding = value - End Set - End Property - - ''' - ''' Iniztializes a new FileItem class. - ''' - Public Sub New(ByVal data As String) - data = data.Remove(0, 1) - data = data.Remove(data.Length - 1, 1) - - Dim dataArr() As String = data.Split(CChar("|")) - - Dim ID As Integer = 0 - Dim Name As String = "" - Dim Price As Integer = 0 - Dim ItemType As Item.ItemTypes = net.Pokemon3D.Game.Item.ItemTypes.Standard - Dim CatchMultiplier As Single = 0.0F - Dim SortValue As Integer = 0 - Dim Description As String = "" - Dim TextureRectangle As Rectangle = Nothing - Dim TextureSource As String = "" - Dim ScriptBinding As String = "" - - If dataArr.Count = 11 Then - If IsNumeric(dataArr(0)) = True Then - ID = CInt(dataArr(0)) - Else - Logger.Log(Logger.LogTypes.ErrorMessage, "FileItem.vb: The field for ""ID"" did not have the correct data type (int).") - Me._isValid = False - End If - - If dataArr(1) <> "" Then - Name = dataArr(1) - Else - Logger.Log(Logger.LogTypes.ErrorMessage, "FileItem.vb: The field for ""Name"" cannot be empty.") - Me._isValid = False - End If - - If IsNumeric(dataArr(2)) = True Then - Price = CInt(dataArr(2)) - Else - Logger.Log(Logger.LogTypes.ErrorMessage, "FileItem.vb: The field for ""Price"" did not have the correct data type (int).") - Me._isValid = False - End If - - Select Case dataArr(3).ToLower() - Case "standard" - ItemType = net.Pokemon3D.Game.Item.ItemTypes.Standard - Case "medicine" - ItemType = net.Pokemon3D.Game.Item.ItemTypes.Medicine - Case "plants" - ItemType = net.Pokemon3D.Game.Item.ItemTypes.Plants - Case "pokeballs", "pokéballs" - ItemType = net.Pokemon3D.Game.Item.ItemTypes.Pokéballs - Case "machines" - ItemType = net.Pokemon3D.Game.Item.ItemTypes.Machines - Case "keyitems", "keyitem" - ItemType = net.Pokemon3D.Game.Item.ItemTypes.KeyItems - Case "mail" - ItemType = net.Pokemon3D.Game.Item.ItemTypes.Mail - Case "battleitems" - ItemType = net.Pokemon3D.Game.Item.ItemTypes.BattleItems - Case Else - Logger.Log(Logger.LogTypes.ErrorMessage, "FileItem.vb: The field for ""ItemType"" did not contain an ItemType data type.") - Me._isValid = False - End Select - - If IsNumeric(dataArr(4).Replace(".", GameController.DecSeparator)) = True Then - CatchMultiplier = CSng(dataArr(4).Replace(".", GameController.DecSeparator)) - Else - Logger.Log(Logger.LogTypes.ErrorMessage, "FileItem.vb: The field for ""CatchMultiplier"" did not have the correct data type (sng).") - Me._isValid = False - End If - - If IsNumeric(dataArr(5)) = True Then - SortValue = CInt(dataArr(5)) - Else - Logger.Log(Logger.LogTypes.ErrorMessage, "FileItem.vb: The field for ""SortValue"" did not have the correct data type (int).") - Me._isValid = False - End If - - If dataArr(6) <> "" Then - Description = dataArr(6) - Else - Logger.Log(Logger.LogTypes.ErrorMessage, "FileItem.vb: The field for ""Description"" cannot be empty.") - Me._isValid = False - End If - - If dataArr(7).CountSeperators(",") = 3 Then - Dim texData() As String = dataArr(7).Split(CChar(",")) - If texData.ToList().IsNumericList() = True Then - TextureRectangle = New Rectangle(CInt(texData(0)), CInt(texData(1)), CInt(texData(2)), CInt(texData(3))) - Else - Logger.Log(Logger.LogTypes.ErrorMessage, "FileItem.vb: The field for ""TextureRectangle"" contains invalid data.") - Me._isValid = False - End If - Else - Logger.Log(Logger.LogTypes.ErrorMessage, "FileItem.vb: The field for ""TextureRectangle"" contains invalid data.") - Me._isValid = False - End If - - TextureSource = dataArr(8) - - If dataArr(9) <> "" Then - ScriptBinding = dataArr(9) - Else - Logger.Log(Logger.LogTypes.ErrorMessage, "FileItem.vb: The field for ""ScriptBinding"" cannot be empty.") - Me._isValid = False - End If - - If dataArr(10).CountSeperators(",") = 3 Then - Dim attData() As String = dataArr(10).Split(CChar(",")) - If attData.ToList().IsBooleanicList() = True Then - Me._canBeUsed = CBool(attData(0)) - Me._canBeTraded = CBool(attData(1)) - Me._canBeHold = CBool(attData(2)) - Me._isBall = CBool(attData(3)) - If Me._isBall = True Then - Me._canBeUsedInBattle = True - End If - Else - Logger.Log(Logger.LogTypes.ErrorMessage, "FileItem.vb: The field for ""ItemAttributes"" contains invalid data.") - Me._isValid = False - End If - Else - Logger.Log(Logger.LogTypes.ErrorMessage, "FileItem.vb: The field for ""ItemAttributes"" contains invalid data.") - Me._isValid = False - End If - Else - Logger.Log(Logger.LogTypes.ErrorMessage, "FileItem.vb: The array length (" & dataArr.Count & ") was smaller or greater than expected (11).") - Me._isValid = False - End If - - If Me._isValid = True Then - Me.Initialize(Name, Price, ItemType, ID, CatchMultiplier, SortValue, TextureRectangle, Description) - Me._scriptBinding = ScriptBinding - - If TextureSource.ToLower() <> "items\itemsheet" And TextureSource <> "" Then - Me._texture = TextureManager.GetTexture(TextureSource, TextureRectangle, "") - End If - End If - End Sub - - Public Overrides Sub Use() - Dim s As Screen = Core.CurrentScreen - While s.Identification <> Screen.Identifications.OverworldScreen And Not s.PreScreen Is Nothing - s = s.PreScreen - End While - - If s.Identification = Screen.Identifications.OverworldScreen Then - Core.SetScreen(s) - CType(s, OverworldScreen).ActionScript.StartScript(Me._scriptBinding, 0) - Else - Logger.Log(Logger.LogTypes.Warning, "FileItem.vb: The Item """ & Me.Name & """ created by the GameMode """ & GameModeManager.ActiveGameMode.Name & """ was used in a bad environment.") - End If - End Sub - - End Class - -End Namespace \ No newline at end of file diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Item.vb b/2.5DHero/2.5DHero/Pokemon/Items/Item.vb index 9b36f3954..38e35baa1 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Item.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Item.vb @@ -1,365 +1,198 @@ Imports net.Pokemon3D.Game.Items + ''' ''' An item the player stores in their inventory. ''' -Public Class Item +Public MustInherit Class Item - ''' - ''' The type of item. This is also the bag they get sorted into. - ''' - Public Enum ItemTypes - ''' - ''' The default item category for misc. items. - ''' - Standard - ''' - ''' Medicine items that restore Pokémon. - ''' - Medicine - ''' - ''' Plants, like berries and apricorns. - ''' - Plants - ''' - ''' All Poké Balls. - ''' - Pokéballs - ''' - ''' TMs and HMs. - ''' - Machines - ''' - ''' Keyitems of the game. - ''' - KeyItems - ''' - ''' Mail items. - ''' - Mail - ''' - ''' Items to be used in battle. - ''' - BattleItems - End Enum + Protected _textureSource As String = "Items\ItemSheet" + Protected _textureRectangle As Rectangle + Private _texture As Texture2D -#Region "Fields" + Private _attribute As ItemAttribute - Private _id As Integer = 0 - Protected _name As String = "" - Protected _pluralName As String = "" - Protected _description As String = "" + Private Function GetAttribute() As ItemAttribute + If _attribute Is Nothing Then + _attribute = CType([GetType]().GetCustomAttributes(GetType(ItemAttribute), False)(0), ItemAttribute) + End If - Protected _pokeDollarPrice As Integer = 0 - Protected _battlePointsPrice As Integer = 1 - Protected _itemType As ItemTypes = ItemTypes.Standard - Protected _catchMultiplier As Single = 1.0F - Protected _maxStack As Integer = 999 - Protected _sortValue As Integer = 0 - - Protected _texture As Texture2D - Private _additionalData As String = "" - - Protected _canBeTraded As Boolean = True - Protected _canBeHold As Boolean = True - Protected _canBeUsed As Boolean = True - Protected _canBeUsedInBattle As Boolean = True - Protected _canBeTossed As Boolean = True - - Protected _isBall As Boolean = False - Protected _isBerry As Boolean = False - Protected _isHealingItem As Boolean = False - Protected _isMail As Boolean = False - Protected _isMegaStone As Boolean = False - Protected _isPlate As Boolean = False - - Protected _flingDamage As Integer = 30 - Protected _requiresPokemonSelectInBattle As Boolean = True - -#End Region - -#Region "Properties" + Return _attribute + End Function ''' ''' The singular item name. ''' - Public ReadOnly Property Name() As String + Public Overridable ReadOnly Property Name As String Get - Return Me._name + Return GetAttribute().Name End Get End Property ''' ''' The ID of the item. ''' - Public ReadOnly Property ID() As Integer + Public Overridable ReadOnly Property ID As Integer Get - Return Me._id + Return GetAttribute().Id End Get End Property ''' ''' The plural name of the item. ''' - Public ReadOnly Property PluralName() As String + Public Overridable ReadOnly Property PluralName As String Get - Return Me._pluralName + Return Name & "s" 'Default plural name with "s" at the end. End Get End Property ''' ''' The price of this item if the player purchases it in exchange for PokéDollars. This halves when selling an item to the store. ''' - Public ReadOnly Property PokéDollarPrice() As Integer - Get - Return Me._pokeDollarPrice - End Get - End Property + Public Overridable ReadOnly Property PokeDollarPrice As Integer = 0 ''' ''' The price of this item if the player purchases it exchange for BattlePoints. ''' - Public ReadOnly Property BattlePointsPrice() As Integer - Get - Return Me._battlePointsPrice - End Get - End Property + Public Overridable ReadOnly Property BattlePointsPrice As Integer = 1 ''' ''' The type of this item. This also controls in which bag this item gets sorted. ''' - Public ReadOnly Property ItemType() As ItemTypes - Get - Return Me._itemType - End Get - End Property + Public Overridable ReadOnly Property ItemType As ItemTypes = ItemTypes.Standard ''' ''' The default catch multiplier if the item gets used as a Pokéball. ''' - Public ReadOnly Property CatchMultiplier() As Single - Get - Return Me._catchMultiplier - End Get - End Property + Public Overridable ReadOnly Property CatchMultiplier As Single = 1.0F ''' ''' The maximum amount of this item type (per ID) that can be stored in the bag. ''' - Public ReadOnly Property MaxStack() As Integer - Get - Return Me._maxStack - End Get - End Property + Public Overridable ReadOnly Property MaxStack As Integer = 999 ''' ''' A value that can be used to sort items in the bag after. Lower values make items appear closer to the top. ''' - Public ReadOnly Property SortValue() As Integer - Get - Return Me._sortValue - End Get - End Property + Public Overridable ReadOnly Property SortValue As Integer = 0 ''' ''' The texture of this item. ''' - Public ReadOnly Property Texture() As Texture2D + Public ReadOnly Property Texture As Texture2D Get - Return Me._texture + If _texture Is Nothing Then + _texture = TextureManager.GetTexture(_textureSource, _textureRectangle, "") + End If + + Return _texture End Get End Property ''' ''' The bag description of this item. ''' - Public ReadOnly Property Description() As String - Get - Return Me._description - End Get - End Property + Public Overridable ReadOnly Property Description As String = "" ''' ''' The additional data that is stored with this item. ''' - Public Property AdditionalData() As String - Get - Return Me._additionalData - End Get - Set(value As String) - Me._additionalData = value - End Set - End Property + Public Property AdditionalData As String = "" ''' ''' The damage the Fling move does when this item is attached to a Pokémon. ''' - Public ReadOnly Property FlingDamage() As Integer - Get - Return Me._flingDamage - End Get - End Property + Public Overridable ReadOnly Property FlingDamage As Integer = 30 ''' ''' If this item can be traded in for money. ''' - Public ReadOnly Property CanBeTraded() As Boolean - Get - Return Me._canBeTraded - End Get - End Property + Public Overridable ReadOnly Property CanBeTraded As Boolean = True ''' ''' If this item can be given to a Pokémon. ''' - Public ReadOnly Property CanBeHold() As Boolean - Get - Return Me._canBeHold - End Get - End Property + Public Overridable ReadOnly Property CanBeHold As Boolean = True ''' ''' If this item can be used from the bag. ''' - Public ReadOnly Property CanBeUsed() As Boolean - Get - Return Me._canBeUsed - End Get - End Property + Public Overridable ReadOnly Property CanBeUsed As Boolean = True ''' ''' If this item can be used in battle. ''' - Public ReadOnly Property CanBeUsedInBattle() As Boolean - Get - Return Me._canBeUsedInBattle - End Get - End Property + Public Overridable ReadOnly Property CanBeUsedInBattle As Boolean = True ''' ''' If this item can be tossed in the bag. ''' - Public ReadOnly Property CanBeTossed() As Boolean - Get - Return Me._canBeTossed - End Get - End Property + Public Overridable ReadOnly Property CanBeTossed As Boolean = True ''' ''' If this item requires the player to select a Pokémon to use the item on in battle. ''' - Public ReadOnly Property BattleSelectPokemon() As Boolean - Get - Return Me._requiresPokemonSelectInBattle - End Get - End Property + Public Overridable ReadOnly Property BattleSelectPokemon As Boolean = True + + ''' + ''' If this item is a Healing item. + ''' + Public Overridable ReadOnly Property IsHealingItem As Boolean = False ''' ''' If this item is a Pokéball item. ''' - Public ReadOnly Property IsBall() As Boolean + Public Overridable ReadOnly Property IsBall As Boolean Get - Return Me._isBall + Return [GetType]().IsSubclassOf(GetType(Items.Balls.BallItem)) End Get End Property ''' ''' If this item is a Berry item. ''' - Public ReadOnly Property IsBerry() As Boolean + Public ReadOnly Property IsBerry As Boolean Get - Return Me._isBerry - End Get - End Property - - ''' - ''' If this item is a Healing item. - ''' - Public ReadOnly Property IsHealingItem() As Boolean - Get - Return Me._isHealingItem + Return [GetType]().IsSubclassOf(GetType(Berry)) End Get End Property ''' ''' If this item is a Mail item. ''' - Public ReadOnly Property IsMail() As Boolean + Public ReadOnly Property IsMail As Boolean Get - Return Me._isMail + Return [GetType]().IsSubclassOf(GetType(MailItem)) End Get End Property ''' ''' If this item is a Mega Stone. ''' - Public ReadOnly Property IsMegaStone() As Boolean + Public ReadOnly Property IsMegaStone As Boolean Get - Return Me._isMegaStone + Return [GetType]().IsSubclassOf(GetType(MegaStone)) End Get End Property ''' ''' If this item is a Plate. ''' - Public ReadOnly Property IsPlate() As Boolean + Public ReadOnly Property IsPlate As Boolean Get - Return Me._isPlate + Return [GetType]().IsSubclassOf(GetType(PlateItem)) End Get End Property ''' ''' The color for player dialogues. ''' - Public Shared ReadOnly Property PlayerDialogueColor() As Color + Public Shared ReadOnly Property PlayerDialogueColor As Color Get Return New Color(0, 128, 227) End Get End Property -#End Region - - ''' - ''' Creates a new instance of the Item class. - ''' - ''' The name of the Item. - ''' The purchase price. - ''' The type of Item. - ''' The ID of this Item. - ''' The CatchMultiplier of this Item. - ''' The SortValue of this Item. - ''' The TextureRectangle from the "Items\ItemSheet" texture. - ''' The description of this Item. - Public Sub New(ByVal Name As String, ByVal Price As Integer, ByVal ItemType As ItemTypes, ByVal ID As Integer, ByVal CatchMultiplier As Single, ByVal SortValue As Integer, ByVal TextureRectangle As Rectangle, ByVal Description As String) - Me.Initialize(Name, Price, ItemType, ID, CatchMultiplier, SortValue, TextureRectangle, Description) - End Sub - - Friend Sub New() - End Sub - - ''' - ''' Sets most properties of an Item class instance. - ''' - ''' The name of the Item. - ''' The purchase price. - ''' The type of Item. - ''' The ID of this Item. - ''' The CatchMultiplier of this Item. - ''' The SortValue of this Item. - ''' The TextureRectangle from the "Items\ItemSheet" texture. - ''' The description of this Item. - Protected Sub Initialize(ByVal Name As String, ByVal Price As Integer, ByVal ItemType As ItemTypes, ByVal ID As Integer, ByVal CatchMultiplier As Single, ByVal SortValue As Integer, ByVal TextureRectangle As Rectangle, ByVal Description As String) - Me._name = Name - Me._pluralName = Name & "s" 'Default plural name with "s" at the end. - Me._pokeDollarPrice = Price - Me._itemType = ItemType - Me._id = ID - Me._catchMultiplier = CatchMultiplier - Me._sortValue = SortValue - Me._description = Description - - Me._texture = TextureManager.GetTexture("Items\ItemSheet", TextureRectangle, "") - End Sub - ''' ''' The item gets used from the bag. ''' @@ -414,13 +247,6 @@ Public Class Item ''' ''' The desired item's ID. Public Shared Function GetItemByID(ByVal ID As Integer) As Item - 'Check if the ID is available in the FileItem list. - For Each f As FileItem In Core.Player.FileItems - If f.Item.ID = ID Then - Return f.Item - End If - Next - If _itemBuffer Is Nothing Then LoadItemBuffer() End If @@ -440,13 +266,6 @@ Public Class Item ''' ''' The name of the item. Public Shared Function GetItemByName(ByVal name As String) As Item - 'Check if the name is available in the FileItem list. - For Each FileItem As Items.FileItem In Core.Player.FileItems - If FileItem.Item.Name.ToLower() = name.ToLower() Then - Return FileItem.Item - End If - Next - Dim type = _itemBuffer.FirstOrDefault(Function(itemTypePair) Return itemTypePair.Key.Name.ToLowerInvariant() = name.ToLowerInvariant() End Function).Value diff --git a/2.5DHero/2.5DHero/Pokemon/Items/ItemType.vb b/2.5DHero/2.5DHero/Pokemon/Items/ItemType.vb new file mode 100644 index 000000000..dc4b67d4d --- /dev/null +++ b/2.5DHero/2.5DHero/Pokemon/Items/ItemType.vb @@ -0,0 +1,41 @@ +Namespace Items + + ''' + ''' The type of item. This is also the bag they get sorted into. + ''' + Public Enum ItemTypes + ''' + ''' The default item category for misc. items. + ''' + Standard + ''' + ''' Medicine items that restore Pokémon. + ''' + Medicine + ''' + ''' Plants, like berries and apricorns. + ''' + Plants + ''' + ''' All Poké Balls. + ''' + Pokéballs + ''' + ''' TMs and HMs. + ''' + Machines + ''' + ''' Keyitems of the game. + ''' + KeyItems + ''' + ''' Mail items. + ''' + Mail + ''' + ''' Items to be used in battle. + ''' + BattleItems + End Enum + +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/BasementKey.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/BasementKey.vb index 49bd0deb8..673fce1c8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/BasementKey.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/BasementKey.vb @@ -3,15 +3,12 @@ Namespace Items.KeyItems Public Class BasementKey - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "A key that opens a door in the Goldenrod Tunnel." Public Sub New() - MyBase.New("Basement Key", 9800, ItemTypes.KeyItems, 133, 1, 0, New Rectangle(288, 120, 24, 24), "A key that opens a door in the Goldenrod Tunnel.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = False - Me._canBeHold = False + _textureRectangle = New Rectangle(288, 120, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/Bicycle.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/Bicycle.vb index d589cb55f..9835e05bf 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/Bicycle.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/Bicycle.vb @@ -3,15 +3,12 @@ Namespace Items.KeyItems Public Class Bicycle - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "A folding Bicycle that enables much faster movement than the Running Shoes." Public Sub New() - MyBase.New("Bicycle", 9800, ItemTypes.KeyItems, 6, 1, 0, New Rectangle(120, 0, 24, 24), "A folding Bicycle that enables much faster movement than the Running Shoes.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = False - Me._canBeHold = False + _textureRectangle = New Rectangle(120, 0, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/BlueCard.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/BlueCard.vb index 301329f97..bf0ba61b8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/BlueCard.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/BlueCard.vb @@ -3,15 +3,12 @@ Namespace Items.KeyItems Public Class BlueCard - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "A card to save points for the Buena's Password show." Public Sub New() - MyBase.New("Blue Card", 100, ItemTypes.KeyItems, 116, 1, 1, New Rectangle(408, 96, 24, 24), "A card to save points for the Buena's Password show.") - - Me._canBeHold = False - Me._canBeTraded = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False + _textureRectangle = New Rectangle(408, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/CardKey.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/CardKey.vb index 4fd734b6f..0353f04e9 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/CardKey.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/CardKey.vb @@ -3,15 +3,12 @@ Namespace Items.KeyItems Public Class CardKey - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "A card key that opens a shutter in the Radio Tower." Public Sub New() - MyBase.New("Card Key", 9800, ItemTypes.KeyItems, 127, 1, 0, New Rectangle(144, 120, 24, 24), "A card key that opens a shutter in the Radio Tower.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = False - Me._canBeHold = False + _textureRectangle = New Rectangle(144, 120, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/CoinCase.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/CoinCase.vb index a6eb3de8d..832b51ec4 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/CoinCase.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/CoinCase.vb @@ -3,19 +3,17 @@ Namespace Items.KeyItems Public Class CoinCase - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "A case for holding coins obtained at the Game Corner. It holds up to 50,000 coins." + Public Overrides ReadOnly Property CanBeUsed As Boolean = True Public Sub New() - MyBase.New("Coin Case", 1337, ItemTypes.KeyItems, 54, 1, 0, New Rectangle(168, 48, 24, 24), "A case for holding coins obtained at the Game Corner. It holds up to 50,000 coins.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = False - Me._canBeTraded = False - Me._canBeHold = False + _textureRectangle = New Rectangle(168, 48, 24, 24) End Sub Public Overrides Sub Use() - Screen.TextBox.Show("Your COINS:~" & Core.Player.Coins, {}, True, True) + Screen.TextBox.Show("Your coins:~" & Core.Player.Coins, {}, True, True) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/CrystalWing.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/CrystalWing.vb index 3ff12b151..175233a2d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/CrystalWing.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/CrystalWing.vb @@ -3,17 +3,12 @@ Namespace Items.KeyItems Public Class CrystalWing - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "A mystical feather entirely made out of crystal." Public Sub New() - MyBase.New("Crystal Wing", 9800, ItemTypes.KeyItems, 56, 1, 0, New Rectangle(240, 192, 24, 24), "A mystical feather entirely made out of crystal.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = False - Me._canBeHold = False - - Me._flingDamage = 20 + _textureRectangle = New Rectangle(240, 192, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/GSBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/GSBall.vb index 7b7e31e6a..02c144d75 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/GSBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/GSBall.vb @@ -3,15 +3,12 @@ Namespace Items.KeyItems Public Class GSBall - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "A mysterious Pokéball. Its purpose is unknown." Public Sub New() - MyBase.New("GS Ball", 100, ItemTypes.KeyItems, 115, 1, 1, New Rectangle(384, 96, 24, 24), "A mysterious Pokéball. Its purpose is unknown.") - - Me._canBeHold = False - Me._canBeTraded = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False + _textureRectangle = New Rectangle(384, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/GoodRod.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/GoodRod.vb index f0ec29f7e..9097683eb 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/GoodRod.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/GoodRod.vb @@ -3,15 +3,13 @@ Namespace Items.KeyItems Public Class GoodRod - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "A new, good-quality fishing rod. Use it by any body of water to fish for wild aquatic Pokémon." + Public Overrides ReadOnly Property CanBeUsed As Boolean = True Public Sub New() - MyBase.New("Good Rod", 1337, ItemTypes.KeyItems, 59, 1, 0, New Rectangle(264, 48, 24, 24), "A new, good-quality fishing rod. Use it by any body of water to fish for wild aquatic Pokémon.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = False - Me._canBeTraded = False - Me._canBeHold = False + _textureRectangle = New Rectangle(264, 48, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/ItemFinder.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/ItemFinder.vb index 75af5d2ef..687898fb4 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/ItemFinder.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/ItemFinder.vb @@ -3,15 +3,13 @@ Namespace Items.KeyItems Public Class ItemFinder - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "It checks for unseen items in the area and makes noise and lights when it finds something." + Public Overrides ReadOnly Property CanBeUsed As Boolean = True Public Sub New() - MyBase.New("Itemfinder", 138, ItemTypes.KeyItems, 55, 1, 0, New Rectangle(192, 48, 24, 24), "It checks for unseen items in the area and makes noise and lights when it finds something.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = False - Me._canBeTraded = False - Me._canBeHold = False + _textureRectangle = New Rectangle(192, 48, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/KeyItem.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/KeyItem.vb new file mode 100644 index 000000000..e0c6854a6 --- /dev/null +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/KeyItem.vb @@ -0,0 +1,17 @@ +Namespace Items.KeyItems + + Public MustInherit Class KeyItem + + Inherits Item + + Public Overrides ReadOnly Property ItemType As ItemTypes = ItemTypes.KeyItems + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeTraded As Boolean = False + Public Overrides ReadOnly Property CanBeTossed As Boolean = False + Public Overrides ReadOnly Property CanBeHold As Boolean = False + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 9800 + + End Class + +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/LostItem.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/LostItem.vb index b96917ccc..4e057254d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/LostItem.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/LostItem.vb @@ -3,15 +3,12 @@ Namespace Items.KeyItems Public Class LostItem - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "The Poké Doll lost by the Copycat." Public Sub New() - MyBase.New("Lost Item", 100, ItemTypes.KeyItems, 130, 1, 1, New Rectangle(216, 120, 24, 24), "The Poké Doll lost by the Copycat.") - - Me._canBeHold = False - Me._canBeTraded = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False + _textureRectangle = New Rectangle(216, 120, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/MachinePart.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/MachinePart.vb index 215b50919..64a415da1 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/MachinePart.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/MachinePart.vb @@ -3,15 +3,12 @@ Namespace Items.KeyItems Public Class MachinePart - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "An important machine part for the Power Plant that was stolen." Public Sub New() - MyBase.New("Machine Part", 100, ItemTypes.KeyItems, 128, 1, 1, New Rectangle(168, 120, 24, 24), "An important machine part for the Power Plant that was stolen.") - - Me._canBeHold = False - Me._canBeTraded = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False + _textureRectangle = New Rectangle(168, 120, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/MysteryEgg.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/MysteryEgg.vb index c90c98ae0..2933ccbe0 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/MysteryEgg.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/MysteryEgg.vb @@ -3,15 +3,12 @@ Namespace Items.KeyItems Public Class MysteryEgg - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "A mysterious Egg obtained from Mr. Pokémon. What's in the Egg is unknown." Public Sub New() - MyBase.New("Mystery Egg", 9800, ItemTypes.KeyItems, 69, 1, 0, New Rectangle(0, 72, 24, 24), "A mysterious Egg obtained from Mr. Pokémon. What's in the Egg is unknown.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = False - Me._canBeHold = False + _textureRectangle = New Rectangle(0, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/OldRod.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/OldRod.vb index 5b1f730ac..50900fd23 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/OldRod.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/OldRod.vb @@ -3,15 +3,13 @@ Namespace Items.KeyItems Public Class OldRod - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "An old and beat-up fishing rod. Use it by any body of water to fish for wild aquatic Pokémon." + Public Overrides ReadOnly Property CanBeUsed As Boolean = True Public Sub New() - MyBase.New("Old Rod", 1337, ItemTypes.KeyItems, 58, 1, 0, New Rectangle(240, 48, 24, 24), "An old and beat-up fishing rod. Use it by any body of water to fish for wild aquatic Pokémon.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = False - Me._canBeTraded = False - Me._canBeHold = False + _textureRectangle = New Rectangle(240, 48, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/OldSeaMap.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/OldSeaMap.vb index aca95ab45..a2a756665 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/OldSeaMap.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/OldSeaMap.vb @@ -3,15 +3,12 @@ Namespace Items.KeyItems Public Class OldSeaMap - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "A faded sea chart that shows the way to a certain island." Public Sub New() - MyBase.New("Old Sea Map", 100, ItemTypes.KeyItems, 285, 1, 1, New Rectangle(168, 264, 24, 24), "A faded sea chart that shows the way to a certain island.") - - Me._canBeHold = False - Me._canBeTraded = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False + _textureRectangle = New Rectangle(168, 264, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/OvalCharm.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/OvalCharm.vb index dae05a275..7e980c59e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/OvalCharm.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/OvalCharm.vb @@ -3,15 +3,12 @@ Namespace Items.KeyItems Public Class OvalCharm - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "An oval charm said to increase the chance of Pokémon Eggs being found at the Day Care." Public Sub New() - MyBase.New("Oval Charm", 9800, ItemTypes.KeyItems, 241, 1, 0, New Rectangle(96, 264, 24, 24), "An oval charm said to increase the chance of Pokémon Eggs being found at the Day Care.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = False - Me._canBeHold = False + _textureRectangle = New Rectangle(96, 264, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/Pass.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/Pass.vb index b8270419f..fec53574a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/Pass.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/Pass.vb @@ -3,15 +3,12 @@ Namespace Items.KeyItems Public Class Pass - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "A ticket required for riding the Magnet Train. It allows you to ride whenever and however much you'd like." Public Sub New() - MyBase.New("Pass", 100, ItemTypes.KeyItems, 134, 1, 1, New Rectangle(312, 120, 24, 24), "A ticket required for riding the Magnet Train. It allows you to ride whenever and however much you'd like.") - - Me._canBeHold = False - Me._canBeTraded = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False + _textureRectangle = New Rectangle(312, 120, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/RainbowPass.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/RainbowPass.vb index 31f494d6d..804d8255d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/RainbowPass.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/RainbowPass.vb @@ -3,15 +3,12 @@ Namespace Items.KeyItems Public Class RainbowPass - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "A pass for ferries between Vermilion and the Sevii Islands. It features a drawing of a rainbow." Public Sub New() - MyBase.New("Rainbow Pass", 100, ItemTypes.KeyItems, 284, 1, 1, New Rectangle(144, 264, 24, 24), "A pass for ferries between Vermilion and the Sevii Islands. It features a drawing of a rainbow.") - - Me._canBeHold = False - Me._canBeTraded = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False + _textureRectangle = New Rectangle(144, 264, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/RainbowWing.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/RainbowWing.vb index cd54d09d4..8ca0111c5 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/RainbowWing.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/RainbowWing.vb @@ -3,17 +3,12 @@ Namespace Items.KeyItems Public Class RainbowWing - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "A mystical rainbow feather that sparkles." Public Sub New() - MyBase.New("Rainbow Wing", 9800, ItemTypes.KeyItems, 178, 1, 0, New Rectangle(408, 144, 24, 24), "A mystical rainbow feather that sparkles.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = False - Me._canBeHold = False - - Me._flingDamage = 20 + _textureRectangle = New Rectangle(408, 144, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/RedScale.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/RedScale.vb index 88d232a37..348c9eff4 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/RedScale.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/RedScale.vb @@ -3,15 +3,12 @@ Namespace Items.KeyItems Public Class RedScale - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "A scale from the red Gyarados. It glows red like a flame." Public Sub New() - MyBase.New("Red Scale", 9800, ItemTypes.KeyItems, 66, 1, 0, New Rectangle(432, 48, 24, 24), "A scale from the red Gyarados. It glows red like a flame.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = False - Me._canBeHold = False + _textureRectangle = New Rectangle(432, 48, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/RunningShoes.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/RunningShoes.vb index a50946c32..e840ce9bf 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/RunningShoes.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/RunningShoes.vb @@ -3,15 +3,12 @@ Namespace Items.KeyItems Public Class RunningShoes - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "Special high-quality shoes. Instructions: Hold SHIFT to run!" Public Sub New() - MyBase.New("Running Shoes", 9800, ItemTypes.KeyItems, 78, 1, 0, New Rectangle(288, 216, 24, 24), "Special high-quality shoes. Instructions: Hold SHIFT to run!") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = False - Me._canBeHold = False + _textureRectangle = New Rectangle(288, 216, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/SSTicket.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/SSTicket.vb index f6aa743a1..3ccc67f90 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/SSTicket.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/SSTicket.vb @@ -3,15 +3,12 @@ Namespace Items.KeyItems Public Class SSTicket - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "The ticket required for sailing on the ferry S.S. Aqua. It has a drawing of a ship on it. " Public Sub New() - MyBase.New("S.S. Ticket", 9800, ItemTypes.KeyItems, 41, 1, 0, New Rectangle(240, 216, 24, 24), "The ticket required for sailing on the ferry S.S. Aqua. It has a drawing of a ship on it. ") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = False - Me._canBeHold = False + _textureRectangle = New Rectangle(240, 216, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/SecretPotion.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/SecretPotion.vb index d3d134aed..5d2b96294 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/SecretPotion.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/SecretPotion.vb @@ -3,15 +3,12 @@ Namespace Items.KeyItems Public Class SecretPotion - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "A fantastic medicine dispensed by the pharmacy in Cianwood City. It fully heals a Pokémon of any ailment." Public Sub New() - MyBase.New("SecretPotion", 138, ItemTypes.KeyItems, 67, 1, 0, New Rectangle(456, 48, 24, 24), "A fantastic medicine dispensed by the pharmacy in Cianwood City. It fully heals a Pokémon of any ailment.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = False - Me._canBeHold = False + _textureRectangle = New Rectangle(456, 48, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/ShinyCharm.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/ShinyCharm.vb index b35645f4b..ea3718501 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/ShinyCharm.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/ShinyCharm.vb @@ -3,15 +3,12 @@ Namespace Items.KeyItems Public Class ShinyCharm - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "A shiny charm said to increase the chance of finding a Shiny Pokémon in the wild." Public Sub New() - MyBase.New("Shiny Charm", 9800, ItemTypes.KeyItems, 242, 1, 0, New Rectangle(120, 264, 24, 24), "A shiny charm said to increase the chance of finding a Shiny Pokémon in the wild.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = False - Me._canBeHold = False + _textureRectangle = New Rectangle(120, 264, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/SilverWing.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/SilverWing.vb index 25aa5d314..34ec83cd7 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/SilverWing.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/SilverWing.vb @@ -3,17 +3,12 @@ Namespace Items.KeyItems Public Class SilverWing - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "A strange, silvery feather that sparkles." Public Sub New() - MyBase.New("Silver Wing", 9800, ItemTypes.KeyItems, 71, 1, 0, New Rectangle(48, 72, 24, 24), "A strange, silvery feather that sparkles.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = False - Me._canBeHold = False - - Me._flingDamage = 20 + _textureRectangle = New Rectangle(48, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/Squirtbottle.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/Squirtbottle.vb index a79eed3e4..005077e34 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/Squirtbottle.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/Squirtbottle.vb @@ -3,15 +3,12 @@ Namespace Items.KeyItems Public Class Squirtbottle - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "A bottle used for watering plants in Loamy Soil." Public Sub New() - MyBase.New("SquirtBottle", 9800, ItemTypes.KeyItems, 175, 1, 0, New Rectangle(360, 144, 24, 24), "A bottle used for watering plants in Loamy Soil.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = False - Me._canBeHold = False + _textureRectangle = New Rectangle(360, 144, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/SuperRod.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/SuperRod.vb index d5b760f05..0a3af615e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/SuperRod.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/SuperRod.vb @@ -3,15 +3,13 @@ Namespace Items.KeyItems Public Class SuperRod - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "An awesome, high-tech fishing rod. Use it by any body of water to fish for wild aquatic Pokémon." + Public Overrides ReadOnly Property CanBeUsed As Boolean = True Public Sub New() - MyBase.New("Super Rod", 1337, ItemTypes.KeyItems, 61, 1, 0, New Rectangle(312, 48, 24, 24), "An awesome, high-tech fishing rod. Use it by any body of water to fish for wild aquatic Pokémon.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = False - Me._canBeTraded = False - Me._canBeHold = False + _textureRectangle = New Rectangle(312, 48, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/TriPass.vb b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/TriPass.vb index 352b2adb0..ea8f9d114 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/TriPass.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/KeyItems/TriPass.vb @@ -3,15 +3,12 @@ Namespace Items.KeyItems Public Class TriPass - Inherits Item + Inherits KeyItem + + Public Overrides ReadOnly Property Description As String = "A pass for ferries between One, Two, and Three Island. It has a drawing of three islands." Public Sub New() - MyBase.New("Tri-Pass", 100, ItemTypes.KeyItems, 265, 1, 1, New Rectangle(480, 48, 24, 24), "A pass for ferries between One, Two, and Three Island. It has a drawing of three islands.") - - Me._canBeHold = False - Me._canBeTraded = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False + _textureRectangle = New Rectangle(480, 48, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM01.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM01.vb index 51ed09645..b72fbb990 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM01.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM01.vb @@ -1,14 +1,12 @@ Namespace Items.Machines - + Public Class HM01 Inherits TechMachine Public Sub New() - MyBase.New(247, False, 100, 15) - - Me._name = "HM 01" + MyBase.New(False, 100, 15) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM02.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM02.vb index 83b7b6593..cfa6ea338 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM02.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM02.vb @@ -6,9 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(244, False, 100, 19) - - Me._name = "HM 02" + MyBase.New(False, 100, 19) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM03.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM03.vb index 73743699d..24e75b102 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM03.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM03.vb @@ -6,9 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(245, False, 100, 57) - - Me._name = "HM 03" + MyBase.New(False, 100, 57) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM04.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM04.vb index dd9969120..55dca338c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM04.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM04.vb @@ -6,9 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(246, False, 100, 70) - - Me._name = "HM 04" + MyBase.New(False, 100, 70) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM05.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM05.vb index 042a9c888..3da905ee0 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM05.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM05.vb @@ -1,14 +1,12 @@ Namespace Items.Machines - + Public Class HM05 Inherits TechMachine Public Sub New() - MyBase.New(243, False, 100, 148) - - Me._name = "HM 05" + MyBase.New(False, 100, 148) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM06.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM06.vb index b6d967953..11e5a1a51 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM06.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM06.vb @@ -6,9 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(248, False, 100, 250) - - Me._name = "HM 06" + MyBase.New(False, 100, 250) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM07.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM07.vb index 36af7f224..88fec12ed 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM07.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM07.vb @@ -6,9 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(249, False, 100, 127) - - Me._name = "HM 07" + MyBase.New(False, 100, 127) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM08.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM08.vb index 5cf45f289..e065f1a60 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM08.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM08.vb @@ -6,9 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(250, False, 100, 431) - - Me._name = "HM 08" + MyBase.New(False, 100, 431) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM09.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM09.vb index daa9bcbf2..cdba2d401 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM09.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM09.vb @@ -6,9 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(251, False, 100, 560) - - Me._name = "HM 09" + MyBase.New(False, 100, 560) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM10.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM10.vb index 1fb6522fd..58cebede7 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM10.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/HM10.vb @@ -6,9 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(252, False, 100, 291) - - Me._name = "HM 10" + MyBase.New(False, 100, 291) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM01.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM01.vb index fac8a6376..8722fe74b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM01.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM01.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(191, True, 1500, 223) + MyBase.New(True, 1500, 223) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM02.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM02.vb index 97863e1ea..90c0a9ec1 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM02.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM02.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(192, True, 2000, 29) + MyBase.New(True, 2000, 29) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM03.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM03.vb index 371236d69..b53a3c793 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM03.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM03.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(193, True, 3000, 174) + MyBase.New(True, 3000, 174) CanTeachAlways = True End Sub diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM04.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM04.vb index 7b26b6f8f..236f2b3e5 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM04.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM04.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(194, True, 2000, 205) + MyBase.New(True, 2000, 205) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM05.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM05.vb index e159ff4a8..11134428a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM05.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM05.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(195, True, 500, 46) + MyBase.New(True, 500, 46) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM06.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM06.vb index 25a88db53..69f25301d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM06.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM06.vb @@ -5,11 +5,11 @@ Namespace Items.Machines Inherits TechMachine - Public Sub New() - MyBase.New(196, True, 3000, 92) - CanTeachAlways = True + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 32 - Me._battlePointsPrice = 32 + Public Sub New() + MyBase.New(True, 3000, 92) + CanTeachAlways = True End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM07.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM07.vb index 25621f3db..52fe5fa32 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM07.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM07.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(197, True, 2000, 192) + MyBase.New(True, 2000, 192) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM08.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM08.vb index 082586e08..b58c705de 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM08.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM08.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(198, True, 1000, 249) + MyBase.New(True, 1000, 249) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM09.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM09.vb index 59037cde7..d608bbd5a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM09.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM09.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(199, True, 1000, 244) + MyBase.New(True, 1000, 244) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM10.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM10.vb index 79abac01a..144041099 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM10.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM10.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(200, True, 3000, 237) + MyBase.New(True, 3000, 237) CanTeachAlways = True End Sub diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM100.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM100.vb index 9088d62b4..347c5caca 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM100.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM100.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(400, True, 3000, 53, 100) + MyBase.New(True, 3000, 53) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM101.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM101.vb index c1f5686e8..2583fd2bc 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM101.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM101.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(401, True, 2000, 317, 101) + MyBase.New(True, 2000, 317) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM102.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM102.vb index 3c3d71413..ddb5e6563 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM102.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM102.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(402, True, 2000, 332, 102) + MyBase.New(True, 2000, 332) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM103.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM103.vb index 3c438a32f..86ff24517 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM103.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM103.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(403, True, 1500, 259, 103) + MyBase.New(True, 1500, 259) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM104.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM104.vb index 8b3fcb861..266cd5990 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM104.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM104.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(404, True, 3000, 263, 104) + MyBase.New(True, 3000, 263) CanTeachAlways = True End Sub diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM105.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM105.vb index edc3de456..57df91c73 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM105.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM105.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(405, True, 2000, 290, 105) + MyBase.New(True, 2000, 290) CanTeachAlways = True End Sub diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM106.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM106.vb index 29be2d9cd..4feb007ff 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM106.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM106.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(406, True, 3000, 285, 106) + MyBase.New(True, 3000, 285) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM107.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM107.vb index 6cc80ce8b..d531acac8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM107.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM107.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(407, True, 1500, 289, 107) + MyBase.New(True, 1500, 289) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM108.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM108.vb index 22bffe70e..948a169d2 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM108.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM108.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(408, True, 5500, 315, 108) + MyBase.New(True, 5500, 315) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM109.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM109.vb index 3547a32ba..547ac9b77 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM109.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM109.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(409, True, 2000, 355, 109) + MyBase.New(True, 2000, 355) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM11.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM11.vb index fbcf55d5b..4ec974d03 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM11.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM11.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(201, True, 2000, 241) + MyBase.New(True, 2000, 241) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM110.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM110.vb index 9131ab7a9..2bf6268cd 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM110.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM110.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(410, True, 5500, 411, 110) + MyBase.New(True, 5500, 411) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM111.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM111.vb index ec9b0bb2a..718005e67 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM111.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM111.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(411, True, 3000, 412, 111) + MyBase.New(True, 3000, 412) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM112.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM112.vb index 45310ff52..a5ec7eac4 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM112.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM112.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(412, True, 2000, 206, 112) + MyBase.New(True, 2000, 206) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM113.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM113.vb index b6678d97d..db84d8f5f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM113.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM113.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(413, True, 3000, 362, 113) + MyBase.New(True, 3000, 362) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM114.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM114.vb index d1c082563..7630cbe07 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM114.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM114.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(414, True, 2000, 374, 114) + MyBase.New(True, 2000, 374) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM115.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM115.vb index d88772e21..c1081461d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM115.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM115.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(415, True, 3000, 451, 115) + MyBase.New(True, 3000, 451) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM116.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM116.vb index ab7180a2f..5ab197f23 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM116.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM116.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(416, True, 3000, 406, 116) + MyBase.New(True, 3000, 406) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM117.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM117.vb index a664174b8..d1a079bdb 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM117.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM117.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(417, True, 3000, 409, 117) + MyBase.New(True, 3000, 409) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM118.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM118.vb index 61279edf8..750fa4dfd 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM118.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM118.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(418, True, 2000, 261, 118) + MyBase.New(True, 2000, 261) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM119.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM119.vb index 58b8d2ee5..17aa8de81 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM119.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM119.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(419, True, 3000, 318, 119) + MyBase.New(True, 3000, 318) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM12.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM12.vb index 6f3581dd9..8ed4e9a5b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM12.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM12.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(202, True, 1000, 230) + MyBase.New(True, 1000, 230) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM120.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM120.vb index 23400c2d1..897333a1b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM120.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM120.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(420, True, 2000, 373, 120) + MyBase.New(True, 2000, 373) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM121.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM121.vb index 306da7244..b76b1a2ed 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM121.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM121.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(421, True, 3000, 421, 121) + MyBase.New(True, 3000, 421) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM122.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM122.vb index 415ab078d..fbac5c19e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM122.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM122.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(422, True, 3000, 371, 122) + MyBase.New(True, 3000, 371) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM123.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM123.vb index d661d4ce9..dc6b5e03c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM123.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM123.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(423, True, 1000, 278, 123) + MyBase.New(True, 1000, 278) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM124.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM124.vb index b18a8c3e5..cec21971d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM124.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM124.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(424, True, 3000, 416, 124) + MyBase.New(True, 3000, 416) CanTeachWhenFullyEvolved = True End Sub diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM125.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM125.vb index e51a0fc60..653a8af4d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM125.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM125.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(425, True, 1500, 397, 125) + MyBase.New(True, 1500, 397) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM126.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM126.vb index c2549f619..e6c89489c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM126.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM126.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(426, True, 1000, 432, 126) + MyBase.New(True, 1000, 432) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM127.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM127.vb index db64a4cae..3fa88cf98 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM127.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM127.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(427, True, 3000, 444, 127) + MyBase.New(True, 3000, 444) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM128.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM128.vb index af50c585c..a2243508d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM128.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM128.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(428, True, 3000, 419, 128) + MyBase.New(True, 3000, 419) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM129.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM129.vb index 93f9d7b34..1887056db 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM129.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM129.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(429, True, 3000, 360, 129) + MyBase.New(True, 3000, 360) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM13.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM13.vb index 300e8bbce..2dfe869e4 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM13.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM13.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(203, True, 1000, 173) + MyBase.New(True, 1000, 173) CanTeachAlways = True End Sub diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM130.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM130.vb index bf8b5c41e..ed78c17b6 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM130.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM130.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(430, True, 2000, 446, 130) + MyBase.New(True, 2000, 446) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM131.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM131.vb index fb7214e92..e9834174d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM131.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM131.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(431, True, 1500, 445, 131) + MyBase.New(True, 1500, 445) CanTeachWhenGender = True End Sub diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM132.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM132.vb index 4685e48fe..d93018198 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM132.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM132.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(432, True, 3000, 399, 132) + MyBase.New(True, 3000, 399) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM133.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM133.vb index 389785b00..5892874e9 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM133.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM133.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(433, True, 3000, 404, 133) + MyBase.New(True, 3000, 404) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM134.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM134.vb index f2314b41f..5d80e4b37 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM134.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM134.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(434, True, 2000, 363, 134) + MyBase.New(True, 2000, 363) CanTeachAlways = True End Sub diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM135.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM135.vb index a50b7c74a..5e124903e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM135.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM135.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(435, True, 3000, 398, 135) + MyBase.New(True, 3000, 398) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM136.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM136.vb index eee265905..9b0d539af 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM136.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM136.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(436, True, 3000, 447, 136) + MyBase.New(True, 3000, 447) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM137.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM137.vb index 33693cafa..5671e0ff3 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM137.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM137.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(437, True, 3000, 365, 137) + MyBase.New(True, 3000, 365) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM138.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM138.vb index bf7115555..5da0ee2de 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM138.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM138.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(438, True, 3000, 369, 138) + MyBase.New(True, 3000, 369) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM139.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM139.vb index e1c41e419..3549f4173 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM139.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM139.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(439, True, 3000, 430, 139) + MyBase.New(True, 3000, 430) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM14.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM14.vb index d6780c025..e8cf7e10e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM14.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM14.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(204, True, 5500, 59) + MyBase.New(True, 5500, 59) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM140.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM140.vb index fcaf419b9..4507f8686 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM140.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM140.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(440, True, 5500, 433, 140) + MyBase.New(True, 5500, 433) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM141.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM141.vb index 66dea52d2..769144689 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM141.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM141.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(441, True, 3000, 468, 141) + MyBase.New(True, 3000, 468) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM142.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM142.vb index eb031f8f0..5c0fa4f38 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM142.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM142.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(442, True, 3000, 473, 142) + MyBase.New(True, 3000, 473) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM143.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM143.vb index 5d252d4b6..0fc1105b8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM143.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM143.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(443, True, 4000, 474, 143) + MyBase.New(True, 4000, 474) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM144.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM144.vb index e6216dd5d..0008b6b33 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM144.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM144.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(444, True, 2000, 477, 144) + MyBase.New(True, 2000, 477) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM145.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM145.vb index c793eddeb..3ecb1e12e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM145.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM145.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(445, True, 2000, 479, 145) + MyBase.New(True, 2000, 479) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM146.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM146.vb index 280f38e6a..3a1b5071d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM146.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM146.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(446, True, 3500, 482, 146) + MyBase.New(True, 3500, 482) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM147.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM147.vb index 088e9438d..47036be30 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM147.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM147.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(447, True, 3000, 448, 147) + MyBase.New(True, 3000, 448) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM148.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM148.vb index 3d9a623f8..9d5a8e7e5 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM148.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM148.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(448, True, 3000, 490, 148) + MyBase.New(True, 3000, 490) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM149.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM149.vb index 450a104b3..493bc0c69 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM149.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM149.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(449, True, 2500, 496, 149) + MyBase.New(True, 2500, 496) CanTeachAlways = True End Sub diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM15.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM15.vb index f2893558b..71deb507d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM15.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM15.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(205, True, 3000, 63) + MyBase.New(True, 3000, 63) CanTeachWhenFullyEvolved = True End Sub diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM150.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM150.vb index 1a157363d..1e3da70c1 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM150.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM150.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(450, True, 2000, 497, 150) + MyBase.New(True, 2000, 497) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM151.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM151.vb index 50d747c61..b8109f7f8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM151.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM151.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(451, True, 2000, 502, 151) + MyBase.New(True, 2000, 502) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM152.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM152.vb index 250f2b27e..dd77fd996 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM152.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM152.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(452, True, 4000, 503, 152) + MyBase.New(True, 4000, 503) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM153.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM153.vb index 7d30e7ecc..8b18b1a8d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM153.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM153.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(453, True, 3000, 507, 153) + MyBase.New(True, 3000, 507) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM154.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM154.vb index df8f3e7d0..467de283c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM154.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM154.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(454, True, 4000, 510, 154) + MyBase.New(True, 4000, 510) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM155.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM155.vb index cb19640e7..4047edde5 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM155.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM155.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(455, True, 3000, 511, 155) + MyBase.New(True, 3000, 511) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM156.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM156.vb index 3696b54c7..59d111ea9 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM156.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM156.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(456, True, 4000, 512, 156) + MyBase.New(True, 4000, 512) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM157.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM157.vb index 1fdf18223..33a936885 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM157.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM157.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(457, True, 5500, 514, 157) + MyBase.New(True, 5500, 514) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM158.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM158.vb index 75b3ca3be..6605d3d0e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM158.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM158.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(158, True, 5000, 521, 158) + MyBase.New(True, 5000, 521) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM159.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM159.vb index cff5fd55c..5aed234bb 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM159.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM159.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(459, True, 3000, 522, 159) + MyBase.New(True, 3000, 522) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM16.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM16.vb index ea3542ce0..16e98ca8b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM16.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM16.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(206, True, 3000, 196) + MyBase.New(True, 3000, 196) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM160.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM160.vb index db68bd8da..14b14ece2 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM160.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM160.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(460, True, 3000, 523, 160) + MyBase.New(True, 3000, 523) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM161.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM161.vb index 66099b81c..751322307 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM161.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM161.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(461, True, 3000, 524, 161) + MyBase.New(True, 3000, 524) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM162.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM162.vb index f7eede913..68bad5673 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM162.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM162.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(462, True, 4000, 525, 162) + MyBase.New(True, 4000, 525) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM163.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM163.vb index 3c3f63915..bfcd5365a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM163.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM163.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(463, True, 3000, 526, 163) + MyBase.New(True, 3000, 526) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM164.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM164.vb index 1b49f6850..f52214252 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM164.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM164.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(464, True, 5000, 528, 164) + MyBase.New(True, 5000, 528) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM165.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM165.vb index e0f566a89..a3e75f37e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM165.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM165.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(465, True, 3000, 555, 165) + MyBase.New(True, 3000, 555) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM166.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM166.vb index 775e43a6e..e690306cf 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM166.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM166.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(466, True, 3000, 611, 166) + MyBase.New(True, 3000, 611) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM167.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM167.vb index 186e0fa38..328f2874e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM167.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM167.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(467, True, 3000, 267, 167) + MyBase.New(True, 3000, 267) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM168.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM168.vb index 8a0a19754..6f4450e09 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM168.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM168.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(468, True, 4000, 612, 168) + MyBase.New(True, 4000, 612) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM169.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM169.vb index 8fd9d3c9b..9e8c3e283 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM169.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM169.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(469, True, 5000, 605, 169) + MyBase.New(True, 5000, 605) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM17.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM17.vb index d1bb17574..7c1c4a406 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM17.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM17.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(207, True, 3000, 182) + MyBase.New(True, 3000, 182) CanTeachAlways = True End Sub diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM170.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM170.vb index ed5aa5a54..740c411d3 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM170.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM170.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(470, True, 2000, 590, 170) + MyBase.New(True, 2000, 590) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM18.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM18.vb index 0cc900d90..82ba87763 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM18.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM18.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(208, True, 2000, 240) + MyBase.New(True, 2000, 240) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM19.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM19.vb index 25698ef2c..d68df2dfd 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM19.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM19.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(209, True, 3000, 202) + MyBase.New(True, 3000, 202) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM20.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM20.vb index adabaf098..602ecc55b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM20.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM20.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(210, True, 3000, 203) + MyBase.New(True, 3000, 203) CanTeachAlways = True End Sub diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM21.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM21.vb index 0dac93c69..805d2f032 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM21.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM21.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(211, True, 1000, 218) + MyBase.New(True, 1000, 218) CanTeachAlways = True End Sub diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM22.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM22.vb index a758114c6..b937bc11c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM22.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM22.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(212, True, 3000, 76) + MyBase.New(True, 3000, 76) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM23.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM23.vb index 82a6a0738..6bd5faa37 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM23.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM23.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(213, True, 1500, 231) + MyBase.New(True, 1500, 231) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM24.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM24.vb index 34ad96b36..3cbc885a5 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM24.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM24.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(214, True, 3000, 225) + MyBase.New(True, 3000, 225) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM25.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM25.vb index 7ef26d557..981551ab3 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM25.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM25.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(215, True, 5500, 87) + MyBase.New(True, 5500, 87) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM26.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM26.vb index c0e737774..ee37df027 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM26.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM26.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(216, True, 1500, 89) + MyBase.New(True, 1500, 89) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM27.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM27.vb index 715204bbb..398e8ecc3 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM27.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM27.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(217, True, 1000, 216) + MyBase.New(True, 1000, 216) CanTeachAlways = True End Sub diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM28.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM28.vb index a5440c4f5..bbe9451c6 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM28.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM28.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(218, True, 2000, 91) + MyBase.New(True, 2000, 91) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM29.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM29.vb index eef4553ef..f230614e5 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM29.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM29.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(219, True, 2000, 94) + MyBase.New(True, 2000, 94) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM30.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM30.vb index 7f23f8fa8..23c7a1c26 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM30.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM30.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(220, True, 1500, 247) + MyBase.New(True, 1500, 247) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM31.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM31.vb index ec3d79c4e..0db77f66e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM31.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM31.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(221, True, 1500, 189) + MyBase.New(True, 1500, 189) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM32.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM32.vb index c1616c93c..c1c4a4dc3 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM32.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM32.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(222, True, 2000, 104) + MyBase.New(True, 2000, 104) CanTeachAlways = True End Sub diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM33.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM33.vb index be97e4464..4611ed8e4 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM33.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM33.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(223, True, 3000, 8) + MyBase.New(True, 3000, 8) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM34.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM34.vb index ebad82fbc..b6e44e80d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM34.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM34.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(224, True, 1000, 207) + MyBase.New(True, 1000, 207) CanTeachAlways = True End Sub diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM35.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM35.vb index a6a858a1f..e951b70ee 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM35.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM35.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(225, True, 3000, 214) + MyBase.New(True, 3000, 214) CanTeachAlways = True End Sub diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM36.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM36.vb index eb1c9e685..984958e28 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM36.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM36.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(226, True, 1000, 188) + MyBase.New(True, 1000, 188) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM37.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM37.vb index b1c1cb0be..1959cfd0a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM37.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM37.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(227, True, 2000, 201) + MyBase.New(True, 2000, 201) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM38.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM38.vb index b93abcc06..a27ec9baa 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM38.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM38.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(228, True, 2000, 126) + MyBase.New(True, 2000, 126) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM39.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM39.vb index 747d68d5a..ac65cc406 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM39.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM39.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(229, True, 2000, 129) + MyBase.New(True, 2000, 129) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM40.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM40.vb index 0bd9cd46b..b2d7ca105 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM40.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM40.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(230, True, 1000, 111) + MyBase.New(True, 1000, 111) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM41.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM41.vb index dd7561104..935ea685c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM41.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM41.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(231, True, 3000, 9) + MyBase.New(True, 3000, 9) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM42.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM42.vb index 98a11f9a6..14c1e584c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM42.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM42.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(232, True, 3000, 138) + MyBase.New(True, 3000, 138) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM43.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM43.vb index 31c347c35..693fb0a54 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM43.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM43.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(233, True, 500, 197) + MyBase.New(True, 500, 197) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM44.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM44.vb index 6a5740de2..ea0048eb2 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM44.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM44.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(234, True, 3000, 156) + MyBase.New(True, 3000, 156) CanTeachAlways = True End Sub diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM45.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM45.vb index 002751547..267844d55 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM45.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM45.vb @@ -5,11 +5,11 @@ Namespace Items.Machines Inherits TechMachine - Public Sub New() - MyBase.New(235, True, 1500, 213) - CanTeachWhenGender = True + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 32 - Me._battlePointsPrice = 32 + Public Sub New() + MyBase.New(True, 1500, 213) + CanTeachWhenGender = True End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM46.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM46.vb index da3d25225..7a9e2fbde 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM46.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM46.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(236, True, 3000, 168) + MyBase.New(True, 3000, 168) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM47.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM47.vb index c37867b27..777146e21 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM47.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM47.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(237, True, 3000, 211) + MyBase.New(True, 3000, 211) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM48.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM48.vb index d84a3850b..a2302b2b8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM48.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM48.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(238, True, 3000, 7) + MyBase.New(True, 3000, 7) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM49.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM49.vb index 11ecb27cf..eafc441a5 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM49.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM49.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(239, True, 1500, 210) + MyBase.New(True, 1500, 210) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM50.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM50.vb index 62009df4a..a5cd80c12 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM50.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM50.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(240, True, 2000, 171) + MyBase.New(True, 2000, 171) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM51.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM51.vb index 11bbdf79f..d18917488 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM51.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM51.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(351, True, 3000, 5, 51) + MyBase.New(True, 3000, 5) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM52.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM52.vb index 0986d7668..dc8fb0287 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM52.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM52.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(352, True, 2000, 13, 52) + MyBase.New(True, 2000, 13) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM53.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM53.vb index 8feb8b311..bbb15e630 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM53.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM53.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(353, True, 2000, 14, 53) + MyBase.New(True, 2000, 14) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM54.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM54.vb index 1f5bfaacb..86d63c0e2 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM54.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM54.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(354, True, 1000, 18, 54) + MyBase.New(True, 1000, 18) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM55.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM55.vb index 077e39494..bb98d86b7 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM55.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM55.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(355, True, 3000, 25, 55) + MyBase.New(True, 3000, 25) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM56.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM56.vb index d95c93dce..6ac6d91dd 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM56.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM56.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(356, True, 2000, 32, 56) + MyBase.New(True, 2000, 32) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM57.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM57.vb index 4c75610ea..7240e82d9 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM57.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM57.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(357, True, 4000, 34, 57) + MyBase.New(True, 4000, 34) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM58.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM58.vb index 64a837e77..175470d12 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM58.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM58.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(358, True, 3000, 36, 58) + MyBase.New(True, 3000, 36) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM59.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM59.vb index a5572d51d..7abbfe5af 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM59.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM59.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(359, True, 4000, 38, 59) + MyBase.New(True, 4000, 38) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM60.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM60.vb index d0db1f9f9..18a87026a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM60.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM60.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(360, True, 2000, 61, 60) + MyBase.New(True, 2000, 61) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM61.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM61.vb index e34b0df04..8305e9324 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM61.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM61.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(361, True, 1000, 55, 61) + MyBase.New(True, 1000, 55) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM62.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM62.vb index a7b9de1b2..804dda7c1 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM62.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM62.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(362, True, 4000, 58, 62) + MyBase.New(True, 4000, 58) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM63.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM63.vb index d94f8eb22..29ff40376 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM63.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM63.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(363, True, 5000, 6, 63) + MyBase.New(True, 5000, 6) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM64.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM64.vb index 356a6e910..057e59d41 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM64.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM64.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(364, True, 3000, 66, 64) + MyBase.New(True, 3000, 66) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM65.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM65.vb index 9657d960f..83877a4ce 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM65.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM65.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(365, True, 2000, 68, 65) + MyBase.New(True, 2000, 68) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM66.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM66.vb index 582c5fef7..0603539cc 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM66.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM66.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(366, True, 3000, 69, 66) + MyBase.New(True, 3000, 69) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM67.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM67.vb index 279c2ad0e..49865efb5 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM67.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM67.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(367, True, 2000, 99, 67) + MyBase.New(True, 2000, 99) CanTeachAlways = True End Sub diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM68.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM68.vb index aa0c7b453..4e0fe34c8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM68.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM68.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(368, True, 5000, 72, 68) + MyBase.New(True, 5000, 72) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM69.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM69.vb index 5b6094660..72d4a1f5e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM69.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM69.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(369, True, 5000, 82, 69) + MyBase.New(True, 5000, 82) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM70.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM70.vb index be60a7f3b..19dbb47aa 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM70.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM70.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(370, True, 2000, 85, 70) + MyBase.New(True, 2000, 85) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM71.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM71.vb index ee35cd1ba..e3a8893bc 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM71.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM71.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(371, True, 5000, 90, 71) + MyBase.New(True, 5000, 90) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM72.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM72.vb index 172a76116..6637d58cf 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM72.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM72.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(372, True, 1000, 100, 72) + MyBase.New(True, 1000, 100) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM73.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM73.vb index 44ea994c3..38f2409ab 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM73.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM73.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(373, True, 2000, 102, 73) + MyBase.New(True, 2000, 102) CanTeachAlways = True End Sub diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM74.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM74.vb index 7f91c806d..f4cb5b7fa 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM74.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM74.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(374, True, 1000, 115, 74) + MyBase.New(True, 1000, 115) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM75.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM75.vb index 4ab1cfaf7..da4e4087c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM75.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM75.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(375, True, 2000, 117, 75) + MyBase.New(True, 2000, 117) CanTeachAlways = True End Sub diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM76.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM76.vb index a6b2141ae..19662c503 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM76.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM76.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(376, True, 4000, 118, 76) + MyBase.New(True, 4000, 118) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM77.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM77.vb index cf26fc995..edbadefa3 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM77.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM77.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(377, True, 2000, 120, 77) + MyBase.New(True, 2000, 120) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM78.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM78.vb index 282dfa01e..dbe71b0d2 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM78.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM78.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(378, True, 2000, 121, 78) + MyBase.New(True, 2000, 121) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM79.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM79.vb index d71bfc24d..1b30bfa01 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM79.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM79.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(379, True, 4000, 130, 79) + MyBase.New(True, 4000, 130) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM80.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM80.vb index 2a3245121..3a53d42f2 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM80.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM80.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(380, True, 2000, 135, 80) + MyBase.New(True, 2000, 135) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM81.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM81.vb index 0f8908a01..27029040a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM81.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM81.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(381, True, 5000, 143, 81) + MyBase.New(True, 5000, 143) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM82.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM82.vb index f61f7d638..39b433af8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM82.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM82.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(382, True, 2000, 86, 82) + MyBase.New(True, 2000, 86) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM83.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM83.vb index 6a71f42d9..1b5fc0e1f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM83.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM83.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(383, True, 2000, 149, 83) + MyBase.New(True, 2000, 149) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM84.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM84.vb index 14bf17024..c0c93183b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM84.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM84.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(384, True, 3000, 153, 84) + MyBase.New(True, 3000, 153) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM85.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM85.vb index d727b6ea5..a1742df47 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM85.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM85.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(385, True, 3000, 157, 85) + MyBase.New(True, 3000, 157) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM86.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM86.vb index 3994fea68..72e1e8c80 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM86.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM86.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(386, True, 4000, 161, 86) + MyBase.New(True, 4000, 161) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM87.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM87.vb index c388f0243..ca0d262f6 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM87.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM87.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(387, True, 2000, 164, 87) + MyBase.New(True, 2000, 164) CanTeachAlways = True End Sub diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM88.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM88.vb index 26073841a..5e3a547f8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM88.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM88.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(388, True, 3000, 264, 88) + MyBase.New(True, 3000, 264) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM89.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM89.vb index 2a3cefbcb..016b6f576 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM89.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM89.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(389, True, 3000, 337, 89) + MyBase.New(True, 3000, 337) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM90.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM90.vb index 0ef7682a0..cd3d9bcdb 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM90.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM90.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(390, True, 1000, 352, 90) + MyBase.New(True, 1000, 352) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM91.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM91.vb index d75e2240d..874daca53 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM91.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM91.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(391, True, 1500, 347, 91) + MyBase.New(True, 1500, 347) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM92.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM92.vb index 780fd8c73..9a8871638 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM92.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM92.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(392, True, 3000, 258, 92) + MyBase.New(True, 3000, 258) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM93.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM93.vb index 6d6320fd5..bc24b9b70 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM93.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM93.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(393, True, 1500, 339, 93) + MyBase.New(True, 1500, 339) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM94.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM94.vb index 4d732c1e3..4eb1bd2a0 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM94.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM94.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(394, True, 2000, 331, 94) + MyBase.New(True, 2000, 331) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM95.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM95.vb index 75d27ba81..b8f758e29 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM95.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM95.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(395, True, 1500, 269, 95) + MyBase.New(True, 1500, 269) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM96.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM96.vb index 6854ecc9d..1434ff203 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM96.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM96.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(396, True, 2000, 113, 96) + MyBase.New(True, 2000, 113) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM97.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM97.vb index 229a3d949..dd1fa6edf 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM97.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM97.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(397, True, 2000, 219, 97) + MyBase.New(True, 2000, 219) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM98.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM98.vb index bd8ded344..9c3eb8ce6 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM98.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM98.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(398, True, 3000, 280, 98) + MyBase.New(True, 3000, 280) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM99.vb b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM99.vb index 7159d4dc3..69378b98d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM99.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Machines/TM99.vb @@ -6,7 +6,7 @@ Namespace Items.Machines Inherits TechMachine Public Sub New() - MyBase.New(399, True, 1500, 351, 99) + MyBase.New(True, 1500, 351) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/AirMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/AirMail.vb index 05b27f508..cdb35a5d0 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/AirMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/AirMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationery featuring a print of colorful letter sets. Let a Pokémon hold it for delivery." + Public Sub New() - MyBase.New("Air Mail", 50, 313, New Rectangle(288, 456, 24, 24), "Stationery featuring a print of colorful letter sets. Let a Pokémon hold it for delivery.") + _textureRectangle = New Rectangle(288, 456, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/BeadMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/BeadMail.vb index 20924c947..cc3277ea8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/BeadMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/BeadMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Mail featuring a sketch of the holding Pokémon." + Public Sub New() - MyBase.New("Bead Mail", 50, 301, New Rectangle(0, 456, 24, 24), "Mail featuring a sketch of the holding Pokémon.") + _textureRectangle = New Rectangle(0, 456, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/BloomMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/BloomMail.vb index 2f44b5090..c534e9a7e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/BloomMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/BloomMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationery featuring a print of pretty floral patterns. Let a Pokémon hold it for delivery." + Public Sub New() - MyBase.New("Bloom Mail", 50, 314, New Rectangle(312, 456, 24, 24), "Stationery featuring a print of pretty floral patterns. Let a Pokémon hold it for delivery.") + _textureRectangle = New Rectangle(312, 456, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/BrickMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/BrickMail.vb index 7312a0d69..1e6fbf6de 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/BrickMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/BrickMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationery featuring a print of a tough-looking brick pattern. Let a Pokémon hold it for delivery." + Public Sub New() - MyBase.New("Brick Mail", 50, 315, New Rectangle(336, 456, 24, 24), "Stationery featuring a print of a tough-looking brick pattern. Let a Pokémon hold it for delivery.") + _textureRectangle = New Rectangle(336, 456, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/BridgeMailD.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/BridgeMailD.vb index 66beb89ea..abe3dd390 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/BridgeMailD.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/BridgeMailD.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationery featuring a print of a red drawbridge. Let a Pokémon hold it for use." + Public Sub New() - MyBase.New("BridgeMail D", 50, 325, New Rectangle(96, 480, 24, 24), "Stationery featuring a print of a red drawbridge. Let a Pokémon hold it for use.") + _textureRectangle = New Rectangle(96, 480, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/BridgeMailM.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/BridgeMailM.vb index a9aff7791..8d9f8123c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/BridgeMailM.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/BridgeMailM.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationery featuring a print of an arched bridge. Let a Pokémon hold it for use." + Public Sub New() - MyBase.New("BridgeMail M", 50, 328, New Rectangle(168, 480, 24, 24), "Stationery featuring a print of an arched bridge. Let a Pokémon hold it for use.") + _textureRectangle = New Rectangle(168, 480, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/BridgeMailS.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/BridgeMailS.vb index 9a48c4649..1d43f991d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/BridgeMailS.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/BridgeMailS.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationery featuring a print of a sky-piercing bridge. Let a Pokémon hold it for use." + Public Sub New() - MyBase.New("BridgeMail S", 50, 326, New Rectangle(120, 480, 24, 24), "Stationery featuring a print of a sky-piercing bridge. Let a Pokémon hold it for use.") + _textureRectangle = New Rectangle(120, 480, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/BridgeMailT.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/BridgeMailT.vb index 67f3bfc93..d00309661 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/BridgeMailT.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/BridgeMailT.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationery featuring a print of a steel suspension bridge. Let a Pokémon hold it for use." + Public Sub New() - MyBase.New("BridgeMail T", 50, 324, New Rectangle(72, 480, 24, 24), "Stationery featuring a print of a steel suspension bridge. Let a Pokémon hold it for use.") + _textureRectangle = New Rectangle(72, 480, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/BridgeMailV.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/BridgeMailV.vb index e00ae7dd2..14bc1dc02 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/BridgeMailV.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/BridgeMailV.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationery featuring a print of a brick bridge. Let a Pokémon hold it for use." + Public Sub New() - MyBase.New("BridgeMail V", 50, 327, New Rectangle(144, 480, 24, 24), "Stationery featuring a print of a brick bridge. Let a Pokémon hold it for use.") + _textureRectangle = New Rectangle(144, 480, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/BubbleMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/BubbleMail.vb index 419dc6869..9969c5ad2 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/BubbleMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/BubbleMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationery featuring a print of a blue world underwater. Let a Pokémon hold it for delivery." + Public Sub New() - MyBase.New("Bubble Mail", 50, 316, New Rectangle(360, 456, 24, 24), "Stationery featuring a print of a blue world underwater. Let a Pokémon hold it for delivery.") + _textureRectangle = New Rectangle(360, 456, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/DreamMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/DreamMail.vb index 5e55c542a..ee8b6d1be 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/DreamMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/DreamMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Mail featuring a sketch of the holding Pokémon." + Public Sub New() - MyBase.New("Dream Mail", 50, 302, New Rectangle(24, 456, 24, 24), "Mail featuring a sketch of the holding Pokémon.") + _textureRectangle = New Rectangle(24, 456, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/FabMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/FabMail.vb index b8897e859..0e577c98f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/FabMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/FabMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "A gorgeous-print Mail to be held by a Pokémon." + Public Sub New() - MyBase.New("Fab Mail", 50, 303, New Rectangle(48, 456, 24, 24), "A gorgeous-print Mail to be held by a Pokémon.") + _textureRectangle = New Rectangle(48, 456, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/FavoredMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/FavoredMail.vb index 84983a8f5..38bdf5e7a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/FavoredMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/FavoredMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationary designed for writing about your favorite things. Let a Pokémon hold it for delivery." + Public Sub New() - MyBase.New("Favored Mail", 50, 329, New Rectangle(192, 480, 24, 24), "Stationary designed for writing about your favorite things. Let a Pokémon hold it for delivery.") + _textureRectangle = New Rectangle(192, 480, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/FlameMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/FlameMail.vb index beeaa6981..af283a670 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/FlameMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/FlameMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationery featuring a print of flames in blazing red. Let a Pokémon hold it for delivery." + Public Sub New() - MyBase.New("Flame Mail", 50, 317, New Rectangle(384, 456, 24, 24), "Stationery featuring a print of flames in blazing red. Let a Pokémon hold it for delivery.") + _textureRectangle = New Rectangle(384, 456, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/GlitterMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/GlitterMail.vb index c4dc5cd0f..4882609b3 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/GlitterMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/GlitterMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "A Pikachu-print Mail to be held by a Pokémon." + Public Sub New() - MyBase.New("Glitter Mail", 50, 304, New Rectangle(72, 456, 24, 24), "A Pikachu-print Mail to be held by a Pokémon.") + _textureRectangle = New Rectangle(72, 456, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/GrassMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/GrassMail.vb index 4f7de8d42..a6d495d30 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/GrassMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/GrassMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Let a Pokémon hold it for delivery." + Public Sub New() - MyBase.New("Grass Mail", 50, 300, New Rectangle(408, 456, 24, 24), "Let a Pokémon hold it for delivery.") + _textureRectangle = New Rectangle(408, 456, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/GreetMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/GreetMail.vb index 28a1acef3..fc5b11b3d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/GreetMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/GreetMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationary designed for introductory greetings. Let a Pokémon hold it for delivery." + Public Sub New() - MyBase.New("Greet Mail", 50, 332, New Rectangle(264, 480, 24, 24), "Stationary designed for introductory greetings. Let a Pokémon hold it for delivery.") + _textureRectangle = New Rectangle(264, 480, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/HarborMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/HarborMail.vb index 5d4934424..9d35aa41c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/HarborMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/HarborMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "A Wingull-print Mail to be held by a Pokémon." + Public Sub New() - MyBase.New("Harbor Mail", 50, 305, New Rectangle(96, 456, 24, 24), "A Wingull-print Mail to be held by a Pokémon.") + _textureRectangle = New Rectangle(96, 456, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/HeartMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/HeartMail.vb index 82f42c6d9..179a5a117 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/HeartMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/HeartMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationery featuring a print of giant heart patterns. Let a Pokémon hold it for delivery." + Public Sub New() - MyBase.New("Heart Mail", 50, 318, New Rectangle(432, 456, 24, 24), "Stationery featuring a print of giant heart patterns. Let a Pokémon hold it for delivery.") + _textureRectangle = New Rectangle(432, 456, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/InquiryMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/InquiryMail.vb index 528630bd6..5d0e39a2a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/InquiryMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/InquiryMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationary designed for writing questions. Let a Pokémon hold it for delivery." + Public Sub New() - MyBase.New("Inquiry Mail", 50, 331, New Rectangle(240, 480, 24, 24), "Stationary designed for writing questions. Let a Pokémon hold it for delivery.") + _textureRectangle = New Rectangle(240, 480, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/KolbenMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/KolbenMail.vb index a6111f24f..d89d08c3a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/KolbenMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/KolbenMail.vb @@ -5,13 +5,15 @@ Namespace Items.Mail Inherits MailItem - Public Sub New() - MyBase.New("Kolben Mail", 2674, 336, New Rectangle(360, 480, 24, 24), "Stationery featuring a print of the Kolben Logo. It is given to Pokémon with a special meaning.") + Public Overrides ReadOnly Property Description As String = "Stationery featuring a print of the Kolben Logo. It is given to Pokémon with a special meaning." + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeTraded As Boolean = False + Public Overrides ReadOnly Property CanBeHold As Boolean = False + Public Overrides ReadOnly Property CanBeTossed As Boolean = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = False - Me._canBeHold = False + Public Sub New() + _textureRectangle = New Rectangle(360, 480, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/LikeMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/LikeMail.vb index 018daf75a..63004e418 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/LikeMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/LikeMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationary designed for writing recommendations. Let a Pokémon hold it for delivery." + Public Sub New() - MyBase.New("Like Mail", 50, 334, New Rectangle(312, 480, 24, 24), "Stationary designed for writing recommendations. Let a Pokémon hold it for delivery.") + _textureRectangle = New Rectangle(312, 480, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/MechMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/MechMail.vb index eb930a73c..c14593fb7 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/MechMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/MechMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "A Magnemite-print Mail to be held by a Pokémon." + Public Sub New() - MyBase.New("Mech Mail", 50, 306, New Rectangle(120, 456, 24, 24), "A Magnemite-print Mail to be held by a Pokémon.") + _textureRectangle = New Rectangle(120, 456, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/MosaicMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/MosaicMail.vb index 5e6176b17..ef097a690 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/MosaicMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/MosaicMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationery featuring a print of a vivid rainbow pattern. Let a Pokémon hold it for delivery." + Public Sub New() - MyBase.New("Mosaic Mail", 50, 319, New Rectangle(456, 456, 24, 24), "Stationery featuring a print of a vivid rainbow pattern. Let a Pokémon hold it for delivery.") + _textureRectangle = New Rectangle(456, 456, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/OrangeMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/OrangeMail.vb index 1c6c094b8..46cf6d8a6 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/OrangeMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/OrangeMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "A Zigzagoon-print Mail to be held by a Pokémon." + Public Sub New() - MyBase.New("Orange Mail", 50, 307, New Rectangle(144, 456, 24, 24), "A Zigzagoon-print Mail to be held by a Pokémon.") + _textureRectangle = New Rectangle(144, 456, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/RSVPMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/RSVPMail.vb index c5bdd4bdf..95dd0f0cf 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/RSVPMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/RSVPMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationary designed for invitations. Let a Pokémon hold it for delivery." + Public Sub New() - MyBase.New("RSVP Mail", 50, 333, New Rectangle(288, 480, 24, 24), "Stationary designed for invitations. Let a Pokémon hold it for delivery.") + _textureRectangle = New Rectangle(288, 480, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/ReplyMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/ReplyMail.vb index a1e07fea9..a7e354236 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/ReplyMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/ReplyMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationary designed for writing a reply. Let a Pokémon hold it for delivery." + Public Sub New() - MyBase.New("Reply Mail", 50, 335, New Rectangle(336, 480, 24, 24), "Stationary designed for writing a reply. Let a Pokémon hold it for delivery.") + _textureRectangle = New Rectangle(336, 480, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/RetroMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/RetroMail.vb index 45ceb761a..f47e9bc16 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/RetroMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/RetroMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Mail featuring the drawings of three Pokémon." + Public Sub New() - MyBase.New("Retro Mail", 50, 308, New Rectangle(168, 456, 24, 24), "Mail featuring the drawings of three Pokémon.") + _textureRectangle = New Rectangle(168, 456, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/ShadowMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/ShadowMail.vb index 8101d0021..66b231742 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/ShadowMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/ShadowMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "A Duskull-print Mail to be held by a Pokémon." + Public Sub New() - MyBase.New("Shadow Mail", 50, 309, New Rectangle(192, 456, 24, 24), "A Duskull-print Mail to be held by a Pokémon.") + _textureRectangle = New Rectangle(192, 456, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/SnowMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/SnowMail.vb index e16753c1c..7ae318732 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/SnowMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/SnowMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationery featuring a print of a chilly, snow-covered world. Let a Pokémon hold it for delivery." + Public Sub New() - MyBase.New("Snow Mail", 50, 320, New Rectangle(480, 456, 24, 24), "Stationery featuring a print of a chilly, snow-covered world. Let a Pokémon hold it for delivery.") + _textureRectangle = New Rectangle(480, 456, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/SpaceMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/SpaceMail.vb index 360945d07..ad644027e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/SpaceMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/SpaceMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationery featuring a print depicting the huge expanse of space. Let a Pokémon hold it for delivery." + Public Sub New() - MyBase.New("Space Mail", 50, 321, New Rectangle(0, 480, 24, 24), "Stationery featuring a print depicting the huge expanse of space. Let a Pokémon hold it for delivery.") + _textureRectangle = New Rectangle(0, 480, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/SteelMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/SteelMail.vb index f65bfbe36..9ea645b79 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/SteelMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/SteelMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationery featuring a print of cool mechanical designs. Let a Pokémon hold it for delivery." + Public Sub New() - MyBase.New("Steel Mail", 50, 322, New Rectangle(24, 480, 24, 24), "Stationery featuring a print of cool mechanical designs. Let a Pokémon hold it for delivery.") + _textureRectangle = New Rectangle(24, 480, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/ThanksMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/ThanksMail.vb index ecb126ad6..2c02e04ed 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/ThanksMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/ThanksMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationary designed for a thank-you note. Let a Pokémon hold it for delivery." + Public Sub New() - MyBase.New("Thanks Mail", 50, 330, New Rectangle(216, 480, 24, 24), "Stationary designed for a thank-you note. Let a Pokémon hold it for delivery.") + _textureRectangle = New Rectangle(216, 480, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/TropicMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/TropicMail.vb index c5e0df62a..d48d77ef4 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/TropicMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/TropicMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "A Bellossom-print Mail to be held by a Pokémon." + Public Sub New() - MyBase.New("Tropic Mail", 50, 310, New Rectangle(216, 456, 24, 24), "A Bellossom-print Mail to be held by a Pokémon.") + _textureRectangle = New Rectangle(216, 456, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/TunnelMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/TunnelMail.vb index 358502155..f1ac78d01 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/TunnelMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/TunnelMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "Stationery featuring a print of a dimly lit coal mine. Let a Pokémon hold it for delivery." + Public Sub New() - MyBase.New("Tunnel Mail", 50, 323, New Rectangle(48, 480, 24, 24), "Stationery featuring a print of a dimly lit coal mine. Let a Pokémon hold it for delivery.") + _textureRectangle = New Rectangle(48, 480, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/WaveMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/WaveMail.vb index 6569a3bd4..029af1c25 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/WaveMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/WaveMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "A Wailmer-print Mail to be held by a Pokémon." + Public Sub New() - MyBase.New("Wave Mail", 50, 311, New Rectangle(240, 456, 24, 24), "A Wailmer-print Mail to be held by a Pokémon.") + _textureRectangle = New Rectangle(240, 456, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Mail/WoodMail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Mail/WoodMail.vb index c2ca58fcf..bb57973a9 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Mail/WoodMail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Mail/WoodMail.vb @@ -5,8 +5,10 @@ Namespace Items.Mail Inherits MailItem + Public Overrides ReadOnly Property Description As String = "A Slakoth-print Mail to be held by a Pokémon." + Public Sub New() - MyBase.New("Wood Mail", 50, 312, New Rectangle(264, 456, 24, 24), "A Slakoth-print Mail to be held by a Pokémon.") + _textureRectangle = New Rectangle(264, 456, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MailItem.vb b/2.5DHero/2.5DHero/Pokemon/Items/MailItem.vb index 6a59ef186..73aaf3358 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MailItem.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MailItem.vb @@ -18,24 +18,9 @@ Namespace Items Dim MailRead As Boolean End Structure - ''' - ''' Creates a new instance of the Mail Item class. - ''' - ''' The name of the Mail. - ''' The price when purchased. - ''' The ID of the Item. - ''' The TextureRectangle of the Item. - ''' The Description of the Item. - Public Sub New(ByVal Name As String, ByVal Price As Integer, ByVal ID As Integer, ByVal TextureRectangle As Rectangle, ByVal Description As String) - MyBase.New(Name, Price, ItemTypes.Mail, ID, 1.0F, 0, TextureRectangle, Description) - - Me._canBeUsed = True - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True - - Me._isMail = True - End Sub + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property ItemType As ItemTypes = ItemTypes.Mail + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 50 Public Shared Function GetMailDataFromString(ByVal s As String) As MailData If s.Contains("|") = True Then diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Antidote.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Antidote.vb index 8784a71a7..7ae1325a7 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Antidote.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Antidote.vb @@ -5,13 +5,11 @@ Namespace Items.Medicine Inherits MedicineItem - Public Sub New() - MyBase.New("Antidote", 100, ItemTypes.Medicine, 9, 1, 1, New Rectangle(168, 0, 24, 24), "A spray-type medicine for poisoning. It can be used once to lift the effects of being poisoned from a Pokémon.") + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 100 + Public Overrides ReadOnly Property Description As String = "A spray-type medicine for poisoning. It can be used once to lift the effects of being poisoned from a Pokémon." - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(168, 0, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Awakening.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Awakening.vb index 383f7accc..695957a97 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Awakening.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Awakening.vb @@ -5,13 +5,11 @@ Namespace Items.Medicine Inherits MedicineItem - Public Sub New() - MyBase.New("Awakening", 250, ItemTypes.Medicine, 12, 1, 1, New Rectangle(240, 0, 24, 24), "A spray-type medicine used against sleep. It can be used once to rouse a Pokémon from the clutches of sleep.") + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 250 + Public Overrides ReadOnly Property Description As String = "A spray-type medicine used against sleep. It can be used once to rouse a Pokémon from the clutches of sleep." - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(240, 0, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/BerryJuice.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/BerryJuice.vb index dbe2c310e..a786d7ad8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/BerryJuice.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/BerryJuice.vb @@ -5,15 +5,12 @@ Namespace Items.Medicine Inherits MedicineItem + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 100 + Public Overrides ReadOnly Property Description As String = "A 100 percent pure juice made of Berries. When consumed, it restores 20 HP to an injured Pokémon." + Public Overrides ReadOnly Property IsHealingItem As Boolean = True + Public Sub New() - MyBase.New("Berry Juice", 100, ItemTypes.Medicine, 139, 1, 0, New Rectangle(360, 120, 24, 24), "A 100 percent pure juice made of Berries. When consumed, it restores 20 HP to an injured Pokémon.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._isHealingItem = True + _textureRectangle = New Rectangle(360, 120, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/BurnHeal.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/BurnHeal.vb index afdfd2418..797aefb52 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/BurnHeal.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/BurnHeal.vb @@ -5,13 +5,11 @@ Namespace Items.Medicine Inherits MedicineItem - Public Sub New() - MyBase.New("Burn Heal", 250, ItemTypes.Medicine, 10, 1, 1, New Rectangle(192, 0, 24, 24), "A spray-type medicine for treating burns. It can be used once to heal a Pokemon suffering from a burn.") + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 250 + Public Overrides ReadOnly Property Description As String = "A spray-type medicine for treating burns. It can be used once to heal a Pokemon suffering from a burn." - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(192, 0, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Elixir.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Elixir.vb index 71fb45c64..099c74624 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Elixir.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Elixir.vb @@ -5,13 +5,11 @@ Namespace Items.Medicine Inherits Item - Public Sub New() - MyBase.New("Elixir", 3000, ItemTypes.Medicine, 65, 1, 1, New Rectangle(408, 48, 24, 24), "This medicine can restore 10 PP to each of the moves that have been learned by a Pokémon.") + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 3000 + Public Overrides ReadOnly Property Description As String = "This medicine can restore 10 PP to each of the moves that have been learned by a Pokémon." - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(408, 48, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/EnergyPowder.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/EnergyPowder.vb index b572f0edf..5246c8c19 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/EnergyPowder.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/EnergyPowder.vb @@ -5,15 +5,12 @@ 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 IsHealingItem As Boolean = True + Public Sub New() - MyBase.New("Energy Powder", 500, ItemTypes.Medicine, 121, 1, 0, New Rectangle(0, 120, 24, 24), "A bitter medicine powder. When consumed, it restores 50 HP to an injured Pokémon.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._isHealingItem = True + _textureRectangle = New Rectangle(0, 120, 24, 24) End Sub Public Overrides Sub Use() @@ -25,11 +22,11 @@ Namespace Items.Medicine End Sub Public Overrides Function UseOnPokemon(ByVal PokeIndex As Integer) As Boolean - Dim r As Boolean = HealPokemon(PokeIndex, 50) - If r = True Then + Dim success As Boolean = HealPokemon(PokeIndex, 50) + If success Then Core.Player.Pokemons(PokeIndex).ChangeFriendShip(Pokemon.FriendShipCauses.EnergyPowder) End If - Return r + Return success End Function End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/EnergyRoot.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/EnergyRoot.vb index 08e056e58..284837d5d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/EnergyRoot.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/EnergyRoot.vb @@ -5,15 +5,12 @@ 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 IsHealingItem As Boolean = True + Public Sub New() - MyBase.New("Energy Root", 800, ItemTypes.Medicine, 122, 1, 0, New Rectangle(24, 120, 24, 24), "An extremely bitter medicinal root. When consumed, it restores 200 HP to an injured Pokémon.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._isHealingItem = True + _textureRectangle = New Rectangle(24, 120, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Ether.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Ether.vb index 97b774cc0..271362e6b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Ether.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Ether.vb @@ -5,13 +5,11 @@ Namespace Items.Medicine Inherits Item - Public Sub New() - MyBase.New("Ether", 1200, ItemTypes.Medicine, 63, 1, 1, New Rectangle(360, 48, 24, 24), "This medicine can restore 10 PP to a single selected move that has been learned by a Pokémon.") + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 1200 + Public Overrides ReadOnly Property Description As String = "This medicine can restore 10 PP to a single selected move that has been learned by a Pokémon." - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(360, 48, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Fanta.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Fanta.vb index d05655c44..01edf01f4 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Fanta.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Fanta.vb @@ -5,15 +5,12 @@ Namespace Items.Medicine Inherits MedicineItem + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 750 + Public Overrides ReadOnly Property Description As String = "Fizzzzzz. When consumed, it restores 250 HP to an injured Pokémon." + Public Overrides ReadOnly Property IsHealingItem As Boolean = True + Public Sub New() - MyBase.New("Fanta", 750, ItemTypes.Medicine, 266, 1, 0, New Rectangle(48, 264, 24, 24), "Fizzzzzz. When consumed, it restores 250 HP to an injured Pokémon.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._isHealingItem = True + _textureRectangle = New Rectangle(48, 264, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/FreshWater.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/FreshWater.vb index 82274a8a4..703a80e83 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/FreshWater.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/FreshWater.vb @@ -5,15 +5,12 @@ 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 IsHealingItem As Boolean = True + Public Sub New() - MyBase.New("Fresh Water", 200, ItemTypes.Medicine, 46, 1, 0, New Rectangle(0, 48, 24, 24), "Water with a high mineral content. When consumed, it restores 50 HP to an injured Pokémon.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._isHealingItem = True + _textureRectangle = New Rectangle(0, 48, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/FullHeal.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/FullHeal.vb index 24b246729..15f8415aa 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/FullHeal.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/FullHeal.vb @@ -5,13 +5,11 @@ Namespace Items.Medicine Inherits Item - Public Sub New() - MyBase.New("Full Heal", 600, ItemTypes.Medicine, 38, 1, 1, New Rectangle(336, 24, 24, 24), "A spray-type medicine that is broadly effective. It can be used once to heal all the status conditions of a Pokémon.") + Public Overrides ReadOnly Property Description As String = "A spray-type medicine that is broadly effective. It can be used once to heal all the status conditions of a Pokémon." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 600 - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(336, 24, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/FullRestore.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/FullRestore.vb index 9c3f390a4..4e197e45b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/FullRestore.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/FullRestore.vb @@ -5,15 +5,12 @@ Namespace Items.Medicine Inherits MedicineItem + Public Overrides ReadOnly Property IsHealingItem As Boolean = True + Public Overrides ReadOnly Property Description As String = "A medicine that can be used to fully restore the HP of a single Pokémon and heal any status conditions it has." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 3000 + Public Sub New() - MyBase.New("Full Restore", 3000, ItemTypes.Medicine, 14, 1, 0, New Rectangle(288, 0, 24, 24), "A medicine that can be used to fully restore the HP of a single Pokémon and heal any status conditions it has.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._isHealingItem = True + _textureRectangle = New Rectangle(288, 0, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/HealPowder.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/HealPowder.vb index e7cdeddf7..a3e4340c5 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/HealPowder.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/HealPowder.vb @@ -5,13 +5,11 @@ Namespace Items.Medicine Inherits Item - Public Sub New() - MyBase.New("Heal Powder", 450, ItemTypes.Medicine, 123, 1, 1, New Rectangle(48, 120, 24, 24), "A very bitter medicine powder. When consumed, it heals all of a Pokémon's status conditions.") + Public Overrides ReadOnly Property Description As String = "A very bitter medicine powder. When consumed, it heals all of a Pokémon's status conditions." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 450 - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(48, 120, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/HyperPotion.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/HyperPotion.vb index 0e84b52f4..f426c3a1c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/HyperPotion.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/HyperPotion.vb @@ -5,15 +5,12 @@ 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 PokeDollarPrice As Integer = 1200 + Public Sub New() - MyBase.New("Hyper Potion", 1200, ItemTypes.Medicine, 16, 1, 0, New Rectangle(336, 0, 24, 24), "A spray-type medicine for treating wounds. It can be used to restore 200 HP to an injured Pokémon.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._isHealingItem = True + _textureRectangle = New Rectangle(336, 0, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/IceHeal.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/IceHeal.vb index 803774d0a..c3aecf319 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/IceHeal.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/IceHeal.vb @@ -5,13 +5,11 @@ Namespace Items.Medicine Inherits MedicineItem - Public Sub New() - MyBase.New("Ice Heal", 250, ItemTypes.Medicine, 11, 1, 1, New Rectangle(216, 0, 24, 24), "A spray-type medicine for freezing. It can be used once to defrost a Pokémon that has been frozen solid.") + Public Overrides ReadOnly Property Description As String = "A spray-type medicine for freezing. It can be used once to defrost a Pokémon that has been frozen solid." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 250 - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(216, 0, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/LavaCookie.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/LavaCookie.vb index 16b7b06ec..748857c11 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/LavaCookie.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/LavaCookie.vb @@ -5,13 +5,11 @@ Namespace Items.Medicine Inherits Item - Public Sub New() - MyBase.New("Lava Cookie", 200, ItemTypes.Medicine, 7, 1, 1, New Rectangle(192, 192, 24, 24), "Lavaridge Town's local specialty. It can be used once to heal all the status conditions of a Pokemon.") + Public Overrides ReadOnly Property Description As String = "Lavaridge Town's local specialty. It can be used once to heal all the status conditions of a Pokemon." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 200 - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(192, 192, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Lemonade.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Lemonade.vb index 487089914..6f7778a27 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Lemonade.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Lemonade.vb @@ -5,15 +5,12 @@ 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 PokeDollarPrice As Integer = 350 + Public Sub New() - MyBase.New("Lemonade", 350, ItemTypes.Medicine, 48, 1, 0, New Rectangle(48, 48, 24, 24), "A very sweet and refreshing drink. When consumed, it restores 80 HP to an injured Pokémon.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._isHealingItem = True + _textureRectangle = New Rectangle(48, 48, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/MaxElixir.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/MaxElixir.vb index 31b908451..086d2b996 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/MaxElixir.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/MaxElixir.vb @@ -5,13 +5,11 @@ Namespace Items.Medicine Inherits Item - Public Sub New() - MyBase.New("Max Elixir", 4500, ItemTypes.Medicine, 21, 1, 1, New Rectangle(456, 0, 24, 24), "This medicine can fully restore the PP of all of the moves that have been learned by a Pokémon.") + Public Overrides ReadOnly Property Description As String = "This medicine can fully restore the PP of all of the moves that have been learned by a Pokémon." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 4500 - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(456, 0, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/MaxEther.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/MaxEther.vb index f3abab901..ce82ccbbe 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/MaxEther.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/MaxEther.vb @@ -5,13 +5,11 @@ Namespace Items.Medicine Inherits Item - Public Sub New() - MyBase.New("Max Ether", 2000, ItemTypes.Medicine, 64, 1, 1, New Rectangle(384, 48, 24, 24), "This medicine can fully restore the PP of a single selected move that has been learned by a Pokémon.") + Public Overrides ReadOnly Property Description As String = "This medicine can fully restore the PP of a single selected move that has been learned by a Pokémon." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 2000 - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(384, 48, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/MaxPotion.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/MaxPotion.vb index 0839306fd..a9feacff3 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/MaxPotion.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/MaxPotion.vb @@ -5,15 +5,12 @@ 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 will completely restore the max HP of a single Pokémon." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 2500 + Public Sub New() - MyBase.New("Max Potion", 2500, ItemTypes.Medicine, 15, 1, 0, New Rectangle(312, 0, 24, 24), "A spray-type medicine for treating wounds. It will completely restore the max HP of a single Pokémon.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._isHealingItem = True + _textureRectangle = New Rectangle(312, 0, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/MaxRevive.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/MaxRevive.vb index 3212a8621..e2914dbd9 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/MaxRevive.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/MaxRevive.vb @@ -5,15 +5,12 @@ Namespace Items.Medicine Inherits Item + Public Overrides ReadOnly Property IsHealingItem As Boolean = True + Public Overrides ReadOnly Property Description As String = "A medicine that can revive fainted Pokémon. It also fully restores a fainted Pokémon's maximum HP." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 4000 + Public Sub New() - MyBase.New("Max Revive", 4000, ItemTypes.Medicine, 40, 1, 0, New Rectangle(384, 24, 24, 24), "A medicine that can revive fainted Pokémon. It also fully restores a fainted Pokémon's maximum HP.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._isHealingItem = True + _textureRectangle = New Rectangle(384, 24, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/MooMooMilk.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/MooMooMilk.vb index 635ec22e7..c139ef77f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/MooMooMilk.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/MooMooMilk.vb @@ -5,15 +5,12 @@ Namespace Items.Medicine Inherits MedicineItem + Public Overrides ReadOnly Property IsHealingItem As Boolean = True + Public Overrides ReadOnly Property Description As String = "A bottle of highly nutritious milk. When consumed, it restores 100 HP to an injured Pokémon." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 500 + Public Sub New() - MyBase.New("Moomoo Milk", 500, ItemTypes.Medicine, 72, 1, 0, New Rectangle(72, 72, 24, 24), "A bottle of highly nutritious milk. When consumed, it restores 100 HP to an injured Pokémon.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._isHealingItem = True + _textureRectangle = New Rectangle(72, 72, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/PPMax.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/PPMax.vb index 5262dc90e..2f230c354 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/PPMax.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/PPMax.vb @@ -5,13 +5,11 @@ Namespace Items.Medicine Inherits Item - Public Sub New() - MyBase.New("PP Max", 9800, ItemTypes.Medicine, 502, 1, 1, New Rectangle(120, 240, 24, 24), "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 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 - Me._canBeUsed = True - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(120, 240, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/PPUp.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/PPUp.vb index 4be50a735..d89b51222 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/PPUp.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/PPUp.vb @@ -5,13 +5,11 @@ Namespace Items.Medicine Inherits Item - Public Sub New() - MyBase.New("PP Up", 9800, ItemTypes.Medicine, 62, 1, 1, New Rectangle(336, 48, 24, 24), "A medicine that can slightly raise the maximum PP of a single move that has been learned by the target Pokémon.") + Public Overrides ReadOnly Property Description As String = "A medicine that can slightly 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 - Me._canBeUsed = True - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(336, 48, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/ParalyzeHeal.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/ParalyzeHeal.vb index 08a87630f..40a518aaf 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/ParalyzeHeal.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/ParalyzeHeal.vb @@ -5,13 +5,11 @@ Namespace Items.Medicine Inherits MedicineItem - Public Sub New() - MyBase.New("Paralyze Heal", 200, ItemTypes.Medicine, 13, 1, 1, New Rectangle(264, 0, 24, 24), "A spray-type medicine for paralysis. It can be used once to free a Pokémon that has been paralyzed.") + Public Overrides ReadOnly Property Description As String = "A spray-type medicine for paralysis. It can be used once to free a Pokémon that has been paralyzed." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 200 - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(264, 0, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Potion.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Potion.vb index a01061313..1ac8db14a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Potion.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Potion.vb @@ -5,15 +5,12 @@ 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 20 HP to an injured Pokémon." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 300 + Public Sub New() - MyBase.New("Potion", 300, ItemTypes.Medicine, 18, 1, 0, New Rectangle(384, 0, 24, 24), "A spray-type medicine for treating wounds. It can be used to restore 20 HP to an injured Pokémon.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._isHealingItem = True + _textureRectangle = New Rectangle(384, 0, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/RageCandyBar.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/RageCandyBar.vb index f7838ff5f..a8265875d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/RageCandyBar.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/RageCandyBar.vb @@ -5,15 +5,12 @@ 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 PokeDollarPrice As Integer = 300 + Public Sub New() - MyBase.New("RageCandyBar", 300, ItemTypes.Medicine, 114, 1, 0, New Rectangle(360, 96, 24, 24), "A famous Mahogany Town candy tourists like to buy and take home. It restores the HP of one Pokémon by 20 points.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._isHealingItem = True + _textureRectangle = New Rectangle(360, 96, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/RareCandy.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/RareCandy.vb index a93376217..4b46fba8d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/RareCandy.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/RareCandy.vb @@ -5,15 +5,12 @@ Namespace Items.Medicine Inherits Item + Public Overrides ReadOnly Property Description As String = "A candy that is packed with energy. When consumed, it will instantly raise the level of a single Pokémon by one." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 4800 + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 48 + Public Sub New() - MyBase.New("Rare Candy", 4800, ItemTypes.Medicine, 32, 1, 1, New Rectangle(192, 24, 24, 24), "A candy that is packed with energy. When consumed, it will instantly raise the level of a single Pokémon by one.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True - - Me._battlePointsPrice = 48 + _textureRectangle = New Rectangle(192, 24, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/RevivalHerb.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/RevivalHerb.vb index 26d41109c..c2a008afb 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/RevivalHerb.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/RevivalHerb.vb @@ -5,15 +5,12 @@ Namespace Items.Medicine Inherits Item + Public Overrides ReadOnly Property IsHealingItem As Boolean = True + Public Overrides ReadOnly Property Description As String = "A terribly bitter medicinal herb. It revives a fainted Pokémon and fully restores its maximum HP." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 2800 + Public Sub New() - MyBase.New("Revival Herb", 2800, ItemTypes.Medicine, 124, 1, 0, New Rectangle(72, 120, 24, 24), "A terribly bitter medicinal herb. It revives a fainted Pokémon and fully restores its maximum HP.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._isHealingItem = True + _textureRectangle = New Rectangle(72, 120, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Revive.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Revive.vb index bfd309d19..f0db94264 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Revive.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/Revive.vb @@ -5,15 +5,12 @@ Namespace Items.Medicine Inherits Item + Public Overrides ReadOnly Property IsHealingItem As Boolean = True + Public Overrides ReadOnly Property Description As String = "A medicine that can revive fainted Pokémon. It also restores half of a fainted Pokémon's HP." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 1500 + Public Sub New() - MyBase.New("Revive", 1500, ItemTypes.Medicine, 39, 1, 0, New Rectangle(360, 24, 24, 24), "A medicine that can revive fainted Pokémon. It also restores half of a fainted Pokémon's HP.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._isHealingItem = True + _textureRectangle = New Rectangle(360, 24, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/SacredAsh.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/SacredAsh.vb index ac90e833f..145acc668 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/SacredAsh.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/SacredAsh.vb @@ -5,13 +5,11 @@ Namespace Items.Medicine Inherits Item - Public Sub New() - MyBase.New("Sacred Ash", 200, ItemTypes.Medicine, 156, 1, 1, New Rectangle(24, 144, 24, 24), "It revives all fainted Pokémon. In doing so, it also fully restores their HP.") + 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 - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(24, 144, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/ShinyCandy.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/ShinyCandy.vb index 5a93dec38..97f8eebe6 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/ShinyCandy.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/ShinyCandy.vb @@ -1,20 +1,15 @@ Namespace Items.Medicine - ''' - ''' Not in the game... - ''' Public Class ShinyCandy Inherits Item - Public Sub New() - MyBase.New("Shiny Candy", 4800, ItemTypes.Medicine, 501, 1, 1, New Rectangle(96, 240, 24, 24), "This mysterious candy sparkles when unwrapped. It attracts all sorts of Pokémon.") + Public Overrides ReadOnly Property Description As String = "This mysterious candy sparkles when unwrapped. It attracts all sorts of Pokémon." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 4800 - Me._canBeUsed = True - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(96, 240, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/SodaPop.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/SodaPop.vb index 66d863f4d..f16754a64 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/SodaPop.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/SodaPop.vb @@ -5,15 +5,12 @@ 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 PokeDollarPrice As Integer = 300 + Public Sub New() - MyBase.New("Soda Pop", 300, ItemTypes.Medicine, 47, 1, 0, New Rectangle(24, 48, 24, 24), "A highly carbonated soda drink. When consumed, it restores 60 HP to an injured Pokémon.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._isHealingItem = True + _textureRectangle = New Rectangle(24, 48, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/SuperPotion.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/SuperPotion.vb index d7d9debc5..7829b5720 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/SuperPotion.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/SuperPotion.vb @@ -5,15 +5,12 @@ 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 PokeDollarPrice As Integer = 700 + Public Sub New() - MyBase.New("Super Potion", 700, ItemTypes.Medicine, 17, 1, 0, New Rectangle(360, 0, 24, 24), "A spray-type medicine for treating wounds. It can be used to restore 50 HP to an injured Pokémon.") - - Me._canBeUsed = True - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._isHealingItem = True + _textureRectangle = New Rectangle(360, 0, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MedicineItem.vb b/2.5DHero/2.5DHero/Pokemon/Items/MedicineItem.vb index 08d95c85c..b1628c99e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MedicineItem.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MedicineItem.vb @@ -7,20 +7,7 @@ Namespace Items Inherits Item - ''' - ''' Creates a new instance of the Item class. - ''' - ''' The name of the Item. - ''' The purchase price. - ''' The type of Item. - ''' The ID of this Item. - ''' The CatchMultiplier of this Item. - ''' The SortValue of this Item. - ''' The TextureRectangle from the "Items\ItemSheet" texture. - ''' The description of this Item. - Public Sub New(ByVal Name As String, ByVal Price As Integer, ByVal ItemType As ItemTypes, ByVal ID As Integer, ByVal CatchMultiplier As Single, ByVal SortValue As Integer, ByVal TextureRectangle As Rectangle, ByVal Description As String) - MyBase.New(Name, Price, ItemType, ID, CatchMultiplier, SortValue, TextureRectangle, Description) - End Sub + Public Overrides ReadOnly Property ItemType As ItemTypes = ItemTypes.Medicine ''' ''' Tries to heal a Pokémon from the player's party. If this succeeds, the method returns True. diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStone.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStone.vb index d5c8c5fec..38eba523d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStone.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStone.vb @@ -7,29 +7,21 @@ Namespace Items Inherits Item - Private _megaPokemonNumber As Integer = 0 + Public ReadOnly Property MegaPokemonNumber As Integer - Public Sub New(ByVal Name As String, ByVal ID As Integer, ByVal TextureRectangle As Rectangle, ByVal MegaPokemonName As String, ByVal MegaPokemonNumber As Integer) - MyBase.New(Name, 100, ItemTypes.Standard, ID, 1.0F, 0, TextureRectangle, "One variety of the mysterious Mega Stones. Have " & MegaPokemonName & " hold it, and this stone will enable it to Mega Evolve during battle.") + Public Overrides ReadOnly Property Description As String + Public Overrides ReadOnly Property CanBeTossed As Boolean = False + Public Overrides ReadOnly Property CanBeTraded As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Me._texture = TextureManager.GetTexture("Items\MegaStones", TextureRectangle, "") + Public Sub New(ByVal MegaPokemonName As String, ByVal MegaPokemonNumber As Integer) + Description = "One variety of the mysterious Mega Stones. Have " & MegaPokemonName & " hold it, and this stone will enable it to Mega Evolve during battle." + _textureSource = "Items\MegaStones" - Me._canBeHold = True - Me._canBeTossed = False - Me._canBeTraded = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._isMegaStone = True - Me._megaPokemonNumber = MegaPokemonNumber + MegaPokemonNumber = MegaPokemonNumber End Sub - Public ReadOnly Property MegaPokemonNumber() As Integer - Get - Return Me._megaPokemonNumber - End Get - End Property - End Class End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Abomasite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Abomasite.vb index eebafbf5d..a261305d1 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Abomasite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Abomasite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Abomasite", 507, New Rectangle(0, 0, 24, 24), "Abomasnow", 460) + MyBase.New("Abomasnow", 460) + _textureRectangle = New Rectangle(0, 0, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Absolite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Absolite.vb index 156f9178d..1f9f1de62 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Absolite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Absolite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Absolite", 508, New Rectangle(24, 0, 24, 24), "Absol", 359) + MyBase.New("Absol", 359) + _textureRectangle = New Rectangle(24, 0, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aerodactylite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aerodactylite.vb index 81da84ede..c08d4ce7f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aerodactylite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aerodactylite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Aerodactylite", 509, New Rectangle(48, 0, 24, 24), "Aerodactyl", 142) + MyBase.New("Aerodactyl", 142) + _textureRectangle = New Rectangle(48, 0, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aggronite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aggronite.vb index f6090f8e2..9f843c28c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aggronite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aggronite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Aggronite", 510, New Rectangle(72, 0, 24, 24), "Aggron", 306) + MyBase.New("Aggron", 306) + _textureRectangle = New Rectangle(72, 0, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Alakazite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Alakazite.vb index 8dfe460af..961991412 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Alakazite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Alakazite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Alakazite", 511, New Rectangle(96, 0, 24, 24), "Alakazam", 65) + MyBase.New("Alakazam", 65) + _textureRectangle = New Rectangle(96, 0, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Altarianite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Altarianite.vb index bdb70292c..486f211bd 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Altarianite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Altarianite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Altarianite", 535, New Rectangle(0, 72, 24, 24), "Altaria", 334) + MyBase.New("Altaria", 334) + _textureRectangle = New Rectangle(0, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Ampharosite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Ampharosite.vb index ef097928e..f6704148b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Ampharosite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Ampharosite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Ampharosite", 512, New Rectangle(120, 0, 24, 24), "Ampharos", 181) + MyBase.New("Ampharos", 181) + _textureRectangle = New Rectangle(120, 0, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Audinite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Audinite.vb index 13f027186..39dbe45d1 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Audinite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Audinite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Audinite", 536, New Rectangle(24, 72, 24, 24), "Audino", 531) + MyBase.New("Audino", 531) + _textureRectangle = New Rectangle(24, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Banettite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Banettite.vb index 35485d89a..50e9acd8d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Banettite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Banettite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Banettite", 513, New Rectangle(144, 0, 24, 24), "Banette", 354) + MyBase.New("Banette", 354) + _textureRectangle = New Rectangle(144, 0, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Beedrillite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Beedrillite.vb index 4787e8a06..4f772397e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Beedrillite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Beedrillite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Beedrillite", 537, New Rectangle(48, 72, 24, 24), "Beedrill", 15) + MyBase.New("Beedrill", 15) + _textureRectangle = New Rectangle(48, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blastoisinite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blastoisinite.vb index c8754c8c8..8f94084c3 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blastoisinite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blastoisinite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Blastoisinite", 514, New Rectangle(168, 0, 24, 24), "Blastoise", 9) + MyBase.New("Blastoise", 9) + _textureRectangle = New Rectangle(168, 0, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blazikenite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blazikenite.vb index 768cc4af6..f15fdb847 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blazikenite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blazikenite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Blazikenite", 515, New Rectangle(192, 0, 24, 24), "Blaziken", 257) + MyBase.New("Blaziken", 257) + _textureRectangle = New Rectangle(192, 0, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Cameruptite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Cameruptite.vb index f5c8fdef5..e8a2e20f0 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Cameruptite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Cameruptite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Cameruptite", 538, New Rectangle(72, 72, 24, 24), "Camerupt", 323) + MyBase.New("Camerupt", 323) + _textureRectangle = New Rectangle(72, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeX.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeX.vb index 826394d01..ab6b5e423 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeX.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeX.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Charizardite X", 516, New Rectangle(216, 0, 24, 24), "Charizard", 6) + MyBase.New("Charizard", 6) + _textureRectangle = New Rectangle(216, 0, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeY.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeY.vb index 333735a09..bbb2fe637 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeY.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeY.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Charizardite Y", 517, New Rectangle(0, 24, 24, 24), "Charizard", 6) + MyBase.New("Charizard", 6) + _textureRectangle = New Rectangle(0, 24, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Diancite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Diancite.vb index d783fc158..16d7c17b4 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Diancite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Diancite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Diancite", 539, New Rectangle(96, 72, 24, 24), "Diancie", 719) + MyBase.New("Diancie", 719) + _textureRectangle = New Rectangle(96, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Galladite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Galladite.vb index ba41652ec..ff468c4e3 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Galladite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Galladite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Galladite", 540, New Rectangle(120, 72, 24, 24), "Gallade", 475) + MyBase.New("Gallade", 475) + _textureRectangle = New Rectangle(120, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Garchompite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Garchompite.vb index 85bc39678..2f028f145 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Garchompite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Garchompite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Garchompite", 518, New Rectangle(24, 24, 24, 24), "Garchompite", 445) + MyBase.New("Garchompite", 445) + _textureRectangle = New Rectangle(24, 24, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gardevoirite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gardevoirite.vb index e51a319fc..d90d504bd 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gardevoirite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gardevoirite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Gardevoirite", 519, New Rectangle(48, 24, 24, 24), "Gardevoir", 282) + MyBase.New("Gardevoir", 282) + _textureRectangle = New Rectangle(48, 24, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gengarite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gengarite.vb index dc05b12a6..59c1c1ca7 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gengarite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gengarite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Gengarite", 520, New Rectangle(72, 24, 24, 24), "Gengar", 94) + MyBase.New("Gengar", 94) + _textureRectangle = New Rectangle(72, 24, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Glalitite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Glalitite.vb index 53b41f398..951899e55 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Glalitite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Glalitite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Glalitite", 541, New Rectangle(144, 72, 24, 24), "Glalie", 362) + MyBase.New("Glalie", 362) + _textureRectangle = New Rectangle(144, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gyaradosite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gyaradosite.vb index c58dbfd99..6efbd4bbf 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gyaradosite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gyaradosite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Gyaradosite", 521, New Rectangle(96, 24, 24, 24), "Gyarados", 130) + MyBase.New("Gyarados", 130) + _textureRectangle = New Rectangle(96, 24, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Heracronite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Heracronite.vb index 02c44971f..5656942d2 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Heracronite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Heracronite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Heracronite", 522, New Rectangle(120, 24, 24, 24), "Heracross", 214) + MyBase.New("Heracross", 214) + _textureRectangle = New Rectangle(120, 24, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Houndoominite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Houndoominite.vb index e624170b9..56407f0e6 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Houndoominite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Houndoominite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Houndoominite", 523, New Rectangle(144, 24, 24, 24), "Houndoom", 229) + MyBase.New("Houndoom", 229) + _textureRectangle = New Rectangle(144, 24, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Kangaskhanite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Kangaskhanite.vb index b7cb8431a..a50348171 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Kangaskhanite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Kangaskhanite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Kangaskhanite", 524, New Rectangle(168, 24, 24, 24), "Kangaskhan", 115) + MyBase.New("Kangaskhan", 115) + _textureRectangle = New Rectangle(168, 24, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiasite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiasite.vb index 96bcf21cf..a14304d62 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiasite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiasite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Latiasite", 542, New Rectangle(168, 72, 24, 24), "Latias", 380) + MyBase.New("Latias", 380) + _textureRectangle = New Rectangle(168, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiosite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiosite.vb index a03232d58..7b3121dcc 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiosite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiosite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Latiosite", 543, New Rectangle(192, 72, 24, 24), "Latios", 381) + MyBase.New("Latios", 381) + _textureRectangle = New Rectangle(192, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lopunnite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lopunnite.vb index a3be2a2ca..041f7c7db 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lopunnite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lopunnite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Lopunnite", 544, New Rectangle(216, 72, 24, 24), "Lopunny", 428) + MyBase.New("Lopunny", 428) + _textureRectangle = New Rectangle(216, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lucarionite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lucarionite.vb index d29103e73..040e1b084 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lucarionite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lucarionite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Lucarionite", 525, New Rectangle(192, 24, 24, 24), "Lucario", 448) + MyBase.New("Lucario", 448) + _textureRectangle = New Rectangle(192, 24, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Manectite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Manectite.vb index 20defed86..26d3d81af 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Manectite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Manectite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Manectite", 526, New Rectangle(216, 24, 24, 24), "Manectric", 310) + MyBase.New("Manectric", 310) + _textureRectangle = New Rectangle(216, 24, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Mawilite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Mawilite.vb index 0eeed9d60..3dc7b3ef9 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Mawilite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Mawilite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Mawilite", 527, New Rectangle(0, 48, 24, 24), "Mawile", 303) + MyBase.New("Mawile", 303) + _textureRectangle = New Rectangle(0, 48, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Medichamite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Medichamite.vb index fa6e85d9f..288a28802 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Medichamite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Medichamite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Medichamite", 528, New Rectangle(24, 48, 24, 24), "Medicham", 308) + MyBase.New("Medicham", 308) + _textureRectangle = New Rectangle(24, 48, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Metagrossite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Metagrossite.vb index af6867f16..3d55f20a8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Metagrossite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Metagrossite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Metagrossite", 545, New Rectangle(0, 96, 24, 24), "Metagross", 376) + MyBase.New("Metagross", 376) + _textureRectangle = New Rectangle(0, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteX.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteX.vb index fe890bf1e..5c43d3015 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteX.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteX.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Mewtwonite X", 529, New Rectangle(48, 48, 24, 24), "Mewtwo", 150) + MyBase.New("Mewtwo", 150) + _textureRectangle = New Rectangle(48, 48, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteY.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteY.vb index 199740661..773bb1bc8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteY.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteY.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Mewtwonite Y", 530, New Rectangle(72, 48, 24, 24), "Mewtwo", 150) + MyBase.New("Mewtwo", 150) + _textureRectangle = New Rectangle(72, 48, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pidgeotite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pidgeotite.vb index 7e260a442..b3d5aff32 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pidgeotite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pidgeotite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Pidgeotite", 546, New Rectangle(24, 96, 24, 24), "Pidgeot", 18) + MyBase.New("Pidgeot", 18) + _textureRectangle = New Rectangle(24, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pinsirite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pinsirite.vb index 4b2eac658..e0865b3a6 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pinsirite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pinsirite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Pinsirite", 531, New Rectangle(96, 48, 24, 24), "Pinsir", 127) + MyBase.New("Pinsir", 127) + _textureRectangle = New Rectangle(96, 48, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sablenite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sablenite.vb index 0c5d7ed5e..335d2ae46 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sablenite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sablenite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Sablenite", 547, New Rectangle(48, 96, 24, 24), "Sableye", 302) + MyBase.New("Sableye", 302) + _textureRectangle = New Rectangle(48, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Salamencite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Salamencite.vb index d76ef4bf1..e343994c0 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Salamencite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Salamencite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Salamencite", 548, New Rectangle(72, 96, 24, 24), "Salamence", 373) + MyBase.New("Salamence", 373) + _textureRectangle = New Rectangle(72, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sceptilite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sceptilite.vb index edb2afc09..b07577266 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sceptilite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sceptilite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Sceptilite", 549, New Rectangle(96, 96, 24, 24), "Sceptile", 254) + MyBase.New("Sceptile", 254) + _textureRectangle = New Rectangle(96, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Scizorite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Scizorite.vb index 64ebf1aa8..761ef4d1d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Scizorite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Scizorite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Scizorite", 532, New Rectangle(120, 48, 24, 24), "Scizor", 212) + MyBase.New("Scizor", 212) + _textureRectangle = New Rectangle(120, 48, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sharpedonite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sharpedonite.vb index 7dcd34735..7a9c45b09 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sharpedonite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sharpedonite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Sharpedonite", 550, New Rectangle(120, 96, 24, 24), "Sharpedo", 319) + MyBase.New("Sharpedo", 319) + _textureRectangle = New Rectangle(120, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Slowbronite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Slowbronite.vb index 52b76d79d..c6802d99b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Slowbronite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Slowbronite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Slowbronite", 551, New Rectangle(144, 96, 24, 24), "Slowbro", 80) + MyBase.New("Slowbro", 80) + _textureRectangle = New Rectangle(144, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Steelixite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Steelixite.vb index 4aeb99772..b8b83f054 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Steelixite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Steelixite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Steelixite", 552, New Rectangle(168, 96, 24, 24), "Steelix", 208) + MyBase.New("Steelix", 208) + _textureRectangle = New Rectangle(168, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Swampertite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Swampertite.vb index a713900fd..ebf722849 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Swampertite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Swampertite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Swampertite", 553, New Rectangle(192, 96, 24, 24), "Swampert", 260) + MyBase.New("Swampert", 260) + _textureRectangle = New Rectangle(192, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Tyranitarite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Tyranitarite.vb index 91992672e..8628bf961 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Tyranitarite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Tyranitarite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Tyranitarite", 533, New Rectangle(144, 48, 24, 24), "Tyranitar", 248) + MyBase.New("Tyranitar", 248) + _textureRectangle = New Rectangle(144, 48, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Venusaurite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Venusaurite.vb index 6967913d3..a733fc9ea 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Venusaurite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Venusaurite.vb @@ -9,7 +9,8 @@ Namespace Items.MegaStones Inherits MegaStone Public Sub New() - MyBase.New("Venusaurite", 534, New Rectangle(168, 48, 24, 24), "Venusaur", 3) + MyBase.New("Venusaur", 3) + _textureRectangle = New Rectangle(168, 48, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/PlateItem.vb b/2.5DHero/2.5DHero/Pokemon/Items/PlateItem.vb index 38db1918e..a50240633 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/PlateItem.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/PlateItem.vb @@ -7,18 +7,16 @@ Namespace Items Inherits Item - Public Sub New(ByVal Name As String, ByVal ID As Integer, ByVal Type As Element.Types) - MyBase.New(Name, 1000, ItemTypes.Standard, ID, 1.0F, 0, New Rectangle(0, 0, 24, 24), "An item to be held by a Pokémon. It's a stone tablet that boosts the power of " & Type.ToString() & "-type moves.") + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property ItemType As ItemTypes = ItemTypes.Standard + Public Overrides ReadOnly Property Description As String + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 1000 - Me._texture = TextureManager.GetTexture("Items\Plates", GetTextureRectangle(Type), "") - - Me._canBeHold = True - Me._canBeTossed = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._isPlate = True + Public Sub New(ByVal Type As Element.Types) + Description = "An item to be held by a Pokémon. It's a stone tablet that boosts the power of " & Type.ToString() & "-type moves." + _textureSource = "Items\Plates" + _textureRectangle = GetTextureRectangle(Type) End Sub Private Function GetTextureRectangle(ByVal Type As Element.Types) As Rectangle diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Plates/DracoPlate.vb b/2.5DHero/2.5DHero/Pokemon/Items/Plates/DracoPlate.vb index cb19b328f..a6a3e7b2f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Plates/DracoPlate.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Plates/DracoPlate.vb @@ -6,7 +6,7 @@ Namespace Items.Plates Inherits PlateItem Public Sub New() - MyBase.New("Draco Plate", 267, Element.Types.Dragon) + MyBase.New(Element.Types.Dragon) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Plates/DreadPlate.vb b/2.5DHero/2.5DHero/Pokemon/Items/Plates/DreadPlate.vb index f6bbbe534..4890d7c54 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Plates/DreadPlate.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Plates/DreadPlate.vb @@ -6,7 +6,7 @@ Namespace Items.Plates Inherits PlateItem Public Sub New() - MyBase.New("Dread Plate", 268, Element.Types.Dark) + MyBase.New(Element.Types.Dark) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Plates/EarthPlate.vb b/2.5DHero/2.5DHero/Pokemon/Items/Plates/EarthPlate.vb index 6630c18d7..86ec28015 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Plates/EarthPlate.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Plates/EarthPlate.vb @@ -6,7 +6,7 @@ Namespace Items.Plates Inherits PlateItem Public Sub New() - MyBase.New("Earth Plate", 269, Element.Types.Ground) + MyBase.New(Element.Types.Ground) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Plates/FistPlate.vb b/2.5DHero/2.5DHero/Pokemon/Items/Plates/FistPlate.vb index 9e0d3b0c2..61ee8cee6 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Plates/FistPlate.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Plates/FistPlate.vb @@ -6,7 +6,7 @@ Namespace Items.Plates Inherits PlateItem Public Sub New() - MyBase.New("Fist Plate", 270, Element.Types.Fighting) + MyBase.New(Element.Types.Fighting) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Plates/FlamePlate.vb b/2.5DHero/2.5DHero/Pokemon/Items/Plates/FlamePlate.vb index 33d0f0dfb..0fe505dc0 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Plates/FlamePlate.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Plates/FlamePlate.vb @@ -6,7 +6,7 @@ Namespace Items.Plates Inherits PlateItem Public Sub New() - MyBase.New("Flame Plate", 271, Element.Types.Fire) + MyBase.New(Element.Types.Fire) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Plates/IciclePlate.vb b/2.5DHero/2.5DHero/Pokemon/Items/Plates/IciclePlate.vb index 406f201e2..104a51ea5 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Plates/IciclePlate.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Plates/IciclePlate.vb @@ -6,7 +6,7 @@ Namespace Items.Plates Inherits PlateItem Public Sub New() - MyBase.New("Icicle Plate", 272, Element.Types.Ice) + MyBase.New(Element.Types.Ice) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Plates/InsectPlate.vb b/2.5DHero/2.5DHero/Pokemon/Items/Plates/InsectPlate.vb index e26cc8227..0281e3668 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Plates/InsectPlate.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Plates/InsectPlate.vb @@ -6,7 +6,7 @@ Namespace Items.Plates Inherits PlateItem Public Sub New() - MyBase.New("Insect Plate", 273, Element.Types.Bug) + MyBase.New(Element.Types.Bug) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Plates/IronPlate.vb b/2.5DHero/2.5DHero/Pokemon/Items/Plates/IronPlate.vb index 6b1f34eff..d4de7d1e4 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Plates/IronPlate.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Plates/IronPlate.vb @@ -6,7 +6,7 @@ Namespace Items.Plates Inherits PlateItem Public Sub New() - MyBase.New("Iron Plate", 274, Element.Types.Steel) + MyBase.New(Element.Types.Steel) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Plates/MeadowPlate.vb b/2.5DHero/2.5DHero/Pokemon/Items/Plates/MeadowPlate.vb index 7ab709fcc..5eafffdf3 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Plates/MeadowPlate.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Plates/MeadowPlate.vb @@ -6,7 +6,7 @@ Namespace Items.Plates Inherits PlateItem Public Sub New() - MyBase.New("Meadow Plate", 275, Element.Types.Grass) + MyBase.New(Element.Types.Grass) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Plates/MindPlate.vb b/2.5DHero/2.5DHero/Pokemon/Items/Plates/MindPlate.vb index 606a06610..2ff36fdbc 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Plates/MindPlate.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Plates/MindPlate.vb @@ -6,7 +6,7 @@ Namespace Items.Plates Inherits PlateItem Public Sub New() - MyBase.New("Mind Plate", 276, Element.Types.Psychic) + MyBase.New(Element.Types.Psychic) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Plates/PixiePlate.vb b/2.5DHero/2.5DHero/Pokemon/Items/Plates/PixiePlate.vb index 4498c7e2b..8e7a5f9bb 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Plates/PixiePlate.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Plates/PixiePlate.vb @@ -6,7 +6,7 @@ Namespace Items.Plates Inherits PlateItem Public Sub New() - MyBase.New("Pixie Plate", 277, Element.Types.Fairy) + MyBase.New(Element.Types.Fairy) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Plates/SkyPlate.vb b/2.5DHero/2.5DHero/Pokemon/Items/Plates/SkyPlate.vb index 4697ddf74..d71e05de3 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Plates/SkyPlate.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Plates/SkyPlate.vb @@ -6,7 +6,7 @@ Namespace Items.Plates Inherits PlateItem Public Sub New() - MyBase.New("Sky Plate", 278, Element.Types.Flying) + MyBase.New(Element.Types.Flying) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Plates/SplashPlate.vb b/2.5DHero/2.5DHero/Pokemon/Items/Plates/SplashPlate.vb index 2f8f7ac20..6f72518ef 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Plates/SplashPlate.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Plates/SplashPlate.vb @@ -6,7 +6,7 @@ Namespace Items.Plates Inherits PlateItem Public Sub New() - MyBase.New("Splash Plate", 279, Element.Types.Water) + MyBase.New(Element.Types.Water) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Plates/SpookyPlate.vb b/2.5DHero/2.5DHero/Pokemon/Items/Plates/SpookyPlate.vb index ae16865c4..27b054b68 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Plates/SpookyPlate.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Plates/SpookyPlate.vb @@ -6,7 +6,7 @@ Namespace Items.Plates Inherits PlateItem Public Sub New() - MyBase.New("Spooky Plate", 280, Element.Types.Ghost) + MyBase.New(Element.Types.Ghost) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Plates/StonePlate.vb b/2.5DHero/2.5DHero/Pokemon/Items/Plates/StonePlate.vb index 665668f7c..4ed4755b7 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Plates/StonePlate.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Plates/StonePlate.vb @@ -6,7 +6,7 @@ Namespace Items.Plates Inherits PlateItem Public Sub New() - MyBase.New("Stone Plate", 281, Element.Types.Rock) + MyBase.New(Element.Types.Rock) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Plates/ToxicPlate.vb b/2.5DHero/2.5DHero/Pokemon/Items/Plates/ToxicPlate.vb index c00ee76bf..e3bdfb22e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Plates/ToxicPlate.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Plates/ToxicPlate.vb @@ -6,7 +6,7 @@ Namespace Items.Plates Inherits PlateItem Public Sub New() - MyBase.New("Toxic Plate", 282, Element.Types.Poison) + MyBase.New(Element.Types.Poison) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Plates/ZapPlate.vb b/2.5DHero/2.5DHero/Pokemon/Items/Plates/ZapPlate.vb index a2f1ff803..2c0d8ee4e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Plates/ZapPlate.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Plates/ZapPlate.vb @@ -6,7 +6,7 @@ Namespace Items.Plates Inherits PlateItem Public Sub New() - MyBase.New("Zap Plate", 283, Element.Types.Electric) + MyBase.New(Element.Types.Electric) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Repels/MaxRepel.vb b/2.5DHero/2.5DHero/Pokemon/Items/Repels/MaxRepel.vb index e3e0f8870..17aac7ee5 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Repels/MaxRepel.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Repels/MaxRepel.vb @@ -3,29 +3,14 @@ Namespace Items.Repels Public Class MaxRepel - Inherits Item + Inherits RepelItem + + Public Overrides ReadOnly Property Description As String = "An item that prevents any low-level wild Pokémon from jumping out at you for 250 steps after its use." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 700 + Public Overrides ReadOnly Property RepelSteps As Integer = 250 Public Sub New() - MyBase.New("Max Repel", 700, ItemTypes.Standard, 43, 1, 0, New Rectangle(456, 24, 24, 24), "An item that prevents any low-level wild Pokémon from jumping out at you for 250 steps after its use.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = True - Me._canBeUsedInBattle = False - End Sub - - Public Overrides Sub Use() - If Core.Player.RepelSteps <= 0 Then - Core.Player.Inventory.RemoveItem(Me.ID, 1) - Player.Temp.LastUsedRepel = Me.ID - - SoundManager.PlaySound("repel_use", False) - Screen.TextBox.Show(Core.Player.Name & " used a~" & Me.Name, {}, True, True) - Core.Player.RepelSteps = 250 - PlayerStatistics.Track("[42]Repels used", 1) - Else - Screen.TextBox.Show("The Repel is still~in effect.", {}, True, True) - End If + _textureRectangle = New Rectangle(456, 24, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Repels/Repel.vb b/2.5DHero/2.5DHero/Pokemon/Items/Repels/Repel.vb index d7d6a127e..83413f83c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Repels/Repel.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Repels/Repel.vb @@ -3,29 +3,14 @@ Namespace Items.Repels Public Class Repel - Inherits Item + Inherits RepelItem + + Public Overrides ReadOnly Property Description As String = "An item that prevents any low-level wild Pokémon from jumping out at you for 100 steps after its use." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 350 + Public Overrides ReadOnly Property RepelSteps As Integer = 100 Public Sub New() - MyBase.New("Repel", 350, ItemTypes.Standard, 20, 1, 0, New Rectangle(432, 0, 24, 24), "An item that prevents any low-level wild Pokémon from jumping out at you for 100 steps after its use.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = True - Me._canBeUsedInBattle = False - End Sub - - Public Overrides Sub Use() - If Core.Player.RepelSteps <= 0 Then - Core.Player.Inventory.RemoveItem(Me.ID, 1) - Player.Temp.LastUsedRepel = Me.ID - - SoundManager.PlaySound("repel_use", False) - Screen.TextBox.Show(Core.Player.Name & " used a~" & Me.Name, {}, True, True) - Core.Player.RepelSteps = 100 - PlayerStatistics.Track("[42]Repels used", 1) - Else - Screen.TextBox.Show("The Repel is still~in effect.", {}, True, True) - End If + _textureRectangle = New Rectangle(432, 0, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Repels/RepelItem.vb b/2.5DHero/2.5DHero/Pokemon/Items/Repels/RepelItem.vb new file mode 100644 index 000000000..cac4e215b --- /dev/null +++ b/2.5DHero/2.5DHero/Pokemon/Items/Repels/RepelItem.vb @@ -0,0 +1,27 @@ +Namespace Items.Repels + + Public MustInherit Class RepelItem + + Inherits Item + + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + + Public MustOverride ReadOnly Property RepelSteps As Integer + + Public Overrides Sub Use() + If Core.Player.RepelSteps <= 0 Then + Core.Player.Inventory.RemoveItem(ID, 1) + Player.Temp.LastUsedRepel = ID + + SoundManager.PlaySound("repel_use", False) + Screen.TextBox.Show(Core.Player.Name & " used a~" & Name, {}, True, True) + Core.Player.RepelSteps = RepelSteps + PlayerStatistics.Track("[42]Repels used", 1) + Else + Screen.TextBox.Show("The Repel is still~in effect.", {}, True, True) + End If + End Sub + + End Class + +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Repels/SuperRepel.vb b/2.5DHero/2.5DHero/Pokemon/Items/Repels/SuperRepel.vb index 2c82290d5..fbb1700cb 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Repels/SuperRepel.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Repels/SuperRepel.vb @@ -3,29 +3,14 @@ Namespace Items.Repels Public Class SuperRepel - Inherits Item + Inherits RepelItem + + Public Overrides ReadOnly Property Description As String = "An item that prevents any low-level wild Pokémon from jumping out at you for 200 steps after its use." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 500 + Public Overrides ReadOnly Property RepelSteps As Integer = 200 Public Sub New() - MyBase.New("Super Repel", 500, ItemTypes.Standard, 42, 1, 0, New Rectangle(432, 24, 24, 24), "An item that prevents any low-level wild Pokémon from jumping out at you for 200 steps after its use.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = True - Me._canBeUsedInBattle = False - End Sub - - Public Overrides Sub Use() - If Core.Player.RepelSteps <= 0 Then - Core.Player.Inventory.RemoveItem(Me.ID, 1) - Player.Temp.LastUsedRepel = Me.ID - - SoundManager.PlaySound("repel_use", False) - Screen.TextBox.Show(Core.Player.Name & " used a~" & Me.Name, {}, True, True) - Core.Player.RepelSteps = 200 - PlayerStatistics.Track("[42]Repels used", 1) - Else - Screen.TextBox.Show("The Repel is still~in effect.", {}, True, True) - End If + _textureRectangle = New Rectangle(432, 24, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/AbilityCapsule.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/AbilityCapsule.vb index 11a6a58a4..fb5405ef1 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/AbilityCapsule.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/AbilityCapsule.vb @@ -5,13 +5,12 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Ability Capsule", 1000, ItemTypes.Standard, 187, 1, 1, New Rectangle(0, 240, 24, 24), "A capsule that allows a Pokémon with two Abilities to switch between these Abilities when it is used.") + Public Overrides ReadOnly Property Description As String = "A capsule that allows a Pokémon with two Abilities to switch between these Abilities when it is used." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 1000 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = True - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(0, 240, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/AmuletCoin.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/AmuletCoin.vb index 0be691e66..207599754 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/AmuletCoin.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/AmuletCoin.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Amulet Coin", 100, ItemTypes.Standard, 91, 1, 1, New Rectangle(360, 72, 24, 24), "An item to be held by a Pokémon. It doubles any prize money received if the holding Pokémon joins in a battle.") + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It doubles any prize money received if the holding Pokémon joins in a battle." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(360, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BalmMushroom.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BalmMushroom.vb index 22f8c37fe..db07fe68b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BalmMushroom.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BalmMushroom.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Balm Mushroom", 50000, ItemTypes.Standard, 153, 1, 0, New Rectangle(48, 216, 24, 24), "A rare mushroom which gives off a nice fragrance. A maniac will buy it for a high price.") + Public Overrides ReadOnly Property Description As String = "A rare mushroom which gives off a nice fragrance. A maniac will buy it for a high price." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 50000 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(48, 216, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BigMushroom.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BigMushroom.vb index 944ff9358..61d91890d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BigMushroom.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BigMushroom.vb @@ -5,13 +5,14 @@ Namespace Items.Plants Inherits Item - Public Sub New() - MyBase.New("Big Mushroom", 5000, ItemTypes.Plants, 87, 1, 73, New Rectangle(288, 72, 24, 24), "A very large and rare mushroom. It's popular with a certain class of collectors and sought out by them.") + Public Overrides ReadOnly Property ItemType As ItemTypes = ItemTypes.Plants + Public Overrides ReadOnly Property Description As String = "A very large and rare mushroom. It's popular with a certain class of collectors and sought out by them." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 5000 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(288, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BigNugget.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BigNugget.vb index 8d5897379..25559b443 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BigNugget.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BigNugget.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Big Nugget", 20000, ItemTypes.Standard, 189, 1, 1, New Rectangle(48, 240, 24, 24), "A big nugget of pure gold that gives off a lustrous gleam. It can be sold at a high price to shops.") + Public Overrides ReadOnly Property Description As String = "A big nugget of pure gold that gives off a lustrous gleam. It can be sold at a high price to shops." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 20000 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(48, 240, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BigPearl.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BigPearl.vb index 5160dd8a3..bf86ef68c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BigPearl.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BigPearl.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Big Pearl", 7500, ItemTypes.Standard, 111, 1, 0, New Rectangle(288, 96, 24, 24), "A rather large pearl that has a very nice silvery sheen. It can be sold to shops for a high price.") + Public Overrides ReadOnly Property Description As String = "A rather large pearl that has a very nice silvery sheen. It can be sold to shops for a high price." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 7500 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(288, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BlackBelt.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BlackBelt.vb index 8651f1fdc..42281241c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BlackBelt.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BlackBelt.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Black Belt", 100, ItemTypes.Standard, 98, 1, 0, New Rectangle(24, 96, 24, 24), "An item to be held by a Pokémon. This belt helps the wearer to focus and boosts the power of Fighting-type moves.") + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. This belt helps the wearer to focus and boosts the power of Fighting-type moves." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(24, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BlackGlasses.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BlackGlasses.vb index f5e801b6f..3b7af593b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BlackGlasses.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BlackGlasses.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Black Glasses", 100, ItemTypes.Standard, 102, 1, 0, New Rectangle(96, 96, 24, 24), "An item to be held by a Pokemon. A pair of shady-looking glasses that boost the power of Dark-type moves.") + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokemon. A pair of shady-looking glasses that boost the power of Dark-type moves." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(96, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BlackSludge.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BlackSludge.vb index b55b27b8f..a694fff12 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BlackSludge.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BlackSludge.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Black Sludge", 200, ItemTypes.Standard, 182, 1, 0, New Rectangle(432, 144, 24, 24), "A held item that gradually restores the HP of Poison-type Pokémon. It inflicts damage on all other types.") + Public Overrides ReadOnly Property Description As String = "A held item that gradually restores the HP of Poison-type Pokémon. It inflicts damage on all other types." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 200 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(432, 144, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BrickPiece.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BrickPiece.vb index 6d4befcce..8812d515e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BrickPiece.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BrickPiece.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Brick Piece", 100, ItemTypes.Standard, 180, 1, 1, New Rectangle(72, 240, 24, 24), "A rare chunk of brick.") + Public Overrides ReadOnly Property Description As String = "A rare chunk of brick." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(72, 240, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Charcoal.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Charcoal.vb index c746d6fd5..a64857975 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Charcoal.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Charcoal.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Charcoal", 4900, ItemTypes.Standard, 138, 1, 0, New Rectangle(336, 120, 24, 24), "An item to be held by a Pokémon. It is a combustible fuel that boosts the power of Fire-type moves.") + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It is a combustible fuel that boosts the power of Fire-type moves." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 4900 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(336, 120, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/CleanseTag.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/CleanseTag.vb index f24091574..0966bf200 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/CleanseTag.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/CleanseTag.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("CleanseTag", 200, ItemTypes.Standard, 94, 1, 0, New Rectangle(432, 72, 24, 24), "An item to be held by a Pokémon. It helps keep wild Pokémon away if the holder is the head of the party.") + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It helps keep wild Pokémon away if the holder is the head of the party." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 200 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(432, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/CometShard.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/CometShard.vb index 7c9699845..554a19a73 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/CometShard.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/CometShard.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Comet Shard", 120000, ItemTypes.Standard, 149, 1, 0, New Rectangle(24, 216, 24, 24), "A shard which fell to the ground when a comet approached. A maniac will buy it for a high price.") + Public Overrides ReadOnly Property Description As String = "A shard which fell to the ground when a comet approached. A maniac will buy it for a high price." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 120000 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(24, 216, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/DeepSeaScale.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/DeepSeaScale.vb index f3304e7a4..4217d5d98 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/DeepSeaScale.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/DeepSeaScale.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("DeepSeaScale", 200, ItemTypes.Standard, 162, 1, 1, New Rectangle(120, 216, 24, 24), "An item to be held by Clamperl. This scale shines with a faint pink and raises the holder's Sp. Def stat.") + Public Overrides ReadOnly Property Description As String = "An item to be held by Clamperl. This scale shines with a faint pink and raises the holder's Sp. Def stat." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 200 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(120, 216, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/DeepSeaTooth.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/DeepSeaTooth.vb index 9f075226f..a0bd2aa59 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/DeepSeaTooth.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/DeepSeaTooth.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by Clamperl. This fang gleams a sharp silver and raises the holder's Sp. Atk stat." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 200 + 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 Sub New() - MyBase.New("DeepSeaTooth", 200, ItemTypes.Standard, 167, 1, 1, New Rectangle(312, 216, 24, 24), "An item to be held by Clamperl. This fang gleams a sharp silver and raises the holder's Sp. Atk stat.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._flingDamage = 90 + _textureRectangle = New Rectangle(312, 216, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/DragonFang.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/DragonFang.vb index bf59471fb..513e63c9d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/DragonFang.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/DragonFang.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. This hard and sharp fang boosts the power of Dragon-type moves." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + Public Overrides ReadOnly Property FlingDamage As Integer = 70 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Sub New() - MyBase.New("Dragon Fang", 100, ItemTypes.Standard, 144, 1, 0, New Rectangle(432, 120, 24, 24), "An item to be held by a Pokémon. This hard and sharp fang boosts the power of Dragon-type moves.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True - - Me._flingDamage = 70 + _textureRectangle = New Rectangle(432, 120, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/DragonScale.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/DragonScale.vb index 2f116286d..92f9b8704 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/DragonScale.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/DragonScale.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Dragon Scale", 2100, ItemTypes.Standard, 151, 1, 0, New Rectangle(480, 120, 24, 24), "A very tough and inflexible scale. Dragon-type Pokémon may be holding this item when caught.") + Public Overrides ReadOnly Property Description As String = "A very tough and inflexible scale. Dragon-type Pokémon may be holding this item when caught." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 2100 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(480, 120, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/DubiousDisc.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/DubiousDisc.vb index 507559e9d..e1aa715f5 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/DubiousDisc.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/DubiousDisc.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "A transparent device overflowing with dubious data. Its producer is unknown." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 2100 + Public Overrides ReadOnly Property FlingDamage As Integer = 50 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Sub New() - MyBase.New("Dubious Disc", 2100, ItemTypes.Standard, 185, 1, 0, New Rectangle(0, 168, 24, 24), "A transparent device overflowing with dubious data. Its producer is unknown.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._flingDamage = 50 + _textureRectangle = New Rectangle(0, 168, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Electirizer.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Electirizer.vb index c7fe02c58..6d4ae4b21 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Electirizer.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Electirizer.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "A box packed with a tremendous amount of electric energy. It is loved by a certain Pokémon." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 2100 + Public Overrides ReadOnly Property FlingDamage As Integer = 80 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Sub New() - MyBase.New("Electirizer", 2100, ItemTypes.Standard, 120, 1, 0, New Rectangle(312, 192, 24, 24), "A box packed with a tremendous amount of electric energy. It is loved by a certain Pokémon.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True - - Me._flingDamage = 80 + _textureRectangle = New Rectangle(312, 192, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/EscapeRope.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/EscapeRope.vb index efe1d1d4f..d0531f0f0 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/EscapeRope.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/EscapeRope.vb @@ -5,13 +5,12 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Escape Rope", 550, ItemTypes.Standard, 19, 1, 0, New Rectangle(408, 0, 24, 24), "A long and durable rope. Use it to escape instantly from a cave or a dungeon.") + Public Overrides ReadOnly Property Description As String = "A long and durable rope. Use it to escape instantly from a cave or a dungeon." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 550 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = True - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(408, 0, 24, 24) End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/ExpShare.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/ExpShare.vb index bfc5f207c..08a0371b3 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/ExpShare.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/ExpShare.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Exp Share", 3000, ItemTypes.Standard, 57, 1, 0, New Rectangle(216, 48, 24, 24), "An item to be held by a Pokémon. The holder gets a share of a battle's Exp. Points without battling.") + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. The holder gets a share of a battle's Exp. Points without battling." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 3000 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(216, 48, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/FocusBand.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/FocusBand.vb index c978c57cd..9c9902920 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/FocusBand.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/FocusBand.vb @@ -5,17 +5,15 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. The holder may endure a potential KO attack, leaving it with just 1 HP." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 200 + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 64 + 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 Sub New() - MyBase.New("Focus Band", 200, ItemTypes.Standard, 119, 1, 1, New Rectangle(480, 96, 24, 24), "An item to be held by a Pokémon. The holder may endure a potential KO attack, leaving it with just 1 HP.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._flingDamage = 10 - - Me._battlePointsPrice = 64 + _textureRectangle = New Rectangle(480, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/GoldLeaf.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/GoldLeaf.vb index 1cf5351ef..5e7756658 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/GoldLeaf.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/GoldLeaf.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Gold Leaf", 2000, ItemTypes.Standard, 75, 1, 0, New Rectangle(120, 72, 24, 24), "A strange, gold-colored leaf.") + Public Overrides ReadOnly Property Description As String = "A strange, gold-colored leaf." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 2000 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(120, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/GripClaw.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/GripClaw.vb index 0d3ebaa1d..eb065c57e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/GripClaw.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/GripClaw.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "A Pokémon hold item that extends the duration of multiturn attacks like Bind and Wrap." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 200 + 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 Sub New() - MyBase.New("Grip Claw", 200, ItemTypes.Standard, 176, 1, 1, New Rectangle(168, 216, 24, 24), "A Pokémon hold item that extends the duration of multiturn attacks like Bind and Wrap.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._flingDamage = 90 + _textureRectangle = New Rectangle(168, 216, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/HardStone.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/HardStone.vb index ffd6bc7b4..aad78628e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/HardStone.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/HardStone.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It is a durable stone that boosts the power of Rock-type moves." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + Public Overrides ReadOnly Property FlingDamage As Integer = 100 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Sub New() - MyBase.New("HardStone", 100, ItemTypes.Standard, 125, 1, 0, New Rectangle(96, 120, 24, 24), "An item to be held by a Pokémon. It is a durable stone that boosts the power of Rock-type moves.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True - - Me._flingDamage = 100 + _textureRectangle = New Rectangle(96, 120, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/HeartScale.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/HeartScale.vb index d16ed6d67..fc11970f4 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/HeartScale.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/HeartScale.vb @@ -4,13 +4,13 @@ Namespace Items.Standard Public Class HeartScale Inherits Item - Public Sub New() - MyBase.New("Heart Scale", 100, ItemTypes.Standard, 190, 1, 0, New Rectangle(264, 216, 24, 24), "A pretty, heart-shaped scale that is extremely rare. It glows faintly with all of the colors of the rainbow.") + Public Overrides ReadOnly Property Description As String = "A pretty, heart-shaped scale that is extremely rare. It glows faintly with all of the colors of the rainbow." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(264, 216, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Honey.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Honey.vb index 428486793..8d9a2d381 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Honey.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Honey.vb @@ -5,13 +5,14 @@ Namespace Items.Plants Inherits Item - Public Sub New() - MyBase.New("Honey", 100, ItemTypes.Plants, 253, 1, 0, New Rectangle(264, 240, 24, 24), "Honey produced by a Pokémon.") + Public Overrides ReadOnly Property ItemType As ItemTypes = ItemTypes.Plants + Public Overrides ReadOnly Property Description As String = "Honey produced by a Pokémon." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(264, 240, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/KingsRock.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/KingsRock.vb index e2dd114c9..b3e935079 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/KingsRock.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/KingsRock.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. When the holder successfully inflicts damage, the target may also flinch." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 100 + 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 Sub New() - MyBase.New("King's Rock", 100, ItemTypes.Standard, 82, 1, 0, New Rectangle(216, 72, 24, 24), "An item to be held by a Pokémon. When the holder successfully inflicts damage, the target may also flinch.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._battlePointsPrice = 64 + _textureRectangle = New Rectangle(216, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/LaggingTail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/LaggingTail.vb index 0955d3e9c..fb35c9fd1 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/LaggingTail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/LaggingTail.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It is tremendously heavy and makes the holder move slower than usual." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 200 + 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 Sub New() - MyBase.New("Lagging Tail", 200, ItemTypes.Standard, 142, 1, 0, New Rectangle(432, 192, 24, 24), "An item to be held by a Pokémon. It is tremendously heavy and makes the holder move slower than usual.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._flingDamage = 10 + _textureRectangle = New Rectangle(432, 192, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Leftovers.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Leftovers.vb index fab7a27c3..8676a8681 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Leftovers.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Leftovers.vb @@ -5,17 +5,15 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. The holder's HP is slowly but steadily restored throughout every battle." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 200 + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 64 + 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 Sub New() - MyBase.New("Leftovers", 200, ItemTypes.Standard, 146, 1, 1, New Rectangle(456, 120, 24, 24), "An item to be held by a Pokémon. The holder's HP is slowly but steadily restored throughout every battle.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._flingDamage = 10 - - Me._battlePointsPrice = 64 + _textureRectangle = New Rectangle(456, 120, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/LifeOrb.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/LifeOrb.vb index 276e10927..3cb4059df 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/LifeOrb.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/LifeOrb.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Life Orb", 200, ItemTypes.Standard, 506, 1, 1, New Rectangle(240, 240, 24, 24), "An item to be held by a Pokémon. It boosts the power of moves, but at the cost of some HP on each hit.") + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It boosts the power of moves, but at the cost of some HP on each hit." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 200 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(240, 240, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/LightBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/LightBall.vb index 20d297207..2a8b81eb3 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/LightBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/LightBall.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Light Ball", 100, ItemTypes.Standard, 163, 1, 1, New Rectangle(168, 144, 24, 24), "An item to be held by Pikachu. It's a puzzling orb that boosts its Attack and Sp. Atk stats.") + Public Overrides ReadOnly Property Description As String = "An item to be held by Pikachu. It's a puzzling orb that boosts its Attack and Sp. Atk stats." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(168, 144, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/LuckyEgg.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/LuckyEgg.vb index 0afe0f6b8..1a89f8b6a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/LuckyEgg.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/LuckyEgg.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Lucky Egg", 100, ItemTypes.Standard, 126, 1, 0, New Rectangle(120, 120, 24, 24), "An item to be held by a Pokémon. It is an egg filled with happiness that earns extra Exp. Points in battle.") + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It is an egg filled with happiness that earns extra Exp. Points in battle." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(120, 120, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/LuckyPunch.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/LuckyPunch.vb index d02166df5..e20690af4 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/LuckyPunch.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/LuckyPunch.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by Chansey. This pair of lucky boxing gloves will boost Chansey's critical-hit ratio." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 10 + Public Overrides ReadOnly Property FlingDamage As Integer = 40 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Sub New() - MyBase.New("Lucky Punch", 10, ItemTypes.Standard, 30, 1, 0, New Rectangle(144, 24, 24, 24), "An item to be held by Chansey. This pair of lucky boxing gloves will boost Chansey's critical-hit ratio.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True - - Me._flingDamage = 40 + _textureRectangle = New Rectangle(144, 24, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Magmarizer.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Magmarizer.vb index 9d9aa1d1b..bb8ee6c42 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Magmarizer.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Magmarizer.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "A box packed with a tremendous amount of magma energy. It is loved by a certain Pokémon." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 2100 + Public Overrides ReadOnly Property FlingDamage As Integer = 80 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Sub New() - MyBase.New("Magmarizer", 2100, ItemTypes.Standard, 100, 1, 0, New Rectangle(288, 192, 24, 24), "A box packed with a tremendous amount of magma energy. It is loved by a certain Pokémon.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True - - Me._flingDamage = 80 + _textureRectangle = New Rectangle(288, 192, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Magnet.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Magnet.vb index 8295f8d65..7031b1c29 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Magnet.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Magnet.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Magnet", 100, ItemTypes.Standard, 108, 1, 0, New Rectangle(240, 96, 24, 24), "An item to be held by a Pokémon. It is a powerful magnet that boosts the power of Electric-type moves.") + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It is a powerful magnet that boosts the power of Electric-type moves." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(240, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/MetalCoat.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/MetalCoat.vb index e77139f8e..8fa13dfb1 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/MetalCoat.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/MetalCoat.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Metal Coat", 100, ItemTypes.Standard, 143, 1, 0, New Rectangle(408, 120, 24, 24), "An item to be held by a Pokémon. It is a special metallic film that can boost the power of Steel-type moves.") + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It is a special metallic film that can boost the power of Steel-type moves." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(408, 120, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/MetalPowder.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/MetalPowder.vb index a978f5240..f9f0695c6 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/MetalPowder.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/MetalPowder.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by Ditto. Extremely fine yet hard, this odd powder boosts the Defense stat." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 10 + 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 Sub New() - MyBase.New("Metal Powder", 10, ItemTypes.Standard, 35, 1, 1, New Rectangle(264, 24, 24, 24), "An item to be held by Ditto. Extremely fine yet hard, this odd powder boosts the Defense stat.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._flingDamage = 10 + _textureRectangle = New Rectangle(264, 24, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/MiracleSeed.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/MiracleSeed.vb index a90ba2023..2efce21ff 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/MiracleSeed.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/MiracleSeed.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Miracle Seed", 100, ItemTypes.Standard, 117, 1, 0, New Rectangle(432, 96, 24, 24), "An item to be held by a Pokémon. It is a seed imbued with life force that boosts the power of Grass-type moves.") + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It is a seed imbued with life force that boosts the power of Grass-type moves." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(432, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/MysticWater.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/MysticWater.vb index 7c63544dd..a550092ee 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/MysticWater.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/MysticWater.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Mystic Water", 100, ItemTypes.Standard, 95, 1, 0, New Rectangle(456, 72, 24, 24), "An item to be held by a Pokémon. This teardrop-shaped gem boosts the power of Water-type moves.") + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. This teardrop-shaped gem boosts the power of Water-type moves." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(456, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/NeverMeltIce.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/NeverMeltIce.vb index bfb34972e..6e36bf704 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/NeverMeltIce.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/NeverMeltIce.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Never-Melt Ice", 100, ItemTypes.Standard, 107, 1, 0, New Rectangle(216, 96, 24, 24), "An item to be held by a Pokémon. It's a piece of ice that repels heat effects and boosts Ice-type moves.") + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It's a piece of ice that repels heat effects and boosts Ice-type moves." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(216, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Nugget.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Nugget.vb index 14d371c70..44e832f06 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Nugget.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Nugget.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Nugget", 10000, ItemTypes.Standard, 36, 1, 0, New Rectangle(288, 24, 24, 24), "A nugget of the purest gold that gives off a lustrous gleam in direct light. It can be sold at a high price to shops.") + Public Overrides ReadOnly Property Description As String = "A nugget of the purest gold that gives off a lustrous gleam in direct light. It can be sold at a high price to shops." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 10000 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(288, 24, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/OddIncense.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/OddIncense.vb index d418a7512..7483fddbe 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/OddIncense.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/OddIncense.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. This exotic-smelling incense boosts the power of Psychic-type moves." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 9800 + 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 Sub New() - MyBase.New("Odd Incense", 9800, ItemTypes.Standard, 263, 1, 0, New Rectangle(0, 264, 24, 24), "An item to be held by a Pokémon. This exotic-smelling incense boosts the power of Psychic-type moves.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True - - Me._flingDamage = 10 + _textureRectangle = New Rectangle(0, 264, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/OvalStone.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/OvalStone.vb index e1eecfdec..a781ef991 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/OvalStone.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/OvalStone.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "A peculiar stone that makes certain species of Pokémon evolve. It is shaped like an egg." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 2100 + Public Overrides ReadOnly Property FlingDamage As Integer = 80 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Sub New() - MyBase.New("Oval Stone", 2100, ItemTypes.Standard, 179, 1, 1, New Rectangle(192, 216, 24, 24), "A peculiar stone that makes certain species of Pokémon evolve. It is shaped like an egg.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._flingDamage = 80 + _textureRectangle = New Rectangle(192, 216, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Pearl.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Pearl.vb index 017e580c9..0f33516f4 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Pearl.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Pearl.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Pearl", 1400, ItemTypes.Standard, 110, 1, 0, New Rectangle(264, 96, 24, 24), "A rather small pearl that has a very nice silvery sheen to it. It can be sold cheaply to shops.") + Public Overrides ReadOnly Property Description As String = "A rather small pearl that has a very nice silvery sheen to it. It can be sold cheaply to shops." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 1400 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(264, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/PearlString.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/PearlString.vb index ccf040075..ff9f30170 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/PearlString.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/PearlString.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Pearl String", 50000, ItemTypes.Standard, 173, 1, 0, New Rectangle(408, 216, 24, 24), "Very large pearls that sparkle in a pretty silver color. They can be sold at a high price to shops.") + Public Overrides ReadOnly Property Description As String = "Very large pearls that sparkle in a pretty silver color. They can be sold at a high price to shops." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 50000 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(408, 216, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/PinkBow.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/PinkBow.vb index c06aa058c..ddb8e222f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/PinkBow.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/PinkBow.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Pink Bow", 100, ItemTypes.Standard, 104, 1, 0, New Rectangle(144, 96, 24, 24), "Powers up Fairy-type moves.") + Public Overrides ReadOnly Property Description As String = "Powers up Fairy-type moves." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(144, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/PoisonBarb.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/PoisonBarb.vb index 932e45bcb..dfe90e260 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/PoisonBarb.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/PoisonBarb.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. This small, poisonous barb boosts the power of Poison-type moves." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + Public Overrides ReadOnly Property FlingDamage As Integer = 70 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Sub New() - MyBase.New("Poison Barb", 100, ItemTypes.Standard, 81, 1, 0, New Rectangle(192, 72, 24, 24), "An item to be held by a Pokémon. This small, poisonous barb boosts the power of Poison-type moves.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True - - Me._flingDamage = 70 + _textureRectangle = New Rectangle(192, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/PokeDoll.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/PokeDoll.vb index 947c02612..9a6f1c60b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/PokeDoll.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/PokeDoll.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property ItemType As ItemTypes = ItemTypes.BattleItems + Public Overrides ReadOnly Property Description As String = "A doll that attracts the attention of a Pokémon. It guarantees escape from any battle with wild Pokémon." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 1000 + Public Overrides ReadOnly Property BattleSelectPokemon As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Sub New() - MyBase.New("Poké Doll", 1000, ItemTypes.BattleItems, 37, 1, 0, New Rectangle(312, 24, 24, 24), "A doll that attracts the attention of a Pokémon. It guarantees escape from any battle with wild Pokémon.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = True - - Me._requiresPokemonSelectInBattle = False + _textureRectangle = New Rectangle(312, 24, 24, 24) End Sub Public Overrides Function UseOnPokemon(PokeIndex As Integer) As Boolean diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/PolkadotBow.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/PolkadotBow.vb index 2292a34cb..fcb6b9820 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/PolkadotBow.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/PolkadotBow.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Polkadot Bow", 100, ItemTypes.Standard, 170, 1, 1, New Rectangle(192, 240, 24, 24), "A pink bow. A certain Pokémon likes this item.") + Public Overrides ReadOnly Property Description As String = "A pink bow. A certain Pokémon likes this item." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(192, 240, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/PrismScale.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/PrismScale.vb index acf56a4c5..7460bfc02 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/PrismScale.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/PrismScale.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Prism Scale", 500, ItemTypes.Standard, 83, 1, 1, New Rectangle(72, 168, 24, 24), "A mysterious scale that causes a certain Pokémon to evolve. It shines in rainbow colors.") + Public Overrides ReadOnly Property Description As String = "A mysterious scale that causes a certain Pokémon to evolve. It shines in rainbow colors." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 500 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(72, 168, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Protector.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Protector.vb index c375d3ed6..ba71f3292 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Protector.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Protector.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "A protective item of some sort. It is extremely stiff and heavy. It is loved by a certain Pokémon." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 2100 + Public Overrides ReadOnly Property FlingDamage As Integer = 80 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Sub New() - MyBase.New("Protector", 2100, ItemTypes.Standard, 141, 1, 0, New Rectangle(408, 192, 24, 24), "A protective item of some sort. It is extremely stiff and heavy. It is loved by a certain Pokémon.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True - - Me._flingDamage = 80 + _textureRectangle = New Rectangle(408, 192, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/QuickClaw.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/QuickClaw.vb index 629bebb46..6c019c4c3 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/QuickClaw.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/QuickClaw.vb @@ -5,17 +5,15 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. This light, sharp claw lets the bearer move first occasionally." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 100 + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 64 + Public Overrides ReadOnly Property FlingDamage As Integer = 80 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Sub New() - MyBase.New("Quick Claw", 100, ItemTypes.Standard, 73, 1, 0, New Rectangle(96, 72, 24, 24), "An item to be held by a Pokémon. This light, sharp claw lets the bearer move first occasionally.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True - - Me._flingDamage = 80 - - Me._battlePointsPrice = 64 + _textureRectangle = New Rectangle(96, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/QuickPowder.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/QuickPowder.vb index 1d89de482..898ef1b3a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/QuickPowder.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/QuickPowder.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by Ditto. Extremely fine yet hard, this odd powder boosts the Speed stat." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 10 + 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 Sub New() - MyBase.New("Quick Powder", 10, ItemTypes.Standard, 155, 1, 1, New Rectangle(96, 216, 24, 24), "An item to be held by Ditto. Extremely fine yet hard, this odd powder boosts the Speed stat.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._flingDamage = 10 + _textureRectangle = New Rectangle(96, 216, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/RareBone.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/RareBone.vb index 26ef5f37a..ca7294415 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/RareBone.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/RareBone.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Rare Bone", 30000, ItemTypes.Standard, 109, 1, 0, New Rectangle(456, 96, 24, 24), "A rare bone that is extremely valuable for the study of Pokémon archeology. It can be sold for a high price to shops.") + Public Overrides ReadOnly Property Description As String = "A rare bone that is extremely valuable for the study of Pokémon archeology. It can be sold for a high price to shops." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 30000 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(456, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/RazorClaw.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/RazorClaw.vb index 674f72ae8..92fa7b859 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/RazorClaw.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/RazorClaw.vb @@ -5,17 +5,15 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It is a sharply hooked claw that ups the holder's critical-hit ratio." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 2100 + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 48 + Public Overrides ReadOnly Property FlingDamage As Integer = 80 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Sub New() - MyBase.New("Razor Claw", 2100, ItemTypes.Standard, 184, 1, 1, New Rectangle(480, 144, 24, 24), "An item to be held by a Pokémon. It is a sharply hooked claw that ups the holder's critical-hit ratio.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._flingDamage = 80 - - Me._battlePointsPrice = 48 + _textureRectangle = New Rectangle(480, 144, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/RazorFang.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/RazorFang.vb index 283d5e190..836027984 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/RazorFang.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/RazorFang.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It may make foes and allies flinch when the holder inflicts damage." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 2100 + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 48 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Sub New() - MyBase.New("Razor Fang", 2100, ItemTypes.Standard, 183, 1, 1, New Rectangle(456, 144, 24, 24), "An item to be held by a Pokémon. It may make foes and allies flinch when the holder inflicts damage.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._battlePointsPrice = 48 + _textureRectangle = New Rectangle(456, 144, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/ReaperCloth.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/ReaperCloth.vb index 5b5c11349..a0b8bd560 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/ReaperCloth.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/ReaperCloth.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "A cloth imbued with horrifyingly strong spiritual energy. It's loved by a certain Pokémon." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 2100 + 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 Sub New() - MyBase.New("Reaper Cloth", 2100, ItemTypes.Standard, 84, 1, 1, New Rectangle(96, 168, 24, 24), "A cloth imbued with horrifyingly strong spiritual energy. It's loved by a certain Pokémon.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._flingDamage = 10 + _textureRectangle = New Rectangle(96, 168, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Sachet.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Sachet.vb index 459eb5b15..c474c86d4 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Sachet.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Sachet.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Sachet", 2100, ItemTypes.Standard, 503, 1, 1, New Rectangle(144, 240, 24, 24), "A sachet filled with fragrant perfumes that are just slightly too overwhelming. Yet it's loved by a certain Pokémon.") + Public Overrides ReadOnly Property Description As String = "A sachet filled with fragrant perfumes that are just slightly too overwhelming. Yet it's loved by a certain Pokémon." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 2100 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(144, 240, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/ScopeLens.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/ScopeLens.vb index e6b9db1b2..7d383db70 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/ScopeLens.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/ScopeLens.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It is a lens that boosts the holder's critical-hit ratio." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 200 + 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 Sub New() - MyBase.New("Scope Lens", 200, ItemTypes.Standard, 140, 1, 1, New Rectangle(384, 120, 24, 24), "An item to be held by a Pokémon. It is a lens that boosts the holder's critical-hit ratio.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._battlePointsPrice = 64 + _textureRectangle = New Rectangle(384, 120, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SeaIncense.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SeaIncense.vb index fa5e13dc8..91102cfe5 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SeaIncense.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SeaIncense.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. This incense has a curious aroma that boosts the power of Water-type moves." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 9800 + 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 Sub New() - MyBase.New("Sea Incense", 9800, ItemTypes.Standard, 264, 1, 0, New Rectangle(24, 264, 24, 24), "An item to be held by a Pokémon. This incense has a curious aroma that boosts the power of Water-type moves.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True - - Me._flingDamage = 10 + _textureRectangle = New Rectangle(24, 264, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SharpBeak.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SharpBeak.vb index 2106faaac..a212dd930 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SharpBeak.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SharpBeak.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It's a long, sharp beak that boosts the power of Flying-type moves." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + Public Overrides ReadOnly Property FlingDamage As Integer = 50 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Sub New() - MyBase.New("Sharp Beak", 100, ItemTypes.Standard, 77, 1, 0, New Rectangle(168, 72, 24, 24), "An item to be held by a Pokémon. It's a long, sharp beak that boosts the power of Flying-type moves.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True - - Me._flingDamage = 50 + _textureRectangle = New Rectangle(168, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/ShedShell.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/ShedShell.vb index 8cf0e2924..10247a091 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/ShedShell.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/ShedShell.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "A tough, discarded carapace to be held by a Pokémon. It enables the holder to switch with a waiting Pokémon in battle." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + 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 Sub New() - MyBase.New("Shed Shell", 100, ItemTypes.Standard, 154, 1, 1, New Rectangle(72, 216, 24, 24), "A tough, discarded carapace to be held by a Pokémon. It enables the holder to switch with a waiting Pokémon in battle.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._flingDamage = 10 + _textureRectangle = New Rectangle(72, 216, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SilkScarf.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SilkScarf.vb index 64a7ddb3b..9c8ad85be 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SilkScarf.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SilkScarf.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It's a sumptuous scarf that boosts the power of Normal-type moves." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + 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 Sub New() - MyBase.New("Silk Scarf", 100, ItemTypes.Standard, 90, 1, 0, New Rectangle(264, 192, 24, 24), "An item to be held by a Pokémon. It's a sumptuous scarf that boosts the power of Normal-type moves.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True - - Me._flingDamage = 10 + _textureRectangle = New Rectangle(264, 192, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SilverLeaf.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SilverLeaf.vb index 92130215f..1676976f1 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SilverLeaf.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SilverLeaf.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Silver Leaf", 1000, ItemTypes.Standard, 60, 1, 0, New Rectangle(288, 48, 24, 24), "A strange, silver-colored leaf.") + Public Overrides ReadOnly Property Description As String = "A strange, silver-colored leaf." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 1000 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(288, 48, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SilverPowder.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SilverPowder.vb index 05dcbde3f..d3920958d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SilverPowder.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SilverPowder.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It is a shiny, silver powder that will boost the power of Bug-type moves." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + 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 Sub New() - MyBase.New("SilverPowder", 100, ItemTypes.Standard, 88, 1, 0, New Rectangle(312, 72, 24, 24), "An item to be held by a Pokémon. It is a shiny, silver powder that will boost the power of Bug-type moves.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True - - Me._flingDamage = 10 + _textureRectangle = New Rectangle(312, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SlowPokeTail.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SlowPokeTail.vb index bdbb3080b..2cd682c87 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SlowPokeTail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SlowPokeTail.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Slowpoketail", 9800, ItemTypes.Standard, 103, 1, 0, New Rectangle(120, 96, 24, 24), "A very tasty tail of something. It sells for a high price.") + Public Overrides ReadOnly Property Description As String = "A very tasty tail of something. It sells for a high price." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 9800 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(120, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SmokeBall.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SmokeBall.vb index 4f078dca7..d06506efc 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SmokeBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SmokeBall.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Smoke Ball", 200, ItemTypes.Standard, 106, 1, 0, New Rectangle(192, 96, 24, 24), "An item to be held by a Pokémon. It enables the holder to flee from any wild Pokémon encounter without fail.") + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It enables the holder to flee from any wild Pokémon encounter without fail." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 200 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(192, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SoftSand.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SoftSand.vb index a4536bbad..ac69e5985 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SoftSand.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SoftSand.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It is a loose, silky sand that boosts the power of Ground-type moves." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + 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 Sub New() - MyBase.New("Soft Sand", 100, ItemTypes.Standard, 76, 1, 0, New Rectangle(144, 72, 24, 24), "An item to be held by a Pokémon. It is a loose, silky sand that boosts the power of Ground-type moves.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True - - Me._flingDamage = 10 + _textureRectangle = New Rectangle(144, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SootheBell.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SootheBell.vb index 78445c308..4abea3f9a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SootheBell.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SootheBell.vb @@ -5,16 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. The comforting chime of this bell calms the holder, making it friendly." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + 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 Sub New() - 'Tea Gardner style - MyBase.New("Soothe Bell", 100, ItemTypes.Standard, 148, 1, 0, New Rectangle(0, 216, 24, 24), "An item to be held by a Pokémon. The comforting chime of this bell calms the holder, making it friendly.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True - - Me._flingDamage = 10 + _textureRectangle = New Rectangle(0, 216, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SpellTag.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SpellTag.vb index 19f1e15b8..d69c99de1 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SpellTag.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SpellTag.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Spell Tag", 100, ItemTypes.Standard, 113, 1, 0, New Rectangle(336, 96, 24, 24), "An item to be held by a Pokémon. It is a sinister, eerie tag that boosts the power of Ghost-type moves.") + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It is a sinister, eerie tag that boosts the power of Ghost-type moves." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(336, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/StarPiece.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/StarPiece.vb index dd7a79ece..69b8b51b6 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/StarPiece.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/StarPiece.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Star Piece", 9800, ItemTypes.Standard, 132, 1, 0, New Rectangle(264, 120, 24, 24), "A small shard of a beautiful gem that demonstrates a distinctly red sparkle. It can be sold at a high price to shops.") + Public Overrides ReadOnly Property Description As String = "A small shard of a beautiful gem that demonstrates a distinctly red sparkle. It can be sold at a high price to shops." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 9800 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(264, 120, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Stardust.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Stardust.vb index aaf1fba93..e9187d922 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Stardust.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Stardust.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Stardust", 2000, ItemTypes.Standard, 131, 1, 0, New Rectangle(240, 120, 24, 24), "Lovely, red sand that flows between the fingers with a loose, silky feel. It can be sold at a high price to shops.") + Public Overrides ReadOnly Property Description As String = "Lovely, red sand that flows between the fingers with a loose, silky feel. It can be sold at a high price to shops." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 2000 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(240, 120, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Stick.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Stick.vb index 6b8b174c9..24a4be61e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Stick.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Stick.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by Farfetch'd. It is a very long and stiff stalk of leek that boosts the critical-hit ratio." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 200 + Public Overrides ReadOnly Property FlingDamage As Integer = 60 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Sub New() - MyBase.New("Stick", 200, ItemTypes.Standard, 105, 1, 0, New Rectangle(168, 96, 24, 24), "An item to be held by Farfetch'd. It is a very long and stiff stalk of leek that boosts the critical-hit ratio.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True - - Me._flingDamage = 60 + _textureRectangle = New Rectangle(168, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/StickyBarb.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/StickyBarb.vb index f08dc4647..d46582725 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/StickyBarb.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/StickyBarb.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It damages the holder every turn and may latch on to Pokémon that touch the holder." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 200 + Public Overrides ReadOnly Property FlingDamage As Integer = 80 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Sub New() - MyBase.New("Sticky Barb", 200, ItemTypes.Standard, 70, 1, 0, New Rectangle(24, 168, 24, 24), "An item to be held by a Pokémon. It damages the holder every turn and may latch on to Pokémon that touch the holder.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._flingDamage = 80 + _textureRectangle = New Rectangle(24, 168, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/ThickClub.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/ThickClub.vb index 2016bfe91..e7aa4b59b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/ThickClub.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/ThickClub.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "A rare bone that is extremely valuable for the study of Pokémon archeology. It can be sold for a high price to shops." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 500 + 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 Sub New() - MyBase.New("Thick Club", 500, ItemTypes.Standard, 118, 1, 1, New Rectangle(456, 96, 24, 24), "A rare bone that is extremely valuable for the study of Pokémon archeology. It can be sold for a high price to shops.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._flingDamage = 90 + _textureRectangle = New Rectangle(456, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/TinyMushroom.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/TinyMushroom.vb index 8249c225e..920578d69 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/TinyMushroom.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/TinyMushroom.vb @@ -5,13 +5,14 @@ Namespace Items.Plants Inherits Item - Public Sub New() - MyBase.New("Tiny Mushroom", 500, ItemTypes.Plants, 86, 1, 72, New Rectangle(264, 72, 24, 24), "A very small and rare mushroom. It's popular with a certain class of collectors and sought out by them.") + Public Overrides ReadOnly Property ItemType As ItemTypes = ItemTypes.Plants + Public Overrides ReadOnly Property Description As String = "A very small and rare mushroom. It's popular with a certain class of collectors and sought out by them." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 500 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(264, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/ToxicOrb.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/ToxicOrb.vb index edad18b4d..cbb093dec 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/ToxicOrb.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/ToxicOrb.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It is a bizarre orb that will badly poison the holder during battle." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 200 + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 16 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Sub New() - MyBase.New("Toxic Orb", 200, ItemTypes.Standard, 505, 1, 1, New Rectangle(216, 240, 24, 24), "An item to be held by a Pokémon. It is a bizarre orb that will badly poison the holder during battle.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._battlePointsPrice = 16 + _textureRectangle = New Rectangle(216, 240, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/TwistedSpoon.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/TwistedSpoon.vb index d9f353a06..9cdf7aa53 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/TwistedSpoon.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/TwistedSpoon.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Twisted Spoon", 100, ItemTypes.Standard, 96, 1, 0, New Rectangle(480, 72, 24, 24), "An item to be held by a Pokémon. It is a spoon imbued with telekinetic power that boosts Psychic-type moves.") + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It is a spoon imbued with telekinetic power that boosts Psychic-type moves." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 100 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(480, 72, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/UpGrade.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/UpGrade.vb index 1fe9335fa..5f3dad803 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/UpGrade.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/UpGrade.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Up-Grade", 2100, ItemTypes.Standard, 172, 1, 0, New Rectangle(336, 144, 24, 24), "A transparent device somehow filled with all sorts of data. It was produced by Silph Co.") + Public Overrides ReadOnly Property Description As String = "A transparent device somehow filled with all sorts of data. It was produced by Silph Co." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 2100 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(336, 144, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/WaveIncense.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/WaveIncense.vb index 5878b68a4..85c421aaa 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/WaveIncense.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/WaveIncense.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. This exotic-smelling incense boots the power of Water-type moves." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 9800 + 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 Sub New() - MyBase.New("Wave Incense", 9800, ItemTypes.Standard, 145, 1, 0, New Rectangle(480, 192, 24, 24), "An item to be held by a Pokémon. This exotic-smelling incense boots the power of Water-type moves.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True - - Me._flingDamage = 10 + _textureRectangle = New Rectangle(480, 192, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/WhippedDream.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/WhippedDream.vb index be7c17243..ccdab2a25 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/WhippedDream.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/WhippedDream.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("Whipped Dream", 2100, ItemTypes.Standard, 504, 1, 1, New Rectangle(168, 240, 24, 24), "A soft and sweet treat made of fluffy, puffy, whipped and whirled cream. It's loved by a certain Pokémon.") + Public Overrides ReadOnly Property Description As String = "A soft and sweet treat made of fluffy, puffy, whipped and whirled cream. It's loved by a certain Pokémon." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 2100 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(168, 240, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/WhiteFlute.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/WhiteFlute.vb index ac8389fda..ede474c45 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/WhiteFlute.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/WhiteFlute.vb @@ -5,13 +5,13 @@ Namespace Items.Standard Inherits Item - Public Sub New() - MyBase.New("White Flute", 500, ItemTypes.Standard, 147, 1, 0, New Rectangle(456, 192, 24, 24), "A white flute made from blown glass. Its melody makes wild Pokémon more likely to appear.") + Public Overrides ReadOnly Property Description As String = "A white flute made from blown glass. Its melody makes wild Pokémon more likely to appear." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 500 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Me._canBeUsed = False - Me._canBeUsedInBattle = False - Me._canBeTraded = True - Me._canBeHold = True + Public Sub New() + _textureRectangle = New Rectangle(456, 192, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/WideLens.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/WideLens.vb index 674a4f905..4dd965823 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/WideLens.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/WideLens.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It's a magnifying lens that slightly boosts the accuracy of moves." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 200 + 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 Sub New() - MyBase.New("Wide Lens", 200, ItemTypes.Standard, 171, 1, 1, New Rectangle(144, 216, 24, 24), "An item to be held by a Pokémon. It's a magnifying lens that slightly boosts the accuracy of moves.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._flingDamage = 10 + _textureRectangle = New Rectangle(144, 216, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/ZoomLens.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/ZoomLens.vb index 2e8f43937..9c6603943 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/ZoomLens.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/ZoomLens.vb @@ -5,15 +5,14 @@ Namespace Items.Standard Inherits Item + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. If the holder moves after its target moves, its accuracy will be boosted." + Public Overrides ReadOnly Property BattlePointsPrice As Integer = 200 + 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 Sub New() - MyBase.New("Zoom Lens", 200, ItemTypes.Standard, 74, 1, 1, New Rectangle(264, 144, 24, 24), "An item to be held by a Pokémon. If the holder moves after its target moves, its accuracy will be boosted.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._flingDamage = 10 + _textureRectangle = New Rectangle(264, 144, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/StoneItem.vb b/2.5DHero/2.5DHero/Pokemon/Items/StoneItem.vb index 138fde6ba..ad4077e5d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/StoneItem.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/StoneItem.vb @@ -4,25 +4,8 @@ Namespace Items Inherits Item - ''' - ''' Creates a new instance of the StoneItem class. - ''' - ''' The name of the Item. - ''' The purchase price. - ''' The type of Item. - ''' The ID of this Item. - ''' The CatchMultiplier of this Item. - ''' The SortValue of this Item. - ''' The TextureRectangle from the "Items\ItemSheet" texture. - ''' The description of this Item. - Public Sub New(ByVal Name As String, ByVal Price As Integer, ByVal ItemType As ItemTypes, ByVal ID As Integer, ByVal CatchMultiplier As Single, ByVal SortValue As Integer, ByVal TextureRectangle As Rectangle, ByVal Description As String) - MyBase.New(Name, Price, ItemType, ID, CatchMultiplier, SortValue, TextureRectangle, Description) - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = True - Me._canBeUsedInBattle = False - End Sub + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 2100 Public Overrides Sub Use() Core.SetScreen(New ChoosePokemonScreen(Core.CurrentScreen, Me, AddressOf Me.UseOnPokemon, "Use " & Me.Name, True)) diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Stones/DawnStone.vb b/2.5DHero/2.5DHero/Pokemon/Items/Stones/DawnStone.vb index fdf9fbb87..4a3ec8760 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Stones/DawnStone.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Stones/DawnStone.vb @@ -5,8 +5,10 @@ Namespace Items.Standard Inherits StoneItem + Public Overrides ReadOnly Property Description As String = "A peculiar stone that makes certain species of Pokémon evolve. It sparkles like eyes." + Public Sub New() - MyBase.New("Dawn Stone", 2100, ItemTypes.Standard, 137, 1, 0, New Rectangle(384, 192, 24, 24), "A peculiar stone that makes certain species of Pokémon evolve. It sparkles like eyes.") + _textureRectangle = New Rectangle(384, 192, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Stones/DuskStone.vb b/2.5DHero/2.5DHero/Pokemon/Items/Stones/DuskStone.vb index b88a61700..fda439dad 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Stones/DuskStone.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Stones/DuskStone.vb @@ -5,8 +5,10 @@ Namespace Items.Standard Inherits StoneItem + Public Overrides ReadOnly Property Description As String = "A peculiar stone that makes certain species of Pokémon evolve. It is as dark as dark can be." + Public Sub New() - MyBase.New("Dusk Stone", 2100, ItemTypes.Standard, 136, 1, 0, New Rectangle(360, 192, 24, 24), "A peculiar stone that makes certain species of Pokémon evolve. It is as dark as dark can be.") + _textureRectangle = New Rectangle(360, 192, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Stones/Everstone.vb b/2.5DHero/2.5DHero/Pokemon/Items/Stones/Everstone.vb index 1a5c9a036..90478a272 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Stones/Everstone.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Stones/Everstone.vb @@ -5,13 +5,13 @@ Namespace Items.Stones Inherits Item - Public Sub New() - MyBase.New("Everstone", 200, ItemTypes.Standard, 112, 1, 0, New Rectangle(312, 96, 24, 24), "An item to be held by a Pokémon. A Pokémon holding this peculiar stone is prevented from evolving.") + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 200 + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. A Pokémon holding this peculiar stone is prevented from evolving." + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(312, 96, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Stones/FireStone.vb b/2.5DHero/2.5DHero/Pokemon/Items/Stones/FireStone.vb index 24039059f..c162ba83f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Stones/FireStone.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Stones/FireStone.vb @@ -5,8 +5,10 @@ Namespace Items.Stones Inherits StoneItem + Public Overrides ReadOnly Property Description As String = "A peculiar stone that can make certain species of Pokémon evolve. The stone has a fiery orange heart." + Public Sub New() - MyBase.New("Fire Stone", 2100, ItemTypes.Standard, 22, 1, 0, New Rectangle(480, 0, 24, 24), "A peculiar stone that can make certain species of Pokémon evolve. The stone has a fiery orange heart.") + _textureRectangle = New Rectangle(480, 0, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Stones/LeafStone.vb b/2.5DHero/2.5DHero/Pokemon/Items/Stones/LeafStone.vb index 478415424..b3bcbd8fe 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Stones/LeafStone.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Stones/LeafStone.vb @@ -5,8 +5,10 @@ Namespace Items.Stones Inherits StoneItem + Public Overrides ReadOnly Property Description As String = "A peculiar stone that can make certain species of Pokémon evolve. It has an unmistakable leaf pattern." + Public Sub New() - MyBase.New("Leaf Stone", 2100, ItemTypes.Standard, 34, 1, 0, New Rectangle(240, 24, 24, 24), "A peculiar stone that can make certain species of Pokémon evolve. It has an unmistakable leaf pattern.") + _textureRectangle = New Rectangle(240, 24, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Stones/MoonStone.vb b/2.5DHero/2.5DHero/Pokemon/Items/Stones/MoonStone.vb index 49f153f0f..39e4c6ffb 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Stones/MoonStone.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Stones/MoonStone.vb @@ -5,8 +5,10 @@ Namespace Items.Stones Inherits StoneItem + Public Overrides ReadOnly Property Description As String = "A peculiar stone that can make certain species of Pokémon evolve. It is as black as the night sky." + Public Sub New() - MyBase.New("Moon Stone", 2100, ItemTypes.Standard, 8, 1, 10, New Rectangle(144, 0, 24, 24), "A peculiar stone that can make certain species of Pokémon evolve. It is as black as the night sky.") + _textureRectangle = New Rectangle(144, 0, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Stones/ShinyStone.vb b/2.5DHero/2.5DHero/Pokemon/Items/Stones/ShinyStone.vb index b8f5d04b3..a8efd950e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Stones/ShinyStone.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Stones/ShinyStone.vb @@ -5,8 +5,10 @@ Namespace Items.Standard Inherits StoneItem + Public Overrides ReadOnly Property Description As String = "A peculiar stone that makes certain species of Pokémon evolve. It shines with a dazzling light." + Public Sub New() - MyBase.New("Shiny Stone", 2100, ItemTypes.Standard, 135, 1, 0, New Rectangle(336, 192, 24, 24), "A peculiar stone that makes certain species of Pokémon evolve. It shines with a dazzling light.") + _textureRectangle = New Rectangle(336, 192, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Stones/StickyRock.vb b/2.5DHero/2.5DHero/Pokemon/Items/Stones/StickyRock.vb index 77662d96a..db291fd75 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Stones/StickyRock.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Stones/StickyRock.vb @@ -5,13 +5,13 @@ Namespace Items.Stones Inherits Item - Public Sub New() - MyBase.New("Sticky Rock", 300, ItemTypes.Standard, 262, 1.0F, 0, New Rectangle(480, 240, 24, 24), "It's a stone that sticks to other stones, but it's just a regular rock and has no effect on Pokémon.") + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 300 + Public Overrides ReadOnly Property Description As String = "It's a stone that sticks to other stones, but it's just a regular rock and has no effect on Pokémon." + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(480, 240, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Stones/SunStone.vb b/2.5DHero/2.5DHero/Pokemon/Items/Stones/SunStone.vb index 2437ca59f..29cf92164 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Stones/SunStone.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Stones/SunStone.vb @@ -5,8 +5,10 @@ Namespace Items.Stones Inherits StoneItem + Public Overrides ReadOnly Property Description As String = "A peculiar stone that can make certain species of Pokémon evolve. It burns as red as the evening sun." + Public Sub New() - MyBase.New("Sun Stone", 2100, ItemTypes.Standard, 169, 1, 0, New Rectangle(312, 144, 24, 24), "A peculiar stone that can make certain species of Pokémon evolve. It burns as red as the evening sun.") + _textureRectangle = New Rectangle(312, 144, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Stones/ThunderStone.vb b/2.5DHero/2.5DHero/Pokemon/Items/Stones/ThunderStone.vb index ddc88f308..77fcf2d30 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Stones/ThunderStone.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Stones/ThunderStone.vb @@ -5,8 +5,10 @@ Namespace Items.Stones Inherits StoneItem + Public Overrides ReadOnly Property Description As String = "A peculiar stone that can make certain species of Pokémon evolve. It has a distinct thunderbolt pattern." + Public Sub New() - MyBase.New("Thunder Stone", 2100, ItemTypes.Standard, 23, 1, 0, New Rectangle(0, 24, 24, 24), "A peculiar stone that can make certain species of Pokémon evolve. It has a distinct thunderbolt pattern.") + _textureRectangle = New Rectangle(0, 24, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Stones/WaterStone.vb b/2.5DHero/2.5DHero/Pokemon/Items/Stones/WaterStone.vb index 74e4a6fad..561682871 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Stones/WaterStone.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Stones/WaterStone.vb @@ -5,8 +5,10 @@ Namespace Items.Stones Inherits StoneItem + Public Overrides ReadOnly Property Description As String = "A peculiar stone that can make certain species of Pokémon evolve. It is the blue of a pool of clear water." + Public Sub New() - MyBase.New("Water Stone", 2100, ItemTypes.Standard, 24, 1, 0, New Rectangle(24, 24, 24, 24), "A peculiar stone that can make certain species of Pokémon evolve. It is the blue of a pool of clear water.") + _textureRectangle = New Rectangle(24, 24, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/TechMachine.vb b/2.5DHero/2.5DHero/Pokemon/Items/TechMachine.vb index b769b06c1..615abc0f7 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/TechMachine.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/TechMachine.vb @@ -14,43 +14,38 @@ Public CanTeachWhenFullyEvolved As Boolean = False Public CanTeachWhenGender As Boolean = False - Public Sub New(ByVal ID As Integer, ByVal IsTM As Boolean, ByVal Price As Integer, ByVal AttackID As Integer) - Me.New(ID, IsTM, Price, AttackID, (ID - 190)) - End Sub - - Public Sub New(ByVal ID As Integer, ByVal IsTM As Boolean, ByVal Price As Integer, ByVal AttackID As Integer, ByVal NameNumber As Integer) - MyBase.New("TM " & NameNumber.ToString(), Price, ItemTypes.Machines, ID, 1.0F, ID - 191, New Rectangle(0, 0, 1, 1), "DUMMY") - If _name.Length = 4 Then - _name = "TM 0" & NameNumber.ToString() - End If + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeHold As Boolean = False + Public Overrides ReadOnly Property CanBeTraded As Boolean = True + Public Overrides ReadOnly Property CanBeTossed As Boolean = True + Public Overrides ReadOnly Property SortValue As Integer + Public Overrides ReadOnly Property Description As String + Public Overrides ReadOnly Property ItemType As ItemTypes = ItemTypes.Machines + Public Overrides ReadOnly Property PokeDollarPrice As Integer + Public Sub New(ByVal IsTM As Boolean, ByVal Price As Integer, ByVal AttackID As Integer) Attack = BattleSystem.Attack.GetAttackByID(AttackID) Me.IsTM = IsTM - _canBeUsedInBattle = False TechID = ID - 190 HiddenID = ID - 242 - _canBeHold = False + PokeDollarPrice = Price If Me.IsTM = False Then - _name = "HM " & (Me.ID - 242).ToString() - If Name.Length = 4 Then - _name = "HM 0" & (Me.ID - 242).ToString() - End If - _canBeTraded = False - _canBeTossed = False + _CanBeTraded = False + _CanBeTossed = False 'Sets the sortvalue to something very low so the HMs will always be in first place: - _sortValue = -100000 + NameNumber + _SortValue = -100000 + ID Else - _sortValue = NameNumber + _SortValue = ID End If - _description = "Teaches """ & Attack.Name & """ to a Pokémon." + _Description = "Teaches """ & Attack.Name & """ to a Pokémon." - SetTexture() + SetTextureRectangle() End Sub - Private Sub SetTexture() + Private Sub SetTextureRectangle() Dim r As New Rectangle(144, 168, 24, 24) Select Case Attack.Type.Type @@ -92,7 +87,7 @@ r = New Rectangle(192, 168, 24, 24) End Select - _texture = TextureManager.GetTexture("Items\ItemSheet", r, "") + _textureRectangle = r End Sub Public Overrides Sub Use() diff --git a/2.5DHero/2.5DHero/Pokemon/Items/VitaminItem.vb b/2.5DHero/2.5DHero/Pokemon/Items/VitaminItem.vb index a76904f8e..a469e491c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/VitaminItem.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/VitaminItem.vb @@ -7,19 +7,12 @@ Namespace Items Inherits Item - ''' - ''' Creates a new instance of the Item class. - ''' - ''' The name of the Item. - ''' The purchase price. - ''' The type of Item. - ''' The ID of this Item. - ''' The CatchMultiplier of this Item. - ''' The SortValue of this Item. - ''' The TextureRectangle from the "Items\ItemSheet" texture. - ''' The description of this Item. - Public Sub New(ByVal Name As String, ByVal Price As Integer, ByVal ItemType As ItemTypes, ByVal ID As Integer, ByVal CatchMultiplier As Single, ByVal SortValue As Integer, ByVal TextureRectangle As Rectangle, ByVal Description As String) - MyBase.New(Name, Price, ItemType, ID, CatchMultiplier, SortValue, TextureRectangle, Description) + Public Overrides ReadOnly Property ItemType As ItemTypes = ItemTypes.Medicine + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 9800 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + + Public Overrides Sub Use() + Core.SetScreen(New ChoosePokemonScreen(Core.CurrentScreen, Me, AddressOf Me.UseOnPokemon, "Use " & Me.Name, True)) End Sub ''' @@ -27,7 +20,7 @@ Namespace Items ''' ''' An integer representing the stat that should be upped by the Vitamin. ''' The Pokémon that the Vitamin should be used on. - Protected Function CanUseVitamin(ByVal stat As Integer, ByVal p As Pokemon) As Boolean + Protected Shared Function CanUseVitamin(ByVal stat As Integer, ByVal p As Pokemon) As Boolean If stat < 100 Then Dim allStats As Integer = p.EVAttack + p.EVDefense + p.EVSpAttack + p.EVSpDefense + p.EVHP + p.EVSpeed If allStats < 510 Then diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/Calcium.vb b/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/Calcium.vb index 5a9ba6ae5..8cb5ff195 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/Calcium.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/Calcium.vb @@ -5,17 +5,10 @@ Namespace Items.Vitamins Inherits VitaminItem + Public Overrides ReadOnly Property Description As String = "A nutritious drink for Pokémon. When consumed, it raises the base Sp. Atk stat of a single Pokémon." + Public Sub New() - MyBase.New("Calcium", 9800, ItemTypes.Medicine, 31, 1, 1, New Rectangle(168, 24, 24, 24), "A nutritious drink for Pokémon. When consumed, it raises the base Sp. Atk stat of a single Pokémon.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = True - Me._canBeUsedInBattle = False - End Sub - - Public Overrides Sub Use() - Core.SetScreen(New ChoosePokemonScreen(Core.CurrentScreen, Me, AddressOf Me.UseOnPokemon, "Use " & Me.Name, True)) + _textureRectangle = New Rectangle(168, 24, 24, 24) End Sub Public Overrides Function UseOnPokemon(PokeIndex As Integer) As Boolean diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/Carbos.vb b/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/Carbos.vb index faf755035..76422df58 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/Carbos.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/Carbos.vb @@ -5,17 +5,10 @@ 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 Sub New() - MyBase.New("Carbos", 9800, ItemTypes.Medicine, 29, 1, 1, New Rectangle(120, 24, 24, 24), "A nutritious drink for Pokémon. When consumed, it raises the base Speed stat of a single Pokémon.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = True - Me._canBeUsedInBattle = False - End Sub - - Public Overrides Sub Use() - Core.SetScreen(New ChoosePokemonScreen(Core.CurrentScreen, Me, AddressOf Me.UseOnPokemon, "Use " & Me.Name, True)) + _textureRectangle = New Rectangle(120, 24, 24, 24) End Sub Public Overrides Function UseOnPokemon(PokeIndex As Integer) As Boolean diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/HPUp.vb b/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/HPUp.vb index d386ba1b5..d728c0401 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/HPUp.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/HPUp.vb @@ -5,17 +5,10 @@ Namespace Items.Vitamins Inherits VitaminItem + Public Overrides ReadOnly Property Description As String = "A nutritious drink for Pokémon. When consumed, it raises the base HP of a single Pokémon." + Public Sub New() - MyBase.New("HP Up", 9800, ItemTypes.Medicine, 26, 1, 1, New Rectangle(48, 24, 24, 24), "A nutritious drink for Pokémon. When consumed, it raises the base HP of a single Pokémon.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = True - Me._canBeUsedInBattle = False - End Sub - - Public Overrides Sub Use() - Core.SetScreen(New ChoosePokemonScreen(Core.CurrentScreen, Me, AddressOf Me.UseOnPokemon, "Use " & Me.Name, True)) + _textureRectangle = New Rectangle(48, 24, 24, 24) End Sub Public Overrides Function UseOnPokemon(PokeIndex As Integer) As Boolean diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/Iron.vb b/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/Iron.vb index 23919735b..039092dd8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/Iron.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/Iron.vb @@ -5,17 +5,10 @@ Namespace Items.Vitamins Inherits VitaminItem + Public Overrides ReadOnly Property Description As String = "A nutritious drink for Pokémon. When consumed, it raises the base Defense stat of a single Pokémon." + Public Sub New() - MyBase.New("Iron", 9800, ItemTypes.Medicine, 28, 1, 1, New Rectangle(96, 24, 24, 24), "A nutritious drink for Pokémon. When consumed, it raises the base Defense stat of a single Pokémon.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = True - Me._canBeUsedInBattle = False - End Sub - - Public Overrides Sub Use() - Core.SetScreen(New ChoosePokemonScreen(Core.CurrentScreen, Me, AddressOf Me.UseOnPokemon, "Use " & Me.Name, True)) + _textureRectangle = New Rectangle(96, 24, 24, 24) End Sub Public Overrides Function UseOnPokemon(PokeIndex As Integer) As Boolean diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/Protein.vb b/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/Protein.vb index 812283bf4..730aff98c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/Protein.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/Protein.vb @@ -5,17 +5,10 @@ Namespace Items.Vitamins Inherits VitaminItem + Public Overrides ReadOnly Property Description As String = "A nutritious drink for Pokémon. When consumed, it raises the base Attack stat of a single Pokémon." + Public Sub New() - MyBase.New("Protein", 9800, ItemTypes.Medicine, 27, 1, 1, New Rectangle(72, 24, 24, 24), "A nutritious drink for Pokémon. When consumed, it raises the base Attack stat of a single Pokémon.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = True - Me._canBeUsedInBattle = False - End Sub - - Public Overrides Sub Use() - Core.SetScreen(New ChoosePokemonScreen(Core.CurrentScreen, Me, AddressOf Me.UseOnPokemon, "Use " & Me.Name, True)) + _textureRectangle = New Rectangle(72, 24, 24, 24) End Sub Public Overrides Function UseOnPokemon(PokeIndex As Integer) As Boolean diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/Zinc.vb b/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/Zinc.vb index c2be7efd9..bc67eee5f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/Zinc.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Vitamins/Zinc.vb @@ -5,17 +5,10 @@ Namespace Items.Vitamins Inherits VitaminItem + Public Overrides ReadOnly Property Description As String = "A nutritious drink for Pokémon. When consumed, it raises the base Sp. Def stat of a single Pokémon." + Public Sub New() - MyBase.New("Zinc", 9800, ItemTypes.Medicine, 25, 1, 1, New Rectangle(168, 192, 24, 24), "A nutritious drink for Pokémon. When consumed, it raises the base Sp. Def stat of a single Pokémon.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = True - Me._canBeUsedInBattle = False - End Sub - - Public Overrides Sub Use() - Core.SetScreen(New ChoosePokemonScreen(Core.CurrentScreen, Me, AddressOf Me.UseOnPokemon, "Use " & Me.Name, True)) + _textureRectangle = New Rectangle(168, 192, 24, 24) End Sub Public Overrides Function UseOnPokemon(PokeIndex As Integer) As Boolean diff --git a/2.5DHero/2.5DHero/Pokemon/Items/WingItem.vb b/2.5DHero/2.5DHero/Pokemon/Items/WingItem.vb index 0746fb6e1..c1384c960 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/WingItem.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/WingItem.vb @@ -7,27 +7,10 @@ Namespace Items Inherits Item - ''' - ''' Creates a new instance of the Item class. - ''' - ''' The name of the Item. - ''' The purchase price. - ''' The type of Item. - ''' The ID of this Item. - ''' The CatchMultiplier of this Item. - ''' The SortValue of this Item. - ''' The TextureRectangle from the "Items\ItemSheet" texture. - ''' The description of this Item. - Public Sub New(ByVal Name As String, ByVal Price As Integer, ByVal ItemType As ItemTypes, ByVal ID As Integer, ByVal CatchMultiplier As Single, ByVal SortValue As Integer, ByVal TextureRectangle As Rectangle, ByVal Description As String) - MyBase.New(Name, Price, ItemType, ID, CatchMultiplier, SortValue, TextureRectangle, Description) - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = True - Me._canBeUsedInBattle = False - - Me._flingDamage = 20 - End Sub + Public Overrides ReadOnly Property ItemType As ItemTypes = ItemTypes.Medicine + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property FlingDamage As Integer = 20 + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 3000 Public Overrides Sub Use() Core.SetScreen(New ChoosePokemonScreen(Core.CurrentScreen, Me, AddressOf Me.UseOnPokemon, "Use " & Me.Name, True)) @@ -38,7 +21,7 @@ Namespace Items ''' ''' An integer representing the stat that should be upped by the Wing. ''' The Pokémon that the Wing should be used on. - Protected Function CanUseWing(ByVal stat As Integer, ByVal p As Pokemon) As Boolean + Protected Shared Function CanUseWing(ByVal stat As Integer, ByVal p As Pokemon) As Boolean If stat < 255 Then Dim allStats As Integer = p.EVAttack + p.EVDefense + p.EVSpAttack + p.EVSpDefense + p.EVHP + p.EVSpeed If allStats < 510 Then diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Wings/CleverWing.vb b/2.5DHero/2.5DHero/Pokemon/Items/Wings/CleverWing.vb index d2ef291d3..a03b00c7d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Wings/CleverWing.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Wings/CleverWing.vb @@ -5,8 +5,10 @@ Namespace Items.Wings Inherits WingItem + Public Overrides ReadOnly Property Description As String = "An item for use on a Pokémon. It slightly increases the base Sp. Def. stat of a single Pokémon." + Public Sub New() - MyBase.New("Clever Wing", 3000, ItemTypes.Medicine, 258, 1.0F, 0, New Rectangle(384, 240, 24, 24), "An item for use on a Pokémon. It slightly increases the base Sp. Def. stat of a single Pokémon.") + _textureRectangle = New Rectangle(384, 240, 24, 24) End Sub Public Overrides Function UseOnPokemon(PokeIndex As Integer) As Boolean diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Wings/GeniusWing.vb b/2.5DHero/2.5DHero/Pokemon/Items/Wings/GeniusWing.vb index 5a78be9b6..801e7e94b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Wings/GeniusWing.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Wings/GeniusWing.vb @@ -5,8 +5,10 @@ Namespace Items.Wings Inherits WingItem + Public Overrides ReadOnly Property Description As String = "An item for use on a Pokémon. It slightly increases the base Sp. Atk. stat of a single Pokémon." + Public Sub New() - MyBase.New("Genius Wing", 3000, ItemTypes.Medicine, 257, 1.0F, 0, New Rectangle(360, 240, 24, 24), "An item for use on a Pokémon. It slightly increases the base Sp. Atk. stat of a single Pokémon.") + _textureRectangle = New Rectangle(360, 240, 24, 24) End Sub Public Overrides Function UseOnPokemon(PokeIndex As Integer) As Boolean diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Wings/HealthWing.vb b/2.5DHero/2.5DHero/Pokemon/Items/Wings/HealthWing.vb index f2daab950..cdc538cfc 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Wings/HealthWing.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Wings/HealthWing.vb @@ -5,8 +5,10 @@ Namespace Items.Wings Inherits WingItem + Public Overrides ReadOnly Property Description As String = "An item for use on a Pokémon. It slightly increases the base HP stat of a single Pokémon." + Public Sub New() - MyBase.New("Health Wing", 3000, ItemTypes.Medicine, 254, 1.0F, 0, New Rectangle(288, 240, 24, 24), "An item for use on a Pokémon. It slightly increases the base HP of a single Pokémon.") + _textureRectangle = New Rectangle(288, 240, 24, 24) End Sub Public Overrides Function UseOnPokemon(PokeIndex As Integer) As Boolean diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Wings/MuscleWing.vb b/2.5DHero/2.5DHero/Pokemon/Items/Wings/MuscleWing.vb index 56ca86441..6431a9aa2 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Wings/MuscleWing.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Wings/MuscleWing.vb @@ -5,8 +5,10 @@ Namespace Items.Wings Inherits WingItem + Public Overrides ReadOnly Property Description As String = "An item for use on a Pokémon. It slightly increases the base Attack stat of a single Pokémon." + Public Sub New() - MyBase.New("Muscle Wing", 3000, ItemTypes.Medicine, 255, 1.0F, 0, New Rectangle(312, 240, 24, 24), "An item for use on a Pokémon. It slightly increases the base Attack stat of a single Pokémon.") + _textureRectangle = New Rectangle(312, 240, 24, 24) End Sub Public Overrides Function UseOnPokemon(PokeIndex As Integer) As Boolean diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Wings/PrettyWing.vb b/2.5DHero/2.5DHero/Pokemon/Items/Wings/PrettyWing.vb index c67fcebaa..49e65a2a6 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Wings/PrettyWing.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Wings/PrettyWing.vb @@ -5,13 +5,13 @@ Namespace Items.Wings Inherits Item - Public Sub New() - MyBase.New("Pretty Wing", 200, ItemTypes.Standard, 260, 1.0F, 0, New Rectangle(432, 240, 24, 24), "Though this feather is beautiful, it's just a regular feather and has no effect on Pokémon.") + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property Description As String = "Though this feather is beautiful, it's just a regular feather and has no effect on Pokémon." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 200 - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False + Public Sub New() + _textureRectangle = New Rectangle(432, 240, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Wings/ResistWing.vb b/2.5DHero/2.5DHero/Pokemon/Items/Wings/ResistWing.vb index 5f4d5ee7c..c1f40cd1c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Wings/ResistWing.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Wings/ResistWing.vb @@ -5,8 +5,10 @@ Namespace Items.Wings Inherits WingItem + Public Overrides ReadOnly Property Description As String = "An item for use on a Pokémon. It slightly increases the base Defense stat of a single Pokémon." + Public Sub New() - MyBase.New("Resist Wing", 3000, ItemTypes.Medicine, 256, 1.0F, 0, New Rectangle(336, 240, 24, 24), "An item for use on a Pokémon. It slightly increases the base Defense stat of a single Pokémon.") + _textureRectangle = New Rectangle(336, 240, 24, 24) End Sub Public Overrides Function UseOnPokemon(PokeIndex As Integer) As Boolean diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Wings/StickyWing.vb b/2.5DHero/2.5DHero/Pokemon/Items/Wings/StickyWing.vb index c57e3a647..b03bf4c32 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Wings/StickyWing.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Wings/StickyWing.vb @@ -5,15 +5,14 @@ Namespace Items.Wings Inherits Item + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property Description As String = "It's a feather that sticks to other feathers, but it's just a regular feather and has no effect on Pokémon." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 200 + Public Overrides ReadOnly Property FlingDamage As Integer = 20 + Public Sub New() - MyBase.New("Sticky Wing", 200, ItemTypes.Standard, 261, 1.0F, 0, New Rectangle(456, 240, 24, 24), "It's a feather that sticks to other feathers, but it's just a regular feather and has no effect on Pokémon.") - - Me._canBeHold = True - Me._canBeTraded = True - Me._canBeUsed = False - Me._canBeUsedInBattle = False - - Me._flingDamage = 20 + _textureRectangle = New Rectangle(456, 240, 24, 24) End Sub End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Wings/SwiftWing.vb b/2.5DHero/2.5DHero/Pokemon/Items/Wings/SwiftWing.vb index 9150d9670..1524b5a1c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Wings/SwiftWing.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Wings/SwiftWing.vb @@ -5,8 +5,10 @@ Namespace Items.Wings Inherits WingItem + Public Overrides ReadOnly Property Description As String = "An item for use on a Pokémon. It slightly increases the base Speed stat of a single Pokémon." + Public Sub New() - MyBase.New("Swift Wing", 3000, ItemTypes.Medicine, 259, 1.0F, 0, New Rectangle(408, 240, 24, 24), "An item for use on a Pokémon. It slightly increases the base Speed stat of a single Pokémon.") + _textureRectangle = New Rectangle(408, 240, 24, 24) End Sub Public Overrides Function UseOnPokemon(PokeIndex As Integer) As Boolean diff --git a/2.5DHero/2.5DHero/Pokemon/Items/XItems/DireHit.vb b/2.5DHero/2.5DHero/Pokemon/Items/XItems/DireHit.vb index c90d8396c..b6a0109e8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/XItems/DireHit.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/XItems/DireHit.vb @@ -3,17 +3,13 @@ Namespace Items.XItems Public Class DireHit - Inherits Item + Inherits XItem + + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 650 + Public Overrides ReadOnly Property Description As String = "An item that raises the critical-hit ratio greatly. It can be used only once and wears off if the Pokémon is withdrawn." Public Sub New() - MyBase.New("Dire Hit", 650, ItemTypes.BattleItems, 44, 1, 0, New Rectangle(480, 24, 24, 24), "An item that raises the critical-hit ratio greatly. It can be used only once and wears off if the Pokémon is withdrawn.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._requiresPokemonSelectInBattle = False + _textureRectangle = New Rectangle(480, 24, 24, 24) End Sub Public Overrides Function UseOnPokemon(PokeIndex As Integer) As Boolean diff --git a/2.5DHero/2.5DHero/Pokemon/Items/XItems/GuardSpec.vb b/2.5DHero/2.5DHero/Pokemon/Items/XItems/GuardSpec.vb index b81a15d2f..b45ff7358 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/XItems/GuardSpec.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/XItems/GuardSpec.vb @@ -3,17 +3,13 @@ Namespace Items.XItems Public Class GuardSpec - Inherits Item + Inherits XItem + + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 700 + Public Overrides ReadOnly Property Description As String = "An item that prevents stat reduction among the Trainer's party Pokémon for five turns after it is used in battle." Public Sub New() - MyBase.New("Guard Spec.", 700, ItemTypes.BattleItems, 68, 1, 0, New Rectangle(408, 24, 24, 24), "An item that prevents stat reduction among the Trainer's party Pokémon for five turns after it is used in battle.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._requiresPokemonSelectInBattle = False + _textureRectangle = New Rectangle(408, 24, 24, 24) End Sub Public Overrides Function UseOnPokemon(PokeIndex As Integer) As Boolean diff --git a/2.5DHero/2.5DHero/Pokemon/Items/XItems/XAccuracy.vb b/2.5DHero/2.5DHero/Pokemon/Items/XItems/XAccuracy.vb index 944ddde7d..cf4de0adb 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/XItems/XAccuracy.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/XItems/XAccuracy.vb @@ -3,17 +3,13 @@ Namespace Items.XItems Public Class XAccuracy - Inherits Item + Inherits XItem + + 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 Sub New() - MyBase.New("X Accuracy", 950, ItemTypes.BattleItems, 33, 1, 0, New Rectangle(216, 24, 24, 24), "An item that boosts the accuracy of a Pokémon during a battle. It wears off once the Pokémon is withdrawn.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._requiresPokemonSelectInBattle = False + _textureRectangle = New Rectangle(216, 24, 24, 24) End Sub Public Overrides Function UseOnPokemon(PokeIndex As Integer) As Boolean diff --git a/2.5DHero/2.5DHero/Pokemon/Items/XItems/XAttack.vb b/2.5DHero/2.5DHero/Pokemon/Items/XItems/XAttack.vb index 0fd9acd18..730ae6f03 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/XItems/XAttack.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/XItems/XAttack.vb @@ -3,17 +3,13 @@ Namespace Items.XItems Public Class XAttack - Inherits Item + Inherits XItem + + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 500 + Public Overrides ReadOnly Property Description As String = "An item that boosts the Attack stat of a Pokémon during a battle. It wears off once the Pokémon is withdrawn." Public Sub New() - MyBase.New("X Attack", 500, ItemTypes.BattleItems, 49, 1, 0, New Rectangle(72, 48, 24, 24), "An item that boosts the Attack stat of a Pokémon during a battle. It wears off once the Pokémon is withdrawn.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._requiresPokemonSelectInBattle = False + _textureRectangle = New Rectangle(72, 48, 24, 24) End Sub Public Overrides Function UseOnPokemon(PokeIndex As Integer) As Boolean diff --git a/2.5DHero/2.5DHero/Pokemon/Items/XItems/XDefend.vb b/2.5DHero/2.5DHero/Pokemon/Items/XItems/XDefend.vb index 9a3f3b623..0eb3e9557 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/XItems/XDefend.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/XItems/XDefend.vb @@ -3,17 +3,13 @@ Namespace Items.XItems Public Class XDefend - Inherits Item + Inherits XItem + + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 550 + Public Overrides ReadOnly Property Description As String = "An item that boosts the Defense stat of a Pokémon during a battle. It wears off once the Pokémon is withdrawn." Public Sub New() - MyBase.New("X Defense", 550, ItemTypes.BattleItems, 51, 1, 0, New Rectangle(96, 48, 24, 24), "An item that boosts the Defense stat of a Pokémon during a battle. It wears off once the Pokémon is withdrawn.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._requiresPokemonSelectInBattle = False + _textureRectangle = New Rectangle(96, 48, 24, 24) End Sub Public Overrides Function UseOnPokemon(PokeIndex As Integer) As Boolean diff --git a/2.5DHero/2.5DHero/Pokemon/Items/XItems/XItem.vb b/2.5DHero/2.5DHero/Pokemon/Items/XItems/XItem.vb new file mode 100644 index 000000000..9065bd6aa --- /dev/null +++ b/2.5DHero/2.5DHero/Pokemon/Items/XItems/XItem.vb @@ -0,0 +1,13 @@ +Namespace Items.XItems + Public MustInherit Class XItem + + Inherits Item + + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + Public Overrides ReadOnly Property BattleSelectPokemon As Boolean = True + Public Overrides ReadOnly Property ItemType As ItemTypes = ItemTypes.BattleItems + + End Class + +End Namespace + diff --git a/2.5DHero/2.5DHero/Pokemon/Items/XItems/XSpAtk.vb b/2.5DHero/2.5DHero/Pokemon/Items/XItems/XSpAtk.vb index 62c6772d1..e05dc1347 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/XItems/XSpAtk.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/XItems/XSpAtk.vb @@ -3,17 +3,13 @@ Namespace Items.XItems Public Class XSpecial - Inherits Item + Inherits XItem + + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 350 + Public Overrides ReadOnly Property Description As String = "An item that boosts the Sp. Atk stat of a Pokémon during a battle. It wears off once the Pokémon is withdrawn." Public Sub New() - MyBase.New("X Sp. Atk.", 350, ItemTypes.BattleItems, 53, 1, 0, New Rectangle(144, 48, 24, 24), "An item that boosts the Sp. Atk stat of a Pokémon during a battle. It wears off once the Pokémon is withdrawn.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._requiresPokemonSelectInBattle = False + _textureRectangle = New Rectangle(144, 48, 24, 24) End Sub Public Overrides Function UseOnPokemon(PokeIndex As Integer) As Boolean diff --git a/2.5DHero/2.5DHero/Pokemon/Items/XItems/XSpDef.vb b/2.5DHero/2.5DHero/Pokemon/Items/XItems/XSpDef.vb index bdc67643b..67a6424a9 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/XItems/XSpDef.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/XItems/XSpDef.vb @@ -3,17 +3,13 @@ Namespace Items.XItems Public Class XSpDef - Inherits Item + Inherits XItem + + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 350 + Public Overrides ReadOnly Property Description As String = "An item that boosts the Sp. Def stat of a Pokémon during a battle. It wears off once the Pokémon is withdrawn." Public Sub New() - MyBase.New("X Sp. Def", 350, ItemTypes.BattleItems, 50, 1, 0, New Rectangle(144, 192, 24, 24), "An item that boosts the Sp. Def stat of a Pokémon during a battle. It wears off once the Pokémon is withdrawn.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._requiresPokemonSelectInBattle = False + _textureRectangle = New Rectangle(144, 192, 24, 24) End Sub Public Overrides Function UseOnPokemon(PokeIndex As Integer) As Boolean diff --git a/2.5DHero/2.5DHero/Pokemon/Items/XItems/XSpeed.vb b/2.5DHero/2.5DHero/Pokemon/Items/XItems/XSpeed.vb index 71faadad2..da74c0b8d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/XItems/XSpeed.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/XItems/XSpeed.vb @@ -3,17 +3,13 @@ Namespace Items.XItems Public Class XSpeed - Inherits Item + Inherits XItem + + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 350 + Public Overrides ReadOnly Property Description As String = "An item that boosts the Speed stat of a Pokémon during a battle. It wears off once the Pokémon is withdrawn." Public Sub New() - MyBase.New("X Speed", 350, ItemTypes.BattleItems, 52, 1, 0, New Rectangle(120, 48, 24, 24), "An item that boosts the Speed stat of a Pokémon during a battle. It wears off once the Pokémon is withdrawn.") - - Me._canBeUsed = False - Me._canBeUsedInBattle = True - Me._canBeTraded = True - Me._canBeHold = True - - Me._requiresPokemonSelectInBattle = False + _textureRectangle = New Rectangle(120, 48, 24, 24) End Sub Public Overrides Function UseOnPokemon(PokeIndex As Integer) As Boolean diff --git a/2.5DHero/2.5DHero/Resources/GameModeManager.vb b/2.5DHero/2.5DHero/Resources/GameModeManager.vb index 76131786e..4144b70ae 100644 --- a/2.5DHero/2.5DHero/Resources/GameModeManager.vb +++ b/2.5DHero/2.5DHero/Resources/GameModeManager.vb @@ -259,31 +259,6 @@ start: Return GameController.GamePath & GameMode.DefaultContentPath & ContentFile End Function - ''' - ''' Loads the FileItems for the loaded player file. - ''' - Public Shared Sub LoadFileItems() - If Not Core.Player Is Nothing Then - Core.Player.FileItems.Clear() - - If ActiveGameMode.IsDefaultGamemode = False Then - Dim path As String = GameController.GamePath & ActiveGameMode.ContentPath & "\Data\items.dat" - If System.IO.File.Exists(path) = True Then - Dim c() As String = System.IO.File.ReadAllLines(path) - For Each line As String In c - If line.StartsWith("{") = True And line.EndsWith("}") = True Then - Dim fileItem As New Items.FileItem(line) - - If fileItem.IsValid = True Then - Core.Player.FileItems.Add(fileItem) - End If - End If - Next - End If - End If - End If - End Sub - ''' ''' Checks if a map file exists either in the active GameMode or the default GameMode. ''' diff --git a/2.5DHero/2.5DHero/Screens/Inventory/InventoryScreen.vb b/2.5DHero/2.5DHero/Screens/Inventory/InventoryScreen.vb index ba748c4cb..8e8301b18 100644 --- a/2.5DHero/2.5DHero/Screens/Inventory/InventoryScreen.vb +++ b/2.5DHero/2.5DHero/Screens/Inventory/InventoryScreen.vb @@ -5,7 +5,7 @@ Dim index(8) As Integer Dim scrollIndex(8) As Integer Dim bagIndex As Integer = 0 - Dim bagIdentifier As Item.ItemTypes + Dim bagIdentifier As Items.ItemTypes Dim Items As New Dictionary(Of Item, Integer) Dim cItems As New Dictionary(Of Item, Integer) @@ -174,21 +174,21 @@ Private Sub ChangeBag() Select Case bagIndex Case 0 - bagIdentifier = Item.ItemTypes.Standard + bagIdentifier = Game.Items.ItemTypes.Standard Case 1 - bagIdentifier = Item.ItemTypes.Medicine + bagIdentifier = Game.Items.ItemTypes.Medicine Case 2 - bagIdentifier = Item.ItemTypes.Machines + bagIdentifier = Game.Items.ItemTypes.Machines Case 3 - bagIdentifier = Item.ItemTypes.Pokéballs + bagIdentifier = Game.Items.ItemTypes.Pokéballs Case 4 - bagIdentifier = Item.ItemTypes.Plants + bagIdentifier = Game.Items.ItemTypes.Plants Case 5 - bagIdentifier = Item.ItemTypes.Mail + bagIdentifier = Game.Items.ItemTypes.Mail Case 6 - bagIdentifier = Item.ItemTypes.BattleItems + bagIdentifier = Game.Items.ItemTypes.BattleItems Case 7 - bagIdentifier = Item.ItemTypes.KeyItems + bagIdentifier = Game.Items.ItemTypes.KeyItems End Select cItems.Clear() diff --git a/2.5DHero/2.5DHero/Screens/Inventory/ItemDetailScreen.vb b/2.5DHero/2.5DHero/Screens/Inventory/ItemDetailScreen.vb index 3e1e2ac1f..66ce7f917 100644 --- a/2.5DHero/2.5DHero/Screens/Inventory/ItemDetailScreen.vb +++ b/2.5DHero/2.5DHero/Screens/Inventory/ItemDetailScreen.vb @@ -192,7 +192,7 @@ If Item.CanBeHold = True Then MenuItems.Add(Localization.GetString("item_detail_screen_give")) End If - If Item.ItemType <> net.Pokemon3D.Game.Item.ItemTypes.KeyItems And Item.CanBeTossed = True Then + If Item.ItemType <> Game.Items.ItemTypes.KeyItems And Item.CanBeTossed = True Then MenuItems.Add(Localization.GetString("item_detail_screen_trash")) End If MenuItems.Add(Localization.GetString("item_detail_screen_back")) diff --git a/2.5DHero/2.5DHero/Screens/NewGameScreen.vb b/2.5DHero/2.5DHero/Screens/NewGameScreen.vb index 6ed13a2eb..4f5bfe126 100644 --- a/2.5DHero/2.5DHero/Screens/NewGameScreen.vb +++ b/2.5DHero/2.5DHero/Screens/NewGameScreen.vb @@ -47,7 +47,6 @@ ContentPackManager.Load(GameController.GamePath & "\ContentPacks\" & s & "\exceptions.dat") Next - GameModeManager.LoadFileItems() BattleSystem.GameModeAttackLoader.Load() Localization.ReloadGameModeTokens() diff --git a/2.5DHero/2.5DHero/Screens/Pokemon/LearnAttackScreen.vb b/2.5DHero/2.5DHero/Screens/Pokemon/LearnAttackScreen.vb index 78d60e66e..c11274882 100644 --- a/2.5DHero/2.5DHero/Screens/Pokemon/LearnAttackScreen.vb +++ b/2.5DHero/2.5DHero/Screens/Pokemon/LearnAttackScreen.vb @@ -278,7 +278,7 @@ PlayerStatistics.Track("TMs/HMs used", 1) If Core.Player.DifficultyMode > 0 Then Dim TechMachine As Item = Item.GetItemByID(Me.MachineItemID) - If TechMachine.ItemType = Item.ItemTypes.Machines Then + If TechMachine.ItemType = Items.ItemTypes.Machines Then If CType(TechMachine, Items.TechMachine).IsTM = True Then Core.Player.Inventory.RemoveItem(Me.MachineItemID, 1) End If diff --git a/2.5DHero/2.5DHero/Screens/TradeScreen.vb b/2.5DHero/2.5DHero/Screens/TradeScreen.vb index 68082989b..35c857be1 100644 --- a/2.5DHero/2.5DHero/Screens/TradeScreen.vb +++ b/2.5DHero/2.5DHero/Screens/TradeScreen.vb @@ -14,7 +14,7 @@ Public Class TradeScreen End Enum Private MenuState As MenuStates = MenuStates.MainPage - Private CurrentCategory As Item.ItemTypes = Item.ItemTypes.Medicine + Private CurrentCategory As Items.ItemTypes = Items.ItemTypes.Medicine Private MainCursor As Integer = 0 Private CategoryCursor As Integer = 0 @@ -98,7 +98,7 @@ Public Class TradeScreen If Currency = Currencies.BattlePoints Then Me.Price = i.BattlePointsPrice ElseIf Currency = Currencies.Pokédollar Then - Me.Price = i.PokéDollarPrice + Me.Price = i.PokeDollarPrice End If Else Me.Price = Price @@ -350,7 +350,7 @@ Public Class TradeScreen #Region "BuyCategoryScreen" - Private loadedBuyCategories As New List(Of Item.ItemTypes) + Private loadedBuyCategories As New List(Of Items.ItemTypes) Private Sub LoadBuyCategoriesItems() Me.loadedBuyCategories.Clear() @@ -361,7 +361,7 @@ Public Class TradeScreen loadedBuyCategories.Add(item.ItemType) End If Next - Me.loadedBuyCategories = (From c As Item.ItemTypes In Me.loadedBuyCategories Order By CInt(c)).ToList() + Me.loadedBuyCategories = (From c As Items.ItemTypes In Me.loadedBuyCategories Order By CInt(c)).ToList() End Sub Private Sub UpdateBuyCategory() @@ -760,7 +760,7 @@ Public Class TradeScreen #Region "SellCatetoryScreen" - Private loadedSellCategories As New List(Of Item.ItemTypes) + Private loadedSellCategories As New List(Of Items.ItemTypes) Private Sub LoadSellCategoryItems() Me.loadedSellCategories.Clear() @@ -771,7 +771,7 @@ Public Class TradeScreen loadedSellCategories.Add(i.ItemType) End If Next - Me.loadedSellCategories = (From c As Item.ItemTypes In Me.loadedSellCategories Order By CInt(c)).ToList() + Me.loadedSellCategories = (From c As Items.ItemTypes In Me.loadedSellCategories Order By CInt(c)).ToList() End Sub Private Sub UpdateSellCategory() @@ -1220,24 +1220,24 @@ Public Class TradeScreen Core.SpriteBatch.DrawString(Font, Text, New Vector2(Position.X + Height + 10, Position.Y + textY), Color.White) End Sub - Private Function GetItemTypeTexture(ByVal itemType As Item.ItemTypes) As Texture2D + Private Function GetItemTypeTexture(ByVal itemType As Items.ItemTypes) As Texture2D Dim i As Integer = 0 Select Case itemType - Case Item.ItemTypes.Standard + Case Items.ItemTypes.Standard i = 0 - Case Item.ItemTypes.Medicine + Case Items.ItemTypes.Medicine i = 1 - Case Item.ItemTypes.Machines + Case Items.ItemTypes.Machines i = 2 - Case Item.ItemTypes.Pokéballs + Case Items.ItemTypes.Pokéballs i = 3 - Case Item.ItemTypes.Plants + Case Items.ItemTypes.Plants i = 4 - Case Item.ItemTypes.Mail + Case Items.ItemTypes.Mail i = 5 - Case Item.ItemTypes.BattleItems + Case Items.ItemTypes.BattleItems i = 6 - Case Item.ItemTypes.KeyItems + Case Items.ItemTypes.KeyItems i = 7 End Select