Dev merge to master

.gitignore

@@ -23,6 +23,8 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+*.orig
+*.bak
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

README.md

@@ -56,10 +56,7 @@ If this is your first time making a PR or aren't sure of the standard practice o
 - [x] Incubate eggs
 - [x] Crowd Sourced Map Prototype
 - [ ] [Standalone Desktop Application] (https://github.com/PokemonGoF/PokemonGo-Bot-Desktop)
-- [ ] Use candy
-
-## Gym Battles
-[PokemonGo-Bot](https://github.com/PokemonGoF/PokemonGo-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.
+- [x] Use candy
 
 ## Analytics
 [PokemonGo-Bot](https://github.com/PokemonGoF/PokemonGo-Bot) is very popular and has a vibrant community. Because of that, it has become very difficult for us to know how the bot is used and what errors people hit. By capturing small amounts of data, we can prioritize our work better such as fixing errors that happen to a large percentage of our user base, not just a vocal minority.
@@ -93,9 +90,11 @@ If you do not want any data to be gathered, you can turn off this feature by set
  * 05-032
  * sinistance
  * CapCap
+ * YvesHenri
  * mzupan
  * gnekic(GeXx)
  * Shoh
+ * JSchwerberg
  * luizperes
  * brantje
  * VirtualSatai
@@ -157,6 +156,7 @@ If you do not want any data to be gathered, you can turn off this feature by set
  * rawgni
  * Breeze Ro
  * bruno-kenji
+ * Gobberwart
 
 ## Disclaimer
 ©2016 Niantic, Inc. ©2016 Pokémon. ©1995–2016 Nintendo / Creatures Inc. / GAME FREAK inc. © 2016 Pokémon/Nintendo Pokémon and Pokémon character names are trademarks of Nintendo. The Google Maps Pin is a trademark of Google Inc. and the trade dress in the product design is a trademark of Google Inc. under license to The Pokémon Company. Other trademarks are the property of their respective owners.

configs/config.json.cluster.example

@@ -38,6 +38,21 @@
           "level_limit": -1
         }
       },
+      {
+        "type": "BuddyPokemon",
+        "config": {
+          "enabled": true,
+          "buddy_list": "dratini, magikarp",
+          "best_in_family": true,
+          "// candy_limit = 0 means no limit, so it will never change current buddy": {},
+          "candy_limit": 0,
+          "// force_first_change = true will always change buddy at start removing current one": {},
+          "force_first_change": false,
+          "buddy_change_wait_min": 3,
+          "buddy_change_wait_max": 5,
+          "min_interval": 120
+        }
+      },
       {
         "type": "IncubateEggs",
         "config": {
@@ -99,18 +114,18 @@
         "type": "EvolvePokemon",
         "config": {
             "enabled": false,
-            
+
             "// evolve only pidgey and drowzee": "",
             "// evolve_list": "pidgey, drowzee",
             "// donot_evolve_list": "none",
-            
+
             "// evolve all but pidgey and drowzee": "",
             "// evolve_list": "all",
             "// donot_evolve_list": "pidgey, drowzee",
-            
+
             "evolve_list": "all",
             "donot_evolve_list": "none",
-            
+
             "first_evolve_by": "cp",
             "evolve_above_cp": 500,
             "evolve_above_iv": 0.8,
@@ -176,7 +191,7 @@
             "berry_wait_max": 5,
             "changeball_wait_min": 3,
             "changeball_wait_max": 5,
-            "newtodex_wait_min": 20, 
+            "newtodex_wait_min": 20,
             "newtodex_wait_max": 30
           }
         }
@@ -309,6 +324,6 @@
     },
 	"websocket": {
 		"start_embedded_server": true,
-		"server_url": "127.0.0.1:4000"
+		"server_url": "0.0.0.0:4000"
 	}
 }

configs/config.json.example

@@ -1,7 +1,7 @@
 {
     "websocket_server": false,
     "heartbeat_threshold": 10,
-    "enable_social": true,
+    "enable_social": false,
     "live_config_update": {
       "enabled": false,
       "tasks_only": false
@@ -75,6 +75,21 @@
           "level_limit": -1
         }
       },
