Changed Apricorns

2.5DHero/2.5DHero/2.5DHero.vbproj

@@ -938,6 +938,7 @@
     <Compile Include="Pokemon\Attacks\Water\WaterSpout.vb" />
     <Compile Include="Pokemon\Attacks\Water\Whirlpool.vb" />
     <Compile Include="Pokemon\Attacks\Water\Withdraw.vb" />
+    <Compile Include="Pokemon\Items\Apricorns\Apricorn.vb" />
     <Compile Include="Pokemon\Items\Apricorns\BlkApricorn.vb" />
     <Compile Include="Pokemon\Items\Apricorns\BluApricorn.vb" />
     <Compile Include="Pokemon\Items\Apricorns\GrnApricorn.vb" />

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

2.5DHero/2.5DHero/Pokemon/Items/Apricorns/BlkApricorn.vb

@@ -3,13 +3,12 @@ Namespace Items.Apricorns
     <Item(99, "Black Apricorn")>
     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.")
+            _textureRectangle = New Rectangle(48, 96, 24, 24)
-
-            Me._canBeUsedInBattle = False
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Apricorns/BluApricorn.vb

@@ -3,13 +3,12 @@ Namespace Items.Apricorns
     <Item(89, "Blue Apricorn")>
     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.")
+            _textureRectangle = New Rectangle(336, 72, 24, 24)
-
-            Me._canBeUsedInBattle = False
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Apricorns/GrnApricorn.vb

@@ -3,13 +3,12 @@ Namespace Items.Apricorns
     <Item(93, "Green Apricorn")>
     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.")
+            _textureRectangle = New Rectangle(408, 72, 24, 24)
-
-            Me._canBeUsedInBattle = False
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Apricorns/PnkApricorn.vb

@@ -3,13 +3,12 @@ Namespace Items.Apricorns
     <Item(101, "Pink Apricorn")>
     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.")
+            _textureRectangle = New Rectangle(72, 96, 24, 24)
-
-            Me._canBeUsedInBattle = False
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Apricorns/RedApricorn.vb

@@ -3,13 +3,12 @@ Namespace Items.Apricorns
     <Item(85, "Red Apricorn")>
     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.")
+            _textureRectangle = New Rectangle(240, 72, 24, 24)
-
-            Me._canBeUsedInBattle = False
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Apricorns/WhtApricorn.vb

@@ -3,13 +3,12 @@ Namespace Items.Apricorns
     <Item(97, "White Apricorn")>
     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.")
+            _textureRectangle = New Rectangle(0, 96, 24, 24)
-
-            Me._canBeUsedInBattle = False
-            Me._canBeUsed = False
         End Sub
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/Apricorns/YlwApricorn.vb

@@ -3,13 +3,12 @@ Namespace Items.Apricorns
     <Item(92, "Yellow Apricorn")>
     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.")
+            _textureRectangle = New Rectangle(384, 72, 24, 24)
-
-            Me._canBeUsedInBattle = False
-            Me._canBeUsed = False
         End Sub
 
     End Class