From 4ce2be7c08ea300e0fafd608e32af8c6861b666c Mon Sep 17 00:00:00 2001 From: nilllzz Date: Wed, 21 Sep 2016 00:50:35 +0200 Subject: [PATCH] Changed stone items. --- 2.5DHero/2.5DHero/Pokemon/Items/StoneItem.vb | 1 + 2.5DHero/2.5DHero/Pokemon/Items/Stones/DawnStone.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Stones/DuskStone.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Stones/Everstone.vb | 12 ++++++------ 2.5DHero/2.5DHero/Pokemon/Items/Stones/FireStone.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Stones/LeafStone.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Stones/MoonStone.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Stones/ShinyStone.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Stones/StickyRock.vb | 12 ++++++------ 2.5DHero/2.5DHero/Pokemon/Items/Stones/SunStone.vb | 4 +++- .../2.5DHero/Pokemon/Items/Stones/ThunderStone.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Stones/WaterStone.vb | 4 +++- 12 files changed, 40 insertions(+), 21 deletions(-) diff --git a/2.5DHero/2.5DHero/Pokemon/Items/StoneItem.vb b/2.5DHero/2.5DHero/Pokemon/Items/StoneItem.vb index 39dde849f..ad4077e5d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/StoneItem.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/StoneItem.vb @@ -5,6 +5,7 @@ Namespace Items Inherits Item 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