fix setup.sh failing on macOSX

Switch to 12b2028cbf19342efd971020033027802b569769 of pgoapi, the latest doesn't work. show what kind of egg is being hatched (PokemonGoF#4219) Add spin message (PokemonGoF#4226) List Pokemon bag at bot start (PokemonGoF#4189) * - Added option to print Pokemon Bag when bot starts - Using self.logger to log multiple lines * Little code change - Some progress making it customizable, to be possible to choose which info to show from each pokemon to show * Update ListPokemonBag functionality * Code tweaked to use inventory * Nested config with 3 parameters * Configs to change settings: show amount of each pokemon; pokemon info to show * Added config example to all config example files * typo fix Added UpdateLiveInventory config (PokemonGoF#3950) * Added UpdateLiveInventory function * Added UpdateLiveInventory function * Fix no EOF empty line * Updated UpdateLiveInventory function, more customizable now * More configs on UpdateLiveInventory * - Changed to self.logger instead of event when using multiple lines config - When using multiple lines config emits event at debug level * Minor tweak and merge with PokemonGoF/dev * Fixed config.json.example * Updated CONTRIBUTORS.md Removed proto folder, we don't need it anymore. Removed the old inventory / only one call to the api (PokemonGoF#3948) * Removed every call to the old inventory Added some messages to monitor item inventory Added some methods needed on the new inventory * Removed print * Removed print * Keeps track of candy on pokemon catch * Dynamically count candy gained * Rename pokemon id in pokemon unique id * Fixed typo Some clean up * Renamed pokemon id in unique_id * Now display again stats on start * Now use ultraball on non vip too * Merge branch 'dev' of https://github.com/PokemonGoF/PokemonGo-Bot into remove-old-inventory Now move to map use cached inventory Removed log.logger() Minor fixes after removed the old inventory (PokemonGoF#4231) Pokestops / Evolves / Transfers Logged to DB (PokemonGoF#4232) * Pokestop Logging * Evolve Logging * evolve_log.py migrations * transfer_log.py migration * pokestop_log.py migration * Update transfer_pokemon.py * Update transfer_pokemon.py Revert "Pokestops / Evolves / Transfers Logged to DB" (PokemonGoF#4239) Hotfix/remove old inventory (PokemonGoF#4238) * Updated configuration documentation after PokemonGoF#4005 * Updated configuration documentation of walk * Renamed id in unique_id Added functions to get pokemon inventory size * Removed variable used for test purpose * Computing candy awarded instead of taking only the first value * Reverted to use json again * Calling the api instead of the removed inventory * Fixed PokemonGoF#4237 Not calling old inventory to get available lucky egg count Polyline rework (PokemonGoF#3854) * added better rng * forgot adding * rework on polyline * remove wrong files... * remove wrong files... * reverting unnecessory change... * minor fix * get the CI pass * fix test * minor fix Features/missed throws (PokemonGoF#4107) * Adds a missed shot opportunity. This will reduce the 100% hit rate and humanise the throwing behaviour. * * Added the new value to config.json.example. * A little house cleaning * Fixing error in logic * Changing sleep for action_delay * * Updated config example * Fixed simulation changes * Fixes bugs Configurable altitude range (PokemonGoF#4250) * Added alt_min/alt_max * Changed default values * Added alt * Cleaned up speed calc * Added altitude randomness * Added altitude randomness * Added altitude randomness * Fixed import * Added altitude randomness * Added altitude randomness * Fixed import * Added alt_min/alt_max * Added alt_min/alt_max * Added alt_min/alt_max * Switch to walk_min, walk_max * Added alt_min/alt_max * Added alt_min/alt_max
rawgni · Aug 19, 2016 · 830fc6b · 830fc6b
1 parent 2368fea
commit 830fc6b
Show file tree

Hide file tree

Showing 39 changed files with 829 additions and 2,046 deletions.
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -72,3 +72,8 @@
  * net8q
  * SyncX
  * umbreon222
+<<<<<<< HEAD
+ * rawgni
+=======
+ * DeXtroTip
+>>>>>>> ff25dc6... Added UpdateLiveInventory config (#3950)
diff --git a/configs/config.json.cluster.example b/configs/config.json.cluster.example
@@ -48,6 +48,15 @@
           "terminal_title": true
         }
       },
+      {
+        "type": "UpdateLiveInventory",
+        "config": {
+          "enabled": false,
+          "min_interval": 120,
+          "show_all_multiple_lines": false,
+          "items": ["space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
+        }
+      },
       {
         "type": "TransferPokemon",
         "config": {
@@ -139,8 +148,20 @@
       "max_circle_size": 50,
       "cache_recent_forts": true
     },
+    "pokemon_bag": {
+      "// if 'show_at_start' is true, it will log all the pokemons in the bag (not eggs) at bot start": {},
+      "show_at_start": true,
+      "// if 'show_count' is true, it will show the amount of each pokemon (minimum 1)": {},
+      "show_count": false,
+      "// 'pokemon_info' parameter define which info to show for each pokemon": {},
+      "// the available options are": {},
+      "// ['cp', 'iv_ads', 'iv_pct', 'ivcp', 'ncp', 'level', 'hp', 'moveset', 'dps']": {},
+      "pokemon_info": ["cp", "iv_pct"]
+    },
     "walk_max": 4.16,
     "walk_min": 2.16,
+    "alt_min": 0.75,
+    "alt_max": 2.5,
     "debug": false,
     "test": false,
     "health_record": true,

diff --git a/configs/config.json.example b/configs/config.json.example
@@ -58,6 +58,15 @@
           "terminal_title": true
         }
       },
+      {
+        "type": "UpdateLiveInventory",
+        "config": {
+          "enabled": false,
+          "min_interval": 120,
+          "show_all_multiple_lines": false,
+          "items": ["space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
+        }
+      },
       {
         "type": "TransferPokemon",
         "config": {
@@ -115,7 +124,8 @@
             "great_rate": 0.5,
             "nice_rate": 0.3,
             "normal_rate": 0.1,
-            "spin_success_rate" : 0.6
+            "spin_success_rate" : 0.6,
+            "hit_rate": 0.75
           },
           "catch_simulation": {
             "flee_count": 3,
@@ -157,8 +167,20 @@
       "max_circle_size": 50,
       "cache_recent_forts": true
     },
+    "pokemon_bag": {
+      "// if 'show_at_start' is true, it will log all the pokemons in the bag (not eggs) at bot start": {},
+      "show_at_start": true,
+      "// if 'show_count' is true, it will show the amount of each pokemon (minimum 1)": {},
+      "show_count": false,
+      "// 'pokemon_info' parameter define which info to show for each pokemon": {},
+      "// the available options are": {},
+      "// ['cp', 'iv_ads', 'iv_pct', 'ivcp', 'ncp', 'level', 'hp', 'moveset', 'dps']": {},
+      "pokemon_info": ["cp", "iv_pct"]
+    },
     "walk_max": 4.16,
     "walk_min": 2.16,
+    "alt_min": 0.75,
+    "alt_max": 2.5,
     "debug": false,
     "test": false,
     "health_record": true,

diff --git a/configs/config.json.map.example b/configs/config.json.map.example
@@ -48,6 +48,15 @@
           "terminal_title": true
         }
       },
+      {
+        "type": "UpdateLiveInventory",
+        "config": {
+          "enabled": false,
+          "min_interval": 120,
+          "show_all_multiple_lines": false,
+          "items": ["space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
+        }
+      },
       {
         "type": "TransferPokemon",
         "config": {
@@ -139,6 +148,7 @@
           "update_map": true,
           "mode": "priority",
           "map_path": "raw_data",
+          "walker": "StepWalker",
           "catch": {
             "==========Legendaries==========": 0,
             "Aerodactyl": 1000,
@@ -391,8 +401,20 @@
       "max_circle_size": 50,
       "cache_recent_forts": true
     },
+    "pokemon_bag": {
+      "// if 'show_at_start' is true, it will log all the pokemons in the bag (not eggs) at bot start": {},
+      "show_at_start": true,
+      "// if 'show_count' is true, it will show the amount of each pokemon (minimum 1)": {},
+      "show_count": false,
+      "// 'pokemon_info' parameter define which info to show for each pokemon": {},
+      "// the available options are": {},
+      "// ['cp', 'iv_ads', 'iv_pct', 'ivcp', 'ncp', 'level', 'hp', 'moveset', 'dps']": {},
+      "pokemon_info": ["cp", "iv_pct"]
+    },
     "walk_max": 4.16,
     "walk_min": 2.16,
+    "alt_min": 0.75,
+    "alt_max": 2.5,
     "debug": false,
     "test": false,
     "health_record": true,

diff --git a/configs/config.json.optimizer.example b/configs/config.json.optimizer.example
@@ -48,6 +48,15 @@
           "terminal_title": true
         }
       },
+        {
+            "type": "UpdateLiveInventory",
+            "config": {
+                "enabled": false,
+                "min_interval": 120,
+                "show_all_multiple_lines": false,
+                "items": ["space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
+            }
+        },
         {
             "type": "PokemonOptimizer",
             "config": {
@@ -205,8 +214,20 @@
       "max_circle_size": 50,
       "cache_recent_forts": true
     },
+    "pokemon_bag": {
+      "// if 'show_at_start' is true, it will log all the pokemons in the bag (not eggs) at bot start": {},
+      "show_at_start": true,
+      "// if 'show_count' is true, it will show the amount of each pokemon (minimum 1)": {},
+      "show_count": false,
+      "// 'pokemon_info' parameter define which info to show for each pokemon": {},
+      "// the available options are": {},
+      "// ['cp', 'iv_ads', 'iv_pct', 'ivcp', 'ncp', 'level', 'hp', 'moveset', 'dps']": {},
+      "pokemon_info": ["cp", "iv_pct"]
+    },
     "walk_max": 4.16,
     "walk_min": 2.16,
+    "alt_min": 0.75,
+    "alt_max": 2.5,
     "debug": false,
     "test": false,
     "health_record": true,

diff --git a/configs/config.json.path.example b/configs/config.json.path.example
@@ -48,6 +48,15 @@
           "terminal_title": true
         }
       },
+      {
+        "type": "UpdateLiveInventory",
+        "config": {
+          "enabled": false,
+          "min_interval": 120,
+          "show_all_multiple_lines": false,
+          "items": ["space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
+        }
+      },
       {
         "type": "TransferPokemon",
         "config": {
@@ -140,8 +149,20 @@
       "avoid_circles": true,
       "max_circle_size": 50
     },
+    "pokemon_bag": {
+      "// if 'show_at_start' is true, it will log all the pokemons in the bag (not eggs) at bot start": {},
+      "show_at_start": true,
+      "// if 'show_count' is true, it will show the amount of each pokemon (minimum 1)": {},
+      "show_count": false,
+      "// 'pokemon_info' parameter define which info to show for each pokemon": {},
+      "// the available options are": {},
+      "// ['cp', 'iv_ads', 'iv_pct', 'ivcp', 'ncp', 'level', 'hp', 'moveset', 'dps']": {},
+      "pokemon_info": ["cp", "iv_pct"]
+    },
     "walk_max": 4.16,
     "walk_min": 2.16,
+    "alt_min": 0.75,
+    "alt_max": 2.5,
     "debug": false,
     "test": false,
     "health_record": true,

diff --git a/configs/config.json.pokemon.example b/configs/config.json.pokemon.example
@@ -48,6 +48,15 @@
           "terminal_title": true
         }
       },
+      {
+        "type": "UpdateLiveInventory",
+        "config": {
+          "enabled": false,
+          "min_interval": 120,
+          "show_all_multiple_lines": false,
+          "items": ["space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
+        }
+      },
       {
         "type": "TransferPokemon",
         "config": {
@@ -147,8 +156,20 @@
       "max_circle_size": 50,
       "cache_recent_forts": true
     },
+    "pokemon_bag": {
+      "// if 'show_at_start' is true, it will log all the pokemons in the bag (not eggs) at bot start": {},
+      "show_at_start": true,
+      "// if 'show_count' is true, it will show the amount of each pokemon (minimum 1)": {},
+      "show_count": false,
+      "// 'pokemon_info' parameter define which info to show for each pokemon": {},
+      "// the available options are": {},
+      "// ['cp', 'iv_ads', 'iv_pct', 'ivcp', 'ncp', 'level', 'hp', 'moveset', 'dps']": {},
+      "pokemon_info": ["cp", "iv_pct"]
+    },
     "walk_max": 4.16,
     "walk_min": 2.16,
+    "alt_min": 0.75,
+    "alt_max": 2.5,
     "debug": false,
     "test": false,
     "health_record": true,

diff --git a/pokecli.py b/pokecli.py
@@ -39,6 +39,7 @@
 from pgoapi.exceptions import NotLoggedInException, ServerSideRequestThrottlingException, ServerBusyOrOfflineException
 from geopy.exc import GeocoderQuotaExceeded
 
+from pokemongo_bot import inventory
 from pokemongo_bot import PokemonGoBot, TreeConfigBuilder
 from pokemongo_bot.base_dir import _base_dir
 from pokemongo_bot.health_record import BotEvent
@@ -455,6 +456,46 @@ def _json_loader(filename):
         type=int,
         default=10
     )
+    add_config(
+        parser,
+        load,
+        long_flag="--pokemon_bag.show_at_start",
+        help="Logs all pokemon in the bag at bot start",
+        type=bool,
+        default=False
+    )
+    add_config(
+        parser,
+        load,
+        long_flag="--pokemon_bag.show_count",
+        help="Shows the amount of which pokemon (minimum 1)",
+        type=bool,
+        default=False
+    )
+    add_config(
+        parser,
+        load,
+        long_flag="--pokemon_bag.pokemon_info",
+        help="List with the info to show for each pokemon",
+        type=bool,
+        default=[]
+    )
+    add_config(
+        parser,
+        load,
+        long_flag="--alt_min",
+        help="Minimum random altitude",
+        type=float,
+        default=0.75
+    )
+    add_config(
+        parser,
+        load,
+        long_flag="--alt_max",
+        help="Maximum random altitude",
+        type=float,
+        default=2.5
+    )
     # Start to parse other attrs
     config = parser.parse_args()
     if not config.username and 'username' not in load: