diff --git a/P3D/Pokemon/Monster/PokemonInteractions.vb b/P3D/Pokemon/Monster/PokemonInteractions.vb index 08a9883d0..0b3cfab89 100644 --- a/P3D/Pokemon/Monster/PokemonInteractions.vb +++ b/P3D/Pokemon/Monster/PokemonInteractions.vb @@ -23,11 +23,11 @@ End Enum Public Shared Function GetScriptString(ByVal p As Pokemon, ByVal cPosition As Vector3, ByVal facing As Integer) As String - If PickupItemID > CInt(-1).ToString Then + If PickupItemID > "-1" Then If PickupIndividualValue = p.IndividualValue Then Return GenerateItemReaction(p, cPosition, facing) Else - PickupItemID = CInt(-1).ToString + PickupItemID = "-1" PickupIndividualValue = "" End If End If @@ -139,7 +139,7 @@ End If s &= ":end" - PickupItemID = CInt(-1).ToString + PickupItemID = "-1" PickupIndividualValue = "" Return s @@ -873,7 +873,7 @@ End Class Shared PickupIndividualValue As String = "" 'This value holds the individual value of the Pokémon that picked up the item. - Shared PickupItemID As String = CInt(-1).ToString 'This is the Item ID of the item that the Pokémon picked up. -1 means no item got picked up. + Shared PickupItemID As String = "-1" 'This is the Item ID of the item that the Pokémon picked up. -1 means no item got picked up. Public Shared Sub CheckForRandomPickup() 'Checks if the first Pokémon in the party is following the player: @@ -883,7 +883,7 @@ If Core.Player.GetWalkPokemon().Status = Pokemon.StatusProblems.None Then 'If the player switched the Pokémon, reset the item ID. If PickupIndividualValue <> Core.Player.GetWalkPokemon().IndividualValue Then - PickupItemID = CInt(-1).ToString + PickupItemID = "-1" End If 'Check if an item should be generated: @@ -1053,7 +1053,7 @@ End If Else 'Reset the system if no Pokémon: - PickupItemID = CInt(-1).ToString + PickupItemID = "-1" PickupIndividualValue = "" End If End If diff --git a/P3D/Screens/Pokemon/LearnAttackScreen.vb b/P3D/Screens/Pokemon/LearnAttackScreen.vb index 0cbb0a65a..cea5f19e0 100644 --- a/P3D/Screens/Pokemon/LearnAttackScreen.vb +++ b/P3D/Screens/Pokemon/LearnAttackScreen.vb @@ -13,12 +13,12 @@ Dim AttackPos As Single = 320.0F Dim canForget As Boolean = True - Dim MachineItemID As String = CInt(-1).ToString + Dim MachineItemID As String = "-1" Dim currentCharIndex As Integer = 0 Public Sub New(ByVal currentScreen As Screen, ByVal Pokemon As Pokemon, ByVal newAttack As BattleSystem.Attack) - Me.New(currentScreen, Pokemon, newAttack, CInt(-1).ToString) + Me.New(currentScreen, Pokemon, newAttack, "-1") End Sub Public Sub New(ByVal currentScreen As Screen, ByVal Pokemon As Pokemon, ByVal newAttack As BattleSystem.Attack, ByVal MachineItemID As String) @@ -261,7 +261,7 @@ Pokemon.Attacks.RemoveAt(AttackIndex) Pokemon.Attacks.Insert(AttackIndex, newAttack) - If Me.MachineItemID <> CInt(-1).ToString Then + If Me.MachineItemID <> "-1" Then PlayerStatistics.Track("TMs/HMs used", 1) If CBool(GameModeManager.GetGameRuleValue("SingleUseTM", "0")) = True Then Dim TechMachine As Item = Item.GetItemByID(Me.MachineItemID) diff --git a/P3D/Screens/Pokemon/PartyScreen.vb b/P3D/Screens/Pokemon/PartyScreen.vb index f094d418c..75786eb9b 100644 --- a/P3D/Screens/Pokemon/PartyScreen.vb +++ b/P3D/Screens/Pokemon/PartyScreen.vb @@ -75,7 +75,7 @@ Public Class PartyScreen Public LearnType As Integer = 0 Dim moveLearnArg As Object = Nothing - Public EvolutionItemID As String = CInt(-1).ToString + Public EvolutionItemID As String = "-1" 'Stuff related to blurred PreScreens Private _preScreenTexture As RenderTarget2D Private _preScreenTarget As RenderTarget2D @@ -376,7 +376,7 @@ Public Class PartyScreen 'Able/unable display (when using an Evolution Item) Dim ItemLabel As String = "" - If EvolutionItemID <> CInt(-1).ToString Then + If EvolutionItemID <> "-1" Then ItemLabel = "Unable!" If p.IsEgg() = False And p.CanEvolve(EvolutionCondition.EvolutionTrigger.ItemUse, EvolutionItemID.ToString()) = True Then ItemLabel = "Able!"