Merge pull request #14 from P3D-Legacy/Item-Migration

Tested, working perfectly.

2.5DHero/2.5DHero/2.5DHero.vbproj

@@ -1041,6 +1041,7 @@
     <Compile Include="Pokemon\Items\KeyItems\CardKey.vb" />
     <Compile Include="Pokemon\Items\KeyItems\CoinCase.vb" />
     <Compile Include="Pokemon\Items\KeyItems\CrystalWing.vb" />
+    <Compile Include="Pokemon\Items\KeyItems\EmptySeaMap.vb" />
     <Compile Include="Pokemon\Items\KeyItems\GoodRod.vb" />
     <Compile Include="Pokemon\Items\KeyItems\GSBall.vb" />
     <Compile Include="Pokemon\Items\KeyItems\ItemFinder.vb" />
@@ -1050,7 +1051,6 @@
     <Compile Include="Pokemon\Items\KeyItems\MysteryEgg.vb" />
     <Compile Include="Pokemon\Items\KeyItems\OldRod.vb" />
     <Compile Include="Pokemon\Items\KeyItems\OldSeaMap.vb" />
-    <Compile Include="Pokemon\Items\KeyItems\EmptySeaMap.vb" />
     <Compile Include="Pokemon\Items\KeyItems\OvalCharm.vb" />
     <Compile Include="Pokemon\Items\KeyItems\Pass.vb" />
     <Compile Include="Pokemon\Items\KeyItems\RainbowPass.vb" />
@@ -1409,6 +1409,7 @@
     <Compile Include="Pokemon\Items\Standard\EscapeRope.vb" />
     <Compile Include="Pokemon\Items\Standard\ExpShare.vb" />
     <Compile Include="Pokemon\Items\Standard\FocusBand.vb" />
+    <Compile Include="Pokemon\Items\Standard\FullIncense.vb" />
     <Compile Include="Pokemon\Items\Standard\GoldLeaf.vb" />
     <Compile Include="Pokemon\Items\Standard\GripClaw.vb" />
     <Compile Include="Pokemon\Items\Standard\HardStone.vb" />
@@ -1416,9 +1417,11 @@
     <Compile Include="Pokemon\Items\Standard\Honey.vb" />
     <Compile Include="Pokemon\Items\Standard\KingsRock.vb" />
     <Compile Include="Pokemon\Items\Standard\LaggingTail.vb" />
+    <Compile Include="Pokemon\Items\Standard\LaxIncense.vb" />
     <Compile Include="Pokemon\Items\Standard\Leftovers.vb" />
     <Compile Include="Pokemon\Items\Standard\LifeOrb.vb" />
     <Compile Include="Pokemon\Items\Standard\LightBall.vb" />
+    <Compile Include="Pokemon\Items\Standard\LuckIncense.vb" />
     <Compile Include="Pokemon\Items\Standard\LuckyEgg.vb" />
     <Compile Include="Pokemon\Items\Standard\LuckyPunch.vb" />
     <Compile Include="Pokemon\Items\Standard\Magmarizer.vb" />
@@ -1439,12 +1442,15 @@
     <Compile Include="Pokemon\Items\Standard\PolkadotBow.vb" />
     <Compile Include="Pokemon\Items\Standard\PrismScale.vb" />
     <Compile Include="Pokemon\Items\Standard\Protector.vb" />
+    <Compile Include="Pokemon\Items\Standard\PureIncense.vb" />
     <Compile Include="Pokemon\Items\Standard\QuickClaw.vb" />
     <Compile Include="Pokemon\Items\Standard\QuickPowder.vb" />
     <Compile Include="Pokemon\Items\Standard\RareBone.vb" />
     <Compile Include="Pokemon\Items\Standard\RazorClaw.vb" />
     <Compile Include="Pokemon\Items\Standard\RazorFang.vb" />
     <Compile Include="Pokemon\Items\Standard\ReaperCloth.vb" />
