Dev merge to master, PR

Dockerfile

@@ -1,15 +1,41 @@
-FROM python:2.7
+# To build a docker container for the "master" branch (this is the default) execute:
+#
+# docker build --build-arg BUILD_BRANCH=master .
+# (or)
+# docker build .
+#
+# To build a docker container for the "dev" branch execute:
+# 
+# docker build --build-arg BUILD_BRANCH=dev .
+# 
+# You can also build from different fork and specify a particular commit as the branch
+# 
+# docker build  --build-arg BUILD_REPO=YourFork/PokemonGo-Bot --build-arg BUILD_BRANCH=6a4580f .
+
+FROM python:2.7.12-alpine
+
+RUN apk add --update --no-cache alpine-sdk git
+
+ARG BUILD_BRANCH
+ENV BUILD_BRANCH ${BUILD_BRANCH:-master}
+
+ARG BUILD_REPO
+ENV BUILD_REPO ${BUILD_REPO:-PokemonGoF/PokemonGo-Bot}
+
+LABEL build_repo=$BUILD_REPO build_branch=$BUILD_BRANCH
+
+ADD https://github.com/$BUILD_REPO/archive/$BUILD_BRANCH.tar.gz .
+RUN tar -zxvf $BUILD_BRANCH.tar.gz && mv PokemonGo-Bot-* /usr/src/app && rm $BUILD_BRANCH.tar.gz
 
 WORKDIR /usr/src/app
 VOLUME ["/usr/src/app/configs", "/usr/src/app/web"]
 
 ARG timezone=Etc/UTC
-RUN echo $timezone > /etc/timezone \
-    && ln -sfn /usr/share/zoneinfo/$timezone /etc/localtime \
-    && dpkg-reconfigure -f noninteractive tzdata
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-RUN cd /tmp && wget "http://pgoapi.com/pgoencrypt.tar.gz" \
-    && tar zxvf pgoencrypt.tar.gz \
+#setup the bot
+ADD http://pgoapi.com/pgoencrypt.tar.gz /tmp/
+RUN cd /tmp && tar zxvf pgoencrypt.tar.gz \
     && cd pgoencrypt/src \
     && make \
     && cp libencrypt.so /usr/src/app/encrypt.so \
@@ -18,9 +44,11 @@ RUN cd /tmp && wget "http://pgoapi.com/pgoencrypt.tar.gz" \
 
 ENV LD_LIBRARY_PATH /usr/src/app
 
-COPY requirements.txt /usr/src/app/
+RUN ln -s /usr/include/locale.h /usr/include/xlocale.h
 RUN pip install --no-cache-dir -r requirements.txt
 
-COPY . /usr/src/app
+#remove unused stuff
+RUN apk del alpine-sdk\
+  && rm -rf /var/cache/apk/*
 
 ENTRYPOINT ["python", "pokecli.py"]

README.md

@@ -49,9 +49,9 @@ If you'd like to make your own changes, make sure you follow the pull request te
 - [x] Adjust delay between Pokemon capture & Transfer as per configuration
 - [x] Hatch eggs
 - [x] Incubate eggs
+- [x] Crowd Sourced Map Prototype
 - [ ] [Standalone Desktop Application] (https://github.com/PokemonGoF/PokemonGo-Bot-Desktop)
 - [ ] Use candy
-- [x] Crowd Sourced Map Prototype
 
 ## 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.
@@ -67,7 +67,6 @@ If you do not want any data to be gathered, you can turn off this feature by set
 
 ## Help Needed on [Desktop Version](https://github.com/PokemonGoF/PokemonGo-Bot-Desktop)
 
-
 ## Credits
 - [tejado](https://github.com/tejado) many thanks for the API
 - [U6 Group](http://pgoapi.com) for the U6
@@ -77,5 +76,7 @@ If you do not want any data to be gathered, you can turn off this feature by set
 - [AHAAAAAAA](https://github.com/AHAAAAAAA/PokemonGo-Map) for parts of the s2sphere stuff
 - [Breeze ro](https://github.com/BreezeRo) for some of the MQTT/Map stuff
 
+## [Contributors](https://github.com/PokemonGoF/PokemonGo-Bot/blob/master/CONTRIBUTORS.md)
+
 
 [![Analytics](https://ga-beacon.appspot.com/UA-81468120-1/welcome-page-master)](https://github.com/igrigorik/ga-beacon)

configs/config.json.cluster.example

@@ -9,6 +9,17 @@
     "heartbeat_threshold": 10,
     "enable_social": true,
     "tasks": [
+      {
+        "//NOTE: This task MUST be placed on the top of task list": {},
+        "type": "RandomAlivePause",
+        "config": {
+          "enabled": false,
+          "min_duration": "00:00:10",
+          "max_duration": "00:10:00",
+          "min_interval": "00:05:00",
+          "max_interval": "01:30:00"
+        }
+      },
       {
         "type": "HandleSoftBan"
       },

configs/config.json.example

@@ -9,6 +9,17 @@
     "heartbeat_threshold": 10,
     "enable_social": true,
     "tasks": [
+      {
+        "//NOTE: This task MUST be placed on the top of task list": {},
+        "type": "RandomAlivePause",
+        "config": {
+          "enabled": false,
+          "min_duration": "00:00:10",
+          "max_duration": "00:10:00",
+          "min_interval": "00:05:00",
+          "max_interval": "01:30:00"
+        }
+      },
       {
         "type": "HandleSoftBan"
       },

configs/config.json.map.example

@@ -9,6 +9,17 @@
     "heartbeat_threshold": 10,
     "enable_social": true,
     "tasks": [
+      {
+        "//NOTE: This task MUST be placed on the top of task list": {},
+        "type": "RandomAlivePause",
+        "config": {
+          "enabled": false,
+          "min_duration": "00:00:10",
+          "max_duration": "00:10:00",
+          "min_interval": "00:05:00",
+          "max_interval": "01:30:00"
+        }
+      },
       {
         "type": "HandleSoftBan"
       },

configs/config.json.optimizer.example

@@ -9,6 +9,17 @@
     "heartbeat_threshold": 10,
     "enable_social": true,
     "tasks": [
+      {
+        "//NOTE: This task MUST be placed on the top of task list": {},
+        "type": "RandomAlivePause",
+        "config": {
+          "enabled": false,
+          "min_duration": "00:00:10",
+          "max_duration": "00:10:00",
+          "min_interval": "00:05:00",
+          "max_interval": "01:30:00"
+        }
+      },
       {
         "type": "HandleSoftBan"
       },

configs/config.json.path.example

@@ -9,6 +9,17 @@
     "heartbeat_threshold": 10,
     "enable_social": true,
     "tasks": [
+      {
+        "//NOTE: This task MUST be placed on the top of task list": {},
+        "type": "RandomAlivePause",
+        "config": {
+          "enabled": false,
+          "min_duration": "00:00:10",
+          "max_duration": "00:10:00",
+          "min_interval": "00:05:00",
+          "max_interval": "01:30:00"
+        }
+      },
       {
         "type": "HandleSoftBan"
       },

configs/config.json.pokemon.example

@@ -9,6 +9,17 @@
     "heartbeat_threshold": 10,
     "enable_social": true,
     "tasks": [
+      {
+        "//NOTE: This task MUST be placed on the top of task list": {},
+        "type": "RandomAlivePause",
+        "config": {
+          "enabled": false,
+          "min_duration": "00:00:10",
+          "max_duration": "00:10:00",
+          "min_interval": "00:05:00",
+          "max_interval": "01:30:00"
+        }
+      },
       {
         "type": "HandleSoftBan"
       },

docs/configuration_files.md

@@ -506,6 +506,7 @@ This task will fetch current pokemon spawns from /raw_data of an PokemonGo-Map i
    - `priority` - Will move to the pokemon with the highest priority assigned (tie breaking by distance)
 * `prioritize_vips` - Will prioritize vips in distance and priority mode above all normal pokemon if set to true
 * `min_time` - Minimum time the pokemon has to be available before despawn
+* `min_ball` - Minimum amount of balls required to run task
 * `max_distance` - Maximum distance the pokemon is allowed to be when walking, ignored when sniping
 * `snipe`:
    - `True` - Will teleport to target pokemon, encounter it, teleport back then catch it

docs/installation.md

@@ -1,11 +1,11 @@
-#Install the bot
+# Install the bot
 ## Table of Contents
 - [Linux or Mac Automatic Installation](#linuxmac)
 - [Windows Automatic Installation](#windows)
 - [Docker Automatic Installation](#docker)
 
 
-#Linux/Mac
+# Linux/Mac
 ### Requirements (click each one for install guide)
 - [Python 2.7.x](http://docs.python-guide.org/en/latest/starting/installation/)
 - [pip](https://pip.pypa.io/en/stable/installing/)
@@ -28,12 +28,12 @@
 
 for manual installation please refer to [here](https://github.com/PokemonGoF/PokemonGo-Bot/blob/dev/docs/manual_installation.md)
 
-#Windows
+# Windows
 We do recommend Windows users to use [Docker](#docker) this will work much easier and smoother (also saver)
 
-##Requirements
+## Requirements
 
-###Easy Installation
+### Easy Installation
 1. Download [PokemonGo-Bot-Install.bat](https://github.com/PokemonGoF/PokemonGo-Bot/blob/master/windows_bat/PokemonGo-Bot-Install.bat)
 2. Download `encrypt.so` and `encrypt.dll` or `encrypt_64.dll` to the same folder of the `PokemonGo-Bot-Install.bat`.
 3. Run `PokemonGo-Bot-install.bat`.
@@ -45,9 +45,9 @@ This will start the bot and the web interface.
 3. Run `PokemonGo-Bot-Start.bat`
 This will check for an update and will start the bot afterwards.
 
-#Docker
+# Docker
 
-###Easy installation
+### Easy installation
 Start by downloading for your platform:
 - [Mac](https://www.docker.com/products/docker#/mac)
 - [Windows](https://www.docker.com/products/docker#/windows)
@@ -81,7 +81,7 @@ docker run --name=bot1-pokegoweb --rm -it --volumes-from bot1-pokego -p 8000:800
 ```
 The OpenPoGoWeb will be served on `http://<your host>:8000`
 
-###Remarks for Windows
+### Remarks for Windows
 
 Even if the previous command are valid, you will not be able to visualize the web view under Windows. 
 To visualize the web view, execute instead the following commands (*make sure you are in the root folder and that your docker images is built*):
@@ -109,7 +109,7 @@ Then, with your containers running and your host address, you can access the web
 `http://<your host address>:8000 (eg http://192.168.99.100:8000)`
 
 
-####Errors
+#### Errors
 
 - An error occurred trying to connect:
 
@@ -124,7 +124,7 @@ docker-machine env default
 
 Make sure that the name of the image is correct.
 
- ###Using Docker compose
+### Using Docker compose
 
 if docker-compose [installed](https://docs.docker.com/compose/install/) you can alternatively run the PokemonGo-Bot ecosystem with one simple command:  
 (by using the docker-compose.yml configuration in this repo)