Evolve only if evolvable candidates no less than a certain number.

.github/ISSUE_TEMPLATE.md

@@ -1,12 +1,23 @@
+## Stop! Before you create this issue (you can delete this section when opening the issue):
+1. Have you validated that your config.json is valid JSON? Use http://jsonlint.com/ to check.
+2. Have you searched to see if there are other issues for the same issue? If so, comment on that issue instead.
+3. Are you running `master`? We work on the `dev` branch and then add that functionality to `master`. Your issue may be fixed on `dev` and there is no need for this issue, just wait and it will eventually be merged to `master`.
+
 ### Expected Behavior
 
 
 ### Actual Behavior
 
 
+### Your config.json (remove your credentials and any other private info)
+```
+your config here
+```
+
 ### Steps to Reproduce
 
 
 ### Other Information
-OS: 
+OS:
 Git Commit: (run 'git log -n 1 --pretty=format:"%H"' and paste it here)
+Python Version: (run 'python -V' and paste it here)

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,15 @@
-Short Description: 
+# Please Note (you may remove this section before opening your PR):
+We receive lots of PRs and it is hard to give proper review to PRs. Please make it easy on us by following these guidelines:
 
-Fixes:
-- 
-- 
-- 
+1. We do not accept changes to `master`. Please make sure your pull request is aimed at `dev`.
+2. If you changed a bunch of files (that aren't config files) or multiple workers to implement your feature, it probably won't get proper attention. Please split it up into multiple, smaller, more focused, and iterative PRs if you can.
+3. If you are adding a config value to something, make sure you update the appropriate `config.json` example files.
+
+
+## Short Description:
+
+## Fixes (provide links to github issues if you can):
+-
+-
+-
 

.gitignore

@@ -35,6 +35,9 @@ var/
 .pydevproject
 .settings/
 
+# Cloud9 Users
+.c9/
+
 # Installer logs
 pip-log.txt
 pip-delete-this-directory.txt
@@ -86,6 +89,8 @@ celerybeat-schedule
 # virtualenv
 venv/
 ENV/
+local/
+share/
 
 # Spyder project settings
 .spyderproject
@@ -95,6 +100,8 @@ ENV/
 
 # PyCharm IDE settings
 .idea/
+*.iml
+out/
 
 # Personal load details
 src/
@@ -113,10 +120,14 @@ configs/*
 !configs/config.json.map.example
 !configs/path.example.json
 !config.json.cluster.example
+!config.json.optimizer.example
 
 # Virtualenv folders
 bin/
 include/
 
 # Pip check file
 pip-selfcheck.json
+
+# Some love for the vim users
+.*.sw*

.mention-bot

@@ -0,0 +1,3 @@
+{
+  "userBlacklist": ["tejado"]
+}

CONTRIBUTORS.md

@@ -50,3 +50,22 @@
  * z4ppy.bbc
  * matheussampaio
  * Abraxas000
+ * lucasfevi
+ * pokepal
+ * Moonlight-Angel
+ * mjmadsen
+ * nikofil
+ * bigkraig
+ * nikhil-pandey
+ * thebigjc
+ * JaapMoolenaar
+ * eevee-github
+ * g0vanish
+ * cmezh
+ * Nivong
+ * kestel
+ * simonsmh
+ * joaodragao
+ * extink
+ * Quantra
+ * pmquan

Dockerfile

@@ -1,13 +1,26 @@
-FROM python:2.7-onbuild
+FROM python:2.7
+
+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 apt-get update \
-    && apt-get install -y python-protobuf
+RUN cd /tmp && wget "http://pgoapi.com/pgoencrypt.tar.gz" \
+    && tar zxvf pgoencrypt.tar.gz \
+    && cd pgoencrypt/src \
+    && make \
+    && cp libencrypt.so /usr/src/app/encrypt.so \
+    && cd /tmp \
+    && rm -rf /tmp/pgoencrypt*
+
+ENV LD_LIBRARY_PATH /usr/src/app
+
+COPY requirements.txt /usr/src/app/
+RUN pip install --no-cache-dir -r requirements.txt
 
-VOLUME ["/usr/src/app/web"]
+COPY . /usr/src/app
 
-ENTRYPOINT ["python", "pokecli.py"]
+ENTRYPOINT ["python", "pokecli.py"]

Procfile

@@ -0,0 +1 @@
+worker: python pokecli.py $EXTRA_ARGS

README.md

@@ -1,15 +1,15 @@
 # PokemonGo-Bot
 PokemonGo bot is a project created by the [PokemonGoF](https://github.com/PokemonGoF) team.
-The project is currently setup in two main branches. `dev` and `master`.
 
-We use [Slack](https://slack.com) as a web chat. [Click here to join the chat!](https://pokemongo-bot.herokuapp.com)
+The project is currently setup in two main branches. `dev` also known as `beta` and `master` also known as `stable`. Submit your PR's to `dev`.
+
+If you need any help please don't create an issue here on github we have a great community on Slack, [Click here to join the chat!](https://pokemongo-bot.herokuapp.com). You can count on the community in #help channel.
 
 ## 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/)
 - [Features](#features)
-- [Wiki](#wiki)
 - [Credits](#credits)
-- [Donation](#donation)
-
 
 ## Features
 - [x] GPS Location configuration
@@ -23,37 +23,34 @@ We use [Slack](https://slack.com) as a web chat. [Click here to join the chat!](
 - [x] Rudimentary IV Functionality filter
 - [x] Ignore certain pokemon filter
 - [x] Adjust delay between Pokemon capture & Transfer as per configuration
-- [ ] Standalone Desktop Application
 - [x] Hatch eggs
 - [x] Incubate eggs
+- [ ] [Standalone Desktop Application] (https://github.com/PokemonGoF/PokemonGo-Bot-Desktop)
 - [ ] Use candy
 - [ ] Inventory cleaner
 
 ## 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.
 
-## Wiki
-All information on [Getting Started](https://github.com/PokemonGoF/PokemonGo-Bot/wiki/Getting-Started) is available in the [Wiki](https://github.com/PokemonGoF/PokemonGo-Bot/wiki/)!
-- __Installation__
-  - [Requirements] (https://github.com/PokemonGoF/PokemonGo-Bot/wiki/Installation#requirements-click-each-one-for-install-guide)
-  - [How to run with Docker](https://github.com/PokemonGoF/PokemonGo-Bot/wiki/How-to-run-with-Docker)
-  - [Linux] (https://github.com/PokemonGoF/PokemonGo-Bot/wiki/Installation#installation-linux)
-  - [Mac] (https://github.com/PokemonGoF/PokemonGo-Bot/wiki/Installation#installation-mac)
-  - [Windows] (https://github.com/PokemonGoF/PokemonGo-Bot/wiki/Installation#installation-windows)
-- [Develop PokemonGo-Bot](https://github.com/PokemonGoF/PokemonGo-Bot/wiki/Develop-PokemonGo-Bot)
-- [Configuration-files](https://github.com/PokemonGoF/PokemonGo-Bot/wiki/Configuration-files)
-- [Front end web module - Google Maps API] (https://github.com/PokemonGoF/PokemonGo-Bot/wiki/Google-Maps-API-(web-page))
-- [Docker Usage](https://github.com/PokemonGoF/PokemonGo-Bot/wiki/FAQ#how-to-run-with-docker)
-- [FAQ](https://github.com/PokemonGoF/PokemonGo-Bot/wiki/FAQ)
-
-To ensure that all updates are documented - [@eggins](https://github.com/eggins) will keep the Wiki updated with the latest information on installing, updating and configuring the bot.
+## 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.
+
+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).
+
+If there are any concerns with this policy or you believe we are tracking something we shouldn't, please open a ticket in the tracker. The contributors always intend to do the right thing for our users, and we want to make sure we are held to that path.
+
+If you do not want any data to be gathered, you can turn off this feature by setting `health_record` to `false` in your `config.json`.
+
+## 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
 - [Mila432](https://github.com/Mila432/Pokemon_Go_API) for the login secrets
 - [elliottcarlson](https://github.com/elliottcarlson) for the Google Auth PR
 - [AeonLucid](https://github.com/AeonLucid/POGOProtos) for improved protos
 - [AHAAAAAAA](https://github.com/AHAAAAAAA/PokemonGo-Map) for parts of the s2sphere stuff
 
 
-[![Analytics](https://ga-beacon.appspot.com/UA-81468120-1/welcome-page-dev)](https://github.com/igrigorik/ga-beacon)
+[![Analytics](https://ga-beacon.appspot.com/UA-81468120-1/welcome-page-master)](https://github.com/igrigorik/ga-beacon)

configs/config.json.cluster.example

@@ -4,10 +4,21 @@
     "password": "YOUR_PASSWORD",
     "location": "SOME_LOCATION",
     "gmapkey": "GOOGLE_MAPS_API_KEY",
+    "encrypt_location": "",
     "tasks": [
       {
         "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"
       },
@@ -17,6 +28,16 @@
           "longer_eggs_first": true
         }
       },
+      {
+        "type": "UpdateLiveStats",
+        "config": {
+          "enabled": false,
+          "min_interval": 10,
+          "stats": ["uptime", "stardust_earned", "xp_earned", "xp_per_hour", "stops_visited"],
+          "terminal_log": true,
+          "terminal_title": true
+        }
+      },
       {
         "type": "TransferPokemon"
       },
@@ -27,6 +48,7 @@
             "first_evolve_by": "cp",
             "evolve_above_cp": 500,
             "evolve_above_iv": 0.8,
+            "evolve_num_min": 5,
             "logic": "or",
             "evolve_speed": 20,
             "use_lucky_egg": false
@@ -35,6 +57,7 @@
       {
         "type": "RecycleItems",
         "config": {
+          "min_empty_space": 15,
           "item_filter": {
             "Pokeball":       { "keep" : 100 },
             "Potion":         { "keep" : 10 },
@@ -62,7 +85,6 @@
         }
       }
     ],
-    "max_steps": 5,
     "forts": {
       "avoid_circles": true,
       "max_circle_size": 50
@@ -77,9 +99,10 @@
     "location_cache": true,
     "distance_unit": "km",
     "reconnecting_timeout": 15,
-    "evolve_captured": "NONE",
     "catch_randomize_reticle_factor": 1.0,
     "catch_randomize_spin_factor": 1.0,
+    "min_ultraball_to_keep": 10,
+    "logging_color": true,
     "catch": {
       "any": {"catch_above_cp": 0, "catch_above_iv": 0, "logic": "or"},
       "// Example of always catching Rattata:": {},

configs/config.json.example

@@ -4,10 +4,21 @@
     "password": "YOUR_PASSWORD",
     "location": "SOME_LOCATION",
     "gmapkey": "GOOGLE_MAPS_API_KEY",
+    "encrypt_location": "",
     "tasks": [
       {
         "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"
       },
@@ -17,16 +28,34 @@
           "longer_eggs_first": true
         }
       },
+      {
+        "type": "UpdateLiveStats",
+        "config": {
+          "enabled": false,
+          "min_interval": 10,
+          "stats": ["uptime", "stardust_earned", "xp_earned", "xp_per_hour", "stops_visited"],
+          "terminal_log": true,
+          "terminal_title": true
+        }
+      },
       {
         "type": "TransferPokemon"
       },
+      {
+        "type": "NicknamePokemon",
+        "config": {
+          "enabled": false,
+          "nickname_template": "{iv_pct}_{iv_ads}"
+        }
+      },
       {
         "type": "EvolvePokemon",
         "config": {
             "evolve_all": "none",
             "first_evolve_by": "cp",
             "evolve_above_cp": 500,
             "evolve_above_iv": 0.8,
+            "evolve_num_min": 5,
             "logic": "or",
             "evolve_speed": 20,
             "use_lucky_egg": false
@@ -35,6 +64,7 @@
       {
         "type": "RecycleItems",
         "config": {
+          "min_empty_space": 15,
           "item_filter": {
             "Pokeball":       { "keep" : 100 },
             "Potion":         { "keep" : 10 },
@@ -72,7 +102,8 @@
     "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": 4.16,
@@ -84,14 +115,22 @@
     "location_cache": true,
     "distance_unit": "km",
     "reconnecting_timeout": 15,
-    "evolve_captured": "NONE",
     "catch_randomize_reticle_factor": 1.0,
     "catch_randomize_spin_factor": 1.0,
+    "min_ultraball_to_keep": 10,
+    "logging_color": true,
     "catch": {
       "any": {"catch_above_cp": 0, "catch_above_iv": 0, "logic": "or"},
       "// Example of always catching Rattata:": {},
       "// Rattata": { "always_catch" : true }
     },
+    "catch_throw_parameters": {
+      "excellent_rate": 0.1,
+      "great_rate": 0.5,
+      "nice_rate": 0.3,
+      "normal_rate": 0.1,
+      "spin_success_rate" : 0.6
+    },
     "release": {
       "any": {"release_below_cp": 0, "release_below_iv": 0, "logic": "or"},
       "// Example of always releasing Rattata:": {},