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

First basic features of the pokemon optimizer #2956

Merged
merged 36 commits into from
Aug 12, 2016
Merged
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
204ad0e
catching every single pokemon nearby
douglascamata Aug 7, 2016
c9b25d6
catch lured pokemon in all forts nearby
douglascamata Aug 7, 2016
081d90d
adding run_interval to some tasks to avoid running all the time and m…
douglascamata Aug 7, 2016
4f3a744
added config to ignore item count for Spin and MoveToFort
douglascamata Aug 7, 2016
235f6bf
spinning all pokestops in range
douglascamata Aug 7, 2016
ec83d2b
Merge branch 'dev' of github.com:PokemonGoF/PokemonGo-Bot into faetur…
douglascamata Aug 7, 2016
1fd60e7
fixing loop in spin fort task
douglascamata Aug 7, 2016
1cc011c
First basic features of the pokemon optimizer
julienlavergne Aug 7, 2016
a894a32
For now, dry run only
julienlavergne Aug 8, 2016
7490bf8
Add cygwin to supported platform and improved log readability (#2948)
villish Aug 8, 2016
2a7a6cd
- Add dry_run and use_lucky_egg in config
julienlavergne Aug 8, 2016
e2e71f1
Merge remote-tracking branch 'origin/dev' into pokemon_optimizer
julienlavergne Aug 8, 2016
4b0faaa
Add lucky egg support when enough pokemon to evolve
julienlavergne Aug 8, 2016
a205de8
fixing returns
douglascamata Aug 8, 2016
8de542a
Merge branch 'faeture/xp-improvements' of github.com:PokemonGoF/Pokem…
douglascamata Aug 8, 2016
bb931f4
Merge branch 'dev' of github.com:PokemonGoF/PokemonGo-Bot into faetur…
douglascamata Aug 8, 2016
ef2bb53
Merge branch 'dev' of github.com:PokemonGoF/PokemonGo-Bot into faetur…
douglascamata Aug 8, 2016
e8fd901
Merge remote-tracking branch 'origin/dev' into pokemon_optimizer
julienlavergne Aug 8, 2016
ff1f5e4
Merge remote-tracking branch 'origin/faeture/xp-improvements' into po…
julienlavergne Aug 8, 2016
0514a94
- Support Eevee evolution scheme
julienlavergne Aug 9, 2016
d34f74c
Revert "Merge remote-tracking branch 'origin/faeture/xp-improvements'…
julienlavergne Aug 9, 2016
afcbf59
Merge remote-tracking branch 'origin/dev' into pokemon_optimizer
julienlavergne Aug 9, 2016
4d9375f
- Fix an issue in evolve_pokemon task
julienlavergne Aug 9, 2016
86fe6bb
Add missing inventory refresh at the end of the process
julienlavergne Aug 9, 2016
7d6a24b
Merge remote-tracking branch 'origin/dev' into pokemon_optimizer
julienlavergne Aug 9, 2016
0552e95
Merge remote-tracking branch 'origin/dev' into pokemon_optimizer
julienlavergne Aug 10, 2016
49f83e6
Add missing inventory refresh after catching a pokemon
julienlavergne Aug 10, 2016
15fb493
Add parameters "transfer" and "evolve" to activate/deactivate corresp…
julienlavergne Aug 10, 2016
45905e5
Merge remote-tracking branch 'origin/dev' into pokemon_optimizer
julienlavergne Aug 10, 2016
f30cbf2
Move some functions around
julienlavergne Aug 10, 2016
ae6c278
Default lucky egg to false + had again parameter "evolve_only_with_lu…
julienlavergne Aug 11, 2016
0530d80
Fix qn issue with egg counting
julienlavergne Aug 11, 2016
3714221
Update configuration example
julienlavergne Aug 11, 2016
b880f58
Merge remote-tracking branch 'origin/dev' into pokemon_optimizer
julienlavergne Aug 11, 2016
4b02024
Upgrade to latest inventory
julienlavergne Aug 11, 2016
cbb54d8
Fix bug
julienlavergne Aug 12, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/dev' into pokemon_optimizer
Conflicts:
	data/pokemon.json
	pokemongo_bot/cell_workers/__init__.py
julienlavergne committed Aug 11, 2016
commit b880f58d58e938b25d3d0558ab71d0e45694afc1
11,661 changes: 5,826 additions & 5,835 deletions data/pokemon.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pokemongo_bot/cell_workers/__init__.py
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@
from move_to_map_pokemon import MoveToMapPokemon
from nickname_pokemon import NicknamePokemon
from pokemon_catch_worker import PokemonCatchWorker
from pokemon_optimizer import PokemonOptimizer
from transfer_pokemon import TransferPokemon
from recycle_items import RecycleItems
from spin_fort import SpinFort
@@ -17,5 +18,4 @@
from collect_level_up_reward import CollectLevelUpReward
from follow_cluster import FollowCluster
from sleep_schedule import SleepSchedule
from update_title_stats import UpdateTitleStats
from pokemon_optimizer import PokemonOptimizer
from update_live_stats import UpdateLiveStats
You are viewing a condensed version of this merge commit. You can view the full changes here.