Merge branch 'dev' of https://github.com/PokemonGoF/PokemonGo-Bot int…

…o dev

.gitignore

@@ -100,6 +100,7 @@ share/
 
 # PyCharm IDE settings
 .idea/
+*.iml
 
 # Personal load details
 src/

.mention-bot

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

CONTRIBUTORS.md

@@ -61,3 +61,6 @@
  * JaapMoolenaar
  * eevee-github
  * g0vanish
+ * cmezh
+ * Nivong
+ * kestel

Dockerfile

@@ -1,4 +1,7 @@
-FROM python:2.7-onbuild
+FROM python:2.7
+
+WORKDIR /usr/src/app
+VOLUME ["/usr/app/configs", "/usr/src/app/web"]
 
 ARG timezone=Etc/UTC
 RUN echo $timezone > /etc/timezone \
@@ -15,8 +18,11 @@ RUN cd /tmp && wget "http://pgoapi.com/pgoencrypt.tar.gz" \
     && cd /tmp \
     && rm -rf /tmp/pgoencrypt*
 
-VOLUME ["/usr/src/app/web"]
-
 ENV LD_LIBRARY_PATH /usr/src/app
 
+COPY requirements.txt /usr/src/app/
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . /usr/src/app
+
 ENTRYPOINT ["python", "pokecli.py"]

README.md

@@ -1,18 +1,14 @@
-
-# PokemonGo-Bot (Working)
+# 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`.
-
-## Help Needed on [Desktop Version](https://github.com/PokemonGoF/PokemonGo-Bot-Desktop)
 
-## Please submit PR to [Dev branch](https://github.com/PokemonGoF/PokemonGo-Bot/tree/dev)
+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`.
 
-We use [Slack](https://slack.com) as a web chat. [Click here to join the chat!](https://pokemongo-bot.herokuapp.com)
-You can count on the community in #help channel.
+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)
 
 ## Features
@@ -27,9 +23,9 @@ You can count on the community in #help channel.
 - [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
 
@@ -45,22 +41,8 @@ If there are any concerns with this policy or you believe we are tracking someth
 
 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`.
 
-## 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)
-- [Plugins](https://github.com/PokemonGoF/PokemonGo-Bot/blob/dev/docs/plugins.md)
-- [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)
+## Help Needed on [Desktop Version](https://github.com/PokemonGoF/PokemonGo-Bot-Desktop)
 
-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.
 
 ## Credits
 - [tejado](https://github.com/tejado) many thanks for the API

configs/config.json.cluster.example

@@ -78,7 +78,6 @@
     "location_cache": true,
     "distance_unit": "km",
     "reconnecting_timeout": 15,
-    "evolve_captured": "NONE",
     "catch_randomize_reticle_factor": 1.0,
     "catch_randomize_spin_factor": 1.0,
     "logging_color": true,

configs/config.json.example

@@ -93,7 +93,6 @@
     "location_cache": true,
     "distance_unit": "km",
     "reconnecting_timeout": 15,
-    "evolve_captured": "NONE",
     "catch_randomize_reticle_factor": 1.0,
     "catch_randomize_spin_factor": 1.0,
     "logging_color": true,

configs/config.json.map.example

@@ -320,7 +320,6 @@
     "location_cache": true,
     "distance_unit": "km",
     "reconnecting_timeout": 15,
-    "evolve_captured": "NONE",
     "catch_randomize_reticle_factor": 1.0,
     "catch_randomize_spin_factor": 1.0,
     "logging_color": true,

configs/config.json.path.example

@@ -80,7 +80,6 @@
     "location_cache": true,
     "distance_unit": "km",
     "reconnecting_timeout": 15,
-    "evolve_captured": "NONE",
     "catch_randomize_reticle_factor": 1.0,
     "catch_randomize_spin_factor": 1.0,
     "logging_color": true,

configs/config.json.pokemon.example

@@ -86,7 +86,6 @@
     "location_cache": true,
     "distance_unit": "km",
     "reconnecting_timeout": 15,
-    "evolve_captured": "NONE",
     "catch_randomize_reticle_factor": 1.0,
     "catch_randomize_spin_factor": 1.0,
     "logging_color": true,

data/charged_moves.json

@@ -84,9 +84,8 @@
 {"id":101,"name":"Flame Charge","type":"Fire","damage":25,"duration":3100,"energy":20,"dps":8.06},
 {"id":34,"name":"Heart Stamp","type":"Psychic","damage":20,"duration":2550,"energy":25,"dps":7.84},
 {"id":75,"name":"Parabolic Charge","type":"Electric","damage":15,"duration":2100,"energy":20,"dps":7.14},
-{"id":13,"name":"Wrap","type":"Normal","damage":25,"duration":3700,"energy":20,"dps":6.75},
 {"id":111,"name":"Icy Wind","type":"Ice","damage":25,"duration":3800,"energy":20,"dps":6.57},
 {"id":84,"name":"Disarming Voice","type":"Fairy","damage":25,"duration":3900,"energy":20,"dps":6.41},
 {"id":13,"name":"Wrap","type":"Normal","damage":25,"duration":4000,"energy":20,"dps":6.25},
 {"id":66,"name":"Shadow Sneak","type":"Ghost","damage":15,"duration":3100,"energy":20,"dps":4.83},
-{"id":48,"name":"Mega Drain","type":"Grass","damage":15,"duration":3200,"energy":20,"dps":4.68}]
+{"id":48,"name":"Mega Drain","type":"Grass","damage":15,"duration":3200,"energy":20,"dps":4.68}]

