Dev merge to master, PR #3891
Merged
Dev merge to master, PR #3891
Conversation
This file contains 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
* 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
This reverts commit 69fb64f.
With a simple try / except this can be solved. Fix dirty catch all
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
Short Description: The Max Potion count was missing from the inventory summary. Was #2456
* Fix typo in config * Fix all configs * Fixed __init__.py thanks to @hklcf
…3593) * Update setup.sh * fixed for mac creating encrypt.so * for now just do wget or curl * this is all in the setup.sh * updated instructions to reflect setup.sh changes * Update installation.md * Update CONTRIBUTORS.md * Update setup.sh * Update installation.md * Update installation.md * Update installation.md * added missing submodule update * Update installation.md * Update installation.md * Update installation.md * Delete install.sh * Update .gitignore * Update installation.md * Update setup.sh * Update installation.md * Update run.sh add `source bin/activate` if someone forget to use virtualenv.
…3496) * Fix #3411. Update inventory info before every catch try otherwise old values used * Revert "Fix #3411. Update inventory info before every catch try otherwise old values used" This reverts commit f7678da. * Modify pokemon_catch_worker.py to use Inventory class * Fix forgotten line * Fix one more forgotten line * Added check if we really used berry or not * Fix KeyError in inventory.py When we have no items of type, there are no "count" key in the dict. * Revert "Fix KeyError in inventory.py" This reverts commit ed2769c. * Revert "Added check if we really used berry or not" This reverts commit 42e9d9c. * Revert "Fix one more forgotten line" This reverts commit 5fda3c4. * Revert "Fix forgotten line" This reverts commit a8edc57. * Revert "Modify pokemon_catch_worker.py to use Inventory class" This reverts commit 5b6e4d3. * Modify pokemon_catch_worker.py to use Inventory class and fix #3411
* Add Use Ultraball (#1) * Add `use_ultraball` event to Event Manager * Add use ultraball if pokeball + greatball = 0 * Add Use Ultraball if No Other Balls (#2) * Add `use_ultraball` event to Event Manager * Add use ultraball if pokeball + greatball = 0 * Add New Contributor * Revert "Add Use Ultraball" (#4) * Use Ultraball If No Other Balls (#3) * Add `use_ultraball` event to Event Manager * Add use ultraball if pokeball + greatball = 0 * Add New Contributor * Remove 'use_ultraball' event. * Remove `use_ultraball` event call * Update & add avoid catching Pokemon if no pokeball * Update conflict contributors * Add get `min_ultraball_to_keep` from config file * Improved `min_ultraball_to_keep` with condition * Added `min_ultraball_to_keep` option * Added `min_ultraball_to_keep` option * Added `min_ultraball_to_keep` option * Added `min_ultraball_to_keep` option * Add `min_ultraball_to_keep` option * Remove count all pokeballs * Resolved Conflicts
…nd evolve (#3738) * Add and Remove pokemon from the inventory cache when catch and release * Add dealing with evolved pokemon also * Add the evolved pokemon
* added bool option to cache recent forts -crf --forts.cache_recent_forts (default true)
saves recent_forts in data/recent-forts-{username}.json on spin
loads recent_forts from same file on start up
bot doesn't start a new recent_forts on every reset
* forgot contributor
* typo fix no_cached_forts
* changed all events related to caching forts to debug level
* caching of forts happens on sigterm/exception
handling of SIGTERM
-Note handling of SIGTERM in python2.7 with multi threads is not reliable. Child thread can recieve SIGTERM and it is not handled in pokecli.py; pokecli.py continues to run.
* Add Use Ultraball (#1) * Add `use_ultraball` event to Event Manager * Add use ultraball if pokeball + greatball = 0 * Add Use Ultraball if No Other Balls (#2) * Add `use_ultraball` event to Event Manager * Add use ultraball if pokeball + greatball = 0 * Add New Contributor * Revert "Add Use Ultraball" (#4) * Use Ultraball If No Other Balls (#3) * Add `use_ultraball` event to Event Manager * Add use ultraball if pokeball + greatball = 0 * Add New Contributor * Remove 'use_ultraball' event. * Remove `use_ultraball` event call * Update & add avoid catching Pokemon if no pokeball * Update conflict contributors * Add get `min_ultraball_to_keep` from config file * Improved `min_ultraball_to_keep` with condition * Added `min_ultraball_to_keep` option * Added `min_ultraball_to_keep` option * Added `min_ultraball_to_keep` option * Added `min_ultraball_to_keep` option * Add `min_ultraball_to_keep` option * Remove count all pokeballs * Resolved Conflicts * Change from `items_stock` to `ball_count`
…or 'nickname_template' option (#3756) * Add type information and classes - New classes: Type, Types - Usage of new classes anywhere in the Inventory - Tests coverage * Improve API for pokemons in Inventory - Added new class PokemonInfo for the static information loaded from json - API improved, added capture_rate and flee_rate - All covered with tests * Minor refactoring of inventory.py - Item class (moved to other instance classes) to keep file structure - Code style * Rewrite NicknamePokemon to use new Inventory sysem + add a lot of new keys for 'nickname_template' option + tests & documentation * Update documentaion for the new NicknamePokemon * Update documentaion for the new NicknamePokemon (again :)
editet Manual install Mac section
* `catch_randomize_reticle_factor` * `catch_randomize_spin_factor`
* catching every single pokemon nearby * catch lured pokemon in all forts nearby * adding run_interval to some tasks to avoid running all the time and minimum tick time of 5 seconds Tasks inheriting from BaseTask should use `self._update_last_ran` and `_time_to_run` if they want to implement the time based running. The config to set a custom timer is named `run_interval`. * added config to ignore item count for Spin and MoveToFort this works good with the `run_interval` configuration added to TransferPokemon and RecycleItem * spinning all pokestops in range * fixing loop in spin fort task * First basic features of the pokemon optimizer * For now, dry run only * Add cygwin to supported platform and improved log readability (#2948) * Add cygwin to supported platform and improved log readability * fixed formatting * - Add dry_run and use_lucky_egg in config - Evolve all pokemons together and only if enough for a full lucky egg (90). - Keep enough candies for consecutive evolutions of best pokemons - Only evolve the lowest rank of a family * Add lucky egg support when enough pokemon to evolve * fixing returns * - Support Eevee evolution scheme - Rename "use_lucky_egg" parameter in the more accurate "evolve_only_with_lucky_egg" * Revert "Merge remote-tracking branch 'origin/faeture/xp-improvements' into pokemon_optimizer" This reverts commit ff1f5e4, reversing changes made to e8fd901. * - Fix an issue in evolve_pokemon task - Use common inventory - Add configuration example * Add missing inventory refresh at the end of the process * Add missing inventory refresh after catching a pokemon * Add parameters "transfer" and "evolve" to activate/deactivate corresponding action. If both false, this is equivalent to a dry_run. Add parameters "use_lucky_egg" to allow task to use a lucky egg before evolve. Add parameter "minimum_evolve_for_lucky_egg" to add a requirement on the number of evolution before using a lucky egg. * Move some functions around * Default lucky egg to false + had again parameter "evolve_only_with_lucky_egg" * Fix qn issue with egg counting Add configuration parameter to allow customization of how pokemons are ranked in a family * Update configuration example * Upgrade to latest inventory * Fix bug * Add parameter "use_candies_for_xp" to activate/deactivate usage of candies to maximize xp Add comments in the configuration example * Add dps, dps_attack and dps_defense in available sorting keys. So you can now keep the best move. Add more comments in config Display ncp and dps for released and evolved pokemons * Update inventory when releasing and evolving pokemons * Display Pokemon Bag count update
* Fix looping between equidstant pokestops * :D
* Format iv_pct on 3 digits For better sorting on pokemon's name, format iv_pct on 3 digits. * Fix Nicknaming documentation sample usage Fix some nicknaming samble usage around the iv_pct which it now formatted on 3 digits.
* Ignoring compiled test python file of PyCharm * Now spinning fort keeps track of cached inventory * Now the pokemon_catch_worker keeps track of cached ITEMS (and only items, not pokemon) inventory * Minor improvements of the new inventory * Fixed key error * Minor improvements of the new inventory * Fixed attribute non existent * Removed duplicated import
* added locale support for NicknamePokemon added pokemon_de.json beautyfied pokemon.json * fallback to en instead of throwing runtime error * remove log * added locales: fr, ja, pt_br, ru, zh * minor fix
* Update installation.md * Create manual_installation.md * Update installation.md * Update manual_installation.md * Update manual_installation.md * Update manual_installation.md * Update manual_installation.md * Update manual_installation.md * Update manual_installation.md * Update manual_installation.md * Update manual_installation.md * Update manual_installation.md * Update manual_installation.md * Update manual_installation.md * Update manual_installation.md * added windows deps Hopefully it works I don’t have windows. * Update manual_installation.md * Update manual_installation.md * Update manual_installation.md * Update manual_installation.md * docker merged Added docker too * Update manual_installation.md * Update installation.md * Update installation.md * Update installation.md * Update installation.md * Update installation.md * Update installation.md * Update manual_installation.md * Update installation.md * Update installation.md * rename dir * v2 windows bat * Update manual_installation.md * Update installation.md
* Format iv_pct on 3 digits For better sorting on pokemon's name, format iv_pct on 3 digits. * Fix Nicknaming documentation sample usage Fix some nicknaming samble usage around the iv_pct which it now formatted on 3 digits. * Update nicknaming documentation Add missing options in the nicknaming documentation.
* Updated RecycleItems config documentations * Updated RecycleItems config documentations. Removed outdated informations
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Dev merge to master, PR