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

Fixed the problem with localized formula function names, for Deutsch translation.

Browse Source
This commit is contained in:
依瑪貓 2017-06-10 09:10:12 +08:00
parent 0d1c2ea2b2
commit b3df7ae1d2
2 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
PokemonGoIV/2Report.vb
View File

@ -59,7 +59,7 @@ Sub subCreateReport ( _
aBaseStats As aStats, aQuery As aFindIVParam, maIVs () As aIV)
Dim oDoc As Object, oSheet As Object
Dim oRange As Object, oColumns As Object, oRows As Object
Dim oCell As Object, sFormula As String
Dim oCell As Object, sFormula As String, sFormulaLocal As String
Dim nI As Integer, nJ As Integer, nCol As Integer
Dim nLeadCols As Integer, nTotalCols As Integer
Dim nEvolved As Integer, fMaxLevel As Double
@ -180,8 +180,10 @@ Sub subCreateReport ( _
sFormula = "=(" & sColIVAttack & "+" & sColIVDefense _
& "+" & sColIVStamina & ")/45"
oCell.setFormula (sFormula)
sFormula = oCell.getPropertyValue ("FormulaLocal")
oCell.setPropertyValue ("FormulaLocal", sFormula)
sFormulaLocal = oCell.getPropertyValue ("FormulaLocal")
If sFormulaLocal <> sFormula Then
oCell.setPropertyValue ("FormulaLocal", sFormulaLocal)
End If
nCol = nLeadCols
If aBaseStats.bIsLastForm Then
@ -189,8 +191,10 @@ Sub subCreateReport ( _
sFormula = fnGetCPFormula (aBaseStats, _
sColIVAttack, sColIVDefense, sColIVStamina, sMaxCPM)
oCell.setFormula (sFormula)
sFormula = oCell.getPropertyValue ("FormulaLocal")
oCell.setPropertyValue ("FormulaLocal", sFormula)
sFormulaLocal = oCell.getPropertyValue ("FormulaLocal")
If sFormulaLocal <> sFormula Then
oCell.setPropertyValue ("FormulaLocal", sFormulaLocal)
End If
nCol = nCol + 1
End If
For nJ = 0 To nEvolved - 1
@ -198,16 +202,23 @@ Sub subCreateReport ( _
sFormula = fnGetCPFormula (maEvBaseStats (nJ), _
sColIVAttack, sColIVDefense, sColIVStamina, sCPM)
oCell.setFormula (sFormula)
sFormula = oCell.getPropertyValue ("FormulaLocal")
oCell.setPropertyValue ("FormulaLocal", sFormula)
sFormulaLocal = oCell.getPropertyValue ("FormulaLocal")
If sFormulaLocal <> sFormula Then
oCell.setPropertyValue ("FormulaLocal", sFormulaLocal)
End If
nCol = nCol + 1
If maEvBaseStats (nJ).bIsLastForm Then
oCell = oSheet.getCellByPosition (nCol, nI + 1)
sFormula = fnGetCPFormula (maEvBaseStats (nJ), _
sColIVAttack, sColIVDefense, sColIVStamina, sMaxCPM)
sColIVAttack, sColIVDefense, _
sColIVStamina, sMaxCPM)
oCell.setFormula (sFormula)
sFormula = oCell.getPropertyValue ("FormulaLocal")
oCell.setPropertyValue ("FormulaLocal", sFormula)
sFormulaLocal = oCell.getPropertyValue ( _
"FormulaLocal")
If sFormulaLocal <> sFormula Then
oCell.setPropertyValue ( _
"FormulaLocal", sFormulaLocal)
End If
nCol = nCol + 1
End If
Next nJ

23
oxt/PokemonGoIV/2Report.xba
View File

@ -61,7 +61,7 @@ Sub subCreateReport ( _
aBaseStats As aStats, aQuery As aFindIVParam, maIVs () As aIV)
Dim oDoc As Object, oSheet As Object
Dim oRange As Object, oColumns As Object, oRows As Object
Dim oCell As Object, sFormula As String
Dim oCell As Object, sFormula As String, sFormulaLocal As String
Dim nI As Integer, nJ As Integer, nCol As Integer
Dim nLeadCols As Integer, nTotalCols As Integer
Dim nEvolved As Integer, fMaxLevel As Double
@ -182,6 +182,10 @@ Sub subCreateReport ( _
sFormula = &quot;=(&quot; &amp; sColIVAttack &amp; &quot;+&quot; &amp; sColIVDefense _
&amp; &quot;+&quot; &amp; sColIVStamina &amp; &quot;)/45&quot;
oCell.setFormula (sFormula)
sFormulaLocal = oCell.getPropertyValue (&quot;FormulaLocal&quot;)
If sFormulaLocal &lt;&gt; sFormula Then
oCell.setPropertyValue (&quot;FormulaLocal&quot;, sFormulaLocal)
End If
nCol = nLeadCols
If aBaseStats.bIsLastForm Then
@ -189,6 +193,10 @@ Sub subCreateReport ( _
sFormula = fnGetCPFormula (aBaseStats, _
sColIVAttack, sColIVDefense, sColIVStamina, sMaxCPM)
oCell.setFormula (sFormula)
sFormulaLocal = oCell.getPropertyValue (&quot;FormulaLocal&quot;)
If sFormulaLocal &lt;&gt; sFormula Then
oCell.setPropertyValue (&quot;FormulaLocal&quot;, sFormulaLocal)
End If
nCol = nCol + 1
End If
For nJ = 0 To nEvolved - 1
@ -196,12 +204,23 @@ Sub subCreateReport ( _
sFormula = fnGetCPFormula (maEvBaseStats (nJ), _
sColIVAttack, sColIVDefense, sColIVStamina, sCPM)
oCell.setFormula (sFormula)
sFormulaLocal = oCell.getPropertyValue (&quot;FormulaLocal&quot;)
If sFormulaLocal &lt;&gt; sFormula Then
oCell.setPropertyValue (&quot;FormulaLocal&quot;, sFormulaLocal)
End If
nCol = nCol + 1
If maEvBaseStats (nJ).bIsLastForm Then
oCell = oSheet.getCellByPosition (nCol, nI + 1)
sFormula = fnGetCPFormula (maEvBaseStats (nJ), _
sColIVAttack, sColIVDefense, sColIVStamina, sMaxCPM)
sColIVAttack, sColIVDefense, _
sColIVStamina, sMaxCPM)
oCell.setFormula (sFormula)
sFormulaLocal = oCell.getPropertyValue ( _
&quot;FormulaLocal&quot;)
If sFormulaLocal &lt;&gt; sFormula Then
oCell.setPropertyValue ( _
&quot;FormulaLocal&quot;, sFormulaLocal)
End If
nCol = nCol + 1
End If
Next nJ