Inventory refactor#108
Merged
Grover-c13 merged 29 commits intoGrover-c13:masterfrom Jul 22, 2016
mjmjelde:inventory_refactor
Merged
Inventory refactor#108Grover-c13 merged 29 commits intoGrover-c13:masterfrom mjmjelde:inventory_refactor
Grover-c13 merged 29 commits intoGrover-c13:masterfrom
mjmjelde:inventory_refactor
Conversation
Added more data to EncounterResult
# Conflicts: # src/main/java/com/pokegoapi/api/map/Map.java
…ow (ie 0 pokeballs = use greatball, 0 greatballs use ultraball)
made catchPokemon() use the next tier pokeball if out of the tier below (ie 0 pokeballs = use greatball, 0 greatballs use ultraball)
Since we still commit PRs as branches into this repo Travis will build every PR twice plus the merge commit. This means three equal builds for nothing. We should save their resources and (for now) just build the master branch. That way a PR will only be built once plus the actual merge on master to update the build status badge.
Only build master pushes
Make server requests work over multiple threads at once
Owner
|
can you rebase and check it conforms to the style check, if all is good will merge |
…o reply correctly
automatically close the Response stream, even when the server fails to reply correctly
Fix/refresh auth ticket
…nventories when evolving or other similar tasks. Fixed code style
Contributor
Author
|
So many fixed and shit happened when I rebased this and fixed all the errors. Its all fixed now I believe |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Moved all the "inventory" based items out of the main api and into their own class. This is just an inital setup, and can be changed to fit other needs. Probably needs a bit more testing but works with my testing. Supports updating of inventory and not just a full update. May need to go to other classes and remove their interactions with the bags as when an update is called it could mess up. That part is untested.