Changed Ball items

2.5DHero/2.5DHero/2.5DHero.vbproj

@@ -946,6 +946,7 @@
     <Compile Include="Pokemon\Items\Apricorns\RedApricorn.vb" />
     <Compile Include="Pokemon\Items\Apricorns\WhtApricorn.vb" />
     <Compile Include="Pokemon\Items\Apricorns\YlwApricorn.vb" />
+    <Compile Include="Pokemon\Items\Balls\BallItem.vb" />
     <Compile Include="Pokemon\Items\Balls\CherishBall.vb" />
     <Compile Include="Pokemon\Items\Balls\DiveBall.vb" />
     <Compile Include="Pokemon\Items\Balls\DuskBall.vb" />

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

2.5DHero/2.5DHero/Pokemon/Items/Balls/CherishBall.vb

@@ -3,13 +3,12 @@ Namespace Items.Balls
     <Item(45, "Cherish Ball")>
     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.")
+            _textureRectangle = New Rectangle(216, 192, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/DiveBall.vb

@@ -3,13 +3,12 @@ Namespace Items.Balls
     <Item(79, "Dive Ball")>
     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.")
+            _textureRectangle = New Rectangle(288, 144, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/DuskBall.vb

@@ -3,13 +3,12 @@ Namespace Items.Balls
     <Item(158, "Dusk Ball")>
     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.")
+            _textureRectangle = New Rectangle(360, 216, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/FastBall.vb

@@ -3,13 +3,13 @@ Namespace Items.Balls
     <Item(161, "Fast Ball")>
     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.")
+            _textureRectangle = New Rectangle(144, 144, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/FriendBall.vb

@@ -3,13 +3,13 @@ Namespace Items.Balls
     <Item(164, "Friend Ball")>
     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.")
+            _textureRectangle = New Rectangle(192, 144, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/GreatBall.vb

@@ -3,13 +3,14 @@ Namespace Items.Balls
     <Item(4, "Great Ball")>
     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.")
+            _textureRectangle = New Rectangle(72, 0, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/HealBall.vb

@@ -3,13 +3,13 @@ Namespace Items.Balls
     <Item(186, "Heal Ball")>
     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. ")
+            _textureRectangle = New Rectangle(456, 216, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/HeavyBall.vb

@@ -3,13 +3,13 @@ Namespace Items.Balls
     <Item(157, "Heavy Ball")>
     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. ")
+            _textureRectangle = New Rectangle(48, 144, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/LevelBall.vb

@@ -3,13 +3,13 @@ Namespace Items.Balls
     <Item(159, "Level Ball")>
     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. ")
+            _textureRectangle = New Rectangle(96, 144, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/LoveBall.vb

@@ -3,13 +3,13 @@ Namespace Items.Balls
     <Item(166, "Love Ball")>
     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.")
+            _textureRectangle = New Rectangle(240, 144, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/LureBall.vb

@@ -3,13 +3,13 @@ Namespace Items.Balls
     <Item(160, "Lure Ball")>
     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. ")
+            _textureRectangle = New Rectangle(120, 144, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/LuxuryBall.vb

@@ -3,13 +3,12 @@ Namespace Items.Balls
     <Item(174, "Luxury Ball")>
     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.")
+            _textureRectangle = New Rectangle(432, 216, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/Masterball.vb

@@ -3,14 +3,14 @@ Namespace Items.Balls
     <Item(1, "Masterball")>
     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.")
+            _textureRectangle = New Rectangle(0, 0, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
-            Me._canBeTraded = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/MoonBall.vb

@@ -3,13 +3,13 @@ Namespace Items.Balls
     <Item(165, "Moon Ball")>
     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. ")
+            _textureRectangle = New Rectangle(216, 144, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/NestBall.vb

@@ -3,13 +3,12 @@ Namespace Items.Balls
     <Item(188, "Nest Ball")>
     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.")
+            _textureRectangle = New Rectangle(24, 240, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/NetBall.vb

@@ -3,13 +3,12 @@ Namespace Items.Balls
     <Item(80, "Net Ball")>
     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.")
+            _textureRectangle = New Rectangle(48, 168, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/Pokeball.vb

@@ -3,13 +3,13 @@ Namespace Items.Balls
     <Item(5, "Pokéball")>
     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.")
+            _textureRectangle = New Rectangle(96, 0, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/PremierBall.vb

@@ -3,13 +3,13 @@ Namespace Items.Balls
     <Item(3, "Premier Ball")>
     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.")
+            _textureRectangle = New Rectangle(216, 216, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/QuickBall.vb

@@ -3,13 +3,12 @@ Namespace Items.Balls
     <Item(129, "Quick Ball")>
     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.")
+            _textureRectangle = New Rectangle(120, 168, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/RepeatBall.vb

@@ -3,13 +3,12 @@ Namespace Items.Balls
     <Item(168, "Repeat Ball")>
     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.")
+            _textureRectangle = New Rectangle(384, 216, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/SafariBall.vb

@@ -3,14 +3,14 @@ Namespace Items.Balls
     <Item(181, "Safari Ball")>
     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.")
+            _textureRectangle = New Rectangle(72, 144, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
-            Me._canBeTraded = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/SportBall.vb

@@ -3,13 +3,13 @@ Namespace Items.Balls
     <Item(177, "Sport Ball")>
     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.")
+            _textureRectangle = New Rectangle(384, 144, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/TimerBall.vb

@@ -3,13 +3,13 @@ Namespace Items.Balls
     <Item(150, "Timer Ball")>
     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.")
+            _textureRectangle = New Rectangle(336, 216, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Balls/UltraBall.vb

@@ -3,13 +3,14 @@ Namespace Items.Balls
     <Item(2, "Ultra Ball")>
     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.")
+            _textureRectangle = New Rectangle(24, 0, 24, 24)
-
-            Me._isBall = True
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Item.vb

@@ -134,16 +134,20 @@ Public MustInherit Class Item
     ''' </summary>
     Public Overridable ReadOnly Property BattleSelectPokemon As Boolean = True
 
-    ''' <summary>
-    ''' If this item is a Pokéball item.
-    ''' </summary>
-    Public Overridable ReadOnly Property IsBall As Boolean = False
-
     ''' <summary>
     ''' If this item is a Healing item.
     ''' </summary>
     Public Overridable ReadOnly Property IsHealingItem As Boolean = False
 
+    ''' <summary>
+    ''' If this item is a Pokéball item.
+    ''' </summary>
+    Public Overridable ReadOnly Property IsBall As Boolean
+        Get
+            Return [GetType]().IsSubclassOf(GetType(Items.Balls.BallItem))
+        End Get
+    End Property
+
     ''' <summary>
     ''' If this item is a Berry item.
     ''' </summary>