Dev merge to master, PR #3564

solderzzc · 2016-08-11T06:45:51Z

Merge code to master from dev branch

* Adding plugin support * Adding an empty __init__.py

* Moving the base task to the project root * Moving the base class more * Changing the import again

* Adding a heartbeat to the analytics * Heartbeat every 30 seconds, not every 5

* Fixing lure pokestop encoding * fixing lure encoding

* Fix For catchable not being displayed on the web * Update catch_visible_pokemon.py

Fix 32bit check, darwin and linux use the same file Make it a function Check if file exists, if not show error Define file_name first Fix return Check if file exists, if not show error Print info about paths Fix for 32/64bit detection

fixes #2525 #2523

This reverts commit 69fb64f.

With a simple try / except this can be solved. Fix dirty catch all

…login. (#2771) * Fixes #2698 - Added api.activate_signature call to prevent issue after re-login. - Also replaced deprecated log call with event_manager emit to prevent exception being thrown. * Modified to use OS detected library path as per PR #2768

Setting LD_LIBRARY_PATH on Dockerfile

Added a player_data property in PokemonGoBot to access player data from outside Added unit tests for login and username stats Added tests for call args when updating the window title Added a platform-specific test for window title updating on win32 platform

* Fixed emit_event typo * Update CONTRIBUTORS.md * Changed initialization location for "bot" We use bot in main exception on 128 * Update pokecli.py

* Add config option for libencrypt.so * Correctly set the config value and check for the file in said dir

* Checking github plugin file existence * Loading plugins from github

Fixed syntax error on "move_to_map_pokemon.py" that makes the client crash when using this feature.

Short Description: The Max Potion count was missing from the inventory summary. Was #2456

* Update TransferPokemon to use new Inventory Class * Use base_dir * Don't release pokemon if bot is on test mode

Minor text fix.

* Update install.sh Fix path * Update setup.sh fix path * Update run.sh fix path

Fix evolution error in pokemon.json

Improve formatting consistency

* Update setup.sh fix typo * Update run.sh fix typo

* Give the possiblity to disable a task in config without removing it from the config file * Put exmple only in nickname task * Add Unit testing * typo * Use enabled false as exemple

Changed auth to be more specifik and added right permissions.

Previously IV was computed in each worker. Now its fetched from inventory. This was left over and not called in the worker at all.

fix the logic of showing the date

Short Description: Ensures you that item Recycling happens if you have more items than the total bag capacity. When you level up, you are awarded items which can cause the bag to be over the capacity.

@achretien

…, etc.. (#3455) * Add "level to CP multiplier" data Data is from justinleewells/pogo-optimizer: https://github.com/justinleewells/pogo-optimizer/blob/edd692d/data/game/level-to-cpm.json * Many improvements & additions for the inventory logic - LevelToCPm, FastAttacks, ChargedAttacks, Movesets - More info for each pokemon: attacks data, percent to max cp, IV CP perfection * Add PyCharm/IDEA *.iml (project file) to ignored * Fixes, improvements & refactoring for inventory.py - Return inadvertently deleted pieces of code (thanks to @achretien) - Evolution logic fixes - Other minor fixes - Moveset logic moved to Moveset class * Fix data for pokemons & charged moves * Inventory tests: pokemon data, LevelToCPm, attacks * Fix travis build * Fix info for Hitmonlee & Hitmonchan

…on level, etc.." (#3549)

run.bat with persistent loop

* Fix error when MoveToFort called from handle_soft_ban.py * Added myself to CONTRIBUTORS.md

…tamina info fix (#3550) * Revert "Revert "Better inventory: attacks & movesets, IV CP perfection, pokemon level, etc.." (#3549)" This reverts commit e9b229e. * Fix BaseDefense/BaseStamina and type info Fixed BaseDefense/BaseStamina info (was mixed up) Fixed type info for Mr. Mime, Clefairy, Clefable, Jigglypuff, Wigglytuff Added check for correctness of exact CP value calculation * Fixed list of charged attacks for Venonat * Don't kill bot in case of unexpected moveset, use fallback + better error message

elicwhite and others added 30 commits August 7, 2016 00:14

Adding plugin support (#2679)

85f7607

* Adding plugin support * Adding an empty __init__.py

Moving the base task to the project root (#2702)

f114be6

* Moving the base task to the project root * Moving the base class more * Changing the import again

Adding a heartbeat to the analytics (#2709)

0b319bc

* Adding a heartbeat to the analytics * Heartbeat every 30 seconds, not every 5

Don't double track clients

1c369a4

Fix 'local variable 'bot' referenced before assignment'

e16b5ea

Providing an error if tasks don't work for the given api (#2732)

e93431c

Fix for utf8 encoding when catching lured pokemon (#2720)

d5bb09f

* Fixing lure pokestop encoding * fixing lure encoding

Fix For catchable not being displayed on the web (#2719)

420c1be

* Fix For catchable not being displayed on the web * Update catch_visible_pokemon.py

Added encrypt.so compilation process to Dockerfile (#2695)

77200af

OS Detection for encrypt lib (#2768)

e927195

Fix 32bit check, darwin and linux use the same file Make it a function Check if file exists, if not show error Define file_name first Fix return Check if file exists, if not show error Print info about paths Fix for 32/64bit detection

Fix Typo in unexpected_response_retry (#2531)

4f7888b

fixes #2525 #2523

Revert "changing license from MIT to GPLv3"

e8f804a

This reverts commit 69fb64f.

Merge branch 'dev' of github.com:PokemonGoF/PokemonGo-Bot into dev

27cf678

When the google analytics domain is blocked the bot crashed. (#2764)

4eb7b38

With a simple try / except this can be solved. Fix dirty catch all

Support loading plugins from .zip files (#2766)

eeecbc6

Keep track of how many pokemon released (#2884)

2750255

Setting Library path to work with encrypt.so (#2899)

823ba83

Setting LD_LIBRARY_PATH on Dockerfile

[dev] small fixes (#2912)

e5b7eda

* Fixed emit_event typo * Update CONTRIBUTORS.md * Changed initialization location for "bot" We use bot in main exception on 128 * Update pokecli.py

Rename load_path to load_plugin (#2947)

dee28d9

Adding some logic for pulling plugins from github (#2967)

0855dac

flush after title update (#2977)

a1733b9

correctly re-raise exception to keep backtrace (#2944)

e66c509

Update MoveToMapPokemon to use events instead of logger. (#2913)

bdcf251

Config/encrypt.so (#2964)

95902d6

* Add config option for libencrypt.so * Correctly set the config value and check for the file in said dir

Fixed mispelling for "formatted" variable (#2984)

41ed10c

Loading plugins from Github (#2992)

563f898

* Checking github plugin file existence * Loading plugins from github

Fixed #3000 (#3003)

229381c

Fixed syntax error on "move_to_map_pokemon.py" that makes the client crash when using this feature.

Added MaxPotion inventory count to summary. (#3015)

1a18b9f

Short Description: The Max Potion count was missing from the inventory summary. Was #2456

douglascamata and others added 29 commits August 10, 2016 01:34

typo :D

c556b48

let's use dict.get a bit to avoid errors

9c1a943

keeping the account in the remote command response

61df52f

Add ColoredLoggingHandler (#3198)

9f9146c

Update TransferPokemon to use new Inventory Class (#3320)

8b5af8d

* Update TransferPokemon to use new Inventory Class * Use base_dir * Don't release pokemon if bot is on test mode

Some text fixes for setup.sh (#3390)

310f578

Minor text fix.

Fix path of shells in install.sh (#3393)

b3f9e0f

* Update install.sh Fix path * Update setup.sh fix path * Update run.sh fix path

Fix evolution error in pokemon.json (#3344)

67fe00b

Fix evolution error in pokemon.json

Improve formatting consistency in transfer_pokemon.py (#3397)

01bc14d

Improve formatting consistency

Merge branch 'refactor-for-webui' into dev

41de6f7

Remove unnecessary file

d22c5b2

Put info on the next line in run.sh (#3422)

0c3c4c0

* Update setup.sh fix typo * Update run.sh fix typo

Fix Struct() argument 1 must be string, not unicode. (#3375)

72622b4

Give the possibility to disable a task without removing it (#3417)

558540e

* Give the possiblity to disable a task in config without removing it from the config file * Put exmple only in nickname task * Add Unit testing * typo * Use enabled false as exemple

fix config creation (#3482)

99187ab

Changed auth to be more specifik and added right permissions.

Remove unused IV calculation from evolve_pokemon (#3487)

edeb2c2

Previously IV was computed in each worker. Now its fetched from inventory. This was left over and not called in the worker at all.

Don't show Inventory full event if we set "ignore_item_count" (#3440)

f823d77

Fix showing the date in run.sh (#3433)

9ae1b78

fix the logic of showing the date

Typo fix: show new catch rate after berry throw. (#3521)

1183b93

Fix stdout is not a terminal (#3511)

41e5758

Ensure recycling happens if bag is over capacity. (#3531)

e60da10

Short Description: Ensures you that item Recycling happens if you have more items than the total bag capacity. When you level up, you are awarded items which can cause the bag to be over the capacity.

Revert "Better inventory: attacks & movesets, IV CP perfection, pokem…

e9b229e

…on level, etc.." (#3549)

run.bat for windows (#3542)

9ccadcd

run.bat with persistent loop

Fix error when MoveToFort called from handle_soft_ban.py (#3500)

847154d

* Fix error when MoveToFort called from handle_soft_ban.py * Added myself to CONTRIBUTORS.md

Blacklisting tejado from getting mentioned by the mention-bot

f7975bb

Moving wiki pages to docs folder

a8242f7

Merge branch 'master' into dev

04d4c26

solderzzc merged commit d7cb7df into master Aug 11, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dev merge to master, PR #3564

Dev merge to master, PR #3564

solderzzc commented Aug 11, 2016

Dev merge to master, PR #3564

Dev merge to master, PR #3564

Conversation

solderzzc commented Aug 11, 2016