From 8b80db44fc758201fed5fe26cbbe806b3649aa77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Tue, 14 Feb 2017 19:50:46 +0800 Subject: [PATCH] =?UTF-8?q?Changed=20Pok=C3=A9mon=20names=20to=20Pok=C3=A9?= =?UTF-8?q?mon=20IDs=20in=20the=20database.=20=20Put=20Pok=C3=A9mon=20name?= =?UTF-8?q?s=20to=20AddonConfiguration.xcu=20for=20localization.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PokemonGoIV/1Data.vb | 10 +- PokemonGoIV/9Load.vb | 34 +- oxt/AddonConfiguration.xcu | 852 +++++++++++++++++++++++++++++++++++-- 3 files changed, 859 insertions(+), 37 deletions(-) diff --git a/PokemonGoIV/1Data.vb b/PokemonGoIV/1Data.vb index 01b9858..2bd349f 100644 --- a/PokemonGoIV/1Data.vb +++ b/PokemonGoIV/1Data.vb @@ -13,7 +13,7 @@ ' limitations under the License. ' 1Data: The Pokémon GO data for IV calculation -' by imacat , 2017-01-03 +' by imacat , 2017-02-14 ' Generated with 9Load.subReadDataSheets () Option Explicit @@ -49,10 +49,10 @@ Function fnGetBaseStatsData As Variant Array ("Raichu", "026", 120, 193, 165, Array ()), _ Array ("Sandshrew", "027", 100, 126, 145, Array ("Sandslash")), _ Array ("Sandslash", "028", 150, 182, 202, Array ()), _ - Array ("Nidoran♀", "029", 110, 86, 94, Array ("Nidorina", "Nidoqueen")), _ + Array ("NidoranFemale", "029", 110, 86, 94, Array ("Nidorina", "Nidoqueen")), _ Array ("Nidorina", "030", 140, 117, 126, Array ("Nidoqueen")), _ Array ("Nidoqueen", "031", 180, 180, 174, Array ()), _ - Array ("Nidoran♂", "032", 92, 105, 76, Array ("Nidorino", "Nidoking")), _ + Array ("NidoranMale", "032", 92, 105, 76, Array ("Nidorino", "Nidoking")), _ Array ("Nidorino", "033", 122, 137, 112, Array ("Nidoking")), _ Array ("Nidoking", "034", 162, 204, 157, Array ()), _ Array ("Clefairy", "035", 140, 107, 116, Array ("Clefable")), _ @@ -103,7 +103,7 @@ Function fnGetBaseStatsData As Variant Array ("Slowbro", "080", 190, 177, 194, Array ()), _ Array ("Magnemite", "081", 50, 165, 128, Array ("Magneton")), _ Array ("Magneton", "082", 100, 223, 182, Array ()), _ - Array ("Farfetch'd", "083", 104, 124, 118, Array ()), _ + Array ("Farfetchd", "083", 104, 124, 118, Array ()), _ Array ("Doduo", "084", 70, 158, 88, Array ("Dodrio")), _ Array ("Dodrio", "085", 120, 218, 145, Array ()), _ Array ("Seel", "086", 130, 85, 128, Array ("Dewgong")), _ @@ -142,7 +142,7 @@ Function fnGetBaseStatsData As Variant Array ("Seaking", "119", 160, 175, 154, Array ()), _ Array ("Staryu", "120", 60, 137, 112, Array ("Starmie")), _ Array ("Starmie", "121", 120, 210, 184, Array ()), _ - Array ("Mr. Mime", "122", 80, 192, 233, Array ()), _ + Array ("MrMime", "122", 80, 192, 233, Array ()), _ Array ("Scyther", "123", 140, 218, 170, Array ()), _ Array ("Jynx", "124", 130, 223, 182, Array ()), _ Array ("Electabuzz", "125", 130, 198, 173, Array ()), _ diff --git a/PokemonGoIV/9Load.vb b/PokemonGoIV/9Load.vb index c416308..87d0d89 100644 --- a/PokemonGoIV/9Load.vb +++ b/PokemonGoIV/9Load.vb @@ -111,7 +111,8 @@ Function fnReadBaseStatsSheet As String For nI = 1 To UBound (mData) - 1 sEvolveForms = fnFindEvolveForms (mData (nI)) sOutput = sOutput _ - & Chr (9) & Chr (9) & "Array (""" & mData (nI) (0) _ + & Chr (9) & Chr (9) & "Array (""" _ + & fnMapNameToId (mData (nI) (0)) _ & """, """ & mData (nI) (1) _ & """, " & mData (nI) (3) _ & ", " & mData (nI) (4) _ @@ -121,7 +122,8 @@ Function fnReadBaseStatsSheet As String nI = UBound (mData) sEvolveForms = fnFindEvolveForms (mData (nI)) sOutput = sOutput _ - & Chr (9) & Chr (9) & "Array (""" & mData (nI) (0) _ + & Chr (9) & Chr (9) & "Array (""" _ + & fnMapNameToId (mData (nI) (0)) _ & """, """ & mData (nI) (1) _ & """, " & mData (nI) (3) _ & ", " & mData (nI) (4) _ @@ -131,6 +133,30 @@ Function fnReadBaseStatsSheet As String fnReadBaseStatsSheet = sOutput End Function +' fnMapNameToId: Maps the English Pokémon names to their IDs. +Function fnMapNameToId (sName As String) As String + Dim sId As String + + sId = "" + If sName = "Farfetch'd" Then + sId = "Farfetchd" + End If + If sName = "Nidoran♀" Then + sId = "NidoranFemale" + End If + If sName = "Nidoran♂" Then + sId = "NidoranMale" + End If + If sName = "Mr. Mime" Then + sId = "MrMime" + End If + If sId = "" Then + sId = sName + End If + fnMapNameToId = sId +End Function + +' fnFindEvolveForms: Finds the evolved forms of the Pokémons. Function fnFindEvolveForms (mData () As Variant) As String Dim nJ As Integer, nStart As Integer, nEnd As Integer Dim sEvolveForms As String @@ -162,10 +188,10 @@ Function fnFindEvolveForms (mData () As Variant) As String If nEnd = nStart - 1 Then sEvolveForms = "Array ()" Else - sEvolveForms = """" & mData (nStart) & """" + sEvolveForms = """" & fnMapNameToId (mData (nStart)) & """" For nJ = nStart + 1 To nEnd sEvolveForms = sEvolveForms _ - & ", """ & mData (nJ) & """" + & ", """ & fnMapNameToId (mData (nJ)) & """" Next nJ sEvolveForms = "Array (" & sEvolveForms & ")" End If diff --git a/oxt/AddonConfiguration.xcu b/oxt/AddonConfiguration.xcu index 63bc343..6bb242a 100644 --- a/oxt/AddonConfiguration.xcu +++ b/oxt/AddonConfiguration.xcu @@ -32,6 +32,830 @@ + + + + + Found no matching IV. + 找不出符合的 IV 值。 + + + + + Candela, leader of Team Valor, says: + Valor 隊隊長 Candela 說： + + + + + Blanche, leader of Team Mystic, says: + Mystic 隊隊長 Blanche 說： + + + + + Spark, leader of Team Instinct, says: + Instinct 隊隊長 Spark 說： + + + + + + Bulbasaur + + + + + Ivysaur + + + + + Venusaur + + + + + Charmander + + + + + Charmeleon + + + + + Charizard + + + + + Squirtle + + + + + Wartortle + + + + + Blastoise + + + + + Caterpie + + + + + Metapod + + + + + Butterfree + + + + + Weedle + + + + + Kakuna + + + + + Beedrill + + + + + Pidgey + + + + + Pidgeotto + + + + + Pidgeot + + + + + Rattata + + + + + Raticate + + + + + Spearow + + + + + Fearow + + + + + Ekans + + + + + Arbok + + + + + Pikachu + + + + + Raichu + + + + + Sandshrew + + + + + Sandslash + + + + + Nidoran♀ + + + + + Nidorina + + + + + Nidoqueen + + + + + Nidoran♂ + + + + + Nidorino + + + + + Nidoking + + + + + Clefairy + + + + + Clefable + + + + + Vulpix + + + + + Ninetales + + + + + Jigglypuff + + + + + Wigglytuff + + + + + Zubat + + + + + Golbat + + + + + Oddish + + + + + Gloom + + + + + Vileplume + + + + + Paras + + + + + Parasect + + + + + Venonat + + + + + Venomoth + + + + + Diglett + + + + + Dugtrio + + + + + Meowth + + + + + Persian + + + + + Psyduck + + + + + Golduck + + + + + Mankey + + + + + Primeape + + + + + Growlithe + + + + + Arcanine + + + + + Poliwag + + + + + Poliwhirl + + + + + Poliwrath + + + + + Abra + + + + + Kadabra + + + + + Alakazam + + + + + Machop + + + + + Machoke + + + + + Machamp + + + + + Bellsprout + + + + + Weepinbell + + + + + Victreebel + + + + + Tentacool + + + + + Tentacruel + + + + + Geodude + + + + + Graveler + + + + + Golem + + + + + Ponyta + + + + + Rapidash + + + + + Slowpoke + + + + + Slowbro + + + + + Magnemite + + + + + Magneton + + + + + Farfetch'd + + + + + Doduo + + + + + Dodrio + + + + + Seel + + + + + Dewgong + + + + + Grimer + + + + + Muk + + + + + Shellder + + + + + Cloyster + + + + + Gastly + + + + + Haunter + + + + + Gengar + + + + + Onix + + + + + Drowzee + + + + + Hypno + + + + + Krabby + + + + + Kingler + + + + + Voltorb + + + + + Electrode + + + + + Exeggcute + + + + + Exeggutor + + + + + Cubone + + + + + Marowak + + + + + Hitmonlee + + + + + Hitmonchan + + + + + Lickitung + + + + + Koffing + + + + + Weezing + + + + + Rhyhorn + + + + + Rhydon + + + + + Chansey + + + + + Tangela + + + + + Kangaskhan + + + + + Horsea + + + + + Seadra + + + + + Goldeen + + + + + Seaking + + + + + Staryu + + + + + Starmie + + + + + Mr. Mime + + + + + Scyther + + + + + Jynx + + + + + Electabuzz + + + + + Magmar + + + + + Pinsir + + + + + Tauros + + + + + Magikarp + + + + + Gyarados + + + + + Lapras + + + + + Ditto + + + + + Eevee + + + + + Vaporeon + + + + + Jolteon + + + + + Flareon + + + + + Porygon + + + + + Omanyte + + + + + Omastar + + + + + Kabuto + + + + + Kabutops + + + + + Aerodactyl + + + + + Snorlax + + + + + Articuno + + + + + Zapdos + + + + + Moltres + + + + + Dratini + + + + + Dragonair + + + + + Dragonite + + + + + Mewtwo + + + + + Mew + + + + + Pichu + + + + + Cleffa + + + + + Igglybuff + + + + + Togepi + + + + + Togetic + + + + + Smoochum + + + + + Elekid + + + + + Magby + + + + @@ -865,32 +1689,4 @@ - - - - - - Found no matching IV. - 找不出符合的 IV 值。 - - - - - Candela, leader of Team Valor, says: - Valor 隊隊長 Candela 說： - - - - - Blanche, leader of Team Mystic, says: - Mystic 隊隊長 Blanche 說： - - - - - Spark, leader of Team Instinct, says: - Instinct 隊隊長 Spark 說： - - -