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

Dev merge to master, PR #3334

Merged
merged 76 commits into from
Aug 9, 2016
Merged
Changes from 1 commit
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
85f7607
Adding plugin support (#2679)
elicwhite Aug 7, 2016
f114be6
Moving the base task to the project root (#2702)
elicwhite Aug 7, 2016
0b319bc
Adding a heartbeat to the analytics (#2709)
elicwhite Aug 7, 2016
1c369a4
Don't double track clients
elicwhite Aug 7, 2016
e16b5ea
Fix 'local variable 'bot' referenced before assignment'
elicwhite Aug 7, 2016
e93431c
Providing an error if tasks don't work for the given api (#2732)
elicwhite Aug 7, 2016
d5bb09f
Fix for utf8 encoding when catching lured pokemon (#2720)
dkim1000 Aug 7, 2016
420c1be
Fix For catchable not being displayed on the web (#2719)
AcorpBG Aug 7, 2016
77200af
Added encrypt.so compilation process to Dockerfile (#2695)
Aug 7, 2016
e927195
OS Detection for encrypt lib (#2768)
brantje Aug 7, 2016
4f7888b
Fix Typo in unexpected_response_retry (#2531)
peter-bonanni Aug 7, 2016
e8f804a
Revert "changing license from MIT to GPLv3"
douglascamata Aug 7, 2016
27cf678
Merge branch 'dev' of github.com:PokemonGoF/PokemonGo-Bot into dev
douglascamata Aug 7, 2016
4eb7b38
When the google analytics domain is blocked the bot crashed. (#2764)
brantje Aug 7, 2016
6960f35
Fixes #2698 - Prevents "Possibly searching too often" error after re-…
geek-man Aug 7, 2016
eeecbc6
Support loading plugins from .zip files (#2766)
elicwhite Aug 7, 2016
2750255
Keep track of how many pokemon released (#2884)
bixuanzju Aug 7, 2016
823ba83
Setting Library path to work with encrypt.so (#2899)
bernardoVale Aug 7, 2016
fc4e802
:sparkles: Added login and username to available stats (#2494)
Aug 7, 2016
e5b7eda
[dev] small fixes (#2912)
mjmadsen Aug 7, 2016
dee28d9
Rename load_path to load_plugin (#2947)
elicwhite Aug 7, 2016
0855dac
Adding some logic for pulling plugins from github (#2967)
elicwhite Aug 8, 2016
a1733b9
flush after title update (#2977)
mhdasding Aug 8, 2016
e66c509
correctly re-raise exception to keep backtrace (#2944)
rbignon Aug 8, 2016
bdcf251
Update MoveToMapPokemon to use events instead of logger. (#2913)
chrisle Aug 8, 2016
95902d6
Config/encrypt.so (#2964)
DevScarabyte Aug 8, 2016
41ed10c
Fixed mispelling for "formatted" variable (#2984)
middleagedman Aug 8, 2016
563f898
Loading plugins from Github (#2992)
elicwhite Aug 8, 2016
229381c
Fixed #3000 (#3003)
raulgbcr Aug 8, 2016
1a18b9f
Added MaxPotion inventory count to summary. (#3015)
JaapMoolenaar Aug 8, 2016
4faf962
Added cleanup of download and files for encrypt.so after they are no …
Aug 8, 2016
7cc524e
Fix bot not returning back after telepoting (#3014)
bixuanzju Aug 8, 2016
283c17e
Fix Dockerfile installation (#3057)
nikofil Aug 8, 2016
351ea76
Fix for #3045 (#3055)
cmezh Aug 8, 2016
20aeb90
Added request to check configuration (#3089)
mjmadsen Aug 8, 2016
ff380cd
Fixed Dockerfile - missing \ on command lines (#3096)
middleagedman Aug 8, 2016
a5e9131
Fix for FileIO slowing bot performance.This puts the map writing into…
ajurna Aug 8, 2016
d8546d7
Change word usage: "fled" to "escaped" (#3118)
DeviousFusion Aug 8, 2016
0b3aa4f
Update the example config file (#3120)
hklcf Aug 8, 2016
d0f60a2
typo: logrmation -> information (#2601)
gokaygurcan Aug 8, 2016
f648be3
Change fled to escaped (#3129)
pmquan Aug 8, 2016
47ab81f
When JSON parsing fails, give a rough indication of why (#3137)
cwild Aug 8, 2016
c8a33bc
Handle Github Download Zip Format (#3108)
elicwhite Aug 8, 2016
625275c
Merge branch 'master' into dev
solderzzc Aug 8, 2016
5fb1f04
Merge branch 'dev' of https://github.com/PokemonGoF/PokemonGo-Bot int…
solderzzc Aug 8, 2016
4b16e9d
Refactor catch worker (#2527)
pokepal Aug 8, 2016
597196e
Added Run-Loop (#3143)
devn0ll Aug 9, 2016
ec3babc
fixing loop in spin fort task (#3165)
douglascamata Aug 9, 2016
a2b9fe9
Some love for the vim users (#3154)
gurupras Aug 9, 2016
8a2a52b
Updated README with link to desktop version (#3208)
JVenberg Aug 9, 2016
5e3179b
Fix for #3190 (#3197)
bigkraig Aug 9, 2016
e4c54dc
MoveToMap: Add minimum balls to run (#3166)
pmquan Aug 9, 2016
61b6854
added config to ignore item count for Spin and MoveToFort (#3160)
douglascamata Aug 9, 2016
03d7f92
[Inventory Management] Add a central class for caching/parsing invent…
aeckert Aug 9, 2016
f6d73af
Keeping a cache of gym information (#3236)
elicwhite Aug 9, 2016
ce9eb2b
New Option: "dont_nickname_favorite" (#2496)
aceradryd Aug 9, 2016
7e699dd
Restart the loop when catching pokemon and there are more to catch (#…
elicwhite Aug 9, 2016
e73d302
fixed NameError: global name 'pokemon_name' is not defined (#3244)
schubter Aug 9, 2016
8203f36
Stop fetching gym details (#3245)
elicwhite Aug 9, 2016
4c95259
Checking all forts for lured pokemon (#3163)
douglascamata Aug 9, 2016
d420823
Fix flooding of keep_best_release (#3223)
phphong Aug 9, 2016
0f9351e
[Feature] Recycle Threshold (#2465)
Aug 9, 2016
49f9177
Call heartbeat on step_walker even if speed is higher than distance (…
lucasfevi Aug 9, 2016
59f55fd
Return an empty list if no pokemon are available. (#3259)
poupas Aug 9, 2016
79266a0
Allow UpdateTitleStats to emit events instead of rewriting the consol…
Aug 9, 2016
b3d8d86
Updating our issue and PR templates to be more helpful (#3262)
elicwhite Aug 9, 2016
1060afa
Dev (#3277)
mvrska Aug 9, 2016
f4b4c28
Update pgoapi to a newer version (#3241)
eriweb Aug 9, 2016
3e1dc1b
Fix unexpected egg incubation retry (#3276)
eevee-github Aug 9, 2016
0f2bddd
has_next_evolution is a function not a property (#3284)
thebigjc Aug 9, 2016
2ded2ee
Powerful setup.sh (#3263)
simonsmh Aug 9, 2016
e03f834
Added +x to run.sh
solderzzc Aug 9, 2016
c8aaf4b
Added a configuration option "path_startmode" (conflict merge #2489) …
JaapMoolenaar Aug 9, 2016
80a307e
Adding documentation for how to use and write plugins (#3254)
elicwhite Aug 9, 2016
932fd2b
Updating link to the plugin docs in the readme
elicwhite Aug 9, 2016
6bcc631
Merge branch 'master' into dev
solderzzc Aug 9, 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
added config to ignore item count for Spin and MoveToFort (#3160)
douglascamata authored and elicwhite committed Aug 9, 2016

Verified

This commit was signed with the committer’s verified signature.
pradyunsg Pradyun Gedam
commit 61b6854c8c78789c7ee3343df48cb96b25f229a9
9 changes: 5 additions & 4 deletions pokemongo_bot/cell_workers/move_to_fort.py
Original file line number Diff line number Diff line change
@@ -13,17 +13,18 @@ class MoveToFort(BaseTask):

def initialize(self):
self.lure_distance = 0
self.lure_attraction = True #self.config.get("lure_attraction", True)
self.lure_max_distance = 2000 #self.config.get("lure_max_distance", 2000)
self.lure_attraction = self.config.get("lure_attraction", True)
self.lure_max_distance = self.config.get("lure_max_distance", 2000)
self.ignore_item_count = self.config.get("ignore_item_count", False)

def should_run(self):
has_space_for_loot = self.bot.has_space_for_loot()
if not has_space_for_loot:
self.emit_event(
'inventory_full',
formatted="Not moving to any forts as there aren't enough space. You might want to change your config to recycle more items if this message appears consistently."
formatted="Inventory is full. You might want to change your config to recycle more items if this message appears consistently."
)
return has_space_for_loot or self.bot.softban
return has_space_for_loot or self.ignore_item_count or self.bot.softban

def is_attracted(self):
return (self.lure_distance > 0)
8 changes: 5 additions & 3 deletions pokemongo_bot/cell_workers/spin_fort.py
Original file line number Diff line number Diff line change
@@ -15,14 +15,16 @@
class SpinFort(BaseTask):
SUPPORTED_TASK_API_VERSION = 1

def initialize(self):
self.ignore_item_count = self.config.get("ignore_item_count", False)

def should_run(self):
if not self.bot.has_space_for_loot():
self.emit_event(
'inventory_full',
formatted="Not moving to any forts as there aren't enough space. You might want to change your config to recycle more items if this message appears consistently."
formatted="Inventory is full. You might want to change your config to recycle more items if this message appears consistently."
)
return False
return True
return self.ignore_item_count or self.bot.has_space_for_loot()

def work(self):
fort = self.get_fort_in_range()