+      {
+        "type": "BuddyPokemon",
+        "config": {
+          "enabled": true,
+          "buddy_list": "dratini, magikarp",
+          "best_in_family": true,
+          "// candy_limit = 0 means no limit, so it will never change current buddy": {},
+          "candy_limit": 0,
+          "// force_first_change = true will always change buddy at start removing current one": {},
+          "force_first_change": false,
+          "buddy_change_wait_min": 3,
+          "buddy_change_wait_max": 5,
+          "min_interval": 120
+        }
+      },
       {
         "type": "IncubateEggs",
         "config": {
@@ -138,18 +153,18 @@
         "type": "EvolvePokemon",
         "config": {
           "enabled": false,
-            
+
             "// evolve only pidgey and drowzee": "",
             "// evolve_list": "pidgey, drowzee",
             "// donot_evolve_list": "none",
-            
+
             "// evolve all but pidgey and drowzee": "",
             "// evolve_list": "all",
             "// donot_evolve_list": "pidgey, drowzee",
-            
+
             "evolve_list": "all",
             "donot_evolve_list": "none",
-            
+
           "first_evolve_by": "cp",
           "evolve_above_cp": 500,
           "evolve_above_iv": 0.8,
@@ -168,7 +183,7 @@
             "ordinary",
             "spicy",
             "cool",
-            "floral" 
+            "floral"
           ]
         }
       },
@@ -196,6 +211,77 @@
           "recycle_force_max": "00:05:00"
         }
       },
+      {
+		"type": "Sniper",
+		"config": {
+			"enabled": false,
+			"mode": "social",
+			"bullets": 1,
+			"homing_shots": true,
+			"special_iv": 100,
+			"order": ["missing", "vip", "priority"],
+			"sources": [
+				{
+				    "enabled": false,
+					"url": "http://localhost:5000/raw_data",
+					"timeout": 3,
+					"key": "pokemons",
+					"mappings": {
+						"id": { "param": "pokemon_id" },
+						"name": { "param": "pokemon_name" },
+						"latitude": { "param": "latitude" },
+						"longitude": { "param": "longitude" },
+						"expiration": { "param": "disappear_time", "format": "milliseconds" }
+					}
+				},
+				{
+				    "enabled": false,
+					"url": "https://pokewatchers.com/grab/",
+					"timeout": 10,
+					"mappings": {
+						"iv": { "param": "iv" },
+						"id": { "param": "pid" },
+						"name": { "param": "pokemon" },
+						"latitude": { "param": "cords" },
+						"longitude": { "param": "cords" },
+						"expiration": { "param": "timeend", "format": "milliseconds" }
+					}
+				},
+				{
+				    "enabled": false,
+					"url": "http://pokesnipers.com/api/v1/pokemon.json",
+					"timeout": 10,
+					"key": "results",
+					"mappings": {
+						"iv": { "param": "iv" },
+						"name": { "param": "name" },
+						"latitude": { "param": "coords" },
+						"longitude": { "param": "coords" },
+						"expiration": { "param": "until", "format": "utc" }
+					}
+				}
+			],
+			"catch": {
+				"Snorlax": 1000,
+				"Dragonite": 1000,
+				"Growlithe": 600,
+				"Clefairy": 500,
+				"Kabuto": 500,
+				"Dratini": 500,
+				"Dragonair": 500,
+				"Mr. Mime": 500,
+				"Magmar": 500,
+				"Electabuzz": 500,
+				"Tangela": 500,
+				"Tauros": 500,
+				"Primeape": 500,
+				"Chansey": 500,
+				"Pidgey": 100,
+				"Caterpie": 100,
+				"Weedle": 100
+			}
+		}
+      },
       {
         "type": "CatchPokemon",
         "config": {
@@ -230,7 +316,7 @@
             "berry_wait_max": 5,
             "changeball_wait_min": 3,
             "changeball_wait_max": 5,
-            "newtodex_wait_min": 20, 
+            "newtodex_wait_min": 20,
             "newtodex_wait_max": 30
           }
         }
@@ -387,6 +473,6 @@
     },
 	"websocket": {
 		"start_embedded_server": true,
-		"server_url": "127.0.0.1:4000"
+		"server_url": "0.0.0.0:4000"
 	}
 }