+    <Compile Include="Pokemon\Items\Standard\RockIncense.vb" />
+    <Compile Include="Pokemon\Items\Standard\RoseIncense.vb" />
     <Compile Include="Pokemon\Items\Standard\Sachet.vb" />
     <Compile Include="Pokemon\Items\Standard\ScopeLens.vb" />
     <Compile Include="Pokemon\Items\Standard\SeaIncense.vb" />

2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleCalculation.vb

@@ -101,6 +101,30 @@
                         End If
                 End Select
 
+                Dim Full As Integer = 0 'Uses effect of Full Incense
+                If Not ownPokemon.Item Is Nothing And BattleScreen.FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
+                    If ownPokemon.Item.Name = "Full Incense" Then
+                        Full += 1
+                    End If
+                End If
+                If Not oppPokemon.Item Is Nothing And BattleScreen.FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
+                    If oppPokemon.Item.Name = "Full Incense" Then
+                        Full += 10
+                    End If
+                End If
+                Select Case Full
+                    Case 1
+                        Return False 'Your Full incense effect works > You go last
+                    Case 10
+                        Return True 'Opponents full incense effect works > He goes last
+                    Case 11
+                        If Core.Random.Next(0, 2) = 0 Then 'Both full incense works. > Random determination.
+                            Return True
+                        Else
+                            Return False
+                        End If
+                End Select
+
                 If ownPokemon.Ability.Name.ToLower() = "stall" And oppPokemon.Ability.Name.ToLower() <> "stall" Then
                     Return False
                 End If
@@ -953,7 +977,7 @@
                         If Attack.Type.Type = Element.Types.Dragon Then
                             IT = 1.2F
                         End If
-                    Case 125, 281 'Hard Stone, Stone Plate
+                    Case 125, 281, 286 'Hard Stone, Stone Plate, Rock Incense
                         If Attack.Type.Type = Element.Types.Rock Then
                             IT = 1.2F
                         End If
@@ -965,7 +989,7 @@
                         If Attack.Type.Type = Element.Types.Steel Then
                             IT = 1.2F
                         End If
-                    Case 117, 275 'Miracle Seed, Meadow Plate
+                    Case 117, 275, 287 'Miracle Seed, Meadow Plate, Rose Incense
                         If Attack.Type.Type = Element.Types.Grass Then
                             IT = 1.2F
                         End If

2.5DHero/2.5DHero/Pokemon/Items/Standard/FullIncense.vb

@@ -0,0 +1,20 @@
+Namespace Items.Standard
+
+    <Item(288, "Full Incense")>
+    Public Class FullIncense
+
+        Inherits Item
+
+        Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. This exotic-smelling incense makes the holder bloated and slow moving."
+        Public Overrides ReadOnly Property BattlePointsPrice As Integer = 9600
+        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(216, 264, 24, 24)
+        End Sub
+
+    End Class
+
+End Namespace

2.5DHero/2.5DHero/Pokemon/Items/Standard/LaxIncense.vb

@@ -0,0 +1,20 @@
+Namespace Items.Standard
+
+    <Item(289, "Lax Incense")>
+    Public Class LaxIncense
+
+        Inherits Item
+
+        Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. The beguiling aroma of this incense may cause attacks to miss its holder."
+        Public Overrides ReadOnly Property BattlePointsPrice As Integer = 9600
+        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(240, 264, 24, 24)
+        End Sub
+
+    End Class
+
+End Namespace

2.5DHero/2.5DHero/Pokemon/Items/Standard/LuckIncense.vb

@@ -0,0 +1,20 @@
+Namespace Items.Standard
+
+    <Item(290, "Luck Incense")>
+    Public Class LuckIncense
+
+        Inherits Item
+
+        Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. The beguiling aroma of this incense may cause attacks to miss its holder."
+        Public Overrides ReadOnly Property BattlePointsPrice As Integer = 9600
+        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, 264, 24, 24)
+        End Sub
+
+    End Class
+
+End Namespace

2.5DHero/2.5DHero/Pokemon/Items/Standard/OddIncense.vb

@@ -6,7 +6,7 @@ Namespace Items.Standard
         Inherits Item
 
         Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. This exotic-smelling incense boosts the power of Psychic-type moves."
