From 3d44fdf9db7913c5a0383941af72f134567c2a75 Mon Sep 17 00:00:00 2001 From: nilllzz Date: Tue, 20 Sep 2016 06:18:09 +0200 Subject: [PATCH] Changed mail items --- 2.5DHero/2.5DHero/Pokemon/Items/Mail/AirMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/BeadMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/BloomMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/BrickMail.vb | 4 +++- .../2.5DHero/Pokemon/Items/Mail/BridgeMailD.vb | 4 +++- .../2.5DHero/Pokemon/Items/Mail/BridgeMailM.vb | 4 +++- .../2.5DHero/Pokemon/Items/Mail/BridgeMailS.vb | 4 +++- .../2.5DHero/Pokemon/Items/Mail/BridgeMailT.vb | 4 +++- .../2.5DHero/Pokemon/Items/Mail/BridgeMailV.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/BubbleMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/DreamMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/FabMail.vb | 4 +++- .../2.5DHero/Pokemon/Items/Mail/FavoredMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/FlameMail.vb | 4 +++- .../2.5DHero/Pokemon/Items/Mail/GlitterMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/GrassMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/GreetMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/HarborMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/HeartMail.vb | 4 +++- .../2.5DHero/Pokemon/Items/Mail/InquiryMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/KolbenMail.vb | 14 ++++++++------ 2.5DHero/2.5DHero/Pokemon/Items/Mail/LikeMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/MechMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/MosaicMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/OrangeMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/RSVPMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/ReplyMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/RetroMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/ShadowMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/SnowMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/SpaceMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/SteelMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/ThanksMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/TropicMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/TunnelMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/WaveMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/Mail/WoodMail.vb | 4 +++- 2.5DHero/2.5DHero/Pokemon/Items/MailItem.vb | 1 + 38 files changed, 117 insertions(+), 42 deletions(-) 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 bf7da2fca..73aaf3358 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MailItem.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MailItem.vb @@ -20,6 +20,7 @@ Namespace Items 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