imacat/pokemongoiv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Replaced the term "Player" with "Trainer" in variable names, dialog control names, and comments.

Browse Source 
* Renamed the last dialog selected Pokémon from sLastSelected to sLastPokemon, and the last selected trainer level from sLastLevel to sLastTrainerLevel, for a consistent naming scheme.
* Advanced to version 0.8.4.
This commit is contained in:
依瑪貓
2017-11-30 23:11:03 +08:00
parent de7dbdd676
commit 0ccb03c7e7
12 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PokemonGoIV/0Main.vb
View File

@ -47,7 +47,7 @@ Type aFindIVParam
nCP As Integer
nHP As Integer
nStardust As Integer
nPlayerLevel As Integer
nTrainerLevel As Integer
bIsNew As Boolean
nTotal As Integer
sBest As String

22
PokemonGoIV/1Dialog.vb
View File

@ -18,9 +18,9 @@
Option Explicit
' Remembers the selected Pokémon for the next run.
Global sLastSelected As String
' Remembers the selected player level for the next run.
Global sLastLevel As Integer
Global sLastPokemon As String
' Remembers the selected trainer level for the next run.
Global sLastTrainerLevel As Integer
' The parameters to find the individual values.
Type aFindIVParam
@ -29,7 +29,7 @@ Type aFindIVParam
nCP As Integer
nHP As Integer
nStardust As Integer
nPlayerLevel As Integer
nTrainerLevel As Integer
bIsNew As Boolean
nTotal As Integer
sBest As String
@ -74,18 +74,18 @@ Function fnAskParam As aFindIVParam
"ImageURL", fnGetImageUrl ("Unknown"))
' Remembers the previously-selected Pokémon.
oDialog.getControl ("lstPokemon").selectItem (sLastSelected, True)
oDialog.getControl ("lstPlayerLevel").selectItem (sLastLevel, True)
oDialog.getControl ("lstPokemon").selectItem (sLastPokemon, True)
oDialog.getControl ("lstTrainerLevel").selectItem (sLastTrainerLevel, True)
If oDialog.execute = 0 Then
aQuery.bIsCancelled = True
sLastLevel = oDialog.getControl ("lstPlayerLevel").getSelectedItem
sLastTrainerLevel = oDialog.getControl ("lstTrainerLevel").getSelectedItem
fnAskParam = aQuery
Exit Function
End If
subReadBaseStats
sLastLevel = oDialog.getControl ("lstPlayerLevel").getSelectedItem
sLastTrainerLevel = oDialog.getControl ("lstTrainerLevel").getSelectedItem
nSelected = oDialog.getControl ("lstPokemon").getSelectedItemPos
With aQuery
.sPokemonId = maBaseStats (nSelected).sPokemonId
@ -93,7 +93,7 @@ Function fnAskParam As aFindIVParam
.nCP = oDialog.getControl ("numCP").getValue
.nHP = oDialog.getControl ("numHP").getValue
.nStardust = CInt (oDialog.getControl ("lstStardust").getSelectedItem)
.nPlayerLevel = CInt (oDialog.getControl ("lstPlayerLevel").getSelectedItem)
.nTrainerLevel = CInt (oDialog.getControl ("lstTrainerLevel").getSelectedItem)
.nTotal = oDialog.getControl ("lstTotal").getSelectedItemPos + 1
.nMax = oDialog.getControl ("lstMax").getSelectedItemPos + 1
.bIsCancelled = False
@ -180,9 +180,9 @@ Sub subLstPokemonSelected (oEvent As object)
oDialog = oEvent.Source.getContext
' Checks which Pokémon was selected.
sLastSelected = oDialog.getControl ("lstPokemon").getSelectedItem
sLastPokemon = oDialog.getControl ("lstPokemon").getSelectedItem
nSelected = oDialog.getControl ("lstPokemon").getSelectedItemPos
' This happens at the beginning where sLastSelected is "".
' This happens at the beginning where sLastPokemon is "".
If nSelected = -1 Then
Exit Sub
End If

6
PokemonGoIV/2Report.vb
View File

@ -46,7 +46,7 @@ Type aFindIVParam
nCP As Integer
nHP As Integer
nStardust As Integer
nPlayerLevel As Integer
nTrainerLevel As Integer
bIsNew As Boolean
nTotal As Integer
sBest As String
@ -99,8 +99,8 @@ Sub subCreateReport ( _
Next nJ
End If
If aQuery.nPlayerLevel <> 0 Then
fMaxLevel = aQuery.nPlayerLevel + 2
If aQuery.nTrainerLevel <> 0 Then
fMaxLevel = aQuery.nTrainerLevel + 2
If fMaxLevel > 40 Then
fMaxLevel = 40
End If