From 31205d05ba08a11d44d3f41afe50226aa99c5055 Mon Sep 17 00:00:00 2001 From: RedViper9 Date: Wed, 17 Aug 2016 03:27:34 -0700 Subject: [PATCH] Add files via upload --- configs/config.json.cluster.example | 31 +++-- configs/config.json.example | 6 +- configs/config.json.map.example | 53 ++++++-- configs/config.json.optimizer.example | 173 +++++++++++++++----------- configs/config.json.path.example | 93 +++++++------- configs/config.json.pokemon.example | 30 +++-- 6 files changed, 240 insertions(+), 146 deletions(-) diff --git a/configs/config.json.cluster.example b/configs/config.json.cluster.example index 194d6c7e5c..621177658b 100644 --- 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,6 +70,10 @@ "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 }, @@ -64,7 +81,9 @@ "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 index 842e15a687..48925efd89 100644 --- 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 index 1bd393f591..73eff3d465 100644 --- 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,21 +41,39 @@ } }, { - "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 }, @@ -62,7 +81,9 @@ "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, diff --git a/configs/config.json.optimizer.example b/configs/config.json.optimizer.example index 031914b7c3..fa1c2c3fb1 100644 --- a/configs/config.json.optimizer.example +++ b/configs/config.json.optimizer.example @@ -5,19 +5,41 @@ "location": "SOME_LOCATION", "gmapkey": "GOOGLE_MAPS_API_KEY", "encrypt_location": "", + "websocket_server": false, + "heartbeat_threshold": 10, "tasks": [ - { - "type": "HandleSoftBan" - }, - { - "type": "CollectLevelUpReward" - }, - { - "type": "IncubateEggs", - "config": { - "longer_eggs_first": true - } - }, + { + "type": "HandleSoftBan" + }, + { + "type": "SleepSchedule", + "config": { + "enabled": false, + "time": "22:54", + "duration":"7:46", + "time_random_offset": "00:24", + "duration_random_offset": "00:43" + } + }, + { + "type": "CollectLevelUpReward" + }, + { + "type": "IncubateEggs", + "config": { + "longer_eggs_first": true + } + }, + { + "type": "UpdateLiveStats", + "config": { + "enabled": false, + "min_interval": 10, + "stats": ["username", "uptime", "stardust_earned", "xp_earned", "xp_per_hour", "stops_visited"], + "terminal_log": true, + "terminal_title": true + } + }, { "type": "PokemonOptimizer", "config": { @@ -101,76 +123,85 @@ } ] } - }, - { - "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": "CatchPokemon", - "config": { - "catch_visible_pokemon": true, - "catch_lured_pokemon": true, - "min_ultraball_to_keep": 5, - "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": "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 + } + }, { - "type": "SpinFort", - "config": { - "ignore_item_count": true, - "spin_wait_min": 2, - "spin_wait_max": 3 - } + "type": "CatchPokemon", + "config": { + "catch_visible_pokemon": true, + "catch_lured_pokemon": true, + "min_ultraball_to_keep": 5, + "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": "MoveToFort", - "config": { - "lure_attraction": true, - "lure_max_distance": 2000, - "ignore_item_count": true - } + { + "type": "SpinFort", + "config": { + "spin_wait_min": 2, + "spin_wait_max": 3 + } + }, + { + "type": "MoveToFort", + "config": { + "lure_attraction": true, + "lure_max_distance": 2000 + } + }, + { + "type": "FollowSpiral", + "config": { + "diameter": 4, + "step_size": 70 } + } ], "map_object_cache_time": 5, "forts": { - "avoid_circles": true, - "max_circle_size": 50 + "avoid_circles": true, + "max_circle_size": 50, + "cache_recent_forts": true }, - "websocket_server": true, "walk_max": 4.16, "walk_min": 2.16, - "action_wait_min": 1, - "action_wait_max": 4, "debug": false, "test": false, - "health_record": false, + "health_record": true, "location_cache": true, "distance_unit": "km", "reconnecting_timeout": 15, diff --git a/configs/config.json.path.example b/configs/config.json.path.example index 9587c66fd6..acfd9db0cb 100644 --- a/configs/config.json.path.example +++ b/configs/config.json.path.example @@ -5,6 +5,8 @@ "location": "SOME_LOCATION", "gmapkey": "GOOGLE_MAPS_API_KEY", "encrypt_location": "", + "websocket_server": false, + "heartbeat_threshold": 10, "tasks": [ { "type": "HandleSoftBan" @@ -33,13 +35,24 @@ "config": { "enabled": false, "min_interval": 10, - "stats": ["uptime", "stardust_earned", "xp_earned", "xp_per_hour", "stops_visited"], + "stats": ["username", "uptime", "stardust_earned", "xp_earned", "xp_per_hour", "stops_visited"], "terminal_log": true, "terminal_title": true } }, { - "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,6 +70,10 @@ "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 }, @@ -64,36 +81,38 @@ "Hyper Potion": { "keep" : 30 }, "Revive": { "keep" : 30 }, "Razz Berry": { "keep" : 100 } - } + }, + "recycle_wait_min": 1, + "recycle_wait_max": 4 + } + }, + { + "type": "CatchPokemon", + "config": { + "catch_visible_pokemon": true, + "catch_lured_pokemon": true, + "min_ultraball_to_keep": 5, + "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": { - "catch_visible_pokemon": true, - "catch_lured_pokemon": true, - "min_ultraball_to_keep": 5, - "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" + "type": "SpinFort", "config": { "spin_wait_min": 2, "spin_wait_max": 3 @@ -113,30 +132,14 @@ "avoid_circles": true, "max_circle_size": 50 }, - "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, "location_cache": true, "distance_unit": "km", "reconnecting_timeout": 15, - "catch_randomize_reticle_factor": 1.0, - "catch_randomize_spin_factor": 1.0, - "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 - }, - "min_ultraball_to_keep": 10, "logging_color": true, "catch": { "any": {"catch_above_cp": 0, "catch_above_iv": 0, "logic": "or"}, diff --git a/configs/config.json.pokemon.example b/configs/config.json.pokemon.example index 9aa7eebe88..5f35a03e80 100644 --- a/configs/config.json.pokemon.example +++ b/configs/config.json.pokemon.example @@ -5,6 +5,7 @@ "location": "SOME_LOCATION", "gmapkey": "GOOGLE_MAPS_API_KEY", "encrypt_location": "", + "websocket_server": false, "heartbeat_threshold": 10, "tasks": [ { @@ -40,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", @@ -58,6 +70,10 @@ "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 }, @@ -65,7 +81,9 @@ "Hyper Potion": { "keep" : 30 }, "Revive": { "keep" : 30 }, "Razz Berry": { "keep" : 100 } - } + }, + "recycle_wait_min": 1, + "recycle_wait_max": 4 } }, { @@ -94,7 +112,7 @@ } }, { - "type": "SpinFort" + "type": "SpinFort", "config": { "spin_wait_min": 2, "spin_wait_max": 3 @@ -118,13 +136,11 @@ "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,