-        Public Overrides ReadOnly Property BattlePointsPrice As Integer = 9800
+        Public Overrides ReadOnly Property BattlePointsPrice As Integer = 9600
         Public Overrides ReadOnly Property FlingDamage As Integer = 10
         Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False
         Public Overrides ReadOnly Property CanBeUsed As Boolean = False

2.5DHero/2.5DHero/Pokemon/Items/Standard/PureIncense.vb

@@ -0,0 +1,20 @@
+Namespace Items.Standard
+
+    <Item(291, "Pure Incense")>
+    Public Class PureIncense
+
+        Inherits Item
+
+        Public Overrides ReadOnly Property Description As String = "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."
+        Public Overrides ReadOnly Property BattlePointsPrice As Integer = 9600
+        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(288, 264, 24, 24)
+        End Sub
+
+    End Class
+
+End Namespace

2.5DHero/2.5DHero/Pokemon/Items/Standard/RockIncense.vb

@@ -0,0 +1,20 @@
+Namespace Items.Standard
+
+    <Item(286, "Rock Incense")>
+    Public Class RockIncense
+
+        Inherits Item
+
+        Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. This exotic-smelling incense boosts the power of Rock-type moves."
+        Public Overrides ReadOnly Property BattlePointsPrice As Integer = 9600
+        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, 264, 24, 24)
+        End Sub
+
+    End Class
+
+End Namespace

2.5DHero/2.5DHero/Pokemon/Items/Standard/RoseIncense.vb

@@ -0,0 +1,20 @@
+Namespace Items.Standard
+
+    <Item(287, "Rose Incense")>
+    Public Class RoseIncense
+
+        Inherits Item
+
+        Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. This exotic-smelling incense boosts the power of Grass-type moves."
+        Public Overrides ReadOnly Property BattlePointsPrice As Integer = 9600
+        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(336, 264, 24, 24)
+        End Sub
+
+    End Class
+
+End Namespace

2.5DHero/2.5DHero/Pokemon/Items/Standard/SeaIncense.vb

@@ -6,7 +6,7 @@ Namespace Items.Standard
         Inherits Item
 
         Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. This incense has a curious aroma that boosts the power of Water-type moves."
-        Public Overrides ReadOnly Property BattlePointsPrice As Integer = 9800
+        Public Overrides ReadOnly Property BattlePointsPrice As Integer = 9600
         Public Overrides ReadOnly Property FlingDamage As Integer = 10
         Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False
         Public Overrides ReadOnly Property CanBeUsed As Boolean = False

2.5DHero/2.5DHero/Pokemon/Items/Standard/WaveIncense.vb

@@ -6,7 +6,7 @@ Namespace Items.Standard
         Inherits Item
 
         Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. This exotic-smelling incense boots the power of Water-type moves."
-        Public Overrides ReadOnly Property BattlePointsPrice As Integer = 9800
+        Public Overrides ReadOnly Property BattlePointsPrice As Integer = 9600
         Public Overrides ReadOnly Property FlingDamage As Integer = 10
         Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False
         Public Overrides ReadOnly Property CanBeUsed As Boolean = False

2.5DHero/2.5DHero/World/PokemonEncounter.vb

@@ -139,6 +139,17 @@ Public Class PokemonEncounter
                         End If
                     End If
 
+                     'Pure Incense Lowers the chance of encountering wild Pokémon if held by first Pokémon in party.
+                    If Core.Player.Pokemons(0).Level >= Pokemon.Level Then
+                        If Not Core.Player.Pokemons(0).Item Is Nothing Then
+                            If Core.Player.Pokemons(0).Item.ID = 291 Then
+                                If Core.Random.Next(0, 3) = 0 Then
+                                    Exit Sub
+                                End If
+                            End If
+                        End If
+                    End If
+
                     'Register wild Pokémon in the Pokédex.
                     Core.Player.PokedexData = Pokedex.ChangeEntry(Core.Player.PokedexData, Pokemon.Number, 1)