tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-27 07:44:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

CInt(-1).ToString -> "-1" correction

Browse Source
This commit is contained in:
JappaWakka 2023-05-31 12:34:22 +02:00
parent 319ad9b231
commit ac4e5801c2
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
P3D/Pokemon/Monster/PokemonInteractions.vb
View File

@ -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

6
P3D/Screens/Pokemon/LearnAttackScreen.vb
View File

@ -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)

4
P3D/Screens/Pokemon/PartyScreen.vb
View File

@ -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!"