diff --git a/PokemonGoIV/0Main.vb b/PokemonGoIV/0Main.vb
index ad56ebf..87253ca 100644
--- a/PokemonGoIV/0Main.vb
+++ b/PokemonGoIV/0Main.vb
@@ -49,7 +49,7 @@ Type aFindIVParam
sPokemon As String
nCP As Integer
nHP As Integer
- nStarDust As Integer
+ nStardust As Integer
nPlayerLevel As Integer
bIsNew As Boolean
nTotal As Integer
@@ -59,7 +59,7 @@ Type aFindIVParam
End Type
Private maBaseStats () As New aStats
-Private mCPM () As Double, mStarDust () As Integer
+Private mCPM () As Double, mStardust () As Integer
' subMain: The main program
Sub subMain
@@ -113,7 +113,7 @@ Function fnAskParam As aFindIVParam
.sPokemon = oDialog.getControl ("lstPokemon").getSelectedItem
.nCP = oDialog.getControl ("numCP").getValue
.nHP = oDialog.getControl ("numHP").getValue
- .nStarDust = CInt (oDialog.getControl ("lstStarDust").getSelectedItem)
+ .nStardust = CInt (oDialog.getControl ("lstStardust").getSelectedItem)
.nPlayerLevel = CInt (oDialog.getControl ("lstPlayerLevel").getSelectedItem)
.nTotal = oDialog.getControl ("lstTotal").getSelectedItemPos + 1
.nMax = oDialog.getControl ("lstMax").getSelectedItemPos + 1
@@ -174,19 +174,19 @@ End Function
Sub subBtnOKCheck (oEvent As object)
Dim oDialog 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
oPokemon = oDialog.getControl ("lstPokemon")
oCP = oDialog.getControl ("numCP")
oHP = oDialog.getControl ("numHP")
- oStarDust = oDialog.getControl ("lstStarDust")
+ oStardust = oDialog.getControl ("lstStardust")
oOK = oDialog.getControl ("btnOK")
If oPokemon.getSelectedItemPos <> -1 _
And oCP.getText <> "" _
And oHP.getText <> "" _
- And oStarDust.getSelectedItemPos <> -1 Then
+ And oStardust.getSelectedItemPos <> -1 Then
oOK.setEnable (True)
Else
oOK.setEnable (False)
@@ -571,7 +571,7 @@ Function fnFindIV ( _
Else
fStep = 0.5
End If
- subReadStarDust
+ subReadStardust
nEvolved = UBound (aBaseStats.mEvolved)
If nEvolved > -1 Then
ReDim Preserve maEvBaseStats (nEvolved) As New aStats
@@ -585,8 +585,8 @@ Function fnFindIV ( _
Next nI
End If
nN = -1
- For fLevel = 1 To UBound (mStarDust) Step fStep
- If mStarDust (CInt (fLevel - 0.5)) = aQuery.nStarDust Then
+ For fLevel = 1 To UBound (mStardust) Step fStep
+ If mStardust (CInt (fLevel - 0.5)) = aQuery.nStardust Then
For nStamina = 0 To 15
If fnCalcHP (aBaseStats, fLevel, nStamina) = aQuery.nHP Then
For nAttack = 0 To 15
@@ -740,7 +740,7 @@ Sub subSaveIV ( _
nEvolved = UBound (maIVs (0).maEvolved) + 1
mRow = Array ( _
- "No", "Pokemon", "CP", "HP", "Star dust", _
+ "No", "Pokemon", "CP", "HP", "Stardust", _
"Lv", "Atk", "Def", "Sta", "IV")
nFront = UBound (mRow)
If aQuery.sPokemon = "Eevee" Then
@@ -843,7 +843,7 @@ Sub subSaveIV ( _
mData (1) (1) = aQuery.sPokemon
mData (1) (2) = aQuery.nCP
mData (1) (3) = aQuery.nHP
- mData (1) (4) = aQuery.nStarDust
+ mData (1) (4) = aQuery.nStardust
oRange = oSheet.getCellRangeByPosition ( _
0, 0, UBound (mData (0)), UBound (mData))
@@ -1154,9 +1154,9 @@ Sub subReadCPM
End If
End Sub
-' subReadStarDust: Reads the star dust table.
-Sub subReadStarDust
- If UBound (mStarDust) = -1 Then
- mStarDust = fnGetStarDustData
+' subReadStardust: Reads the stardust table.
+Sub subReadStardust
+ If UBound (mStardust) = -1 Then
+ mStardust = fnGetStardustData
End If
End Sub
diff --git a/PokemonGoIV/1Data.vb b/PokemonGoIV/1Data.vb
index eb4ec37..749ae95 100644
--- a/PokemonGoIV/1Data.vb
+++ b/PokemonGoIV/1Data.vb
@@ -228,9 +228,9 @@ Function fnGetCPMData As Variant
0.78463697)
End Function
-' fnGetStarDustData: Returns the star dust data.
-Function fnGetStarDustData As Variant
- fnGetStarDustData = Array( _
+' fnGetStardustData: Returns the stardust data.
+Function fnGetStardustData As Variant
+ fnGetStardustData = Array( _
-1, _
200, _
200, _
diff --git a/PokemonGoIV/9Load.vb b/PokemonGoIV/9Load.vb
index cb0c6b7..f56a3f2 100644
--- a/PokemonGoIV/9Load.vb
+++ b/PokemonGoIV/9Load.vb
@@ -44,7 +44,7 @@ Sub subReadDataSheets
& "Option Explicit"
sOutput = sOutput & Chr (10) & Chr (10) & fnReadBaseStatsSheet
sOutput = sOutput & Chr (10) & Chr (10) & fnReadCPMSheet
- sOutput = sOutput & Chr (10) & Chr (10) & fnReadStarDustSheet
+ sOutput = sOutput & Chr (10) & Chr (10) & fnReadStardustSheet
subShowBasicData (sOutput)
End Sub
@@ -203,8 +203,8 @@ Function fnReadCPMSheet As String
fnReadCPMSheet = sOutput
End Function
-' fnReadStarDustSheet: Reads the star dust sheet.
-Function fnReadStarDustSheet As String
+' fnReadStardustSheet: Reads the stardust sheet.
+Function fnReadStardustSheet As String
Dim oSheet As Object, oRange As Object, mData As Variant
Dim nI As Integer, sOutput As String
@@ -213,9 +213,9 @@ Function fnReadStarDustSheet As String
mData = oRange.getDataArray
sOutput = "" _
- & "' fnGetStarDustData: Returns the star dust data." & Chr (10) _
- & "Function fnGetStarDustData As Variant" & Chr (10) _
- & Chr (9) & "fnGetStarDustData = Array( _" & Chr (10) _
+ & "' fnGetStardustData: Returns the stardust data." & Chr (10) _
+ & "Function fnGetStardustData As Variant" & Chr (10) _
+ & Chr (9) & "fnGetStardustData = Array( _" & Chr (10) _
& Chr (9) & Chr (9) & "-1, _" & Chr (10)
For nI = 1 To UBound (mData) - 1 Step 2
sOutput = sOutput _
@@ -225,5 +225,5 @@ Function fnReadStarDustSheet As String
sOutput = sOutput _
& Chr (9) & Chr (9) & mData (nI) (2) & ")" & Chr (10) _
& "End Function"
- fnReadStarDustSheet = sOutput
+ fnReadStardustSheet = sOutput
End Function
diff --git a/oxt/PokemonGoIV/0Main.xba b/oxt/PokemonGoIV/0Main.xba
index ee3189a..7ed58cd 100644
--- a/oxt/PokemonGoIV/0Main.xba
+++ b/oxt/PokemonGoIV/0Main.xba
@@ -51,7 +51,7 @@ Type aFindIVParam
sPokemon As String
nCP As Integer
nHP As Integer
- nStarDust As Integer
+ nStardust As Integer
nPlayerLevel As Integer
bIsNew As Boolean
nTotal As Integer
@@ -61,7 +61,7 @@ Type aFindIVParam
End Type
Private maBaseStats () As New aStats
-Private mCPM () As Double, mStarDust () As Integer
+Private mCPM () As Double, mStardust () As Integer
' subMain: The main program
Sub subMain
@@ -115,7 +115,7 @@ Function fnAskParam As aFindIVParam
.sPokemon = oDialog.getControl ("lstPokemon").getSelectedItem
.nCP = oDialog.getControl ("numCP").getValue
.nHP = oDialog.getControl ("numHP").getValue
- .nStarDust = CInt (oDialog.getControl ("lstStarDust").getSelectedItem)
+ .nStardust = CInt (oDialog.getControl ("lstStardust").getSelectedItem)
.nPlayerLevel = CInt (oDialog.getControl ("lstPlayerLevel").getSelectedItem)
.nTotal = oDialog.getControl ("lstTotal").getSelectedItemPos + 1
.nMax = oDialog.getControl ("lstMax").getSelectedItemPos + 1
@@ -176,19 +176,19 @@ End Function
Sub subBtnOKCheck (oEvent As object)
Dim oDialog 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
oPokemon = oDialog.getControl ("lstPokemon")
oCP = oDialog.getControl ("numCP")
oHP = oDialog.getControl ("numHP")
- oStarDust = oDialog.getControl ("lstStarDust")
+ oStardust = oDialog.getControl ("lstStardust")
oOK = oDialog.getControl ("btnOK")
If oPokemon.getSelectedItemPos <> -1 _
And oCP.getText <> "" _
And oHP.getText <> "" _
- And oStarDust.getSelectedItemPos <> -1 Then
+ And oStardust.getSelectedItemPos <> -1 Then
oOK.setEnable (True)
Else
oOK.setEnable (False)
@@ -573,7 +573,7 @@ Function fnFindIV ( _
Else
fStep = 0.5
End If
- subReadStarDust
+ subReadStardust
nEvolved = UBound (aBaseStats.mEvolved)
If nEvolved > -1 Then
ReDim Preserve maEvBaseStats (nEvolved) As New aStats
@@ -587,8 +587,8 @@ Function fnFindIV ( _
Next nI
End If
nN = -1
- For fLevel = 1 To UBound (mStarDust) Step fStep
- If mStarDust (CInt (fLevel - 0.5)) = aQuery.nStarDust Then
+ For fLevel = 1 To UBound (mStardust) Step fStep
+ If mStardust (CInt (fLevel - 0.5)) = aQuery.nStardust Then
For nStamina = 0 To 15
If fnCalcHP (aBaseStats, fLevel, nStamina) = aQuery.nHP Then
For nAttack = 0 To 15
@@ -742,7 +742,7 @@ Sub subSaveIV ( _
nEvolved = UBound (maIVs (0).maEvolved) + 1
mRow = Array ( _
- "No", "Pokemon", "CP", "HP", "Star dust", _
+ "No", "Pokemon", "CP", "HP", "Stardust", _
"Lv", "Atk", "Def", "Sta", "IV")
nFront = UBound (mRow)
If aQuery.sPokemon = "Eevee" Then
@@ -845,7 +845,7 @@ Sub subSaveIV ( _
mData (1) (1) = aQuery.sPokemon
mData (1) (2) = aQuery.nCP
mData (1) (3) = aQuery.nHP
- mData (1) (4) = aQuery.nStarDust
+ mData (1) (4) = aQuery.nStardust
oRange = oSheet.getCellRangeByPosition ( _
0, 0, UBound (mData (0)), UBound (mData))
@@ -1156,10 +1156,10 @@ Sub subReadCPM
End If
End Sub
-' subReadStarDust: Reads the star dust table.
-Sub subReadStarDust
- If UBound (mStarDust) = -1 Then
- mStarDust = fnGetStarDustData
+' subReadStardust: Reads the stardust table.
+Sub subReadStardust
+ If UBound (mStardust) = -1 Then
+ mStardust = fnGetStardustData
End If
End Sub
\ No newline at end of file
diff --git a/oxt/PokemonGoIV/1Data.xba b/oxt/PokemonGoIV/1Data.xba
index 8cd76b8..f6a6c1f 100644
--- a/oxt/PokemonGoIV/1Data.xba
+++ b/oxt/PokemonGoIV/1Data.xba
@@ -230,9 +230,9 @@ Function fnGetCPMData As Variant
0.78463697)
End Function
-' fnGetStarDustData: Returns the star dust data.
-Function fnGetStarDustData As Variant
- fnGetStarDustData = Array( _
+' fnGetStardustData: Returns the stardust data.
+Function fnGetStardustData As Variant
+ fnGetStardustData = Array( _
-1, _
200, _
200, _
diff --git a/oxt/PokemonGoIV/9Load.xba b/oxt/PokemonGoIV/9Load.xba
index fc60d53..ea292a7 100644
--- a/oxt/PokemonGoIV/9Load.xba
+++ b/oxt/PokemonGoIV/9Load.xba
@@ -46,7 +46,7 @@ Sub subReadDataSheets
& "Option Explicit"
sOutput = sOutput & Chr (10) & Chr (10) & fnReadBaseStatsSheet
sOutput = sOutput & Chr (10) & Chr (10) & fnReadCPMSheet
- sOutput = sOutput & Chr (10) & Chr (10) & fnReadStarDustSheet
+ sOutput = sOutput & Chr (10) & Chr (10) & fnReadStardustSheet
subShowBasicData (sOutput)
End Sub
@@ -205,8 +205,8 @@ Function fnReadCPMSheet As String
fnReadCPMSheet = sOutput
End Function
-' fnReadStarDustSheet: Reads the star dust sheet.
-Function fnReadStarDustSheet As String
+' fnReadStardustSheet: Reads the stardust sheet.
+Function fnReadStardustSheet As String
Dim oSheet As Object, oRange As Object, mData As Variant
Dim nI As Integer, sOutput As String
@@ -215,9 +215,9 @@ Function fnReadStarDustSheet As String
mData = oRange.getDataArray
sOutput = "" _
- & "' fnGetStarDustData: Returns the star dust data." & Chr (10) _
- & "Function fnGetStarDustData As Variant" & Chr (10) _
- & Chr (9) & "fnGetStarDustData = Array( _" & Chr (10) _
+ & "' fnGetStardustData: Returns the stardust data." & Chr (10) _
+ & "Function fnGetStardustData As Variant" & Chr (10) _
+ & Chr (9) & "fnGetStardustData = Array( _" & Chr (10) _
& Chr (9) & Chr (9) & "-1, _" & Chr (10)
For nI = 1 To UBound (mData) - 1 Step 2
sOutput = sOutput _
@@ -227,6 +227,6 @@ Function fnReadStarDustSheet As String
sOutput = sOutput _
& Chr (9) & Chr (9) & mData (nI) (2) & ")" & Chr (10) _
& "End Function"
- fnReadStarDustSheet = sOutput
+ fnReadStardustSheet = sOutput
End Function
\ No newline at end of file
diff --git a/oxt/PokemonGoIV/DialogStrings_en_US.properties b/oxt/PokemonGoIV/DialogStrings_en_US.properties
index 228c244..ebfc72a 100644
--- a/oxt/PokemonGoIV/DialogStrings_en_US.properties
+++ b/oxt/PokemonGoIV/DialogStrings_en_US.properties
@@ -3,7 +3,7 @@
2.DlgMain.txtPokemon.Label=~Pok\u00e9mon:
3.DlgMain.txtCP.Label=~CP:
4.DlgMain.txtHP.Label=~HP:
-5.DlgMain.txtStarDust.Label=S~tar dust:
+5.DlgMain.txtStardust.Label=S~tardust:
6.DlgMain.txtPlayerLevel.Label=Player ~level:
7.DlgMain.cbxIsNew.Label=This Pok\u00e9mon has ~not been powered-up yet.
8.DlgMain.grpAppraisals.Label=Team Leader Appraisal
diff --git a/oxt/PokemonGoIV/DialogStrings_zh_TW.properties b/oxt/PokemonGoIV/DialogStrings_zh_TW.properties
index c9be928..98696d4 100644
--- a/oxt/PokemonGoIV/DialogStrings_zh_TW.properties
+++ b/oxt/PokemonGoIV/DialogStrings_zh_TW.properties
@@ -3,7 +3,7 @@
2.DlgMain.txtPokemon.Label=\u5bf6\u53ef\u5922(~P)\uff1a
3.DlgMain.txtCP.Label=~CP:
4.DlgMain.txtHP.Label=~HP:
-5.DlgMain.txtStarDust.Label=S~tar dust:
+5.DlgMain.txtStardust.Label=S~tardust:
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
8.DlgMain.grpAppraisals.Label=\u968a\u9577\u8a55\u50f9
diff --git a/oxt/PokemonGoIV/DlgMain.xdl b/oxt/PokemonGoIV/DlgMain.xdl
index ba5f8f6..49f8a03 100644
--- a/oxt/PokemonGoIV/DlgMain.xdl
+++ b/oxt/PokemonGoIV/DlgMain.xdl
@@ -182,8 +182,8 @@
-
-
+
+