diff --git a/README.md b/README.md index 8c5b227..0445228 100644 --- a/README.md +++ b/README.md @@ -8,14 +8,14 @@ **PokéNurse** is a desktop application for Windows and Mac that allows you to manage your pokémon from Pokémon Go without the need for a mobile device. You can now favorite, transfer, and evolve from the comfort of your own home! -## Downloads for v2.3.0 +## Downloads for v2.3.1 You may view all the releases [here](https://github.com/vinnymac/PokeNurse/releases) -* [macOS](https://github.com/vinnymac/PokeNurse/releases/download/v2.3.0/PokeNurse.dmg) -* [Windows](https://github.com/vinnymac/PokeNurse/releases/download/v2.3.0/PokeNurse.exe) -* [Debian 32 bit](https://github.com/vinnymac/PokeNurse/releases/download/v2.3.0/PokeNurse-ia32.deb) -* [Debian 64 bit](https://github.com/vinnymac/PokeNurse/releases/download/v2.3.0/PokeNurse-x64.deb) -* [AppImage 32 bit](https://github.com/vinnymac/PokeNurse/releases/download/v2.3.0/PokeNurse-ia32.AppImage) -* [AppImage 64 bit](https://github.com/vinnymac/PokeNurse/releases/download/v2.3.0/PokeNurse-x64.AppImage) +* [macOS](https://github.com/vinnymac/PokeNurse/releases/download/v2.3.1/PokeNurse.dmg) +* [Windows](https://github.com/vinnymac/PokeNurse/releases/download/v2.3.1/PokeNurse.exe) +* [Debian 32 bit](https://github.com/vinnymac/PokeNurse/releases/download/v2.3.1/PokeNurse-ia32.deb) +* [Debian 64 bit](https://github.com/vinnymac/PokeNurse/releases/download/v2.3.1/PokeNurse-x64.deb) +* [AppImage 32 bit](https://github.com/vinnymac/PokeNurse/releases/download/v2.3.1/PokeNurse-ia32.AppImage) +* [AppImage 64 bit](https://github.com/vinnymac/PokeNurse/releases/download/v2.3.1/PokeNurse-x64.AppImage) ## Examples ![Login Window](app/loginExample.png) @@ -81,6 +81,7 @@ The API Hashing service is a paid service that allows third party Pokémon GO de ## Credit * [cyraxx](https://github.com/cyraxx) for [pogobuf](https://github.com/cyraxx/pogobuf) and [node-pogo-protos](https://github.com/cyraxx/node-pogo-protos) * [AeonLucid](https://github.com/AeonLucid) for [POGOProtos](https://github.com/AeonLucid/POGOProtos) +* [PkParaíso](https://www.pkparaiso.com) for the [animated sprites](https://www.pkparaiso.com/xy/sprites_pokemon.php), licensed under [CC BY-NC-ND 3.0](https://creativecommons.org/licenses/by-nc-nd/3.0/) ## Legal This Project is in no way affiliated with, authorized, maintained, sponsored or endorsed by Niantic, The Pokémon Company, Nintendo or any of its affiliates or subsidiaries. This is an independent and unofficial API for educational use ONLY. Using the Project might be against the TOS diff --git a/app/actions/authenticate.js b/app/actions/authenticate.js index ee8c986..6a640e9 100644 --- a/app/actions/authenticate.js +++ b/app/actions/authenticate.js @@ -50,7 +50,7 @@ export default { } // Use default API version - if (hashingKey) options.version = apiVersion || 5704 + if (hashingKey) options.version = apiVersion || 6100 const client = new pogobuf.Client(options) diff --git a/app/actions/trainer.js b/app/actions/trainer.js index b1a2488..90adbf9 100644 --- a/app/actions/trainer.js +++ b/app/actions/trainer.js @@ -159,6 +159,10 @@ function parseInventory(inventory) { .map(utils.getName) .join('/') + const pokemonCostume = utils.getCostume(p.pokemon_display.costume) + const pokemonGender = utils.getGender(p.pokemon_display.gender) + const pokemonForm = utils.getForm(p.pokemon_display.form) + const quickMoves = pokemonSetting.quick_moves.map(m => getMove(type, moveSettings, m, true)) const cinematicMoves = pokemonSetting.cinematic_moves.map(m => getMove(type, moveSettings, m, false)) @@ -207,7 +211,11 @@ function parseInventory(inventory) { // Multiply by -1 for sorting favorite: p.favorite * -1, move_1: move1, - move_2: move2 + move_2: move2, + costume: pokemonCostume, + gender: pokemonGender, + shiny: p.pokemon_display.shiny, + form: pokemonForm } const speciesIndex = p.pokemon_id - 1 diff --git a/app/imgs/3d/129-fs.webp b/app/imgs/3d/129-fs.webp new file mode 100644 index 0000000..4bc9564 Binary files /dev/null and b/app/imgs/3d/129-fs.webp differ diff --git a/app/imgs/3d/129-s.webp b/app/imgs/3d/129-s.webp new file mode 100644 index 0000000..6b5ebce Binary files /dev/null and b/app/imgs/3d/129-s.webp differ diff --git a/app/imgs/3d/130-fs.webp b/app/imgs/3d/130-fs.webp new file mode 100644 index 0000000..5e781b4 Binary files /dev/null and b/app/imgs/3d/130-fs.webp differ diff --git a/app/imgs/3d/130-s.webp b/app/imgs/3d/130-s.webp new file mode 100644 index 0000000..ba9089e Binary files /dev/null and b/app/imgs/3d/130-s.webp differ diff --git a/app/package.json b/app/package.json index 80b0c6f..54ca3bb 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "PokeNurse", "productName": "PokeNurse", - "version": "2.3.0", + "version": "2.3.1", "description": "A tool for Pokémon Go to aid in transferring and evolving Pokémon", "main": "./main.js", "author": { @@ -12,8 +12,8 @@ "license": "MIT", "dependencies": { "async-file": "^2.0.2", - "electron-localshortcut": "^1.0.0", - "node-pogo-protos": "2.7.0", + "electron-localshortcut": "1.1.1", + "node-pogo-protos": "2.9.1", "pogobuf": "1.10.0" } } diff --git a/app/screens/Detail/components/ModalBody.js b/app/screens/Detail/components/ModalBody.js index 6682af2..e741bf3 100644 --- a/app/screens/Detail/components/ModalBody.js +++ b/app/screens/Detail/components/ModalBody.js @@ -5,6 +5,7 @@ import QuickMove from './QuickMove' import CinematicMove from './CinematicMove' import Nickname from './Nickname' import Evolutions from './Evolutions' +import utils from '../../../utils' class ModalBody extends React.Component { static propTypes = { @@ -31,7 +32,7 @@ class ModalBody extends React.Component { render() { const { transform, - name, + // name, hp, cp, pokemon, @@ -75,7 +76,8 @@ class ModalBody extends React.Component { title="Listen to Cry" alt="Profile Sprite" id="pokemon_profile_sprite" - src={`./imgs/3d/${pokemon.pokemon_id}.webp`} + src={this.handleSprite(pokemon)} + onError={() => { document.getElementById('pokemon_profile_sprite').src = `./imgs/3d/${pokemon.pokemon_id}.webp` }} />