Merge pull request #4632 from PokemonGoF/dev

Dev merge to master
PokemonGoF · Aug 23, 2016 · 081c5e3 · 081c5e3
2 parents f448a77 + b5a8e1b
commit 081c5e3
Show file tree

Hide file tree

Showing 238 changed files with 2,403 additions and 302 deletions.
diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ If you'd like to make your own changes, make sure you follow the pull request te
 - [x] Incubate eggs
 - [ ] [Standalone Desktop Application] (https://github.com/PokemonGoF/PokemonGo-Bot-Desktop)
 - [ ] Use candy
-- [ ] Inventory cleaner
+- [x] Crowd Sourced Map Prototype
 
 ## Gym Battles
 This bot takes a strong stance against automating gym battles. Botting gyms will have a negative effect on most players and thus the game as a whole. We will thus never accept contributions or changes containing code specific for gym battles.
@@ -75,6 +75,7 @@ If you do not want any data to be gathered, you can turn off this feature by set
 - [elliottcarlson](https://github.com/elliottcarlson) for the Google Auth PR
 - [AeonLucid](https://github.com/AeonLucid/POGOProtos) for improved protos
 - [AHAAAAAAA](https://github.com/AHAAAAAAA/PokemonGo-Map) for parts of the s2sphere stuff
+- [breeze ro] for some of that map stuff
 
 
 [![Analytics](https://ga-beacon.appspot.com/UA-81468120-1/welcome-page-master)](https://github.com/igrigorik/ga-beacon)
diff --git a/configs/config.json.cluster.example b/configs/config.json.cluster.example
@@ -7,6 +7,7 @@
     "encrypt_location": "",
     "websocket_server": false,
     "heartbeat_threshold": 10,
+    "enable_social": true,
     "tasks": [
       {
         "type": "HandleSoftBan"
@@ -35,6 +36,7 @@
       {
         "type": "IncubateEggs",
         "config": {
+          "enabled": true,
           "longer_eggs_first": true,
           "min_interval": 120
         }
@@ -61,6 +63,7 @@
       {
         "type": "TransferPokemon",
         "config": {
+          "enabled": true,
           "min_free_slot": 5,
           "transfer_wait_min": 1,
           "transfer_wait_max": 4
@@ -77,18 +80,21 @@
       {
         "type": "EvolvePokemon",
         "config": {
+            "enabled": false,
             "evolve_all": "none",
             "first_evolve_by": "cp",
             "evolve_above_cp": 500,
             "evolve_above_iv": 0.8,
             "logic": "or",
-            "evolve_speed": 20,
+            "min_evolve_speed": 25,
+            "max_evolve_speed": 30,
             "use_lucky_egg": false
         }
       },
       {
         "type": "RecycleItems",
         "config": {
+          "enabled": true,
           "min_empty_space": 15,
           "max_balls_keep": 150,
           "max_potions_keep": 50,
@@ -106,43 +112,46 @@
           "recycle_wait_max": 4
         }
       },
-	    {
-	      "type": "CatchPokemon",
-	      "config": {
-	        "catch_visible_pokemon": true,
-	        "catch_lured_pokemon": true,
-	        "min_ultraball_to_keep": 5,
-	        "berry_threshold": 0.35,
-	        "vip_berry_threshold": 0.9,
-	        "catch_throw_parameters": {
-	          "excellent_rate": 0.1,
-	          "great_rate": 0.5,
-	          "nice_rate": 0.3,
-	          "normal_rate": 0.1,
-	          "spin_success_rate" : 0.6
-	        },
-				  "catch_simulation": {
-				    "flee_count": 3,
-				    "flee_duration": 2,
-				    "catch_wait_min": 2,
-				    "catch_wait_max": 6,
-				    "berry_wait_min": 2,
-				    "berry_wait_max": 3,
-				    "changeball_wait_min": 2,
-				    "changeball_wait_max": 3
-				  }
-	      }
-	    },
+      {
+        "type": "CatchPokemon",
+        "config": {
+          "enabled": true,
+          "catch_visible_pokemon": true,
+          "catch_lured_pokemon": true,
+          "min_ultraball_to_keep": 5,
+          "berry_threshold": 0.35,
+          "vip_berry_threshold": 0.9,
+          "catch_throw_parameters": {
+            "excellent_rate": 0.1,
+            "great_rate": 0.5,
+            "nice_rate": 0.3,
+            "normal_rate": 0.1,
+            "spin_success_rate" : 0.6
+          },
+          "catch_simulation": {
+            "flee_count": 3,
+            "flee_duration": 2,
+            "catch_wait_min": 2,
+            "catch_wait_max": 6,
+            "berry_wait_min": 2,
+            "berry_wait_max": 3,
+            "changeball_wait_min": 2,
+            "changeball_wait_max": 3
+          }
+        }
+      },
       {
         "type": "SpinFort",
         "config": {
+          "enabled": true,
           "spin_wait_min": 3,
           "spin_wait_max": 5
         }
       },
       {
         "type": "FollowCluster",
         "config": {
+            "enabled": true,
             "radius": 50,
             "lured": true
         }
@@ -190,8 +199,10 @@
       "// Pidgey": {"keep_best_cp": 3},
       "// Example of keeping 2 stronger (based on IV) Zubat:": {},
       "// Zubat": {"keep_best_iv": 2},
-      "// Also, it is working with any": {},
+      "// Keep no more than 3 best IV pokemon for every pokemon type": {},
       "// any": {"keep_best_iv": 3},
+      "// Discard all pokemon in bag except 100 pokemon with best CP": {},
+      "// all": {"keep_best_cp": 100},
       "// Example of keeping the 2 strongest (based on CP) and 3 best (based on IV) Zubat:": {},
       "// Zubat": {"keep_best_cp": 2, "keep_best_iv": 3}
     },

diff --git a/configs/config.json.example b/configs/config.json.example
@@ -7,6 +7,7 @@
     "encrypt_location": "",
     "websocket_server": false,
     "heartbeat_threshold": 10,
+    "enable_social": true,
     "tasks": [
       {
         "type": "HandleSoftBan"
@@ -46,8 +47,11 @@
       {
         "type": "IncubateEggs",
         "config": {
+          "enabled": true,
           "longer_eggs_first": true,
-          "min_interval": 120
+          "min_interval": 120,
+         "infinite": [2,5,10],
+         "breakable": [2,5,10]
         }
       },
       {
@@ -72,6 +76,7 @@
       {
         "type": "TransferPokemon",
         "config": {
+          "enabled": true,
           "min_free_slot": 5,
           "transfer_wait_min": 1,
           "transfer_wait_max": 4
@@ -88,18 +93,21 @@
       {
         "type": "EvolvePokemon",
         "config": {
+          "enabled": false,
           "evolve_all": "none",
           "first_evolve_by": "cp",
           "evolve_above_cp": 500,
           "evolve_above_iv": 0.8,
           "logic": "or",
-          "evolve_speed": 20,
+          "min_evolve_speed": 25,
+          "max_evolve_speed": 30,
           "use_lucky_egg": false
         }
       },
       {
         "type": "RecycleItems",
         "config": {
+          "enabled": true,
           "min_empty_space": 15,
           "max_balls_keep": 150,
           "max_potions_keep": 50,
@@ -120,11 +128,13 @@
       {
         "type": "CatchPokemon",
         "config": {
+          "enabled": true,
           "catch_visible_pokemon": true,
           "catch_lured_pokemon": true,
           "min_ultraball_to_keep": 5,
           "berry_threshold": 0.35,
           "vip_berry_threshold": 0.9,
+          "treat_unseen_as_vip": true,
           "catch_throw_parameters": {
             "excellent_rate": 0.1,
             "great_rate": 0.5,
@@ -148,13 +158,15 @@
       {
         "type": "SpinFort",
         "config": {
+          "enabled": true,
           "spin_wait_min": 3,
           "spin_wait_max": 5
         }
       },
       {
         "type": "MoveToFort",
         "config": {
+          "enabled": true,
           "lure_attraction": true,
           "lure_max_distance": 2000,
           "walker": "StepWalker"
@@ -163,6 +175,7 @@
       {
         "type": "FollowSpiral",
         "config": {
+          "enabled": true,
           "diameter": 4,
           "step_size": 70
         }
@@ -216,12 +229,14 @@
       "// Pidgey": {"keep_best_cp": 3},
       "// Example of keeping 2 best (based on IV) Zubat:": {},
       "// Zubat": {"keep_best_iv": 2},
-      "// Also, it is working with any": {},
+      "// Keep no more than 3 best IV pokemon for every pokemon type": {},
       "// any": {"keep_best_iv": 3},
+      "// Discard all pokemon in bag except 100 pokemon with best CP": {},
+      "// all": {"keep_best_cp": 100},
       "// Example of keeping the 2 strongest (based on CP) and 3 best (based on IV) Zubat:": {},
       "// Zubat": {"keep_best_cp": 2, "keep_best_iv": 3},
-	  "// Example of custom order of static criterion": {},
-	  "// Zubat": {"keep_best_custom": "iv, cp, hp_max", "amount":2}
+      "// Example of custom order of static criterion": {},
+      "// Zubat": {"keep_best_custom": "iv, cp, hp_max", "amount":2}
     },
     "vips" : {
         "Any pokemon put here directly force to use Berry & Best Ball to capture, to secure the capture rate!": {},