From 40fe1a01074d0099fdbd1b8f05f608619c62c246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Wed, 25 Oct 2017 16:38:43 +0800 Subject: [PATCH] =?UTF-8?q?*=20Added=20the=20Pok=C3=A9mon=20image=20icon?= =?UTF-8?q?=20of=20Raikou.=20*=20Added=20Sableye,=20Shuppet,=20Banette,=20?= =?UTF-8?q?Duskull,=20and=20Dusclops=20from=20the=20Hoenn=20Region.=20*=20?= =?UTF-8?q?Advanced=20to=20version=200.7.7.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PokemonGoIV/3Data.vb | 9 +++- PokemonGoIV/9Load.vb | 18 ++++---- VERSION | 2 +- excludes/pokemongoiv.update.xml | 4 +- oxt/AddonConfiguration.xcu | 62 +++++++++++++++++++++++++++- oxt/PokemonGoIV/3Data.xba | 9 +++- oxt/PokemonGoIV/9Load.xba | 18 ++++---- oxt/icons/pokemons/243-raikou.png | Bin 0 -> 6054 bytes oxt/icons/pokemons/302-sableye.png | Bin 0 -> 1456 bytes oxt/icons/pokemons/353-shuppet.png | Bin 0 -> 1505 bytes oxt/icons/pokemons/354-banette.png | Bin 0 -> 2674 bytes oxt/icons/pokemons/355-duskull.png | Bin 0 -> 2064 bytes oxt/icons/pokemons/356-dusclops.png | Bin 0 -> 4386 bytes 13 files changed, 96 insertions(+), 26 deletions(-) create mode 100644 oxt/icons/pokemons/243-raikou.png create mode 100644 oxt/icons/pokemons/302-sableye.png create mode 100644 oxt/icons/pokemons/353-shuppet.png create mode 100644 oxt/icons/pokemons/354-banette.png create mode 100644 oxt/icons/pokemons/355-duskull.png create mode 100644 oxt/icons/pokemons/356-dusclops.png 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 0000000000000000000000000000000000000000..9df6512a178fe33adbeda52121c22a040ec14390 GIT binary patch literal 6054 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 Hu0mjf%n{)_ literal 0 HcmV?d00001 diff --git a/oxt/icons/pokemons/354-banette.png b/oxt/icons/pokemons/354-banette.png new file mode 100644 index 0000000000000000000000000000000000000000..dbb73f36a98cf0cf0391ee9d749fb0ccb18375d0 GIT binary patch literal 2674 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 literal 0 HcmV?d00001 diff --git a/oxt/icons/pokemons/355-duskull.png b/oxt/icons/pokemons/355-duskull.png new file mode 100644 index 0000000000000000000000000000000000000000..9d05184c338c7e4025a7e1864aea8a0ad63c369f GIT binary patch literal 2064 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 c>2iMX-#