diff --git a/PokemonGoIV/3Data.vb b/PokemonGoIV/3Data.vb index ce94bce..1f5e2fa 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-07-20 +' by imacat , 2017-10-25 ' Generated with 9Load.subReadDataSheets () Option Explicit @@ -271,7 +271,12 @@ Function fnGetBaseStatsData As Variant Array ("Tyranitar", "248", 200, 251, 212, Array ()), _ Array ("Lugia", "249", 212, 193, 323, Array ()), _ Array ("HoOh", "250", 212, 263, 301, Array ()), _ - Array ("Celebi", "251", 200, 210, 210, Array ())) + Array ("Celebi", "251", 200, 210, 210, Array ()), _ + Array ("Sableye", "302", 100, 141, 141, Array ()), _ + Array ("Shuppet", "353", 88, 138, 66, Array ("Banette")), _ + Array ("Banette", "354", 128, 218, 127, Array ()), _ + Array ("Duskull", "355", 40, 70, 162, Array ("Dusclops")), _ + Array ("Dusclops", "356", 80, 124, 234, Array ())) End Function ' fnGetCPMData: Returns the combat power multiplier data. diff --git a/PokemonGoIV/9Load.vb b/PokemonGoIV/9Load.vb index 31892af..6bebe7b 100644 --- a/PokemonGoIV/9Load.vb +++ b/PokemonGoIV/9Load.vb @@ -200,23 +200,23 @@ Function fnFindEvolveForms (mData As Variant, nI As Integer) As String Exit Function End If - For nJ = 6 To 8 + For nJ = 8 To 10 If mData (nI) (nJ) = mData (nI) (0) Then nStart = nJ + 1 - nJ = 9 + nJ = 11 End If Next nJ - If nStart = 9 Then - nEnd = 8 + If nStart = 11 Then + nEnd = 10 Else - For nJ = nStart To 8 + For nJ = nStart To 10 If mData (nI) (nJ) = "" Then nEnd = nJ - 1 - nJ = 9 + nJ = 11 Else - If nJ = 8 Then - nEnd = 8 - nJ = 9 + If nJ = 10 Then + nEnd = 10 + nJ = 11 End If End If Next nJ diff --git a/VERSION b/VERSION index c006218..879be8a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.7.6 +0.7.7 diff --git a/excludes/pokemongoiv.update.xml b/excludes/pokemongoiv.update.xml index 833c948..b7f44b6 100644 --- a/excludes/pokemongoiv.update.xml +++ b/excludes/pokemongoiv.update.xml @@ -2,8 +2,8 @@ - + - + diff --git a/oxt/AddonConfiguration.xcu b/oxt/AddonConfiguration.xcu index 8433cff..a4f4919 100644 --- a/oxt/AddonConfiguration.xcu +++ b/oxt/AddonConfiguration.xcu @@ -2188,6 +2188,41 @@ Celebi + + + Sableye + 勾魂眼 + Zobiris + + + + + Shuppet + 怨影娃娃 + Shuppet + + + + + Banette + 詛咒娃娃 + Banette + + + + + Duskull + 夜巡靈 + Zwirrlicht + + + + + Dusclops + 彷徨夜靈 + Zwirrklop + + @@ -3439,7 +3474,7 @@ - %origin%/icons/unknown.png + %origin%/icons/pokemons/243-raikou.png @@ -3482,5 +3517,30 @@ %origin%/icons/unknown.png + + + %origin%/icons/pokemons/302-sableye.png + + + + + %origin%/icons/pokemons/353-shuppet.png + + + + + %origin%/icons/pokemons/354-banette.png + + + + + %origin%/icons/pokemons/355-duskull.png + + + + + %origin%/icons/pokemons/356-dusclops.png + + diff --git a/oxt/PokemonGoIV/3Data.xba b/oxt/PokemonGoIV/3Data.xba index 752f26e..07b05be 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-07-20 +' by imacat <imacat@mail.imacat.idv.tw>, 2017-10-25 ' Generated with 9Load.subReadDataSheets () Option Explicit @@ -273,7 +273,12 @@ Function fnGetBaseStatsData As Variant Array ("Tyranitar", "248", 200, 251, 212, Array ()), _ Array ("Lugia", "249", 212, 193, 323, Array ()), _ Array ("HoOh", "250", 212, 263, 301, Array ()), _ - Array ("Celebi", "251", 200, 210, 210, Array ())) + Array ("Celebi", "251", 200, 210, 210, Array ()), _ + Array ("Sableye", "302", 100, 141, 141, Array ()), _ + Array ("Shuppet", "353", 88, 138, 66, Array ("Banette")), _ + Array ("Banette", "354", 128, 218, 127, Array ()), _ + Array ("Duskull", "355", 40, 70, 162, Array ("Dusclops")), _ + Array ("Dusclops", "356", 80, 124, 234, Array ())) End Function ' fnGetCPMData: Returns the combat power multiplier data. diff --git a/oxt/PokemonGoIV/9Load.xba b/oxt/PokemonGoIV/9Load.xba index adb7ae2..582b09b 100644 --- a/oxt/PokemonGoIV/9Load.xba +++ b/oxt/PokemonGoIV/9Load.xba @@ -202,23 +202,23 @@ Function fnFindEvolveForms (mData As Variant, nI As Integer) As String Exit Function End If - For nJ = 6 To 8 + For nJ = 8 To 10 If mData (nI) (nJ) = mData (nI) (0) Then nStart = nJ + 1 - nJ = 9 + nJ = 11 End If Next nJ - If nStart = 9 Then - nEnd = 8 + If nStart = 11 Then + nEnd = 10 Else - For nJ = nStart To 8 + For nJ = nStart To 10 If mData (nI) (nJ) = "" Then nEnd = nJ - 1 - nJ = 9 + nJ = 11 Else - If nJ = 8 Then - nEnd = 8 - nJ = 9 + If nJ = 10 Then + nEnd = 10 + nJ = 11 End If End If Next nJ diff --git a/oxt/icons/pokemons/243-raikou.png b/oxt/icons/pokemons/243-raikou.png new file mode 100644 index 0000000..9df6512 Binary files /dev/null and b/oxt/icons/pokemons/243-raikou.png differ diff --git a/oxt/icons/pokemons/302-sableye.png b/oxt/icons/pokemons/302-sableye.png new file mode 100644 index 0000000..4113176 Binary files /dev/null and b/oxt/icons/pokemons/302-sableye.png differ diff --git a/oxt/icons/pokemons/353-shuppet.png b/oxt/icons/pokemons/353-shuppet.png new file mode 100644 index 0000000..03ef19a Binary files /dev/null and b/oxt/icons/pokemons/353-shuppet.png differ diff --git a/oxt/icons/pokemons/354-banette.png b/oxt/icons/pokemons/354-banette.png new file mode 100644 index 0000000..dbb73f3 Binary files /dev/null and b/oxt/icons/pokemons/354-banette.png differ diff --git a/oxt/icons/pokemons/355-duskull.png b/oxt/icons/pokemons/355-duskull.png new file mode 100644 index 0000000..9d05184 Binary files /dev/null and b/oxt/icons/pokemons/355-duskull.png differ diff --git a/oxt/icons/pokemons/356-dusclops.png b/oxt/icons/pokemons/356-dusclops.png new file mode 100644 index 0000000..09e3487 Binary files /dev/null and b/oxt/icons/pokemons/356-dusclops.png differ