data/level_to_cpm.json

@@ -0,0 +1,81 @@
+{
+  "1":    0.094,
+  "1.5":  0.135137432,
+  "2":    0.16639787,
+  "2.5":  0.192650919,
+  "3":    0.21573247,
+  "3.5":  0.236572661,
+  "4":    0.25572005,
+  "4.5":  0.273530381,
+  "5":    0.29024988,
+  "5.5":  0.306057377,
+  "6":    0.3210876,
+  "6.5":  0.335445036,
+  "7":    0.34921268,
+  "7.5":  0.362457751,
+  "8":    0.37523559,
+  "8.5":  0.387592406,
+  "9":    0.39956728,
+  "9.5":  0.411193551,
+  "10":   0.42250001,
+  "10.5": 0.432926419,
+  "11":   0.44310755,
+  "11.5": 0.4530599578,
+  "12":   0.46279839,
+  "12.5": 0.472336083,
+  "13":   0.48168495,
+  "13.5": 0.4908558,
+  "14":   0.49985844,
+  "14.5": 0.508701765,
+  "15":   0.51739395,
+  "15.5": 0.525942511,
+  "16":   0.53435433,
+  "16.5": 0.542635767,
+  "17":   0.55079269,
+  "17.5": 0.558830576,
+  "18":   0.56675452,
+  "18.5": 0.574569153,
+  "19":   0.58227891,
+  "19.5": 0.589887917,
+  "20":   0.59740001,
+  "20.5": 0.604818814,
+  "21":   0.61215729,
+  "21.5": 0.619399365,
+  "22":   0.62656713,
+  "22.5": 0.633644533,
+  "23":   0.64065295,
+  "23.5": 0.647576426,
+  "24":   0.65443563,
+  "24.5": 0.661214806,
+  "25":   0.667934,
+  "25.5": 0.674577537,
+  "26":   0.68116492,
+  "26.5": 0.687680648,
+  "27":   0.69414365,
+  "27.5": 0.700538673,
+  "28":   0.70688421,
+  "28.5": 0.713164996,
+  "29":   0.71939909,
+  "29.5": 0.725571552,
+  "30":   0.7317,
+  "30.5": 0.734741009,
+  "31":   0.73776948,
+  "31.5": 0.740785574,
+  "32":   0.74378943,
+  "32.5": 0.746781211,
+  "33":   0.74976104,
+  "33.5": 0.752729087,
+  "34":   0.75568551,
+  "34.5": 0.758630378,
+  "35":   0.76156384,
+  "35.5": 0.764486065,
+  "36":   0.76739717,
+  "36.5": 0.770297266,
+  "37":   0.7731865,
+  "37.5": 0.776064962,
+  "38":   0.77893275,
+  "38.5": 0.781790055,
+  "39":   0.78463697,
+  "39.5": 0.787473578,
+  "40":   0.79030001
+}