Dev merge to master

.gitignore

@@ -142,3 +142,5 @@ pip-selfcheck.json
 
 # Mac Gargage
 .DS_Store
+data/mqtt_client_id
+Encrypt_64.dll

configs/config.json.cluster.example

@@ -285,5 +285,9 @@
         "Weezing": {},
         "Flareon": {}
 
-    }
+    },
+	"websocket": {
+		"start_embedded_server": true,
+		"server_url": "127.0.0.1:4000"
+	}
 }

configs/config.json.example

@@ -330,5 +330,9 @@
         "Muk": {},
         "Weezing": {},
         "Flareon": {}
-    }
+    },
+	"websocket": {
+		"start_embedded_server": true,
+		"server_url": "127.0.0.1:4000"
+	}
 }

configs/config.json.map.example

@@ -549,5 +549,9 @@
         "Weezing": {},
         "Flareon": {}
 
-    }
+    },
+	"websocket": {
+		"start_embedded_server": true,
+		"server_url": "127.0.0.1:4000"
+	}
 }

configs/config.json.path.example

@@ -268,5 +268,9 @@
       "// 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}
-    }
+    },
+	"websocket": {
+		"start_embedded_server": true,
+		"server_url": "127.0.0.1:4000"
+	}
 }

configs/config.json.pokemon.example

@@ -519,5 +519,9 @@
         "Weezing": {},
         "Flareon": {}
 
-    }
+    },
+	"websocket": {
+		"start_embedded_server": true,
+		"server_url": "127.0.0.1:4000"
+	}
 }

map-chat/javascript/main.js

