merge and refactor config files (#818)

CONTRIBUTORS.md

@@ -29,4 +29,5 @@
  * budi-khoirudin
  * riberod07
  * th3w4y
- * Leaklessgfy
+ * Leaklessgfy
+ * steffwiz

README.md

@@ -185,6 +185,26 @@ To update your project do: `git pull` in the project folder
 - `item_filter` :
 - `evolve_all` : Set to true to evolve pokemons if possible
 
+## Catch Configuration
+Default configuration will capture all Pokemon.
+```"any": {"catch_above_cp": 0, "catch_above_iv": 0, "logic": "or"}```
+You can override the global configuration with Pokemon-specific options, such as:
+```"Pidgey": {"catch_above_cp": 0, "catch_above_iv": 0.8", "logic": "and"}```
+to only capture Pidgey with a good roll.
+Additionally, you can specify always_capture and never_capture flags. For example:
+```"Pidgey": {"never_capture": true}```
+will stop catching Pidgey entirely.
+
+## Release Configuration
+Default configuration will not release any Pokemon.
+```"any": {"release_under_cp": 0, "release_under_iv": 0, "logic": "or"}```
+You can override the global configuration with Pokemon-specific options, such as:
+```"Pidgey": {"release_below_cp": 0, "release_below_iv": 0.8", "logic": "or"}```
+to only release Pidgey with bad rolls.
+Additionally, you can specify always_release and never_release flags. For example:
+```"Pidgey": {"always_release": true}```
+will release all Pidgey caught.
+
 ### Evolve All Configuration
     By setting the `evolve_all` attribute in config.json, you can instruct the bot to automatically
     evolve specified pokemons on startup. This is especially useful for batch-evolving after popping up
@@ -232,7 +252,7 @@ sudo apt-get install nginx
 
 #### 2. Check the webserver
 Check if the webserver is running by using your browser and entering the IP address of your local machine/server.
-On a local machine this would be http://127.0.0.1. On AWS this is your public DNS if you havent configured an elastic IP.
+On a local machine this would be http://127.0.0.1. On AWS this is your public DNS if you haven't configured an elastic IP.
 
 #### 3. Change Base Directory of the Webserver
 ```
@@ -248,7 +268,7 @@ Comment out following line: ```root /var/www/html;``` and change it to the web f
 ### What's IV ?
 Here's the [introduction](http://bulbapedia.bulbagarden.net/wiki/Individual_values)
 
-### Does it run automatally?
+### Does it run automatically?
 Not yet, still need a trainer to train the script param. But we are very close to.
 ### Set GEO Location
 It works, use -l "xx.yyyy,zz.ttttt" to set lat long for location. -- diordache

configs/config.json.example

@@ -1,9 +1,9 @@
 {
     "auth_service": "google",
-    "username": "YOURACCOUNT@gmail.com",
-    "password": "YOURPASSWORD",
-    "location": "SOME LOCATION",
-    "gmapkey": "AGMAPAPIKEY",
+    "username": "YOUR_USERNAME",
+    "password": "YOUR_PASSWORD",
+    "location": "SOME_LOCATION",
+    "gmapkey": "GOOGLE_MAPS_API_KEY",
     "max_steps": 5,
     "mode": "all",
     "walk": 4.16,
@@ -12,7 +12,13 @@
     "initial_transfer": 0,
     "location_cache": true,
     "distance_unit": "km",
-    "item_filter": "101,102,103,104",
+    "item_filter": "",
     "evolve_all": "NONE",
-    "use_lucky_egg": false
+    "use_lucky_egg": false,
+    "catch": {
+      "any": {"catch_above_cp": 0, "catch_above_iv": 0, "logic": "or"}
+    },
+    "release": {
+      "any": {"release_under_cp": 0, "release_under_iv": 0, "logic": "or"}
+    }
 }

pokecli.py

@@ -43,11 +43,9 @@
 if sys.version_info >= (2, 7, 9):
     ssl._create_default_https_context = ssl._create_unverified_context
 
-
 def init_config():
     parser = argparse.ArgumentParser()
     config_file = "configs/config.json"
-    release_config_json = "configs/release_config.json"
     web_dir = "web"
 
     # If config file exists, load variables from json
@@ -165,6 +163,8 @@ def init_config():
     for key in config.__dict__:
         if key in load:
             config.__dict__[key] = load[key]
+    config.catch = load['catch']
+    config.release = load['release']
 
     if config.auth_service not in ['ptc', 'google']:
         logging.error("Invalid Auth service specified! ('ptc' or 'google')")
@@ -174,14 +174,9 @@ def init_config():
         parser.error("Needs either --use-location-cache or --location.")
         return None
 
-    config.release_config = {}
-    if os.path.isfile(release_config_json):
-        with open(release_config_json) as data:
-            config.release_config.update(json.load(data))
+    # When config.item_filter looks like "101,102,103" needs to be converted to ["101","102","103"]
     if isinstance(config.item_filter, basestring):
-        #When config.item_filter looks like "101,102,103" needs to be converted to ["101","102","103"]
         config.item_filter= config.item_filter.split(",")
-
 
     # create web dir if not exists
     try: