Dev merge to master

.gitignore

@@ -113,7 +113,9 @@ data/map-caught-*.json
 data/recent-forts-*.json
 data/caught-*.json
 data/deviceid-*.txt
+data/mqtt_client_id.*
 user_web_catchable
+version
 
 # Multiple config
 configs/*

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "web"]
 	path = web
-	url = https://github.com/OpenPoGo/OpenPoGoWeb.git
+	url = https://github.com/PokemonGoF/PokemonGo-Web

Dockerfile

@@ -23,29 +23,29 @@ LABEL build_repo=$BUILD_REPO build_branch=$BUILD_BRANCH
 WORKDIR /usr/src/app
 VOLUME ["/usr/src/app/configs", "/usr/src/app/web"]
 
-ADD https://raw.githubusercontent.com/$BUILD_REPO/$BUILD_BRANCH/requirements.txt .
 RUN apk -U --no-cache add python py-pip \
-    && apk --no-cache add --virtual .build-dependencies python-dev gcc make musl-dev git tzdata tar \
+    && rm -rf /var/cache/apk/* \
+    && find / -name '*.pyc' -o -name '*.pyo' | xargs -rn1 rm -f
+
+ADD http://pgoapi.com/pgoencrypt.tar.gz /tmp/pgoencrypt.tar.gz
+ADD https://raw.githubusercontent.com/$BUILD_REPO/$BUILD_BRANCH/requirements.txt .
+RUN apk -U --no-cache add --virtual .build-dependencies python-dev gcc make musl-dev git tzdata \
     && cp -fa /usr/share/zoneinfo/$TIMEZONE /etc/localtime \
     && echo $TIMEZONE > /etc/timezone \
+    && tar zxf /tmp/pgoencrypt.tar.gz -C /tmp \
+    && make -C /tmp/pgoencrypt/src \
+    && cp /tmp/pgoencrypt/src/libencrypt.so /usr/src/app/encrypt.so \
     && ln -s locale.h /usr/include/xlocale.h \
     && pip install --no-cache-dir -r requirements.txt \
     && apk del .build-dependencies \
-    && rm -rf /var/cache/apk/* /usr/include/xlocale.h \
-    && find / -name '*.pyc' -o -name '*.pyo' -exec rm -f {} \;
-
-ADD http://pgoapi.com/pgoencrypt.tar.gz /tmp/pgoencrypt.tar.gz
-RUN apk --no-cache add --virtual .pgoencrypt-dependencies gcc make musl-dev tar \
-    && cat /tmp/pgoencrypt.tar.gz | tar xzf - -C /tmp \
-    && make -C /tmp/pgoencrypt/src \
-    && cp /tmp/pgoencrypt/src/libencrypt.so /usr/src/app/encrypt.so \
-    && apk del .pgoencrypt-dependencies \
-    && rm -rf /var/cache/apk/* /tmp/pgoencrypt /tmp/pgoencrypt.tar.gz
-
-ADD https://github.com/$BUILD_REPO/archive/$BUILD_BRANCH.tar.gz /tmp
-RUN apk -U --no-cache add --virtual .tar-deps tar \
-    && cat /tmp/$BUILD_BRANCH.tar.gz | tar -zxf - --strip-components=1 -C /usr/src/app \
-    && apk del .tar-deps \
-    && rm /tmp/$BUILD_BRANCH.tar.gz
+    && rm -rf /var/cache/apk/* /tmp/pgoencrypt* /usr/include/xlocale.h \
+    && find / -name '*.pyc' -o -name '*.pyo' | xargs -rn1 rm -f
+
+ADD https://api.github.com/repos/$BUILD_REPO/commits/$BUILD_BRANCH /tmp/pgobot-version
+RUN apk -U --no-cache add --virtual .pgobot-dependencies wget ca-certificates tar jq \
+    && wget -q -O- https://github.com/$BUILD_REPO/archive/$BUILD_BRANCH.tar.gz | tar zxf - --strip-components=1 -C /usr/src/app \
+    && jq -r .sha /tmp/pgobot-version > /usr/src/app/version \
+    && apk del .pgobot-dependencies \
+    && rm -rf /var/cache/apk/* /tmp/pgobot-version
 
 ENTRYPOINT ["python", "pokecli.py"]

README.md

@@ -1,26 +1,26 @@
 # PokemonGo-Bot
-PokemonGo bot is a project created by the [PokemonGoF](https://github.com/PokemonGoF) team.
+[PokemonGo-Bot](https://github.com/PokemonGoF/PokemonGo-Bot) is a project created by the [PokemonGoF](https://github.com/PokemonGoF) team.
 
 ## Table of Contents
 - [Installation](https://github.com/PokemonGoF/PokemonGo-Bot/blob/dev/docs/installation.md)
 - [Documentation](https://github.com/PokemonGoF/PokemonGo-Bot/blob/dev/docs/)
 - [Support](#support)
- - [help](#configuration-issueshelp)
- - [bugs](#bugs--issues)
- - [Feature request](#feature-requests)
+ - [Help](#configuration-issueshelp)
+ - [Bugs](#bugs--issues)
+ - [Feature Requests](#feature-requests)
  - [Pull Requests](#pull-requests)
 - [Features](#features)
 - [Credits](#credits)
 
-The project is currently setup in two main branches. 
-- `dev` also known as `beta` - This is where the latest features are, but you may also experience some issues with stability/crashes
-- `master` also known as `stable` - The bot 'should' be stable on this branch, and is generally well tested
+The project is currently setup in two main branches:
+- `dev` also known as `beta` - This is where the latest features are, but you may also experience some issues with stability/crashes.
+- `master` also known as `stable` - The bot 'should' be stable on this branch, and is generally well tested.
 
 ## Support
 ### Configuration issues/help
 If you need any help please don't create an issue as we have a great community on Slack. You can count on the community in [#help](https://pokemongo-bot.slack.com/messages/help/) channel.
- - [Click here to signup (first time only)](https://pokemongo-bot.herokuapp.com) 
- - [Join if you're already a member](https://pokemongo-bot.slack.com/messages/general/). 
+ - [Click here to signup (first time only)](https://pokemongo-bot.herokuapp.com)
+ - [Join here if you're already a member](https://pokemongo-bot.slack.com/messages/general/)
 
 ###[Bugs / Issues](https://github.com/PokemonGoF/PokemonGo-Bot/issues?q=is%3Aissue+sort%3Aupdated-desc)
 If you discover a bug in the bot, please [search our issue tracker](https://github.com/PokemonGoF/PokemonGo-Bot/issues?q=is%3Aissue+sort%3Aupdated-desc) first. If it hasn't been reported, please [create a new issue](https://github.com/PokemonGoF/PokemonGo-Bot/issues/new) and ensure you follow the template guide so that our team can assist you as quickly as possible.
@@ -51,10 +51,10 @@ If you'd like to make your own changes, make sure you follow the pull request te
 - [ ] Use candy
 
 ## Gym Battles
-This 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.
+[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.
 
 ## Analytics
-This 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.
+[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.
 
 Our goal is to help inform our decisions by capturing data that helps us get aggregate usage and error reports, not personal information. To view the code that handles analytics in our master branch, you can use this [search link](https://github.com/PokemonGoF/PokemonGo-Bot/search?utf8=%E2%9C%93&q=BotEvent).
 

configs/config.json.cluster.example

@@ -95,9 +95,18 @@
         "type": "EvolvePokemon",
         "config": {
             "enabled": false,
-            "//evolve all except Zubat and Rattata": "",
-            "//evolve_all": "-Zubat,-Rattata",
-            "evolve_all": "none",
+
+            "// 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,

configs/config.json.example

@@ -12,12 +12,13 @@
         "config": {
           "enabled": false,
           "master": null,
+          "min_interval": 120,
           "// old syntax, still supported: alert_catch": ["all"],
-	  "// new syntax:": {},
-	  "alert_catch": {
-		  "all": {"operator": "and", "cp": 1300, "iv": 0.95},
-		  "Snorlax": {"operator": "or", "cp": 900, "iv": 0.9}
-	  }
+          "// new syntax:": {},
+          "alert_catch": {
+            "all": {"operator": "and", "cp": 1300, "iv": 0.95},
+            "Snorlax": {"operator": "or", "cp": 900, "iv": 0.9}
+          }
         }
       },
       {
@@ -120,9 +121,18 @@
         "type": "EvolvePokemon",
         "config": {
           "enabled": false,
-          "//evolve all except Zubat and Rattata": "",
-          "//evolve_all": "-Zubat,-Rattata",
-          "evolve_all": "none",
+
+            "// 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,
@@ -194,7 +204,8 @@
         "config": {
           "enabled": true,
           "spin_wait_min": 3,
-          "spin_wait_max": 5
+          "spin_wait_max": 5,
+          "daily_spin_limit": 1900
         }
       },
       { "type": "UpdateWebInventory",

configs/config.json.map.example

@@ -95,9 +95,18 @@
         "type": "EvolvePokemon",
         "config": {
             "enabled": false,
-            "//evolve all except Zubat and Rattata": "",
-            "//evolve_all": "-Zubat,-Rattata",
-            "evolve_all": "none",
+
+            "// 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,
@@ -192,6 +201,12 @@
           "map_path": "raw_data",
           "walker": "StepWalker",
           "max_extra_dist_fort": 10,
+          "skip_rounds": 5,
+	  "update_map_min_distance_meters": 500,
+	  "update_map_min_time_sec": 120,
+	  "snipe_sleep_sec": 2,
+	  "snipe_max_in_chain": 2,
+	  "debug": false,
           "catch": {
             "==========Legendaries==========": 0,
             "Aerodactyl": 1000,