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.

Sign up for GitHub

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

Jump to bottom

Refactor evolve_all worker #2244

Merged
merged 12 commits into from
Aug 2, 2016
Merged

Refactor evolve_all worker #2244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e8eeb75
Refactor evolve_all worker
Aug 1, 2016
78ec43e
remove unnecessary debug lines
Aug 1, 2016
becba45
Add missing candy name
Aug 1, 2016
7c67db1
Use uncached inventory to have up to date amount of candy and list of…
Aug 2, 2016
5c9e90e
Fix candy name
Aug 2, 2016
1009dfa
Fix evolving logic:
Aug 2, 2016
a5ebc21
Rename EvolveAll to EvolvePokemon task name
achretien Aug 2, 2016
0fac08c
Add error warning about task renaming
Aug 2, 2016
a11acb6
Add a test about tasl renaming
Aug 2, 2016
1e4d374
Fix task renaming warning
Aug 2, 2016
495a3e9
Merge remote-tracking branch 'origin/dev' into refactor_evolve_all
Aug 2, 2016
7901b40
Update new api wrapper
Aug 2, 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
13 changes: 8 additions & 5 deletions configs/config.json.cluster.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,15 @@
"type": "TransferPokemon"
},
{
"type": "EvolveAll",
"type": "EvolvePokemon",
"config": {
"evolve_all": "NONE",
"evolve_cp_min": 300,
"evolve_speed": 20,
"use_lucky_egg": false
"evolve_all": "none",
"first_evolve_by": "cp",
"evolve_above_cp": 500,
"evolve_above_iv": 0.8,
"logic": "or",
"evolve_speed": 20,
"use_lucky_egg": false
}
},
{
Expand Down
13 changes: 8 additions & 5 deletions configs/config.json.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,15 @@
"type": "TransferPokemon"
},
{
"type": "EvolveAll",
"type": "EvolvePokemon",
"config": {
"evolve_all": "NONE",
"evolve_cp_min": 300,
"evolve_speed": 20,
"use_lucky_egg": false
"evolve_all": "none",
"first_evolve_by": "cp",
"evolve_above_cp": 500,
"evolve_above_iv": 0.8,
"logic": "or",
"evolve_speed": 20,
"use_lucky_egg": false
}
},
{
Expand Down
13 changes: 8 additions & 5 deletions configs/config.json.path.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,15 @@
"type": "TransferPokemon"
},
{
"type": "EvolveAll",
"type": "EvolvePokemon",
"config": {
"evolve_all": "NONE",
"evolve_cp_min": 300,
"evolve_speed": 20,
"use_lucky_egg": false
"evolve_all": "none",
"first_evolve_by": "cp",
"evolve_above_cp": 500,
"evolve_above_iv": 0.8,
"logic": "or",
"evolve_speed": 20,
"use_lucky_egg": false
}
},
{
Expand Down
13 changes: 8 additions & 5 deletions configs/config.json.pokemon.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,15 @@
"type": "TransferPokemon"
},
{
"type": "EvolveAll",
"type": "EvolvePokemon",
"config": {
"evolve_all": "NONE",
"evolve_cp_min": 300,
"evolve_speed": 20,
"use_lucky_egg": false
"evolve_all": "none",
"first_evolve_by": "cp",
"evolve_above_cp": 500,
"evolve_above_iv": 0.8,
"logic": "or",
"evolve_speed": 20,
"use_lucky_egg": false
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pokemongo_bot/cell_workers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from catch_lured_pokemon import CatchLuredPokemon
from catch_visible_pokemon import CatchVisiblePokemon
from evolve_all import EvolveAll
from evolve_pokemon import EvolvePokemon
from incubate_eggs import IncubateEggs
from move_to_fort import MoveToFort
from nickname_pokemon import NicknamePokemon
Expand Down
290 changes: 0 additions & 290 deletions pokemongo_bot/cell_workers/evolve_all.py
View file
Open in desktop

This file was deleted.

Loading