Added Elemental Gems + new gene location
This commit is contained in:
TheOmegaGhost
parent
8e1c0733aa
commit
ac6882104c
|
|
@ -1297,7 +1297,7 @@
|
|||
If Attack.Type.Type = Element.Types.Flying Then
|
||||
IT = 1.2F
|
||||
End If
|
||||
Case 88, 273 'Silver powder, Insect Plate
|
||||
Case 88, 273 'Silver Powder, Insect Plate
|
||||
If Attack.Type.Type = Element.Types.Bug Then
|
||||
IT = 1.2F
|
||||
End If
|
||||
|
|
@ -1313,6 +1313,138 @@
|
|||
If Attack.Type.Type = Element.Types.Psychic Then
|
||||
IT = 1.2F
|
||||
End If
|
||||
Case 90 'Silk Scarf
|
||||
If Attack.Type.Type = Element.Types.Normal Then
|
||||
IT = 1.2F
|
||||
End If
|
||||
End Select
|
||||
Select Case p.Item.ID
|
||||
Case 635 'Fighting Gem
|
||||
If Attack.Type.Type = Element.Types.Fighting Then
|
||||
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "-1", "item:fighting gem") = True Then
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject("The Fighting Gem boosted " & p.GetDisplayName() & "'s " & Attack.Name & "!"))
|
||||
IT = 1.3F
|
||||
End If
|
||||
End If
|
||||
Case 644 'Dark Gem
|
||||
If Attack.Type.Type = Element.Types.Dark Then
|
||||
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "-1", "item:dark gem") = True Then
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject("The Dark Gem boosted " & p.GetDisplayName() & "'s " & Attack.Name & "!"))
|
||||
IT = 1.3F
|
||||
End If
|
||||
End If
|
||||
Case 630 'Fire Gem
|
||||
If Attack.Type.Type = Element.Types.Fire Then
|
||||
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "-1", "item:fire gem") = True Then
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject("The Fire Gem boosted " & p.GetDisplayName() & "'s " & Attack.Name & "!"))
|
||||
IT = 1.3F
|
||||
End If
|
||||
End If
|
||||
Case 643 'Dragon Gem
|
||||
If Attack.Type.Type = Element.Types.Dragon Then
|
||||
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "-1", "item:dragon gem") = True Then
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject("The Dragon Gem boosted " & p.GetDisplayName() & "'s " & Attack.Name & "!"))
|
||||
IT = 1.3F
|
||||
End If
|
||||
End If
|
||||
Case 641 'Rock Gem
|
||||
If Attack.Type.Type = Element.Types.Rock Then
|
||||
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "-1", "item:rock gem") = True Then
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject("The Rock Gem boosted " & p.GetDisplayName() & "'s " & Attack.Name & "!"))
|
||||
IT = 1.3F
|
||||
End If
|
||||
End If
|
||||
Case 632 'Electric Gem
|
||||
If Attack.Type.Type = Element.Types.Electric Then
|
||||
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "-1", "item:electric gem") = True Then
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject("The Electric Gem boosted " & p.GetDisplayName() & "'s " & Attack.Name & "!"))
|
||||
IT = 1.3F
|
||||
End If
|
||||
End If
|
||||
Case 645 'Steel Gem
|
||||
If Attack.Type.Type = Element.Types.Steel Then
|
||||
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "-1", "item:steel gem") = True Then
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject("The Steel Gem boosted " & p.GetDisplayName() & "'s " & Attack.Name & "!"))
|
||||
IT = 1.3F
|
||||
End If
|
||||
End If
|
||||
Case 633 'Grass Gem
|
||||
If Attack.Type.Type = Element.Types.Grass Then
|
||||
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "-1", "item:grass gem") = True Then
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject("The Grass Gem boosted " & p.GetDisplayName() & "'s " & Attack.Name & "!"))
|
||||
IT = 1.3F
|
||||
End If
|
||||
End If
|
||||
Case 631 'Water Gem
|
||||
If Attack.Type.Type = Element.Types.Water Then
|
||||
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "-1", "item:water gem") = True Then
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject("The Water Gem boosted " & p.GetDisplayName() & "'s " & Attack.Name & "!"))
|
||||
IT = 1.3F
|
||||
End If
|
||||
End If
|
||||
Case 634 'Ice Gem
|
||||
If Attack.Type.Type = Element.Types.Ice Then
|
||||
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "-1", "item:ice gem") = True Then
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject("The Ice Gem boosted " & p.GetDisplayName() & "'s " & Attack.Name & "!"))
|
||||
IT = 1.3F
|
||||
End If
|
||||
End If
|
||||
Case 647 'Fairy Gem
|
||||
If Attack.Type.Type = Element.Types.Fairy Then
|
||||
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "-1", "item:fairy gem") = True Then
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject("The Fairy Gem boosted " & p.GetDisplayName() & "'s " & Attack.Name & "!"))
|
||||
IT = 1.3F
|
||||
End If
|
||||
End If
|
||||
Case 636 'Poison Gem
|
||||
If Attack.Type.Type = Element.Types.Poison Then
|
||||
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "-1", "item:poison gem") = True Then
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject("The Poison Gem boosted " & p.GetDisplayName() & "'s " & Attack.Name & "!"))
|
||||
IT = 1.3F
|
||||
End If
|
||||
End If
|
||||
Case 638 'Flying Gem
|
||||
If Attack.Type.Type = Element.Types.Flying Then
|
||||
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "-1", "item:flying gem") = True Then
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject("The Flying Gem boosted " & p.GetDisplayName() & "'s " & Attack.Name & "!"))
|
||||
IT = 1.3F
|
||||
End If
|
||||
End If
|
||||
Case 640 'Bug Gem
|
||||
If Attack.Type.Type = Element.Types.Bug Then
|
||||
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "-1", "item:bug gem") = True Then
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject("The Bug Gem boosted " & p.GetDisplayName() & "'s " & Attack.Name & "!"))
|
||||
IT = 1.3F
|
||||
End If
|
||||
End If
|
||||
Case 637 'Ground Gem
|
||||
If Attack.Type.Type = Element.Types.Ground Then
|
||||
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "-1", "item:ground gem") = True Then
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject("The Ground Gem boosted " & p.GetDisplayName() & "'s " & Attack.Name & "!"))
|
||||
IT = 1.3F
|
||||
End If
|
||||
End If
|
||||
Case 642 'Ghost Gem
|
||||
If Attack.Type.Type = Element.Types.Ghost Then
|
||||
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "-1", "item:ghost gem") = True Then
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject("The Ghost Gem boosted " & p.GetDisplayName() & "'s " & Attack.Name & "!"))
|
||||
IT = 1.3F
|
||||
End If
|
||||
End If
|
||||
Case 639 'Psychic Gem
|
||||
If Attack.Type.Type = Element.Types.Psychic Then
|
||||
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "-1", "item:psychic gem") = True Then
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject("The Psychic Gem boosted " & p.GetDisplayName() & "'s " & Attack.Name & "!"))
|
||||
IT = 1.3F
|
||||
End If
|
||||
End If
|
||||
Case 646 'Normal Gem
|
||||
If Attack.Type.Type = Element.Types.Normal Then
|
||||
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "-1", "item:normal gem") = True Then
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject("The Normal Gem boosted " & p.GetDisplayName() & "'s " & Attack.Name & "!"))
|
||||
IT = 1.3F
|
||||
End If
|
||||
End If
|
||||
End Select
|
||||
End If
|
||||
'CHG (If used Charge)
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 178 KiB After Width: | Height: | Size: 180 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
|
|
@ -26192,6 +26192,24 @@
|
|||
<Compile Include="Pokemon\Items\Berries\MarangaBerry.vb" />
|
||||
<Compile Include="Pokemon\Items\Berries\KeeBerry.vb" />
|
||||
<Compile Include="Pokemon\Items\Berries\RoseliBerry.vb" />
|
||||
<Compile Include="Pokemon\Items\Gems\BugGem.vb" />
|
||||
<Compile Include="Pokemon\Items\Gems\DarkGem.vb" />
|
||||
<Compile Include="Pokemon\Items\Gems\DragonGem.vb" />
|
||||
<Compile Include="Pokemon\Items\Gems\ElectricGem.vb" />
|
||||
<Compile Include="Pokemon\Items\Gems\FairyGem.vb" />
|
||||
<Compile Include="Pokemon\Items\Gems\FightingGem.vb" />
|
||||
<Compile Include="Pokemon\Items\Gems\FireGem.vb" />
|
||||
<Compile Include="Pokemon\Items\Gems\FlyingGem.vb" />
|
||||
<Compile Include="Pokemon\Items\Gems\GhostGem.vb" />
|
||||
<Compile Include="Pokemon\Items\Gems\GrassGem.vb" />
|
||||
<Compile Include="Pokemon\Items\Gems\GroundGem.vb" />
|
||||
<Compile Include="Pokemon\Items\Gems\IceGem.vb" />
|
||||
<Compile Include="Pokemon\Items\Gems\NormalGem.vb" />
|
||||
<Compile Include="Pokemon\Items\Gems\PoisonGem.vb" />
|
||||
<Compile Include="Pokemon\Items\Gems\PsychicGem.vb" />
|
||||
<Compile Include="Pokemon\Items\Gems\RockGem.vb" />
|
||||
<Compile Include="Pokemon\Items\Gems\SteelGem.vb" />
|
||||
<Compile Include="Pokemon\Items\Gems\WaterGem.vb" />
|
||||
<Compile Include="Pokemon\Items\KeyItems\LibertySeaMap.vb" />
|
||||
<Compile Include="Pokemon\Items\Machines\TM171.vb" />
|
||||
<Compile Include="Pokemon\Items\Machines\TM172.vb" />
|
||||
|
|
@ -26205,6 +26223,7 @@
|
|||
<Compile Include="Pokemon\Items\Machines\TM174.vb" />
|
||||
<Compile Include="Pokemon\Items\Machines\TM173.vb" />
|
||||
<Compile Include="Pokemon\Items\Medicine\PewterCrunchies.vb" />
|
||||
<Compile Include="Pokemon\Items\GemItem.vb" />
|
||||
<Compile Include="Pokemon\Items\Standard\PsychicSeed.vb" />
|
||||
<Compile Include="Pokemon\Items\Standard\MistySeed.vb" />
|
||||
<Compile Include="Pokemon\Items\Standard\GrassySeed.vb" />
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
Namespace Items
|
||||
|
||||
''' <summary>
|
||||
''' The base item for all elemental gems.
|
||||
''' </summary>
|
||||
Public MustInherit Class GemItem
|
||||
|
||||
Inherits Item
|
||||
|
||||
Public Overrides ReadOnly Property CanBeUsed As Boolean = False
|
||||
Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False
|
||||
Public Overrides ReadOnly Property ItemType As ItemTypes = ItemTypes.Standard
|
||||
Public Overrides ReadOnly Property Description As String
|
||||
Public Overrides ReadOnly Property PokeDollarPrice As Integer = 200
|
||||
|
||||
Public Sub New(ByVal Type As Element.Types)
|
||||
Description = "Increases the power of the holder's first " & Type.ToString() & "-type move by 30%, and is consumed after use."
|
||||
_textureSource = "Items\Gems"
|
||||
_textureRectangle = GetTextureRectangle(Type)
|
||||
End Sub
|
||||
|
||||
Private Function GetTextureRectangle(ByVal Type As Element.Types) As Rectangle
|
||||
Dim typeArray As List(Of Element.Types) = {Element.Types.Bug, Element.Types.Dark, Element.Types.Dragon, Element.Types.Electric, Element.Types.Fairy, Element.Types.Fighting, Element.Types.Fire, Element.Types.Flying, Element.Types.Ghost, Element.Types.Grass, Element.Types.Ground, Element.Types.Ice, Element.Types.Poison, Element.Types.Psychic, Element.Types.Rock, Element.Types.Steel, Element.Types.Water, Element.Types.Normal}.ToList()
|
||||
Dim i As Integer = typeArray.IndexOf(Type)
|
||||
|
||||
Dim x As Integer = i
|
||||
Dim y As Integer = 0
|
||||
While x > 4
|
||||
x -= 5
|
||||
y += 1
|
||||
End While
|
||||
|
||||
Return New Rectangle(x * 24, y * 24, 24, 24)
|
||||
End Function
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Gems
|
||||
|
||||
<Item(640, "Bug Gem")>
|
||||
Public Class BugGem
|
||||
|
||||
Inherits GemItem
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(Element.Types.Bug)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Gems
|
||||
|
||||
<Item(644, "Dark Gem")>
|
||||
Public Class DarkGem
|
||||
|
||||
Inherits GemItem
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(Element.Types.Dark)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Gems
|
||||
|
||||
<Item(643, "Dragon Gem")>
|
||||
Public Class DragonGem
|
||||
|
||||
Inherits GemItem
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(Element.Types.Dragon)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Gems
|
||||
|
||||
<Item(632, "Electric Gem")>
|
||||
Public Class ElectricGem
|
||||
|
||||
Inherits GemItem
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(Element.Types.Electric)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Gems
|
||||
|
||||
<Item(647, "Fairy Gem")>
|
||||
Public Class FairyGem
|
||||
|
||||
Inherits GemItem
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(Element.Types.Fairy)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Gems
|
||||
|
||||
<Item(635, "Fighting Gem")>
|
||||
Public Class FightingGem
|
||||
|
||||
Inherits GemItem
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(Element.Types.Fighting)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Gems
|
||||
|
||||
<Item(630, "Fire Gem")>
|
||||
Public Class FireGem
|
||||
|
||||
Inherits GemItem
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(Element.Types.Fire)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Gems
|
||||
|
||||
<Item(638, "Flying Gem")>
|
||||
Public Class FlyingGem
|
||||
|
||||
Inherits GemItem
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(Element.Types.Flying)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Gems
|
||||
|
||||
<Item(642, "Ghost Gem")>
|
||||
Public Class GhostGem
|
||||
|
||||
Inherits GemItem
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(Element.Types.Ghost)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Gems
|
||||
|
||||
<Item(633, "Grass Gem")>
|
||||
Public Class GrassGem
|
||||
|
||||
Inherits GemItem
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(Element.Types.Grass)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Gems
|
||||
|
||||
<Item(637, "Ground Gem")>
|
||||
Public Class GroundGem
|
||||
|
||||
Inherits GemItem
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(Element.Types.Ground)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Gems
|
||||
|
||||
<Item(634, "Ice Gem")>
|
||||
Public Class IceGem
|
||||
|
||||
Inherits GemItem
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(Element.Types.Ice)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Gems
|
||||
|
||||
<Item(646, "Normal Gem")>
|
||||
Public Class NormalGem
|
||||
|
||||
Inherits GemItem
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(Element.Types.Normal)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Gems
|
||||
|
||||
<Item(636, "Poison Gem")>
|
||||
Public Class PoisonGem
|
||||
|
||||
Inherits GemItem
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(Element.Types.Poison)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Gems
|
||||
|
||||
<Item(639, "Psychic Gem")>
|
||||
Public Class PsychicGem
|
||||
|
||||
Inherits GemItem
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(Element.Types.Psychic)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Gems
|
||||
|
||||
<Item(641, "Rock Gem")>
|
||||
Public Class RockGem
|
||||
|
||||
Inherits GemItem
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(Element.Types.Rock)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Gems
|
||||
|
||||
<Item(645, "Steel Gem")>
|
||||
Public Class SteelGem
|
||||
|
||||
Inherits GemItem
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(Element.Types.Steel)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Gems
|
||||
|
||||
<Item(631, "Water Gem")>
|
||||
Public Class WaterGem
|
||||
|
||||
Inherits GemItem
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(Element.Types.Water)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -14,7 +14,7 @@ Namespace Items
|
|||
Public Overrides ReadOnly Property PokeDollarPrice As Integer = 1000
|
||||
|
||||
Public Sub New(ByVal Type As Element.Types)
|
||||
Description = "An item to be held by a Pokémon. It's a stone tablet that boosts the power of " & Type.ToString() & "-type moves."
|
||||
Description = "An item to be held by a Pokémon. It's a stone tablet that boosts the power of " & Type.ToString() & "-type moves."
|
||||
_textureSource = "Items\Plates"
|
||||
_textureRectangle = GetTextureRectangle(Type)
|
||||
End Sub
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in New Issue