Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0.57.2 Gen 2 Support #5918

Merged
merged 9 commits into from
Feb 21, 2017
Merged

0.57.2 Gen 2 Support #5918

merged 9 commits into from
Feb 21, 2017

Conversation

MerlionRock
Copy link
Contributor

@MerlionRock MerlionRock commented Feb 18, 2017

Pokemon and Pokemon Moves updated to Generation 2 support
Api check updated to 0.57
Login logger changes with new item information

EDIT: If anyone is getting these files, please also update together with the Gen 2 item support done by @atxfun

Pokemons updated with Gen 2 moves. Moves and it's values updated to Gen 2. Added upgrade stone information
Api check updated to 0.57
Login logger changes with new item information
@mention-bot
Copy link

@MerlionRock, thanks for your PR! By analyzing the history of the files in this pull request, we identified @AdaptCharm, @pogarek and @BreezeRo to be potential reviewers.

Pokemons will have both Gen 1 & Gen 2 moves
Contributed by @pogarek
Nidoran F & Nidoran M name correction
Energy can be negative, commented out test
Nidoran M & Nidoran F Correcrion again...
Change Transformed energy back to 7, change all charged move's energy back to positive values
@Zyrix
Copy link

Zyrix commented Feb 20, 2017

I think there is an error in pokemon.json
For generation II every pokemon has tackle as fast attack and struggle as charged attack.
IIRC these were just placeholders.

@MerlionRock
Copy link
Contributor Author

@Zyrix those are placeholders and won't affect anything.

A more accurate one is almost done by @pogarek

If this PR is not merged by then, I'll retrieve all the final files from him and replace them here. If it's committed, either him or myself will raise another PR.

No worries. Waiting for this to be merged so that people who are waiting gen 2 support can have it, as well as the minor correction to API check.

@solderzzc
Copy link
Contributor

solderzzc commented Feb 21, 2017

👍

Approved with PullApprove

@solderzzc solderzzc merged commit 34bc875 into PokemonGoF:dev Feb 21, 2017
davidakachaos added a commit to davidakachaos/PokemonGo-Bot that referenced this pull request Feb 21, 2017
* dev:
  Added Gen 2 Inventory Items (PokemonGoF#5924)
  0.57.2 Gen 2 Support (PokemonGoF#5918)
  Added Fedora > 17 support.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants