Dev merge to master, PR

.github/ISSUE_TEMPLATE.md

@@ -1,12 +1,3 @@
-# We are aware that there are mass bans of different magnitudes being experienced by a lot of the bot users with symptoms such as:
-1. Bot being able to login, and catch pokemon but NOT spin forts
-2. Bot being able to login, NOT catch pokemon (vanishing) but able to spin forts
-4. Some accounts not being able to login at all
-
-We are also aware of the getting stuck between 2 forts and getting caught in an infinite loop
-
-# If any issues are created relating to the above KNOWN issues they will be closed without reason
-
 ## Stop! Before you create this issue (you can delete this section when opening the issue):
 1. Have you validated that your config.json is valid JSON? Use http://jsonlint.com/ to check.
 2. Have you searched to see if there are other issues for the same issue? If so, comment on that issue instead.
@@ -28,6 +19,5 @@ your config here
 
 ### Other Information
 OS:
-Branch: dev or master
 Git Commit: (run 'git log -n 1 --pretty=format:"%H"' and paste it here)
 Python Version: (run 'python -V' and paste it here)

.gitignore

@@ -101,6 +101,7 @@ share/
 # PyCharm IDE settings
 .idea/
 *.iml
+out/
 
 # Personal load details
 src/
@@ -119,6 +120,7 @@ configs/*
 !configs/config.json.map.example
 !configs/path.example.json
 !config.json.cluster.example
+!config.json.optimizer.example
 
 # Virtualenv folders
 bin/

CONTRIBUTORS.md

@@ -64,4 +64,8 @@
  * cmezh
  * Nivong
  * kestel
+ * simonsmh
  * joaodragao
+ * extink
+ * Quantra
+ * pmquan

Dockerfile

@@ -1,15 +1,13 @@
 FROM python:2.7
 
 WORKDIR /usr/src/app
-VOLUME ["/usr/app/configs", "/usr/src/app/web"]
+VOLUME ["/usr/src/app/configs", "/usr/src/app/web"]
 
 ARG timezone=Etc/UTC
 RUN echo $timezone > /etc/timezone \
     && ln -sfn /usr/share/zoneinfo/$timezone /etc/localtime \
     && dpkg-reconfigure -f noninteractive tzdata
 
-RUN apt-get update \
-    && apt-get install -y python-protobuf
 RUN cd /tmp && wget "http://pgoapi.com/pgoencrypt.tar.gz" \
     && tar zxvf pgoencrypt.tar.gz \
     && cd pgoencrypt/src \

Procfile

@@ -0,0 +1 @@
+worker: python pokecli.py $EXTRA_ARGS

configs/config.json.cluster.example

@@ -4,7 +4,7 @@
     "password": "YOUR_PASSWORD",
     "location": "SOME_LOCATION",
     "gmapkey": "GOOGLE_MAPS_API_KEY",
-    "libencrypt_location": "",
+    "encrypt_location": "",
     "tasks": [
       {
         "type": "HandleSoftBan"
@@ -100,6 +100,7 @@
     "reconnecting_timeout": 15,
     "catch_randomize_reticle_factor": 1.0,
     "catch_randomize_spin_factor": 1.0,
+    "min_ultraball_to_keep": 10,
     "logging_color": true,
     "catch": {
       "any": {"catch_above_cp": 0, "catch_above_iv": 0, "logic": "or"},

configs/config.json.example

@@ -4,7 +4,7 @@
     "password": "YOUR_PASSWORD",
     "location": "SOME_LOCATION",
     "gmapkey": "GOOGLE_MAPS_API_KEY",
-    "libencrypt_location": "",
+    "encrypt_location": "",
     "tasks": [
       {
         "type": "HandleSoftBan"
@@ -101,7 +101,8 @@
     "map_object_cache_time": 5,
     "forts": {
       "avoid_circles": true,
-      "max_circle_size": 50
+      "max_circle_size": 50,
+      "cache_recent_forts": true
     },
     "websocket_server": false,
     "walk": 4.16,
@@ -115,12 +116,20 @@
     "reconnecting_timeout": 15,
     "catch_randomize_reticle_factor": 1.0,
     "catch_randomize_spin_factor": 1.0,
+    "min_ultraball_to_keep": 10,
     "logging_color": true,
     "catch": {
       "any": {"catch_above_cp": 0, "catch_above_iv": 0, "logic": "or"},
       "// Example of always catching Rattata:": {},
       "// Rattata": { "always_catch" : true }
     },
+    "catch_throw_parameters": {
+      "excellent_rate": 0.1,
+      "great_rate": 0.5,
+      "nice_rate": 0.3,
+      "normal_rate": 0.1,
+      "spin_success_rate" : 0.6
+    },
     "release": {
       "any": {"release_below_cp": 0, "release_below_iv": 0, "logic": "or"},
       "// Example of always releasing Rattata:": {},

configs/config.json.map.example

@@ -4,7 +4,7 @@
     "password": "YOUR_PASSWORD",
     "location": "SOME_LOCATION",
     "gmapkey": "GOOGLE_MAPS_API_KEY",
-    "libencrypt_location": "",
+    "encrypt_location": "",
     "tasks": [
       {
         "type": "HandleSoftBan"
@@ -342,6 +342,7 @@
     "reconnecting_timeout": 15,
     "catch_randomize_reticle_factor": 1.0,
     "catch_randomize_spin_factor": 1.0,
+    "min_ultraball_to_keep": 10,
     "logging_color": true,
     "catch": {
       "any": {"catch_above_cp": 0, "catch_above_iv": 0, "logic": "or"},

configs/config.json.optimizer.example

@@ -0,0 +1,156 @@
+{
+    "auth_service": "google",
+    "username": "YOUR_USERNAME",
+    "password": "YOUR_PASSWORD",
+    "location": "SOME_LOCATION",
+    "gmapkey": "GOOGLE_MAPS_API_KEY",
+    "encrypt_location": "",
+    "tasks": [
+        {
+            "type": "HandleSoftBan"
+        },
+        {
+            "type": "CollectLevelUpReward"
+        },
+        {
+            "type": "IncubateEggs",
+            "config": {
+                "longer_eggs_first": true
+            }
+        },
+        {
+            "type": "PokemonOptimizer",
+            "config": {
+                    "// the 'transfer' parameter activate or deactivate the transfer of pokemons": {},
+                    "// at false, no pokemon is going to be transfered, ever": {},
+                    "// at false, you will still get the log information of what the optimizer": {},
+                    "// would have transfered if the parameter was true": {},
+                "transfer": true,
+                    "// the 'evolve' parameter activate or deactivate the evolution of pokemons": {},
+                    "// at false, no pokemon is going to be evolved, ever": {},
+                    "// at false, you will still get the log information of what the": {},
+                    "// optimizer would have evolved if the parameter was true": {},
+                "evolve": true,
+                    "// the 'use_candies_for_xp' parameter let you choose if you want the optimizer": {},
+                    "// to use your candies to evolve low quality pokemons in order to maximize your xp": {},
+                    "// at false, the optimizer will still use candies to evolve your best Pokemons": {},
+                "use_candies_for_xp": true,
+                    "// the 'use_lucky_egg' parameter let you choose if you want the optimizer": {},
+                    "// to use a lucky egg right before evolving Pokemons. At false; the optimizer": {},
+                    "// is free to evolve Pokemons even if you do not have any lucky egg.": {},
+                "use_lucky_egg": true,
+                    "// the 'evolve_only_with_lucky_egg' parameter let you choose if you want the optimizer": {},
+                    "// to only Evolve Pokemons when a lucky egg is available": {},
+                "evolve_only_with_lucky_egg": true,
+                    "// the 'minimum_evolve_for_lucky_egg' parameter let you define the minimum": {},
+                    "// number of Pokemons that must evolve before using a lucky egg": {},
+                    "// If that number is not reached, and evolve_only_with_lucky_egg is true, evolution will be skipped": {},
+                    "// If that number is not reached, and evolve_only_with_lucky_egg is false,": {},
+                    "// evolution will be performed without using a lucky egg": {},
+                "minimum_evolve_for_lucky_egg": 90,
+                    "// the 'keep' parameter let you define what pokemons you consider are the 'best'. These Pokemons": {},
+                    "// will be keep and evolved. Note that Pokemons are evaluated inside their whole family": {},
+                    "// Multiple way of ranking can be defined. Following configuration let you keep the best iv,": {},
+                    "// the best ncp and the best cp": {},
+                "keep": [
+                    {
+                            "// Following setting let you keep the best iv of the family": {},
+                            "// the 'top' parameter allow you to define how many Pokemons you want to keep": {},
+                            "// at the top of your ranking. If several Pokemons get the same score, they are": {},
+                            "// considered equal. Thus, top=1 might result in keeping more than 1 Pokemon.": {},
+                        "top": 1,
+                            "// the 'evolve' parameter let you choose if you want to evolve the Pokemons you keep": {},
+                        "evolve": true,
+                            "// the 'sort' parameter define how you want to rank your pokemons": {},
+                            "// Critera are sorted fro, the most important to the least important.": {},
+                            "// Available criteria are:": {},
+                            "// 'iv' = individual value": {},
+                            "// 'ivcp' = iv weigted so that for equal iv, attack > defense > stamina": {},
+                            "// 'cp' = combat power (can be increased with candies)": {},
+                            "// 'cp_exact' = combar power (not rounded)": {},
+                            "// 'ncp' (normalized cp) or 'cp_percent' = ratio cp / max_cp": {},
+                            "// iv_attack = attach component of iv": {},
+                            "// iv_defense = defense component of iv": {},
+                            "// iv_stamina = stamina component of iv": {},
+                            "// dps = raw dps based on the moves of the pokemon": {},
+                            "// dps_attack = average dps when attacking": {},
+                            "// dps_defense = average dps when defending": {},
+                            "// Note that the more criteria you add to this list, the less likely Pokemons": {},
+                            "// will be equals": {},
+                        "sort": ["iv"]
+                    },
+                    {
+                        "// Following setting let you keep keep the best normalized cp of the family": {},
+                        "// That is the Pokemon with higher CP once fully evolved": {},
+                        "top": 1,
+                        "evolve": true,
+                        "sort": ["ncp"]
+                    },
+                    {
+                        "// Following setting let you keep keep the best cp of the family.": {},
+                        "// But will not evolve it further (in favor of the best ncp)": {},
+                        "top": 1,
+                        "evolve": false,
+                        "sort": ["cp"]
+                    }
+                ]
+            }
+        },
+        {
+            "type": "RecycleItems",
+            "config": {
+                "min_empty_space": 15,
+                "item_filter": {
+                    "Pokeball": { "keep": 100 },
+                    "Potion": { "keep": 10 },
+                    "Super Potion": { "keep": 20 },
+                    "Hyper Potion": { "keep": 30 },
+                    "Revive": { "keep": 30 },
+                    "Razz Berry": { "keep": 100 }
+                }
+            }
+        },
+        {
+            "type": "CatchVisiblePokemon"
+        },
+        {
+            "type": "CatchLuredPokemon"
+        },
+        {
+            "type": "SpinFort",
+            "config": {
+                "ignore_item_count": true
+            }
+        },
+        {
+            "type": "MoveToFort",
+            "config": {
+                "lure_attraction": true,
+                "lure_max_distance": 2000,
+                "ignore_item_count": true
+            }
+        }
+    ],
+    "map_object_cache_time": 5,
+    "forts": {
+        "avoid_circles": true,
+        "max_circle_size": 50
+    },
+    "websocket_server": true,
+    "walk": 4.16,
+    "action_wait_min": 1,
+    "action_wait_max": 4,
+    "debug": false,
+    "test": false,
+    "health_record": false,
+    "location_cache": true,
+    "distance_unit": "km",
+    "reconnecting_timeout": 15,
+    "min_ultraball_to_keep": 10,
+    "logging_color": true,
+    "catch": {
+        "any": {
+            "always_catch": true
+        }
+    }
+}

configs/config.json.path.example

@@ -4,7 +4,7 @@
     "password": "YOUR_PASSWORD",
     "location": "SOME_LOCATION",
     "gmapkey": "GOOGLE_MAPS_API_KEY",
-    "libencrypt_location": "",
+    "encrypt_location": "",
     "tasks": [
       {
         "type": "HandleSoftBan"
@@ -102,6 +102,7 @@
     "reconnecting_timeout": 15,
     "catch_randomize_reticle_factor": 1.0,
     "catch_randomize_spin_factor": 1.0,
+    "min_ultraball_to_keep": 10,
     "logging_color": true,
     "catch": {
       "any": {"catch_above_cp": 0, "catch_above_iv": 0, "logic": "or"},

configs/config.json.pokemon.example

@@ -4,7 +4,7 @@
     "password": "YOUR_PASSWORD",
     "location": "SOME_LOCATION",
     "gmapkey": "GOOGLE_MAPS_API_KEY",
-    "libencrypt_location": "",
+    "encrypt_location": "",
     "tasks": [
       {
         "type": "HandleSoftBan"
@@ -108,6 +108,7 @@
     "reconnecting_timeout": 15,
     "catch_randomize_reticle_factor": 1.0,
     "catch_randomize_spin_factor": 1.0,
+    "min_ultraball_to_keep": 10,
     "logging_color": true,
     "catch": {
       "any": {"catch_above_cp": 0, "catch_above_iv": 0, "logic": "or" },