Add files via upload (PokemonGoF#4151)

net8q · Aug 17, 2016 · a940e54 · a940e54
1 parent 0233882
commit a940e54
Show file tree

Hide file tree

Showing 6 changed files with 240 additions and 146 deletions.
diff --git a/configs/config.json.cluster.example b/configs/config.json.cluster.example
@@ -5,6 +5,8 @@
     "location": "SOME_LOCATION",
     "gmapkey": "GOOGLE_MAPS_API_KEY",
     "encrypt_location": "",
+    "websocket_server": false,
+    "heartbeat_threshold": 10,
     "tasks": [
       {
         "type": "HandleSoftBan"
@@ -39,7 +41,18 @@
         }
       },
       {
-        "type": "TransferPokemon"
+        "type": "TransferPokemon",
+        "config": {
+          "transfer_wait_min": 1,
+          "transfer_wait_max": 4
+        }
+      },
+      {
+        "type": "NicknamePokemon",
+        "config": {
+          "enabled": false,
+          "nickname_template": "{iv_pct}_{iv_ads}"
+        }
       },
       {
         "type": "EvolvePokemon",
@@ -57,14 +70,20 @@
         "type": "RecycleItems",
         "config": {
           "min_empty_space": 15,
+          "max_balls_keep": 150,
+          "max_potions_keep": 50,
+          "max_berries_keep": 70,
+          "max_revives_keep": 70,
           "item_filter": {
             "Pokeball":       { "keep" : 100 },
             "Potion":         { "keep" : 10 },
             "Super Potion":   { "keep" : 20 },
             "Hyper Potion":   { "keep" : 30 },
             "Revive":         { "keep" : 30 },
             "Razz Berry":     { "keep" : 100 }
-          }
+          },
+          "recycle_wait_min": 1,
+          "recycle_wait_max": 4
         }
       },
 	    {
@@ -93,7 +112,7 @@
 	      }
 	    },
       {
-        "type": "SpinFort"
+        "type": "SpinFort",
         "config": {
           "spin_wait_min": 2,
           "spin_wait_max": 3
@@ -109,13 +128,11 @@
     ],
     "forts": {
       "avoid_circles": true,
-      "max_circle_size": 50
+      "max_circle_size": 50,
+      "cache_recent_forts": true
     },
-    "websocket_server": false,
     "walk_max": 4.16,
     "walk_min": 2.16,
-    "action_wait_min": 1,
-    "action_wait_max": 4,
     "debug": false,
     "test": false,
     "health_record": true,

diff --git a/configs/config.json.example b/configs/config.json.example
@@ -41,7 +41,7 @@
         }
       },
       {
-        "type": "TransferPokemon"
+        "type": "TransferPokemon",
         "config": {
 	        "transfer_wait_min": 1,
 	        "transfer_wait_max": 4
@@ -81,7 +81,7 @@
             "Hyper Potion":   { "keep" : 30 },
             "Revive":         { "keep" : 30 },
             "Razz Berry":     { "keep" : 100 }
-          }
+          },
           "recycle_wait_min": 1,
           "recycle_wait_max": 4
         }
@@ -112,7 +112,7 @@
 	      }
 	    },
       {
-        "type": "SpinFort"
+        "type": "SpinFort",
         "config": {
           "spin_wait_min": 2,
           "spin_wait_max": 3

diff --git a/configs/config.json.map.example b/configs/config.json.map.example
@@ -5,6 +5,7 @@
     "location": "SOME_LOCATION",
     "gmapkey": "GOOGLE_MAPS_API_KEY",
     "encrypt_location": "",
+    "websocket_server": false,
     "heartbeat_threshold": 10,
     "tasks": [
       {
@@ -40,29 +41,49 @@
         }
       },
       {
-        "type": "TransferPokemon"
+        "type": "TransferPokemon",
+        "config": {
+          "transfer_wait_min": 1,
+          "transfer_wait_max": 4
+        }
+      },
+      {
+        "type": "NicknamePokemon",
+        "config": {
+          "enabled": false,
+          "nickname_template": "{iv_pct}_{iv_ads}"
+        }
       },
       {
         "type": "EvolvePokemon",
         "config": {
-          "evolve_all": "NONE",
-          "evolve_cp_min": 300,
-          "evolve_speed": 20,
-          "use_lucky_egg": false
+            "evolve_all": "none",
+            "first_evolve_by": "cp",
+            "evolve_above_cp": 500,
+            "evolve_above_iv": 0.8,
+            "logic": "or",
+            "evolve_speed": 20,
+            "use_lucky_egg": false
         }
       },
       {
         "type": "RecycleItems",
         "config": {
           "min_empty_space": 15,
+          "max_balls_keep": 150,
+          "max_potions_keep": 50,
+          "max_berries_keep": 70,
+          "max_revives_keep": 70,
           "item_filter": {
             "Pokeball":       { "keep" : 100 },
             "Potion":         { "keep" : 10 },
             "Super Potion":   { "keep" : 20 },
             "Hyper Potion":   { "keep" : 30 },
             "Revive":         { "keep" : 30 },
             "Razz Berry":     { "keep" : 100 }
-          }
+          },
+          "recycle_wait_min": 1,
+          "recycle_wait_max": 4
         }
       },
 	    {
@@ -91,7 +112,7 @@
 	      }
 	    },
       {
-        "type": "SpinFort"
+        "type": "SpinFort",
         "config": {
           "spin_wait_min": 2,
           "spin_wait_max": 3
@@ -342,22 +363,28 @@
         }
       },
       {
-        "type": "MoveToFort"
+        "type": "MoveToFort",
+        "config": {
+            "lure_attraction": true,
+            "lure_max_distance": 2000
+        }
       },
       {
-        "type": "FollowSpiral"
+        "type": "FollowSpiral",
+        "config": {
+          "diameter": 4,
+          "step_size": 70
+        }
       }
     ],
     "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_max": 4.16,
     "walk_min": 2.16,
-    "action_wait_min": 1,
-    "action_wait_max": 4,
     "debug": false,
     "test": false,
     "health_record": true,