@@ -7,10 +7,11 @@ var urlHashTopic = location.hash ? location.hash.substring(1).toLowerCase() : nu
 var topic = urlHashTopic ? urlHashTopic : "pgomapcatch/chat";
 
 function initialiseEventBus(){
-  window.client = mqtt.connect('ws://broker.pikabot.org'); // you add a ws:// url here
+  window.client = mqtt.connect('ws://broker.pikabot.org',{
+      reconnectPeriod:10*1000
+  });
   client.subscribe("pgomapcatch/#");
   client.subscribe("pgochat/chat");
-
   client.on("message", function (topic, payload) {
     //Materialize.toast(payload, 4000);
     if (topic === 'pgochat/chat') {

pokemongo_bot/cell_workers/incubate_eggs.py

@@ -26,10 +26,10 @@ def _process_config(self):
         self.infinite_longer_eggs_first = self.config.get("infinite_longer_eggs_first", False)
         self.breakable_longer_eggs_first = self.config.get("breakable_longer_eggs_first", True)
         self.min_interval = self.config.get('min_interval', 120)
-        
+
         self.breakable_incubator = self.config.get("breakable", [2,5,10])
         self.infinite_incubator = self.config.get("infinite", [2,5,10])
-    
+
     def work(self):
         try:
             self._check_inventory()
@@ -80,7 +80,7 @@ def _apply_incubators(self, available_eggs, available_incubators):
             for egg in available_eggs:
                 if egg["used"] or egg["km"] == -1:
                     continue
-                
+
                 self.emit_event(
                     'incubate_try',
                     level='debug',
@@ -124,27 +124,21 @@ def _apply_incubators(self, available_eggs, available_incubators):
                         egg["used"] = True
 
     def _check_inventory(self, lookup_ids=[]):
-        inv = {}
+        if lookup_ids:
+            inventory.refresh_inventory()
         matched_pokemon = []
         temp_eggs = []
         temp_used_incubators = []
         temp_ready_breakable_incubators = []
         temp_ready_infinite_incubators = []
-        inv = reduce(
-            dict.__getitem__,
-            ["responses", "GET_INVENTORY", "inventory_delta", "inventory_items"],
-            inventory.jsonify_inventory()
-        )
+        inv = inventory.jsonify_inventory()
         for inv_data in inv:
             inv_data = inv_data.get("inventory_item_data", {})
             if "egg_incubators" in inv_data:
-                temp_used_incubators = []
-                temp_ready_breakable_incubators = []
-                temp_ready_infinite_incubators = []
                 incubators = inv_data.get("egg_incubators", {}).get("egg_incubator",[])
                 if isinstance(incubators, basestring):  # checking for old response
                     incubators = [incubators]
-                for incubator in incubators:                                           
+                for incubator in incubators:
                     if 'pokemon_id' in incubator:
                         start_km = incubator.get('start_km_walked', 0)
                         km_walked = incubator.get('target_km_walked', 0)
@@ -218,8 +212,8 @@ def _hatch_eggs(self):
                 else:
                     pokemon['name'] = "error"
         except:
-            pokemon_data = [{"name":"error","cp":"error","iv":"error"}]
-        if not pokemon_ids or pokemon_data[0]['name'] == "error":
+            pokemon_data = [{"name":"error", "cp":"error", "iv":"error"}]
+        if not pokemon_ids or not pokemon_data or pokemon_data[0]['name'] == "error":
             self.emit_event(
                 'egg_hatched',
                 data={
@@ -256,7 +250,7 @@ def _print_eggs(self):
             return
 
         self.used_incubators.sort(key=lambda x: x.get("km"))
-        
+
         eggs = ['{:.2f}/{} km'.format(e['km_needed']-e['km']+self.km_walked, e['km_needed']) for e in self.used_incubators]
 
         self.emit_event(
@@ -268,7 +262,7 @@ def _print_eggs(self):
                         'eggs': ', '.join(eggs)
                     }
                 )
-        
+
     def _should_print(self):
         """
         Returns a value indicating whether the eggs should be displayed.

pokemongo_bot/cell_workers/update_live_stats.py

@@ -331,6 +331,7 @@ def _get_stats_line(self, player_stats):
 
         # Gather stats values.
         metrics = self.bot.metrics
+        metrics.capture_stats()
         runtime = metrics.runtime()
         login = self.bot.config.username
         player_data = self.bot.player_data

pokemongo_bot/event_handlers/telegram_handler.py

@@ -73,7 +73,7 @@ def run(self):
                                         "_XP:_ "+str(stats["experience"])+"/"+str(stats["next_level_xp"]),
                                         "_Pokemons Captured:_ "+str(stats["pokemons_captured"])+" ("+str(catch_day)+" _last 24h_)",
                                         "_Poke Stop Visits:_ "+str(stats["poke_stop_visits"])+" ("+str(ps_day)+" _last 24h_)",
-                                        "_KM Walked:_ "+str(stats["km_walked"])
+                                        "_KM Walked:_ "+str("%.2f" % stats["km_walked"])
                                     )
                                 self._tbot.sendMessage(chat_id=update.message.chat_id, parse_mode='Markdown', text="\n".join(res))
                                 self._tbot.send_location(chat_id=update.message.chat_id, latitude=self.bot.api._position_lat, longitude=self.bot.api._position_lng)

pokemongo_bot/inventory.py

@@ -1178,6 +1178,7 @@ def __init__(self, bot):
         self.items = Items()
         self.pokemons = Pokemons()
         self.player = Player(self.bot)  # include inventory inside Player?
+        self.egg_incubators = None
         self.refresh()
         self.item_inventory_size = None
         self.pokemon_inventory_size = None
@@ -1190,6 +1191,8 @@ def refresh(self, inventory=None):
         for i in (self.pokedex, self.candy, self.items, self.pokemons, self.player):
             i.refresh(inventory)
 
+        self.egg_incubators = [x["inventory_item_data"] for x in inventory if "egg_incubators" in x["inventory_item_data"]]
+
         self.update_web_inventory()
 
     def init_inventory_outfile(self):
@@ -1234,9 +1237,12 @@ def jsonify_inventory(self):
         for item_id, item in self.items._data.items():
             json_inventory.append({"inventory_item_data": {"item": {"item_id": item_id, "count": item.count}}})
 
-        for pokemon in self.pokemons.all():
+        for pokemon in self.pokemons.all_with_eggs():
             json_inventory.append({"inventory_item_data": {"pokemon_data": pokemon._data}})
 
+        for inc in self.egg_incubators:
+            json_inventory.append({"inventory_item_data": inc})
+
         return json_inventory
 
     def retrieve_inventories_size(self):

windows_bat/PokemonGo-Bot-Start.bat

@@ -44,28 +44,19 @@ if '%1'=='ELEV' (del "%vbsGetPrivileges%" 1>nul 2>nul & shift /1)
 
 :startBot
 CLS
-@ECHO --------------------Verifying PokemonGo-Bot version--------------------
-@ECHO.
-CD..
-git pull
-git submodule update --init --recursive
-@ECHO.
-@ECHO WARNING: Verify if the Config.json file got updated. If Yes, check if your modifications are still valid before proceeding.
-@ECHO.
-@timeout /t 10
-@ECHO.
-CLS
-@ECHO --------------------Initializing web server--------------------
-@ECHO.
-@ECHO.
+ECHO.
+ECHO.
+ECHO --------------------Initializing web server--------------------
+ECHO.
+ECHO.
 set BatchPath="%~dp0"
 start cmd.exe /k "CD %BatchPath%&CD..&CD web&python -m SimpleHTTPServer"
-@ECHO.
-@ECHO.
+ECHO.
+ECHO.
 CLS
-@ECHO --------------------Starting bot--------------------
-@ECHO.
-@ECHO.
+ECHO --------------------Starting bot--------------------
+ECHO.
+ECHO.
 
 
 
@@ -88,9 +79,9 @@ goto:eof
 
 
 :problem
-@ECHO.
-@ECHO. Something went wrong and the bot needed to be restarted. Please investigate the cause.
-@ECHO.
+ECHO.
+ECHO. Something went wrong and the bot needed to be restarted. Please investigate the cause.
+ECHO.
 goto:eof
 
 

windows_bat/PokemonGo-Bot-Updater.bat

@@ -0,0 +1,120 @@
+TITLE PokemonGo-Bot
+CLS
+@ECHO Off
+
+
+
+:init
+setlocal DisableDelayedExpansion
+path c:\Program Files\Git\cmd;%PATH%
+path C:\Python27;%PATH%
+path C:\Python27\Scripts;%PATH%
+SET BatPath=%~dp0
+SET BotPath=%BatPath:~0,-13%
+set "batchPath=%~0"
+for %%k in (%0) do set batchName=%%~nk
+set "vbsGetPrivileges=%temp%\OEgetPriv_%batchName%.vbs"
+setlocal EnableDelayedExpansion
+
+
+
+:checkPrivileges
+NET FILE 1>NUL 2>NUL
+if '%errorlevel%' == '0' ( goto gotPrivileges ) else ( goto getPrivileges )
+
+
+
+:getPrivileges
+if '%1'=='ELEV' (echo ELEV & shift /1 & goto gotPrivileges)
+@ECHO Set UAC = CreateObject^("Shell.Application"^) > "%vbsGetPrivileges%"
+@ECHO args = "ELEV " >> "%vbsGetPrivileges%"
+@ECHO For Each strArg in WScript.Arguments >> "%vbsGetPrivileges%"
+@ECHO args = args ^& strArg ^& " " >> "%vbsGetPrivileges%"
+@ECHO Next >> "%vbsGetPrivileges%"
+@ECHO UAC.ShellExecute "!batchPath!", args, "", "runas", 1 >> "%vbsGetPrivileges%"
+"%SystemRoot%\System32\WScript.exe" "%vbsGetPrivileges%" %*
+exit /B
+
+
+
+:gotPrivileges
+setlocal & pushd .
+cd /d %~dp0
+if '%1'=='ELEV' (del "%vbsGetPrivileges%" 1>nul 2>nul & shift /1)
+
+
+
+:startBot
+CLS
+ECHO.
+ECHO. --------------------Verifying PokemonGo-Bot version--------------------
+ECHO.
+CD..
+FOR /F "usebackq" %%A IN ('%BotPath%\configs\config.json.example') DO set OldSizeNormal=%%~zA
+FOR /F "usebackq" %%A IN ('%BotPath%\configs\config.json.cluster.example') DO set OldSizeCluster=%%~zA
+FOR /F "usebackq" %%A IN ('%BotPath%\configs\config.json.map.example') DO set OldSizeMap=%%~zA
+FOR /F "usebackq" %%A IN ('%BotPath%\configs\config.json.optimizer.example') DO set OldSizeOptimizer=%%~zA
+FOR /F "usebackq" %%A IN ('%BotPath%\configs\config.json.path.example') DO set OldSizePath=%%~zA
+FOR /F "usebackq" %%A IN ('%BotPath%\configs\config.json.pokemon.example') DO set OldSizePokemon=%%~zA
+git pull
+git submodule update --init --recursive
+FOR /F "usebackq" %%A IN ('%BotPath%\configs\config.json.example') DO set SizeNormal=%%~zA
+FOR /F "usebackq" %%A IN ('%BotPath%\configs\config.json.cluster.example') DO set SizeCluster=%%~zA
+FOR /F "usebackq" %%A IN ('%BotPath%\configs\config.json.map.example') DO set SizeMap=%%~zA
+FOR /F "usebackq" %%A IN ('%BotPath%\configs\config.json.optimizer.example') DO set SizeOptimizer=%%~zA
+FOR /F "usebackq" %%A IN ('%BotPath%\configs\config.json.path.example') DO set SizePath=%%~zA
+FOR /F "usebackq" %%A IN ('%BotPath%\configs\config.json.pokemon.example') DO set SizePokemon=%%~zA
+
+CLS
+ECHO.
+ECHO. --------------------Verifying PokemonGo-Bot version--------------------
+ECHO.
+IF %OldSizeNormal% == %SizeNormal% (
+ECHO.
+) ELSE (
+ECHO. WARNING. Check your config.json if you use config.json.example as standard config.json 
+ECHO.
+ECHO. Changes have been made to the config.json.example, check if your modifications are still valid.
+ECHO.
+)
+IF %OldSizeCluster% == %SizeCluster% (
+ECHO.
+) ELSE (
+ECHO. WARNING. Check your config.json if you use config.json.cluster.example as standard config.json 
+ECHO.
+ECHO. Changes have been made to the config.json.cluster.example, check if your modifications are still valid.
+ECHO.
+)
+IF %OldSizeMap% == %SizeMap% (
+ECHO.
+) ELSE (
+ECHO. WARNING. Check your config.json if you use config.json.map.example as standard config.json 
+ECHO.
+ECHO. Changes have been made to the config.json.map.example, check if your modifications are still valid.
+ECHO.
+)
+IF %OldSizeOptimizer% == %SizeOptimizer% (
+ECHO.
+) ELSE (
+ECHO. WARNING. Check your config.json if you use config.json.optimizer.example as standard config.json 
+ECHO.
+ECHO. Changes have been made to the config.json.optimizer.example, check if your modifications are still valid.
+ECHO.
+)
+IF %OldSizePath% == %SizePath% (
+ECHO.
+) ELSE (
+ECHO. WARNING. Check your config.json if you use config.json.path.example as standard config.json 
+ECHO.
+ECHO. Changes have been made to the config.json.path.example, check if your modifications are still valid.
+ECHO.
+)
+IF %OldSizePokemon% == %SizePokemon% (
+ECHO.
+) ELSE (
+ECHO. WARNING. Check your config.json if you use config.json.pokemon.example as standard config.json 
+ECHO.
+ECHO. Changes have been made to the config.json.pokemon.example, check if your modifications are still valid.
+ECHO.
+)
+pause