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

Updated the dialog title, and fixed the cancel behavior.

Browse Source
This commit is contained in:
依瑪貓 2016-11-29 10:41:36 +08:00
parent 0bc16166bc
commit 3279d34e8b
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
oxt/PokemonGoIV/0Main.vb
View File

@ -34,6 +34,7 @@ Type aFindIVParam
nAppraisal1 As Integer nAppraisal1 As Integer
sBest As String sBest As String
nAppraisal2 As Integer nAppraisal2 As Integer
bIsCancelled As Boolean
End Type End Type
Private maBaseStats () As New aStats Private maBaseStats () As New aStats
@ -41,11 +42,13 @@ Private mCPM () As Double, mStarDust () As Integer
' subMain: The main program ' subMain: The main program
Sub subMain Sub subMain
BasicLibraries.loadLibrary "XrayTool"
Dim maIVs As Variant, nI As Integer, sOutput As String Dim maIVs As Variant, nI As Integer, sOutput As String
Dim aQuery As New aFindIVParam, aBaseStats As New aStats Dim aQuery As New aFindIVParam, aBaseStats As New aStats
aQuery = fnAskParam aQuery = fnAskParam
If aQuery.bIsCancelled Then
Exit Sub
End If
maIVs = fnFindIV (aQuery) maIVs = fnFindIV (aQuery)
sOutput = "" sOutput = ""
For nI = 0 To UBound (maIVs) For nI = 0 To UBound (maIVs)

10
oxt/PokemonGoIV/1Dialog.vb
View File

@ -14,6 +14,7 @@ Type aFindIVParam
nAppraisal1 As Integer nAppraisal1 As Integer
sBest As String sBest As String
nAppraisal2 As Integer nAppraisal2 As Integer
bIsCancelled As Boolean
End Type End Type
' fnAskParam: Asks the users for the parameters for the Pokémon. ' fnAskParam: Asks the users for the parameters for the Pokémon.
@ -33,7 +34,7 @@ Function fnAskParam As aFindIVParam
oDialogModel.setPropertyValue ("PositionY", 100) oDialogModel.setPropertyValue ("PositionY", 100)
oDialogModel.setPropertyValue ("Height", 140) oDialogModel.setPropertyValue ("Height", 140)
oDialogModel.setPropertyValue ("Width", 220) oDialogModel.setPropertyValue ("Width", 220)
oDialogModel.setPropertyValue ("Title", "Pokémon Parameters") oDialogModel.setPropertyValue ("Title", "Pokémon Go IV Calculator")
' Adds a text label for the Pokémon list. ' Adds a text label for the Pokémon list.
oTextModel = oDialogModel.createInstance ( _ oTextModel = oDialogModel.createInstance ( _
@ -282,7 +283,11 @@ Function fnAskParam As aFindIVParam
oDialog.setModel (oDialogModel) oDialog.setModel (oDialogModel)
oDialog.setVisible (True) oDialog.setVisible (True)
oDialog.getControl ("lstPokemon").setFocus oDialog.getControl ("lstPokemon").setFocus
oDialog.execute If oDialog.execute = 0 Then
aQuery.bIsCancelled = True
fnAskParam = aQuery
Exit Function
End If
With aQuery With aQuery
.sPokemon = oDialog.getControl ("lstPokemon").getSelectedItem .sPokemon = oDialog.getControl ("lstPokemon").getSelectedItem
@ -292,6 +297,7 @@ Function fnAskParam As aFindIVParam
.nPlayerLevel = CInt (oDialog.getControl ("lstPlayerLevel").getSelectedItem) .nPlayerLevel = CInt (oDialog.getControl ("lstPlayerLevel").getSelectedItem)
.nAppraisal1 = oDialog.getControl ("lstApprasal1").getSelectedItemPos + 1 .nAppraisal1 = oDialog.getControl ("lstApprasal1").getSelectedItemPos + 1
.nAppraisal2 = oDialog.getControl ("lstApprasal2").getSelectedItemPos + 1 .nAppraisal2 = oDialog.getControl ("lstApprasal2").getSelectedItemPos + 1
.bIsCancelled = False
End With End With
If oDialog.getControl ("cbxIsNew").getState = 1 Then If oDialog.getControl ("cbxIsNew").getState = 1 Then
aQuery.bIsNew = True aQuery.bIsNew = True