diff --git a/PokemonGoIV/0Main.vb b/PokemonGoIV/0Main.vb index 11d0ff6..b80b9b0 100644 --- a/PokemonGoIV/0Main.vb +++ b/PokemonGoIV/0Main.vb @@ -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 diff --git a/PokemonGoIV/1Dialog.vb b/PokemonGoIV/1Dialog.vb index 082508e..c06aed0 100644 --- a/PokemonGoIV/1Dialog.vb +++ b/PokemonGoIV/1Dialog.vb @@ -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 diff --git a/PokemonGoIV/2Report.vb b/PokemonGoIV/2Report.vb index 1499f4e..47ef546 100644 --- a/PokemonGoIV/2Report.vb +++ b/PokemonGoIV/2Report.vb @@ -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 diff --git a/VERSION b/VERSION index ee94dd8..b60d719 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.8.3 +0.8.4 diff --git a/excludes/pokemongoiv.update.xml b/excludes/pokemongoiv.update.xml index 27e9489..b7f42c7 100644 --- a/excludes/pokemongoiv.update.xml +++ b/excludes/pokemongoiv.update.xml @@ -2,8 +2,8 @@ - + - + diff --git a/oxt/PokemonGoIV/0Main.xba b/oxt/PokemonGoIV/0Main.xba index 51f0b13..db2a8e4 100644 --- a/oxt/PokemonGoIV/0Main.xba +++ b/oxt/PokemonGoIV/0Main.xba @@ -49,7 +49,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 @@ -310,4 +310,4 @@ Sub subReadStardust mStardust = fnGetStardustData End If End Sub - \ No newline at end of file + diff --git a/oxt/PokemonGoIV/1Dialog.xba b/oxt/PokemonGoIV/1Dialog.xba index 1b2f3cf..eb9b2b4 100644 --- a/oxt/PokemonGoIV/1Dialog.xba +++ b/oxt/PokemonGoIV/1Dialog.xba @@ -21,7 +21,7 @@ Option Explicit ' Remembers the selected Pokémon for the next run. Global sLastSelected As String -' Remembers the selected player level for the next run. +' Remembers the selected trainer level for the next run. Global sLastLevel As Integer ' The parameters to find the individual values. @@ -31,7 +31,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 @@ -77,17 +77,17 @@ Function fnAskParam As aFindIVParam ' Remembers the previously-selected Pokémon. oDialog.getControl ("lstPokemon").selectItem (sLastSelected, True) - oDialog.getControl ("lstPlayerLevel").selectItem (sLastLevel, True) + oDialog.getControl ("lstTrainerLevel").selectItem (sLastLevel, True) If oDialog.execute = 0 Then aQuery.bIsCancelled = True - sLastLevel = oDialog.getControl ("lstPlayerLevel").getSelectedItem + sLastLevel = oDialog.getControl ("lstTrainerLevel").getSelectedItem fnAskParam = aQuery Exit Function End If subReadBaseStats - sLastLevel = oDialog.getControl ("lstPlayerLevel").getSelectedItem + sLastLevel = oDialog.getControl ("lstTrainerLevel").getSelectedItem nSelected = oDialog.getControl ("lstPokemon").getSelectedItemPos With aQuery .sPokemonId = maBaseStats (nSelected).sPokemonId @@ -95,7 +95,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 @@ -538,4 +538,4 @@ Sub subUpdateTotalAppraisal ( _ End If oList.setVisible (True) End Sub - \ No newline at end of file + diff --git a/oxt/PokemonGoIV/2Report.xba b/oxt/PokemonGoIV/2Report.xba index 3840618..c41579e 100644 --- a/oxt/PokemonGoIV/2Report.xba +++ b/oxt/PokemonGoIV/2Report.xba @@ -48,7 +48,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 @@ -101,8 +101,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 @@ -517,4 +517,4 @@ Function fnFindSheetByName (oDoc As Object, sName As String) As Object End If Next nI End Function - \ No newline at end of file + diff --git a/oxt/PokemonGoIV/DialogStrings_de_DE.properties b/oxt/PokemonGoIV/DialogStrings_de_DE.properties index 524e9f4..83292cf 100644 --- a/oxt/PokemonGoIV/DialogStrings_de_DE.properties +++ b/oxt/PokemonGoIV/DialogStrings_de_DE.properties @@ -4,7 +4,7 @@ 3.DlgMain.txtCP.Label=~WP: 4.DlgMain.txtHP.Label=~KP: 5.DlgMain.txtStardust.Label=~Sternenstaub: -6.DlgMain.txtPlayerLevel.Label=Spieler ~Level: +6.DlgMain.txtTrainerLevel.Label=Spieler ~Level: 7.DlgMain.cbxIsNew.Label=Dieses Pok\u00e9mon hat noch ~kein Power-Up bekommen. 8.DlgMain.grpAppraisals.Label=Bewertung des Teamleiters 9.DlgMain.rdoTeamValor.Label=Team W~agemut diff --git a/oxt/PokemonGoIV/DialogStrings_en_US.properties b/oxt/PokemonGoIV/DialogStrings_en_US.properties index 9358ebb..36585cb 100644 --- a/oxt/PokemonGoIV/DialogStrings_en_US.properties +++ b/oxt/PokemonGoIV/DialogStrings_en_US.properties @@ -4,7 +4,7 @@ 3.DlgMain.txtCP.Label=~CP: 4.DlgMain.txtHP.Label=~HP: 5.DlgMain.txtStardust.Label=S~tardust: -6.DlgMain.txtPlayerLevel.Label=Player ~level: +6.DlgMain.txtTrainerLevel.Label=Player ~level: 7.DlgMain.cbxIsNew.Label=This Pok\u00e9mon has ~not been powered-up yet. 8.DlgMain.grpAppraisals.Label=Team Leader Appraisal 9.DlgMain.rdoTeamValor.Label=Team ~Valor diff --git a/oxt/PokemonGoIV/DialogStrings_zh_TW.properties b/oxt/PokemonGoIV/DialogStrings_zh_TW.properties index 54ae942..3f83c0e 100644 --- a/oxt/PokemonGoIV/DialogStrings_zh_TW.properties +++ b/oxt/PokemonGoIV/DialogStrings_zh_TW.properties @@ -4,7 +4,7 @@ 3.DlgMain.txtCP.Label=~CP: 4.DlgMain.txtHP.Label=~HP: 5.DlgMain.txtStardust.Label=\u661f\u661f\u6c99\u5b50(~t): -6.DlgMain.txtPlayerLevel.Label=\u73a9\u5bb6\u7b49\u7d1a(~L)\uff1a +6.DlgMain.txtTrainerLevel.Label=\u73a9\u5bb6\u7b49\u7d1a(~L)\uff1a 7.DlgMain.cbxIsNew.Label=\u9019\u96bb\u5bf6\u53ef\u5922\u9084\u6c92\u5f37\u5316\u904e(~N)\u3002 8.DlgMain.grpAppraisals.Label=\u968a\u9577\u8a55\u50f9 9.DlgMain.rdoTeamValor.Label=\u6b66\u52c7\u968a(~V) diff --git a/oxt/PokemonGoIV/DlgMain.xdl b/oxt/PokemonGoIV/DlgMain.xdl index 78d14d1..d4061d5 100644 --- a/oxt/PokemonGoIV/DlgMain.xdl +++ b/oxt/PokemonGoIV/DlgMain.xdl @@ -49,8 +49,8 @@ - - + +