Dev merge to master, PR

CONTRIBUTORS.md

@@ -72,3 +72,7 @@
  * net8q
  * SyncX
  * umbreon222
+ * DeXtroTip
+ * rawgni
+ * Breeze Ro
+ * bruno-kenji

configs/config.json.cluster.example

@@ -22,7 +22,15 @@
         }
       },
       {
-        "type": "CollectLevelUpReward"
+        "type": "CompleteTutorial",
+        "config": {
+          "enabled": false,
+          "// set a name": "",
+          "nickname": ""
+        }
+      },
+      {
+         "type": "CollectLevelUpReward"
       },
       {
         "type": "IncubateEggs",
@@ -40,9 +48,19 @@
           "terminal_title": true
         }
       },
+      {
+        "type": "UpdateLiveInventory",
+        "config": {
+          "enabled": false,
+          "min_interval": 120,
+          "show_all_multiple_lines": false,
+          "items": ["pokemon_bag", "space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
+        }
+      },
       {
         "type": "TransferPokemon",
         "config": {
+          "min_free_slot": 5,
           "transfer_wait_min": 1,
           "transfer_wait_max": 4
         }
@@ -92,6 +110,8 @@
 	        "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,
@@ -131,15 +151,28 @@
       "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": 500,
+    "alt_max": 1000,
     "debug": false,
     "test": false,
     "health_record": true,
     "location_cache": true,
     "distance_unit": "km",
     "reconnecting_timeout": 15,
     "logging_color": true,
+    "daily_catch_limit": 800,
     "catch": {
       "any": {"catch_above_cp": 0, "catch_above_iv": 0, "logic": "or"},
       "// Example of always catching Rattata:": {},

configs/config.json.example

@@ -20,9 +20,27 @@
           "time_random_offset": "00:24",
           "duration_random_offset": "00:43"
         }
+      },
+	  {
+		"type": "RandomPause",
+        "config": {
+		  "enabled": false,
+		  "min_duration": "00:00:10",
+		  "max_duration": "00:10:00",
+		  "min_interval": "00:10:00",
+		  "max_interval": "02:00:00"
+        }
+	  },
+      {
+        "type": "CompleteTutorial",
+        "config": {
+          "enabled": false,
+          "// set a name": "",
+          "nickname": ""
+        }
       },
       {
-        "type": "CollectLevelUpReward"
+         "type": "CollectLevelUpReward"
       },
       {
         "type": "IncubateEggs",
@@ -40,9 +58,19 @@
           "terminal_title": true
         }
       },
+      {
+        "type": "UpdateLiveInventory",
+        "config": {
+          "enabled": false,
+          "min_interval": 120,
+          "show_all_multiple_lines": false,
+          "items": ["pokemon_bag", "space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
+        }
+      },
       {
         "type": "TransferPokemon",
         "config": {
+          "min_free_slot": 5,
           "transfer_wait_min": 1,
           "transfer_wait_max": 4
         }
@@ -92,12 +120,15 @@
           "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
+            "spin_success_rate" : 0.6,
+            "hit_rate": 0.75
           },
           "catch_simulation": {
             "flee_count": 3,
@@ -122,7 +153,8 @@
         "type": "MoveToFort",
         "config": {
           "lure_attraction": true,
-          "lure_max_distance": 2000
+          "lure_max_distance": 2000,
+          "walker": "StepWalker"
         }
       },
       {
@@ -139,15 +171,33 @@
       "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": 500,
+    "alt_max": 1000,
+    "gps_default_altitude": 8.0,
+    "replicate_gps_xy_noise": false,
+    "replicate_gps_z_noise": false,
+    "gps_xy_noise_range": 0.000125,
+    "gps_z_noise_range": 12.5,
     "debug": false,
     "test": false,
     "health_record": true,
     "location_cache": true,
     "distance_unit": "km",
     "reconnecting_timeout": 15,
     "logging_color": true,
+    "daily_catch_limit": 800,
     "catch": {
       "any": {"catch_above_cp": 0, "catch_above_iv": 0, "logic": "or"},
       "// Example of always catching Rattata:": {},
@@ -159,12 +209,14 @@
       "// Rattata": {"always_release": true},
       "// Example of keeping 3 stronger (based on CP) Pidgey:": {},
       "// Pidgey": {"keep_best_cp": 3},
-      "// Example of keeping 2 stronger (based on IV) Zubat:": {},
+      "// Example of keeping 2 best (based on IV) Zubat:": {},
       "// Zubat": {"keep_best_iv": 2},
       "// Also, it is working with any": {},
       "// any": {"keep_best_iv": 3},
       "// 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}
+      "// 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}
     },
     "vips" : {
         "Any pokemon put here directly force to use Berry & Best Ball to capture, to secure the capture rate!": {},

configs/config.json.map.example

@@ -22,7 +22,15 @@
         }
       },
       {
-        "type": "CollectLevelUpReward"
+        "type": "CompleteTutorial",
+        "config": {
+          "enabled": false,
+          "// set a name": "",
+          "nickname": ""
+        }
+      },
+      {
+         "type": "CollectLevelUpReward"
       },
       {
         "type": "IncubateEggs",
@@ -40,9 +48,19 @@
           "terminal_title": true
         }
       },
+      {
+        "type": "UpdateLiveInventory",
+        "config": {
+          "enabled": false,
+          "min_interval": 120,
+          "show_all_multiple_lines": false,
+          "items": ["pokemon_bag", "space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
+        }
+      },
       {
         "type": "TransferPokemon",
         "config": {
+          "min_free_slot": 5,
           "transfer_wait_min": 1,
           "transfer_wait_max": 4
         }
@@ -92,6 +110,8 @@
 	        "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,
@@ -131,6 +151,7 @@
           "update_map": true,
           "mode": "priority",
           "map_path": "raw_data",
+          "walker": "StepWalker",
           "catch": {
             "==========Legendaries==========": 0,
             "Aerodactyl": 1000,
@@ -383,15 +404,28 @@
       "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": 500,
+    "alt_max": 1000,
     "debug": false,
     "test": false,
     "health_record": true,
     "location_cache": true,
     "distance_unit": "km",
     "reconnecting_timeout": 15,
     "logging_color": true,
+    "daily_catch_limit": 800,
     "catch": {
       "any": {"catch_above_cp": 0, "catch_above_iv": 0, "logic": "or"},
       "// Example of always catching Rattata:": {},