From de7dbdd6767d3636df37f30378d7f4a9616842c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Thu, 30 Nov 2017 17:33:13 +0800 Subject: [PATCH] =?UTF-8?q?*=20Updated=20that=20the=20maximum=20power-up?= =?UTF-8?q?=20level=20of=20a=20Pok=C3=A9mon=20is=20the=20trainer=20level?= =?UTF-8?q?=20+=202.=20=20It=20was=20the=20trainer=20level=20+=201.5=20bef?= =?UTF-8?q?ore.=20*=20Updated=20to=20remember=20the=20last=20selected=20pl?= =?UTF-8?q?ayer=20level.=20=20Player=20level=20rarely=20changes=20when=20c?= =?UTF-8?q?alculating=20a=20bunch=20of=20Pok=C3=A9mons.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PokemonGoIV/1Dialog.vb | 13 +++++++++---- PokemonGoIV/2Report.vb | 2 +- oxt/PokemonGoIV/1Dialog.xba | 13 +++++++++---- oxt/PokemonGoIV/2Report.xba | 2 +- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/PokemonGoIV/1Dialog.vb b/PokemonGoIV/1Dialog.vb index 43f36b7..082508e 100644 --- a/PokemonGoIV/1Dialog.vb +++ b/PokemonGoIV/1Dialog.vb @@ -18,7 +18,9 @@ Option Explicit ' Remembers the selected Pokémon for the next run. -Global sSelected As String +Global sLastSelected As String +' Remembers the selected player level for the next run. +Global sLastLevel As Integer ' The parameters to find the individual values. Type aFindIVParam @@ -72,15 +74,18 @@ Function fnAskParam As aFindIVParam "ImageURL", fnGetImageUrl ("Unknown")) ' Remembers the previously-selected Pokémon. - oDialog.getControl ("lstPokemon").selectItem (sSelected, True) + oDialog.getControl ("lstPokemon").selectItem (sLastSelected, True) + oDialog.getControl ("lstPlayerLevel").selectItem (sLastLevel, True) If oDialog.execute = 0 Then aQuery.bIsCancelled = True + sLastLevel = oDialog.getControl ("lstPlayerLevel").getSelectedItem fnAskParam = aQuery Exit Function End If subReadBaseStats + sLastLevel = oDialog.getControl ("lstPlayerLevel").getSelectedItem nSelected = oDialog.getControl ("lstPokemon").getSelectedItemPos With aQuery .sPokemonId = maBaseStats (nSelected).sPokemonId @@ -175,9 +180,9 @@ Sub subLstPokemonSelected (oEvent As object) oDialog = oEvent.Source.getContext ' Checks which Pokémon was selected. - sSelected = oDialog.getControl ("lstPokemon").getSelectedItem + sLastSelected = oDialog.getControl ("lstPokemon").getSelectedItem nSelected = oDialog.getControl ("lstPokemon").getSelectedItemPos - ' This happens at the beginning where sSelected is "". + ' This happens at the beginning where sLastSelected is "". If nSelected = -1 Then Exit Sub End If diff --git a/PokemonGoIV/2Report.vb b/PokemonGoIV/2Report.vb index ffe27c8..1499f4e 100644 --- a/PokemonGoIV/2Report.vb +++ b/PokemonGoIV/2Report.vb @@ -100,7 +100,7 @@ Sub subCreateReport ( _ End If If aQuery.nPlayerLevel <> 0 Then - fMaxLevel = aQuery.nPlayerLevel + 1.5 + fMaxLevel = aQuery.nPlayerLevel + 2 If fMaxLevel > 40 Then fMaxLevel = 40 End If diff --git a/oxt/PokemonGoIV/1Dialog.xba b/oxt/PokemonGoIV/1Dialog.xba index 353f6f3..1b2f3cf 100644 --- a/oxt/PokemonGoIV/1Dialog.xba +++ b/oxt/PokemonGoIV/1Dialog.xba @@ -20,7 +20,9 @@ Option Explicit ' Remembers the selected Pokémon for the next run. -Global sSelected As String +Global sLastSelected As String +' Remembers the selected player level for the next run. +Global sLastLevel As Integer ' The parameters to find the individual values. Type aFindIVParam @@ -74,15 +76,18 @@ Function fnAskParam As aFindIVParam "ImageURL", fnGetImageUrl ("Unknown")) ' Remembers the previously-selected Pokémon. - oDialog.getControl ("lstPokemon").selectItem (sSelected, True) + oDialog.getControl ("lstPokemon").selectItem (sLastSelected, True) + oDialog.getControl ("lstPlayerLevel").selectItem (sLastLevel, True) If oDialog.execute = 0 Then aQuery.bIsCancelled = True + sLastLevel = oDialog.getControl ("lstPlayerLevel").getSelectedItem fnAskParam = aQuery Exit Function End If subReadBaseStats + sLastLevel = oDialog.getControl ("lstPlayerLevel").getSelectedItem nSelected = oDialog.getControl ("lstPokemon").getSelectedItemPos With aQuery .sPokemonId = maBaseStats (nSelected).sPokemonId @@ -177,9 +182,9 @@ Sub subLstPokemonSelected (oEvent As object) oDialog = oEvent.Source.getContext ' Checks which Pokémon was selected. - sSelected = oDialog.getControl ("lstPokemon").getSelectedItem + sLastSelected = oDialog.getControl ("lstPokemon").getSelectedItem nSelected = oDialog.getControl ("lstPokemon").getSelectedItemPos - ' This happens at the beginning where sSelected is "". + ' This happens at the beginning where sLastSelected is "". If nSelected = -1 Then Exit Sub End If diff --git a/oxt/PokemonGoIV/2Report.xba b/oxt/PokemonGoIV/2Report.xba index 8873d63..3840618 100644 --- a/oxt/PokemonGoIV/2Report.xba +++ b/oxt/PokemonGoIV/2Report.xba @@ -102,7 +102,7 @@ Sub subCreateReport ( _ End If If aQuery.nPlayerLevel <> 0 Then - fMaxLevel = aQuery.nPlayerLevel + 1.5 + fMaxLevel = aQuery.nPlayerLevel + 2 If fMaxLevel > 40 Then fMaxLevel = 40 End If