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

Prepared to merge the Deutsch localization.

Browse Source 
Revert "Fixed "star dust" to "stardust"."

This reverts commit 05b5502f0c.
This commit is contained in:
依瑪貓 2017-02-19 00:14:07 +08:00
parent 05b5502f0c
commit 6346c8d57c
9 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
PokemonGoIV/0Main.vb
View File

@ -49,7 +49,7 @@ Type aFindIVParam
sPokemon As String sPokemon As String
nCP As Integer nCP As Integer
nHP As Integer nHP As Integer
nStardust As Integer nStarDust As Integer
nPlayerLevel As Integer nPlayerLevel As Integer
bIsNew As Boolean bIsNew As Boolean
nTotal As Integer nTotal As Integer
@ -59,7 +59,7 @@ Type aFindIVParam
End Type End Type
Private maBaseStats () As New aStats Private maBaseStats () As New aStats
Private mCPM () As Double, mStardust () As Integer Private mCPM () As Double, mStarDust () As Integer
' subMain: The main program ' subMain: The main program
Sub subMain Sub subMain
@ -113,7 +113,7 @@ Function fnAskParam As aFindIVParam
.sPokemon = oDialog.getControl ("lstPokemon").getSelectedItem .sPokemon = oDialog.getControl ("lstPokemon").getSelectedItem
.nCP = oDialog.getControl ("numCP").getValue .nCP = oDialog.getControl ("numCP").getValue
.nHP = oDialog.getControl ("numHP").getValue .nHP = oDialog.getControl ("numHP").getValue
.nStardust = CInt (oDialog.getControl ("lstStardust").getSelectedItem) .nStarDust = CInt (oDialog.getControl ("lstStarDust").getSelectedItem)
.nPlayerLevel = CInt (oDialog.getControl ("lstPlayerLevel").getSelectedItem) .nPlayerLevel = CInt (oDialog.getControl ("lstPlayerLevel").getSelectedItem)
.nTotal = oDialog.getControl ("lstTotal").getSelectedItemPos + 1 .nTotal = oDialog.getControl ("lstTotal").getSelectedItemPos + 1
.nMax = oDialog.getControl ("lstMax").getSelectedItemPos + 1 .nMax = oDialog.getControl ("lstMax").getSelectedItemPos + 1
@ -174,19 +174,19 @@ End Function
Sub subBtnOKCheck (oEvent As object) Sub subBtnOKCheck (oEvent As object)
Dim oDialog As Object Dim oDialog As Object
Dim oPokemon As Object, oCP As Object Dim oPokemon As Object, oCP As Object
Dim oHP As Object, oStardust As Object, oOK As Object Dim oHP As Object, oStarDust As Object, oOK As Object
oDialog = oEvent.Source.getContext oDialog = oEvent.Source.getContext
oPokemon = oDialog.getControl ("lstPokemon") oPokemon = oDialog.getControl ("lstPokemon")
oCP = oDialog.getControl ("numCP") oCP = oDialog.getControl ("numCP")
oHP = oDialog.getControl ("numHP") oHP = oDialog.getControl ("numHP")
oStardust = oDialog.getControl ("lstStardust") oStarDust = oDialog.getControl ("lstStarDust")
oOK = oDialog.getControl ("btnOK") oOK = oDialog.getControl ("btnOK")
If oPokemon.getSelectedItemPos <> -1 _ If oPokemon.getSelectedItemPos <> -1 _
And oCP.getText <> "" _ And oCP.getText <> "" _
And oHP.getText <> "" _ And oHP.getText <> "" _
And oStardust.getSelectedItemPos <> -1 Then And oStarDust.getSelectedItemPos <> -1 Then
oOK.setEnable (True) oOK.setEnable (True)
Else Else
oOK.setEnable (False) oOK.setEnable (False)
@ -571,7 +571,7 @@ Function fnFindIV ( _
Else Else
fStep = 0.5 fStep = 0.5
End If End If
subReadStardust subReadStarDust
nEvolved = UBound (aBaseStats.mEvolved) nEvolved = UBound (aBaseStats.mEvolved)
If nEvolved > -1 Then If nEvolved > -1 Then
ReDim Preserve maEvBaseStats (nEvolved) As New aStats ReDim Preserve maEvBaseStats (nEvolved) As New aStats
@ -585,8 +585,8 @@ Function fnFindIV ( _
Next nI Next nI
End If End If
nN = -1 nN = -1
For fLevel = 1 To UBound (mStardust) Step fStep For fLevel = 1 To UBound (mStarDust) Step fStep
If mStardust (CInt (fLevel - 0.5)) = aQuery.nStardust Then If mStarDust (CInt (fLevel - 0.5)) = aQuery.nStarDust Then
For nStamina = 0 To 15 For nStamina = 0 To 15
If fnCalcHP (aBaseStats, fLevel, nStamina) = aQuery.nHP Then If fnCalcHP (aBaseStats, fLevel, nStamina) = aQuery.nHP Then
For nAttack = 0 To 15 For nAttack = 0 To 15
@ -843,7 +843,7 @@ Sub subSaveIV ( _
mData (1) (1) = aQuery.sPokemon mData (1) (1) = aQuery.sPokemon
mData (1) (2) = aQuery.nCP mData (1) (2) = aQuery.nCP
mData (1) (3) = aQuery.nHP mData (1) (3) = aQuery.nHP
mData (1) (4) = aQuery.nStardust mData (1) (4) = aQuery.nStarDust
oRange = oSheet.getCellRangeByPosition ( _ oRange = oSheet.getCellRangeByPosition ( _
0, 0, UBound (mData (0)), UBound (mData)) 0, 0, UBound (mData (0)), UBound (mData))
@ -1154,9 +1154,9 @@ Sub subReadCPM
End If End If
End Sub End Sub
' subReadStardust: Reads the stardust table. ' subReadStarDust: Reads the star dust table.
Sub subReadStardust Sub subReadStarDust
If UBound (mStardust) = -1 Then If UBound (mStarDust) = -1 Then
mStardust = fnGetStardustData mStarDust = fnGetStarDustData
End If End If
End Sub End Sub

6
PokemonGoIV/1Data.vb
View File

@ -228,9 +228,9 @@ Function fnGetCPMData As Variant
0.78463697) 0.78463697)
End Function End Function
' fnGetStardustData: Returns the stardust data. ' fnGetStarDustData: Returns the star dust data.
Function fnGetStardustData As Variant Function fnGetStarDustData As Variant
fnGetStardustData = Array( _ fnGetStarDustData = Array( _
-1, _ -1, _
200, _ 200, _
200, _ 200, _

14
PokemonGoIV/9Load.vb
View File

@ -44,7 +44,7 @@ Sub subReadDataSheets
& "Option Explicit" & "Option Explicit"
sOutput = sOutput & Chr (10) & Chr (10) & fnReadBaseStatsSheet sOutput = sOutput & Chr (10) & Chr (10) & fnReadBaseStatsSheet
sOutput = sOutput & Chr (10) & Chr (10) & fnReadCPMSheet sOutput = sOutput & Chr (10) & Chr (10) & fnReadCPMSheet
sOutput = sOutput & Chr (10) & Chr (10) & fnReadStardustSheet sOutput = sOutput & Chr (10) & Chr (10) & fnReadStarDustSheet
subShowBasicData (sOutput) subShowBasicData (sOutput)
End Sub End Sub
@ -203,8 +203,8 @@ Function fnReadCPMSheet As String
fnReadCPMSheet = sOutput fnReadCPMSheet = sOutput
End Function End Function
' fnReadStardustSheet: Reads the stardust sheet. ' fnReadStarDustSheet: Reads the star dust sheet.
Function fnReadStardustSheet As String Function fnReadStarDustSheet As String
Dim oSheet As Object, oRange As Object, mData As Variant Dim oSheet As Object, oRange As Object, mData As Variant
Dim nI As Integer, sOutput As String Dim nI As Integer, sOutput As String
@ -213,9 +213,9 @@ Function fnReadStardustSheet As String
mData = oRange.getDataArray mData = oRange.getDataArray
sOutput = "" _ sOutput = "" _
& "' fnGetStardustData: Returns the stardust data." & Chr (10) _ & "' fnGetStarDustData: Returns the star dust data." & Chr (10) _
& "Function fnGetStardustData As Variant" & Chr (10) _ & "Function fnGetStarDustData As Variant" & Chr (10) _
& Chr (9) & "fnGetStardustData = Array( _" & Chr (10) _ & Chr (9) & "fnGetStarDustData = Array( _" & Chr (10) _
& Chr (9) & Chr (9) & "-1, _" & Chr (10) & Chr (9) & Chr (9) & "-1, _" & Chr (10)
For nI = 1 To UBound (mData) - 1 Step 2 For nI = 1 To UBound (mData) - 1 Step 2
sOutput = sOutput _ sOutput = sOutput _
@ -225,5 +225,5 @@ Function fnReadStardustSheet As String
sOutput = sOutput _ sOutput = sOutput _
& Chr (9) & Chr (9) & mData (nI) (2) & ")" & Chr (10) _ & Chr (9) & Chr (9) & mData (nI) (2) & ")" & Chr (10) _
& "End Function" & "End Function"
fnReadStardustSheet = sOutput fnReadStarDustSheet = sOutput
End Function End Function

28
oxt/PokemonGoIV/0Main.xba
View File

@ -51,7 +51,7 @@ Type aFindIVParam
sPokemon As String sPokemon As String
nCP As Integer nCP As Integer
nHP As Integer nHP As Integer
nStardust As Integer nStarDust As Integer
nPlayerLevel As Integer nPlayerLevel As Integer
bIsNew As Boolean bIsNew As Boolean
nTotal As Integer nTotal As Integer
@ -61,7 +61,7 @@ Type aFindIVParam
End Type End Type
Private maBaseStats () As New aStats Private maBaseStats () As New aStats
Private mCPM () As Double, mStardust () As Integer Private mCPM () As Double, mStarDust () As Integer
&apos; subMain: The main program &apos; subMain: The main program
Sub subMain Sub subMain
@ -115,7 +115,7 @@ Function fnAskParam As aFindIVParam
.sPokemon = oDialog.getControl (&quot;lstPokemon&quot;).getSelectedItem .sPokemon = oDialog.getControl (&quot;lstPokemon&quot;).getSelectedItem
.nCP = oDialog.getControl (&quot;numCP&quot;).getValue .nCP = oDialog.getControl (&quot;numCP&quot;).getValue
.nHP = oDialog.getControl (&quot;numHP&quot;).getValue .nHP = oDialog.getControl (&quot;numHP&quot;).getValue
.nStardust = CInt (oDialog.getControl (&quot;lstStardust&quot;).getSelectedItem) .nStarDust = CInt (oDialog.getControl (&quot;lstStarDust&quot;).getSelectedItem)
.nPlayerLevel = CInt (oDialog.getControl (&quot;lstPlayerLevel&quot;).getSelectedItem) .nPlayerLevel = CInt (oDialog.getControl (&quot;lstPlayerLevel&quot;).getSelectedItem)
.nTotal = oDialog.getControl (&quot;lstTotal&quot;).getSelectedItemPos + 1 .nTotal = oDialog.getControl (&quot;lstTotal&quot;).getSelectedItemPos + 1
.nMax = oDialog.getControl (&quot;lstMax&quot;).getSelectedItemPos + 1 .nMax = oDialog.getControl (&quot;lstMax&quot;).getSelectedItemPos + 1
@ -176,19 +176,19 @@ End Function
Sub subBtnOKCheck (oEvent As object) Sub subBtnOKCheck (oEvent As object)
Dim oDialog As Object Dim oDialog As Object
Dim oPokemon As Object, oCP As Object Dim oPokemon As Object, oCP As Object
Dim oHP As Object, oStardust As Object, oOK As Object Dim oHP As Object, oStarDust As Object, oOK As Object
oDialog = oEvent.Source.getContext oDialog = oEvent.Source.getContext
oPokemon = oDialog.getControl (&quot;lstPokemon&quot;) oPokemon = oDialog.getControl (&quot;lstPokemon&quot;)
oCP = oDialog.getControl (&quot;numCP&quot;) oCP = oDialog.getControl (&quot;numCP&quot;)
oHP = oDialog.getControl (&quot;numHP&quot;) oHP = oDialog.getControl (&quot;numHP&quot;)
oStardust = oDialog.getControl (&quot;lstStardust&quot;) oStarDust = oDialog.getControl (&quot;lstStarDust&quot;)
oOK = oDialog.getControl (&quot;btnOK&quot;) oOK = oDialog.getControl (&quot;btnOK&quot;)
If oPokemon.getSelectedItemPos &lt;&gt; -1 _ If oPokemon.getSelectedItemPos &lt;&gt; -1 _
And oCP.getText &lt;&gt; &quot;&quot; _ And oCP.getText &lt;&gt; &quot;&quot; _
And oHP.getText &lt;&gt; &quot;&quot; _ And oHP.getText &lt;&gt; &quot;&quot; _
And oStardust.getSelectedItemPos &lt;&gt; -1 Then And oStarDust.getSelectedItemPos &lt;&gt; -1 Then
oOK.setEnable (True) oOK.setEnable (True)
Else Else
oOK.setEnable (False) oOK.setEnable (False)
@ -573,7 +573,7 @@ Function fnFindIV ( _
Else Else
fStep = 0.5 fStep = 0.5
End If End If
subReadStardust subReadStarDust
nEvolved = UBound (aBaseStats.mEvolved) nEvolved = UBound (aBaseStats.mEvolved)
If nEvolved &gt; -1 Then If nEvolved &gt; -1 Then
ReDim Preserve maEvBaseStats (nEvolved) As New aStats ReDim Preserve maEvBaseStats (nEvolved) As New aStats
@ -587,8 +587,8 @@ Function fnFindIV ( _
Next nI Next nI
End If End If
nN = -1 nN = -1
For fLevel = 1 To UBound (mStardust) Step fStep For fLevel = 1 To UBound (mStarDust) Step fStep
If mStardust (CInt (fLevel - 0.5)) = aQuery.nStardust Then If mStarDust (CInt (fLevel - 0.5)) = aQuery.nStarDust Then
For nStamina = 0 To 15 For nStamina = 0 To 15
If fnCalcHP (aBaseStats, fLevel, nStamina) = aQuery.nHP Then If fnCalcHP (aBaseStats, fLevel, nStamina) = aQuery.nHP Then
For nAttack = 0 To 15 For nAttack = 0 To 15
@ -845,7 +845,7 @@ Sub subSaveIV ( _
mData (1) (1) = aQuery.sPokemon mData (1) (1) = aQuery.sPokemon
mData (1) (2) = aQuery.nCP mData (1) (2) = aQuery.nCP
mData (1) (3) = aQuery.nHP mData (1) (3) = aQuery.nHP
mData (1) (4) = aQuery.nStardust mData (1) (4) = aQuery.nStarDust
oRange = oSheet.getCellRangeByPosition ( _ oRange = oSheet.getCellRangeByPosition ( _
0, 0, UBound (mData (0)), UBound (mData)) 0, 0, UBound (mData (0)), UBound (mData))
@ -1156,10 +1156,10 @@ Sub subReadCPM
End If End If
End Sub End Sub
&apos; subReadStardust: Reads the stardust table. &apos; subReadStarDust: Reads the star dust table.
Sub subReadStardust Sub subReadStarDust
If UBound (mStardust) = -1 Then If UBound (mStarDust) = -1 Then
mStardust = fnGetStardustData mStarDust = fnGetStarDustData
End If End If
End Sub End Sub
</script:module> </script:module>

6
oxt/PokemonGoIV/1Data.xba
View File

@ -230,9 +230,9 @@ Function fnGetCPMData As Variant
0.78463697) 0.78463697)
End Function End Function
&apos; fnGetStardustData: Returns the stardust data. &apos; fnGetStarDustData: Returns the star dust data.
Function fnGetStardustData As Variant Function fnGetStarDustData As Variant
fnGetStardustData = Array( _ fnGetStarDustData = Array( _
-1, _ -1, _
200, _ 200, _
200, _ 200, _

14
oxt/PokemonGoIV/9Load.xba
View File

@ -46,7 +46,7 @@ Sub subReadDataSheets
&amp; &quot;Option Explicit&quot; &amp; &quot;Option Explicit&quot;
sOutput = sOutput &amp; Chr (10) &amp; Chr (10) &amp; fnReadBaseStatsSheet sOutput = sOutput &amp; Chr (10) &amp; Chr (10) &amp; fnReadBaseStatsSheet
sOutput = sOutput &amp; Chr (10) &amp; Chr (10) &amp; fnReadCPMSheet sOutput = sOutput &amp; Chr (10) &amp; Chr (10) &amp; fnReadCPMSheet
sOutput = sOutput &amp; Chr (10) &amp; Chr (10) &amp; fnReadStardustSheet sOutput = sOutput &amp; Chr (10) &amp; Chr (10) &amp; fnReadStarDustSheet
subShowBasicData (sOutput) subShowBasicData (sOutput)
End Sub End Sub
@ -205,8 +205,8 @@ Function fnReadCPMSheet As String
fnReadCPMSheet = sOutput fnReadCPMSheet = sOutput
End Function End Function
&apos; fnReadStardustSheet: Reads the stardust sheet. &apos; fnReadStarDustSheet: Reads the star dust sheet.
Function fnReadStardustSheet As String Function fnReadStarDustSheet As String
Dim oSheet As Object, oRange As Object, mData As Variant Dim oSheet As Object, oRange As Object, mData As Variant
Dim nI As Integer, sOutput As String Dim nI As Integer, sOutput As String
@ -215,9 +215,9 @@ Function fnReadStardustSheet As String
mData = oRange.getDataArray mData = oRange.getDataArray
sOutput = &quot;&quot; _ sOutput = &quot;&quot; _
&amp; &quot;&apos; fnGetStardustData: Returns the stardust data.&quot; &amp; Chr (10) _ &amp; &quot;&apos; fnGetStarDustData: Returns the star dust data.&quot; &amp; Chr (10) _
&amp; &quot;Function fnGetStardustData As Variant&quot; &amp; Chr (10) _ &amp; &quot;Function fnGetStarDustData As Variant&quot; &amp; Chr (10) _
&amp; Chr (9) &amp; &quot;fnGetStardustData = Array( _&quot; &amp; Chr (10) _ &amp; Chr (9) &amp; &quot;fnGetStarDustData = Array( _&quot; &amp; Chr (10) _
&amp; Chr (9) &amp; Chr (9) &amp; &quot;-1, _&quot; &amp; Chr (10) &amp; Chr (9) &amp; Chr (9) &amp; &quot;-1, _&quot; &amp; Chr (10)
For nI = 1 To UBound (mData) - 1 Step 2 For nI = 1 To UBound (mData) - 1 Step 2
sOutput = sOutput _ sOutput = sOutput _
@ -227,6 +227,6 @@ Function fnReadStardustSheet As String
sOutput = sOutput _ sOutput = sOutput _
&amp; Chr (9) &amp; Chr (9) &amp; mData (nI) (2) &amp; &quot;)&quot; &amp; Chr (10) _ &amp; Chr (9) &amp; Chr (9) &amp; mData (nI) (2) &amp; &quot;)&quot; &amp; Chr (10) _
&amp; &quot;End Function&quot; &amp; &quot;End Function&quot;
fnReadStardustSheet = sOutput fnReadStarDustSheet = sOutput
End Function End Function
</script:module> </script:module>

2
oxt/PokemonGoIV/DialogStrings_en_US.properties
View File

@ -3,7 +3,7 @@
2.DlgMain.txtPokemon.Label=~Pok\u00e9mon: 2.DlgMain.txtPokemon.Label=~Pok\u00e9mon:
3.DlgMain.txtCP.Label=~CP: 3.DlgMain.txtCP.Label=~CP:
4.DlgMain.txtHP.Label=~HP: 4.DlgMain.txtHP.Label=~HP:
5.DlgMain.txtStardust.Label=S~tardust: 5.DlgMain.txtStarDust.Label=S~tar dust:
6.DlgMain.txtPlayerLevel.Label=Player ~level: 6.DlgMain.txtPlayerLevel.Label=Player ~level:
7.DlgMain.cbxIsNew.Label=This Pok\u00e9mon has ~not been powered-up yet. 7.DlgMain.cbxIsNew.Label=This Pok\u00e9mon has ~not been powered-up yet.
8.DlgMain.grpAppraisals.Label=Team Leader Appraisal 8.DlgMain.grpAppraisals.Label=Team Leader Appraisal

2
oxt/PokemonGoIV/DialogStrings_zh_TW.properties
View File

@ -3,7 +3,7 @@
2.DlgMain.txtPokemon.Label=\u5bf6\u53ef\u5922(~P)\uff1a 2.DlgMain.txtPokemon.Label=\u5bf6\u53ef\u5922(~P)\uff1a
3.DlgMain.txtCP.Label=~CP: 3.DlgMain.txtCP.Label=~CP:
4.DlgMain.txtHP.Label=~HP: 4.DlgMain.txtHP.Label=~HP:
5.DlgMain.txtStardust.Label=S~tardust: 5.DlgMain.txtStarDust.Label=S~tar dust:
6.DlgMain.txtPlayerLevel.Label=\u73a9\u5bb6\u7b49\u7d1a(~L)\uff1a 6.DlgMain.txtPlayerLevel.Label=\u73a9\u5bb6\u7b49\u7d1a(~L)\uff1a
7.DlgMain.cbxIsNew.Label=\u9019\u96bb\u5bf6\u53ef\u5922\u9084\u6c92\u5f37\u5316\u904e(~N)\u3002 7.DlgMain.cbxIsNew.Label=\u9019\u96bb\u5bf6\u53ef\u5922\u9084\u6c92\u5f37\u5316\u904e(~N)\u3002
8.DlgMain.grpAppraisals.Label=\u968a\u9577\u8a55\u50f9 8.DlgMain.grpAppraisals.Label=\u968a\u9577\u8a55\u50f9

4
oxt/PokemonGoIV/DlgMain.xdl
View File

@ -182,8 +182,8 @@
<dlg:numericfield dlg:id="numHP" dlg:tab-index="2" dlg:left="65" dlg:top="39" dlg:width="15" dlg:height="12" dlg:decimal-accuracy="0" dlg:value-min="10" dlg:value-max="500"> <dlg:numericfield dlg:id="numHP" dlg:tab-index="2" dlg:left="65" dlg:top="39" dlg:width="15" dlg:height="12" dlg:decimal-accuracy="0" dlg:value-min="10" dlg:value-max="500">
<script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subBtnOKCheck?language=Basic&amp;location=application" script:language="Script"/> <script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subBtnOKCheck?language=Basic&amp;location=application" script:language="Script"/>
</dlg:numericfield> </dlg:numericfield>
<dlg:text dlg:id="txtStardust" dlg:tab-index="19" dlg:left="90" dlg:top="41" dlg:width="30" dlg:height="8" dlg:value="&amp;5.DlgMain.txtStardust.Label"/> <dlg:text dlg:id="txtStarDust" dlg:tab-index="19" dlg:left="90" dlg:top="41" dlg:width="30" dlg:height="8" dlg:value="&amp;5.DlgMain.txtStarDust.Label"/>
<dlg:menulist dlg:id="lstStardust" dlg:tab-index="3" dlg:left="120" dlg:top="39" dlg:width="35" dlg:height="12" dlg:spin="true"> <dlg:menulist dlg:id="lstStarDust" dlg:tab-index="3" dlg:left="120" dlg:top="39" dlg:width="35" dlg:height="12" dlg:spin="true">
<dlg:menupopup> <dlg:menupopup>
<dlg:menuitem dlg:value="200"/> <dlg:menuitem dlg:value="200"/>
<dlg:menuitem dlg:value="400"/> <dlg:menuitem dlg:value="400"/>