From 26957f3106b36473641632d6a5a83f61210a785d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Thu, 20 Jul 2017 22:55:02 +0800 Subject: [PATCH] Updated the base stats of Lapras. --- PokemonGoIV/3Data.vb | 4 +-- oxt/PokemonGoIV/3Data.xba | 4 +-- oxt/PokemonGoIV/9Load.xba | 55 +++++++++++++++++++++++++-------------- 3 files changed, 40 insertions(+), 23 deletions(-) diff --git a/PokemonGoIV/3Data.vb b/PokemonGoIV/3Data.vb index 5d4bf8a..ce94bce 100644 --- a/PokemonGoIV/3Data.vb +++ b/PokemonGoIV/3Data.vb @@ -13,7 +13,7 @@ ' limitations under the License. ' 3Data: The Pokémon GO data for IV calculation -' by imacat , 2017-06-08 +' by imacat , 2017-07-20 ' Generated with 9Load.subReadDataSheets () Option Explicit @@ -151,7 +151,7 @@ Function fnGetBaseStatsData As Variant Array ("Tauros", "128", 150, 198, 197, Array ()), _ Array ("Magikarp", "129", 40, 29, 102, Array ("Gyarados")), _ Array ("Gyarados", "130", 190, 237, 197, Array ()), _ - Array ("Lapras", "131", 260, 186, 190, Array ()), _ + Array ("Lapras", "131", 260, 165, 180, Array ()), _ Array ("Ditto", "132", 96, 91, 91, Array ()), _ Array ("Eevee", "133", 110, 104, 121, Array ("Vaporeon", "Jolteon", "Flareon", "Espeon", "Umbreon")), _ Array ("Vaporeon", "134", 260, 205, 177, Array ()), _ diff --git a/oxt/PokemonGoIV/3Data.xba b/oxt/PokemonGoIV/3Data.xba index 3f69001..752f26e 100644 --- a/oxt/PokemonGoIV/3Data.xba +++ b/oxt/PokemonGoIV/3Data.xba @@ -15,7 +15,7 @@ ' limitations under the License. ' 3Data: The Pokémon GO data for IV calculation -' by imacat <imacat@mail.imacat.idv.tw>, 2017-06-08 +' by imacat <imacat@mail.imacat.idv.tw>, 2017-07-20 ' Generated with 9Load.subReadDataSheets () Option Explicit @@ -153,7 +153,7 @@ Function fnGetBaseStatsData As Variant Array ("Tauros", "128", 150, 198, 197, Array ()), _ Array ("Magikarp", "129", 40, 29, 102, Array ("Gyarados")), _ Array ("Gyarados", "130", 190, 237, 197, Array ()), _ - Array ("Lapras", "131", 260, 186, 190, Array ()), _ + Array ("Lapras", "131", 260, 165, 180, Array ()), _ Array ("Ditto", "132", 96, 91, 91, Array ()), _ Array ("Eevee", "133", 110, 104, 121, Array ("Vaporeon", "Jolteon", "Flareon", "Espeon", "Umbreon")), _ Array ("Vaporeon", "134", 260, 205, 177, Array ()), _ diff --git a/oxt/PokemonGoIV/9Load.xba b/oxt/PokemonGoIV/9Load.xba index 96a49a5..adb7ae2 100644 --- a/oxt/PokemonGoIV/9Load.xba +++ b/oxt/PokemonGoIV/9Load.xba @@ -65,9 +65,9 @@ Sub subShowChinesePokemonNames sResult = "" For nI = 1 To UBound (mData) sNo = mData (nI) (1) - sName = mData (nI) (2) + sName = mData (nI) (0) If sName = "" Then - sName = mData (nI) (0) + sName = mData (nI) (2) Else sNewName = "" For nJ = 1 To Len (sName) @@ -148,10 +148,10 @@ Function fnReadBaseStatsSheet As String & "Function fnGetBaseStatsData As Variant" & Chr (10) _ & Chr (9) & "fnGetBaseStatsData = Array( _" & Chr (10) For nI = 1 To UBound (mData) - 1 - sEvolveForms = fnFindEvolveForms (mData (nI)) + sEvolveForms = fnFindEvolveForms (mData, nI) sOutput = sOutput _ & Chr (9) & Chr (9) & "Array (""" _ - & fnMapPokemonNameToId (mData (nI) (0)) _ + & fnMapPokemonNameToId (mData (nI) (2)) _ & """, """ & mData (nI) (1) _ & """, " & mData (nI) (3) _ & ", " & mData (nI) (4) _ @@ -159,10 +159,10 @@ Function fnReadBaseStatsSheet As String & ", " & sEvolveForms & "), _" & Chr (10) Next nI nI = UBound (mData) - sEvolveForms = fnFindEvolveForms (mData (nI)) + sEvolveForms = fnFindEvolveForms (mData, nI) sOutput = sOutput _ & Chr (9) & Chr (9) & "Array (""" _ - & fnMapPokemonNameToId (mData (nI) (0)) _ + & fnMapPokemonNameToId (mData (nI) (2)) _ & """, """ & mData (nI) (1) _ & """, " & mData (nI) (3) _ & ", " & mData (nI) (4) _ @@ -173,34 +173,37 @@ Function fnReadBaseStatsSheet As String End Function ' fnFindEvolveForms: Finds the evolved forms of the Pokémons. -Function fnFindEvolveForms (mData () As Variant) As String +Function fnFindEvolveForms (mData As Variant, nI As Integer) As String Dim nJ As Integer, nStart As Integer, nEnd As Integer Dim sEvolveForms As String ' Special cases - If mData (0) = "Oddish" Then - fnFindEvolveForms = "Array (""Gloom"", ""Vileplume"", ""Bellossom"")" + If mData (nI) (2) = "Oddish" Then + fnFindEvolveForms = "Array (""Gloom"", ""Vileplume"", " _ + & """Bellossom"")" Exit Function End If - If mData (0) = "Gloom" Then + If mData (nI) (2) = "Gloom" Then fnFindEvolveForms = "Array (""Vileplume"", ""Bellossom"")" Exit Function End If - If mData (0) = "Slowpoke" Then + If mData (nI) (2) = "Slowpoke" Then fnFindEvolveForms = "Array (""Slowbro"", ""Slowking"")" Exit Function End If - If mData (0) = "Tyrogue" Then - fnFindEvolveForms = "Array (""Hitmonlee"", ""Hitmonchan"", ""Hitmontop"")" + If mData (nI) (2) = "Tyrogue" Then + fnFindEvolveForms = "Array (""Hitmonlee"", ""Hitmonchan"", " _ + & """Hitmontop"")" Exit Function End If - If mData (0) = "Eevee" Then - fnFindEvolveForms = "Array (""Vaporeon"", ""Jolteon"", ""Flareon"", ""Espeon"", ""Umbreon"")" + If mData (nI) (2) = "Eevee" Then + fnFindEvolveForms = "Array (""Vaporeon"", ""Jolteon"", " _ + & """Flareon"", ""Espeon"", ""Umbreon"")" Exit Function End If For nJ = 6 To 8 - If mData (nJ) = mData (0) Then + If mData (nI) (nJ) = mData (nI) (0) Then nStart = nJ + 1 nJ = 9 End If @@ -209,7 +212,7 @@ Function fnFindEvolveForms (mData () As Variant) As String nEnd = 8 Else For nJ = nStart To 8 - If mData (nJ) = "" Then + If mData (nI) (nJ) = "" Then nEnd = nJ - 1 nJ = 9 Else @@ -224,17 +227,31 @@ Function fnFindEvolveForms (mData () As Variant) As String sEvolveForms = "Array ()" Else sEvolveForms = """" _ - & fnMapPokemonNameToId (mData (nStart)) & """" + & fnMapChineseNameToId (mData, mData (nI) (nStart)) & """" For nJ = nStart + 1 To nEnd sEvolveForms = sEvolveForms _ & ", """ _ - & fnMapPokemonNameToId (mData (nJ)) & """" + & fnMapChineseNameToId (mData, mData (nI) (nJ)) & """" Next nJ sEvolveForms = "Array (" & sEvolveForms & ")" End If fnFindEvolveForms = sEvolveForms End Function +' fnMapChineseNameToId: Maps the Chinese Pokémon names to their IDs. +Function fnMapChineseNameToId ( _ + mData As Variant, sChinese As String) As String + Dim nI As Integer + + For nI = 0 To UBound (mData) + If mData (nI) (0) = sChinese Then + fnMapChineseNameToId = _ + fnMapPokemonNameToId (mData (nI) (2)) + Exit Function + End If + Next nI +End Function + ' fnMapPokemonNameToId: Maps the English Pokémon names to their IDs. Function fnMapPokemonNameToId (sName As String) As String Dim sId As String