From 4edf30d879fcc3c8934c54faf9b0465892e78656 Mon Sep 17 00:00:00 2001 From: nilllzz Date: Tue, 20 Sep 2016 23:53:08 +0200 Subject: [PATCH] Revert "Changed standard items" This reverts commit cd993217e3a203936ed1d4b79f8b19b9912d202a. --- .../Pokemon/Items/Standard/AbilityCapsule.vb | 9 ++++++--- .../Pokemon/Items/Standard/AmuletCoin.vb | 10 ++++++---- .../Pokemon/Items/Standard/BalmMushroom.vb | 10 ++++++---- .../Pokemon/Items/Standard/BigMushroom.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/BigNugget.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/BigPearl.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/BlackBelt.vb | 10 ++++++---- .../Pokemon/Items/Standard/BlackGlasses.vb | 10 ++++++---- .../Pokemon/Items/Standard/BlackSludge.vb | 10 ++++++---- .../Pokemon/Items/Standard/BrickPiece.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/Charcoal.vb | 10 ++++++---- .../Pokemon/Items/Standard/CleanseTag.vb | 10 ++++++---- .../Pokemon/Items/Standard/CometShard.vb | 10 ++++++---- .../Pokemon/Items/Standard/DeepSeaScale.vb | 10 ++++++---- .../Pokemon/Items/Standard/DeepSeaTooth.vb | 13 ++++++++----- .../Pokemon/Items/Standard/DragonFang.vb | 13 ++++++++----- .../Pokemon/Items/Standard/DragonScale.vb | 10 ++++++---- .../Pokemon/Items/Standard/DubiousDisc.vb | 13 ++++++++----- .../Pokemon/Items/Standard/Electirizer.vb | 13 ++++++++----- .../Pokemon/Items/Standard/EscapeRope.vb | 9 ++++++--- .../2.5DHero/Pokemon/Items/Standard/ExpShare.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/FocusBand.vb | 16 ++++++++++------ .../2.5DHero/Pokemon/Items/Standard/GoldLeaf.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/GripClaw.vb | 13 ++++++++----- .../2.5DHero/Pokemon/Items/Standard/HardStone.vb | 13 ++++++++----- .../Pokemon/Items/Standard/HeartScale.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/Honey.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/KingsRock.vb | 13 ++++++++----- .../Pokemon/Items/Standard/LaggingTail.vb | 13 ++++++++----- .../2.5DHero/Pokemon/Items/Standard/Leftovers.vb | 16 ++++++++++------ .../2.5DHero/Pokemon/Items/Standard/LifeOrb.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/LightBall.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/LuckyEgg.vb | 10 ++++++---- .../Pokemon/Items/Standard/LuckyPunch.vb | 13 ++++++++----- .../Pokemon/Items/Standard/Magmarizer.vb | 13 ++++++++----- .../2.5DHero/Pokemon/Items/Standard/Magnet.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/MetalCoat.vb | 10 ++++++---- .../Pokemon/Items/Standard/MetalPowder.vb | 13 ++++++++----- .../Pokemon/Items/Standard/MiracleSeed.vb | 10 ++++++---- .../Pokemon/Items/Standard/MysticWater.vb | 10 ++++++---- .../Pokemon/Items/Standard/NeverMeltIce.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/Nugget.vb | 10 ++++++---- .../Pokemon/Items/Standard/OddIncense.vb | 13 ++++++++----- .../2.5DHero/Pokemon/Items/Standard/OvalStone.vb | 13 ++++++++----- .../2.5DHero/Pokemon/Items/Standard/Pearl.vb | 10 ++++++---- .../Pokemon/Items/Standard/PearlString.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/PinkBow.vb | 10 ++++++---- .../Pokemon/Items/Standard/PoisonBarb.vb | 13 ++++++++----- .../2.5DHero/Pokemon/Items/Standard/PokeDoll.vb | 12 ++++++++---- .../Pokemon/Items/Standard/PolkadotBow.vb | 10 ++++++---- .../Pokemon/Items/Standard/PrismScale.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/Protector.vb | 13 ++++++++----- .../2.5DHero/Pokemon/Items/Standard/QuickClaw.vb | 16 ++++++++++------ .../Pokemon/Items/Standard/QuickPowder.vb | 13 ++++++++----- .../2.5DHero/Pokemon/Items/Standard/RareBone.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/RazorClaw.vb | 16 ++++++++++------ .../2.5DHero/Pokemon/Items/Standard/RazorFang.vb | 13 ++++++++----- .../Pokemon/Items/Standard/ReaperCloth.vb | 13 ++++++++----- .../2.5DHero/Pokemon/Items/Standard/Sachet.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/ScopeLens.vb | 13 ++++++++----- .../Pokemon/Items/Standard/SeaIncense.vb | 13 ++++++++----- .../2.5DHero/Pokemon/Items/Standard/SharpBeak.vb | 13 ++++++++----- .../2.5DHero/Pokemon/Items/Standard/ShedShell.vb | 13 ++++++++----- .../2.5DHero/Pokemon/Items/Standard/SilkScarf.vb | 13 ++++++++----- .../Pokemon/Items/Standard/SilverLeaf.vb | 10 ++++++---- .../Pokemon/Items/Standard/SilverPowder.vb | 13 ++++++++----- .../Pokemon/Items/Standard/SlowPokeTail.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/SmokeBall.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/SoftSand.vb | 13 ++++++++----- .../Pokemon/Items/Standard/SootheBell.vb | 14 +++++++++----- .../2.5DHero/Pokemon/Items/Standard/SpellTag.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/StarPiece.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/Stardust.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/Stick.vb | 13 ++++++++----- .../Pokemon/Items/Standard/StickyBarb.vb | 13 ++++++++----- .../2.5DHero/Pokemon/Items/Standard/ThickClub.vb | 13 ++++++++----- .../Pokemon/Items/Standard/TinyMushroom.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/ToxicOrb.vb | 13 ++++++++----- .../Pokemon/Items/Standard/TwistedSpoon.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/UpGrade.vb | 10 ++++++---- .../Pokemon/Items/Standard/WaveIncense.vb | 13 ++++++++----- .../Pokemon/Items/Standard/WhippedDream.vb | 10 ++++++---- .../Pokemon/Items/Standard/WhiteFlute.vb | 10 ++++++---- .../2.5DHero/Pokemon/Items/Standard/WideLens.vb | 13 ++++++++----- .../2.5DHero/Pokemon/Items/Standard/ZoomLens.vb | 13 ++++++++----- 85 files changed, 595 insertions(+), 379 deletions(-) diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Standard/AbilityCapsule.vb b/2.5DHero/2.5DHero/Pokemon/Items/Standard/AbilityCapsule.vb index 471afc5b3..11a6a58a4 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/AbilityCapsule.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/AbilityCapsule.vb @@ -5,10 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(0, 240, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = True + Me._canBeUsedInBattle = False 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 4d248c2ec..0be691e66 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/AmuletCoin.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/AmuletCoin.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(360, 72, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 d4d579064..22f8c37fe 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BalmMushroom.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BalmMushroom.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(48, 216, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 a28300bf5..944ff9358 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BigMushroom.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BigMushroom.vb @@ -5,11 +5,13 @@ Namespace Items.Plants Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(288, 72, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 9fa5c66a8..8d5897379 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BigNugget.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BigNugget.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(48, 240, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 d8b5abe01..5160dd8a3 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BigPearl.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BigPearl.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(288, 96, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 1c7660c3d..8651f1fdc 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BlackBelt.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BlackBelt.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(24, 96, 24, 24) + 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.") + + Me._canBeUsed = False + Me._canBeUsedInBattle = False + Me._canBeTraded = True + Me._canBeHold = True 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 7a0272a99..f5e801b6f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BlackGlasses.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BlackGlasses.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(96, 96, 24, 24) + 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.") + + Me._canBeUsed = False + Me._canBeUsedInBattle = False + Me._canBeTraded = True + Me._canBeHold = True 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 d13b3aae2..b55b27b8f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BlackSludge.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BlackSludge.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(432, 144, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 1ba9304e0..6d4befcce 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/BrickPiece.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/BrickPiece.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(72, 240, 24, 24) + MyBase.New("Brick Piece", 100, ItemTypes.Standard, 180, 1, 1, New Rectangle(72, 240, 24, 24), "A rare chunk of brick.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 a9659990c..c746d6fd5 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Charcoal.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Charcoal.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(336, 120, 24, 24) + 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.") + + Me._canBeUsed = False + Me._canBeUsedInBattle = False + Me._canBeTraded = True + Me._canBeHold = True 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 730d1ca02..f24091574 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/CleanseTag.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/CleanseTag.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(432, 72, 24, 24) + 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.") + + Me._canBeUsed = False + Me._canBeUsedInBattle = False + Me._canBeTraded = True + Me._canBeHold = True 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 de240962c..7c9699845 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/CometShard.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/CometShard.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(24, 216, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 2cc8e71f6..f3304e7a4 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/DeepSeaScale.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/DeepSeaScale.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(120, 216, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 df8c21a37..9f075226f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/DeepSeaTooth.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/DeepSeaTooth.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(312, 216, 24, 24) + 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 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 578bec467..bf59471fb 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/DragonFang.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/DragonFang.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(432, 120, 24, 24) + 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 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 635e7a90a..2f116286d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/DragonScale.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/DragonScale.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(480, 120, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 4a14b0081..507559e9d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/DubiousDisc.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/DubiousDisc.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(0, 168, 24, 24) + 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 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 d0a622402..c7fe02c58 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Electirizer.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Electirizer.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(312, 192, 24, 24) + 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 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 8e0885369..efe1d1d4f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/EscapeRope.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/EscapeRope.vb @@ -5,10 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(408, 0, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = True + Me._canBeUsedInBattle = False 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 e9478cfba..bfc5f207c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/ExpShare.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/ExpShare.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(216, 48, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 c65fcd2dc..c978c57cd 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/FocusBand.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/FocusBand.vb @@ -5,13 +5,17 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(480, 96, 24, 24) + 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 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 52ba6d8a1..1cf5351ef 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/GoldLeaf.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/GoldLeaf.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(120, 72, 24, 24) + MyBase.New("Gold Leaf", 2000, ItemTypes.Standard, 75, 1, 0, New Rectangle(120, 72, 24, 24), "A strange, gold-colored leaf.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 1ac8acb54..0d3ebaa1d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/GripClaw.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/GripClaw.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(168, 216, 24, 24) + 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 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 13097bead..ffd6bc7b4 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/HardStone.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/HardStone.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(96, 120, 24, 24) + 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 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 3f947a7df..d16ed6d67 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/HeartScale.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/HeartScale.vb @@ -4,11 +4,13 @@ Namespace Items.Standard Public Class HeartScale Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(264, 216, 24, 24) + 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.") + + Me._canBeUsed = False + Me._canBeUsedInBattle = False + Me._canBeTraded = True + Me._canBeHold = True 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 b509cc4e3..428486793 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Honey.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Honey.vb @@ -5,11 +5,13 @@ Namespace Items.Plants Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(264, 240, 24, 24) + MyBase.New("Honey", 100, ItemTypes.Plants, 253, 1, 0, New Rectangle(264, 240, 24, 24), "Honey produced by a Pokémon.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 330fd6d86..e2dd114c9 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/KingsRock.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/KingsRock.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(216, 72, 24, 24) + 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 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 3f2c036c7..0955d3e9c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/LaggingTail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/LaggingTail.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(432, 192, 24, 24) + 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 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 11ea64257..fab7a27c3 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Leftovers.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Leftovers.vb @@ -5,13 +5,17 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(456, 120, 24, 24) + 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 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 18a224ab4..276e10927 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/LifeOrb.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/LifeOrb.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(240, 240, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 9fea35c8a..20d297207 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/LightBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/LightBall.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(168, 144, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 b9cb32a51..0afe0f6b8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/LuckyEgg.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/LuckyEgg.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(120, 120, 24, 24) + 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.") + + Me._canBeUsed = False + Me._canBeUsedInBattle = False + Me._canBeTraded = True + Me._canBeHold = True 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 dbf1f33d5..d02166df5 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/LuckyPunch.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/LuckyPunch.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(144, 24, 24, 24) + 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 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 025b90d92..9d9aa1d1b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Magmarizer.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Magmarizer.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(288, 192, 24, 24) + 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 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 45c30364e..8295f8d65 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Magnet.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Magnet.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(240, 96, 24, 24) + 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.") + + Me._canBeUsed = False + Me._canBeUsedInBattle = False + Me._canBeTraded = True + Me._canBeHold = True 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 653d94d44..e77139f8e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/MetalCoat.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/MetalCoat.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(408, 120, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 73529801d..a978f5240 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/MetalPowder.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/MetalPowder.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(264, 24, 24, 24) + 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 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 341b21511..a90ba2023 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/MiracleSeed.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/MiracleSeed.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(432, 96, 24, 24) + 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.") + + Me._canBeUsed = False + Me._canBeUsedInBattle = False + Me._canBeTraded = True + Me._canBeHold = True 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 972fedd3c..7c63544dd 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/MysticWater.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/MysticWater.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(456, 72, 24, 24) + 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.") + + Me._canBeUsed = False + Me._canBeUsedInBattle = False + Me._canBeTraded = True + Me._canBeHold = True 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 6ab867b6c..bfb34972e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/NeverMeltIce.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/NeverMeltIce.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(216, 96, 24, 24) + 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.") + + Me._canBeUsed = False + Me._canBeUsedInBattle = False + Me._canBeTraded = True + Me._canBeHold = True 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 c1d58617c..14d371c70 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Nugget.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Nugget.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(288, 24, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 54bd251fe..d418a7512 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/OddIncense.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/OddIncense.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(0, 264, 24, 24) + 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 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 b2a666f7d..e1eecfdec 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/OvalStone.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/OvalStone.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(192, 216, 24, 24) + 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 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 85ba47091..017e580c9 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Pearl.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Pearl.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(264, 96, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 20b8f4419..ccf040075 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/PearlString.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/PearlString.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(408, 216, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 c00ba4ece..c06aa058c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/PinkBow.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/PinkBow.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(144, 96, 24, 24) + MyBase.New("Pink Bow", 100, ItemTypes.Standard, 104, 1, 0, New Rectangle(144, 96, 24, 24), "Powers up Fairy-type moves.") + + Me._canBeUsed = False + Me._canBeUsedInBattle = False + Me._canBeTraded = True + Me._canBeHold = True 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 4d42c38b4..932e45bcb 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/PoisonBarb.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/PoisonBarb.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(192, 72, 24, 24) + 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 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 af6b057a2..947c02612 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/PokeDoll.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/PokeDoll.vb @@ -5,11 +5,15 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property BattleSelectPokemon As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(312, 24, 24, 24) + 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 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 01bf31e0d..2292a34cb 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/PolkadotBow.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/PolkadotBow.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(192, 240, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 c67964a69..acf56a4c5 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/PrismScale.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/PrismScale.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(72, 168, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 729769f5a..c375d3ed6 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Protector.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Protector.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(408, 192, 24, 24) + 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 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 2e94c78c9..629bebb46 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/QuickClaw.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/QuickClaw.vb @@ -5,13 +5,17 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(96, 72, 24, 24) + 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 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 6eff61380..1d89de482 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/QuickPowder.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/QuickPowder.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(96, 216, 24, 24) + 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 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 99cf4f792..26ef5f37a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/RareBone.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/RareBone.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(456, 96, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 b02867ac8..674f72ae8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/RazorClaw.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/RazorClaw.vb @@ -5,13 +5,17 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(480, 144, 24, 24) + 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 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 80d2b5c3c..283d5e190 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/RazorFang.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/RazorFang.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(456, 144, 24, 24) + 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 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 cb687998d..5b5c11349 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/ReaperCloth.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/ReaperCloth.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(96, 168, 24, 24) + 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 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 5ac4b07fa..459eb5b15 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Sachet.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Sachet.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(144, 240, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 b485903e6..e6b9db1b2 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/ScopeLens.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/ScopeLens.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(384, 120, 24, 24) + 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 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 384029571..fa5e13dc8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SeaIncense.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SeaIncense.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(24, 264, 24, 24) + 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 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 ed2053ff4..2106faaac 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SharpBeak.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SharpBeak.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(168, 72, 24, 24) + 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 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 2e2d9371f..8cf0e2924 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/ShedShell.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/ShedShell.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(72, 216, 24, 24) + 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 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 ab3bee03d..64a7ddb3b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SilkScarf.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SilkScarf.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(264, 192, 24, 24) + 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 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 3d1c69dd8..92130215f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SilverLeaf.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SilverLeaf.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(288, 48, 24, 24) + MyBase.New("Silver Leaf", 1000, ItemTypes.Standard, 60, 1, 0, New Rectangle(288, 48, 24, 24), "A strange, silver-colored leaf.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 dba85b4a3..05dcbde3f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SilverPowder.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SilverPowder.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(312, 72, 24, 24) + 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 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 42772d132..bdbb3080b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SlowPokeTail.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SlowPokeTail.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(120, 96, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 db3a9a804..4f078dca7 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SmokeBall.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SmokeBall.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(192, 96, 24, 24) + 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.") + + Me._canBeUsed = False + Me._canBeUsedInBattle = False + Me._canBeTraded = True + Me._canBeHold = True 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 62634640a..a4536bbad 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SoftSand.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SoftSand.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(144, 72, 24, 24) + 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 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 ee30f6b08..78445c308 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SootheBell.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SootheBell.vb @@ -5,12 +5,16 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(0, 216, 24, 24) + '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 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 f24f1273c..19f1e15b8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/SpellTag.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/SpellTag.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(336, 96, 24, 24) + 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.") + + Me._canBeUsed = False + Me._canBeUsedInBattle = False + Me._canBeTraded = True + Me._canBeHold = True 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 f769872fa..dd7a79ece 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/StarPiece.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/StarPiece.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(264, 120, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 bc3d7901f..aaf1fba93 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Stardust.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Stardust.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(240, 120, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 4d82d667f..6b8b174c9 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/Stick.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/Stick.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(168, 96, 24, 24) + 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 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 8999c9357..f08dc4647 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/StickyBarb.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/StickyBarb.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(24, 168, 24, 24) + 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 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 57f1bc8d6..2016bfe91 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/ThickClub.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/ThickClub.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(456, 96, 24, 24) + 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 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 71cb808c8..8249c225e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/TinyMushroom.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/TinyMushroom.vb @@ -5,11 +5,13 @@ Namespace Items.Plants Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(264, 72, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 9d735d618..edad18b4d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/ToxicOrb.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/ToxicOrb.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(216, 240, 24, 24) + 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 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 99fddda79..d9f353a06 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/TwistedSpoon.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/TwistedSpoon.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(480, 72, 24, 24) + 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.") + + Me._canBeUsed = False + Me._canBeUsedInBattle = False + Me._canBeTraded = True + Me._canBeHold = True 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 139e06e09..1fe9335fa 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/UpGrade.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/UpGrade.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(336, 144, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 f39fa9342..5878b68a4 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/WaveIncense.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/WaveIncense.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(480, 192, 24, 24) + 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 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 ab3b4ed2e..be7c17243 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/WhippedDream.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/WhippedDream.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(168, 240, 24, 24) + 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.") + + Me._canBeHold = True + Me._canBeTraded = True + Me._canBeUsed = False + Me._canBeUsedInBattle = False 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 516b65270..ac8389fda 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/WhiteFlute.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/WhiteFlute.vb @@ -5,11 +5,13 @@ Namespace Items.Standard Inherits Item - Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False - Public Overrides ReadOnly Property CanBeUsed As Boolean = False - Public Sub New() - _textureRectangle = New Rectangle(456, 192, 24, 24) + 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.") + + Me._canBeUsed = False + Me._canBeUsedInBattle = False + Me._canBeTraded = True + Me._canBeHold = True 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 4d680af52..674a4f905 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/WideLens.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/WideLens.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(144, 216, 24, 24) + 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 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 aeedbcc4c..2e8f43937 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Standard/ZoomLens.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Standard/ZoomLens.vb @@ -5,12 +5,15 @@ Namespace Items.Standard Inherits Item - 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() - _textureRectangle = New Rectangle(264, 144, 24, 24) + 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 End Sub End Class