From 81129d394fa7bf7913b2caf5b754d0ff42ed862a Mon Sep 17 00:00:00 2001
From: Eli White <github@eli-white.com>
Date: Sat, 30 Jul 2016 23:47:13 -0700
Subject: [PATCH] Moving use_lucky_egg to be a task configuration

---
 configs/config.json.example              |  4 ++--
 configs/config.json.path.example         |  4 ++--
 configs/config.json.pokemon.example      |  4 ++--
 pokecli.py                               | 11 +----------
 pokemongo_bot/cell_workers/evolve_all.py |  3 ++-
 5 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/configs/config.json.example b/configs/config.json.example
index 34ada4c5b2..7c250203d5 100644
--- a/configs/config.json.example
+++ b/configs/config.json.example
@@ -23,7 +23,8 @@
       {
         "type": "EvolveAll",
         "config": {
-          "evolve_speed": 20
+          "evolve_speed": 20,
+          "use_lucky_egg": true
         }
       },
       {
@@ -70,7 +71,6 @@
     },
     "evolve_all": "NONE",
     "evolve_cp_min": 300,
-    "use_lucky_egg": false,
     "evolve_captured": "NONE",
     "catch_randomize_reticle_factor": 1.0,
     "catch_randomize_spin_factor": 1.0,
diff --git a/configs/config.json.path.example b/configs/config.json.path.example
index d798eaaab0..29deee544c 100644
--- a/configs/config.json.path.example
+++ b/configs/config.json.path.example
@@ -23,7 +23,8 @@
       {
         "type": "EvolveAll",
         "config": {
-          "evolve_speed": 20
+          "evolve_speed": 20,
+          "use_lucky_egg": true
         }
       },
       {
@@ -75,7 +76,6 @@
     },
     "evolve_all": "NONE",
     "evolve_cp_min": 300,
-    "use_lucky_egg": false,
     "evolve_captured": "NONE",
     "catch_randomize_reticle_factor": 1.0,
     "catch_randomize_spin_factor": 1.0,
diff --git a/configs/config.json.pokemon.example b/configs/config.json.pokemon.example
index 17973075b9..90dbdd5449 100644
--- a/configs/config.json.pokemon.example
+++ b/configs/config.json.pokemon.example
@@ -23,7 +23,8 @@
       {
         "type": "EvolveAll",
         "config": {
-          "evolve_speed": 20
+          "evolve_speed": 20,
+          "use_lucky_egg": true
         }
       },
       {
@@ -72,7 +73,6 @@
     },
     "evolve_all": "NONE",
     "evolve_cp_min": 300,
-    "use_lucky_egg": false,
     "evolve_captured": "NONE",
     "catch_randomize_reticle_factor": 1.0,
     "catch_randomize_spin_factor": 1.0,
diff --git a/pokecli.py b/pokecli.py
index 4d2008a6db..b2cc91e3eb 100755
--- a/pokecli.py
+++ b/pokecli.py
@@ -315,15 +315,6 @@ def init_config():
         type=str,
         default=[]
     )
-    add_config(
-        parser,
-        load,
-        short_flag="-le",
-        long_flag="--use_lucky_egg",
-        help="Uses lucky egg when using evolve_all",
-        type=bool,
-        default=False
-    )
     add_config(
         parser,
         load,
@@ -408,7 +399,7 @@ def task_configuration_error(flag_name):
             """.format(flag_name))
 
     old_flags = ['mode', 'catch_pokemon', 'spin_forts', 'forts_spin', 'hatch_eggs', 'release_pokemon', 'softban_fix',
-                'longer_eggs_first', 'evolve_speed']
+                'longer_eggs_first', 'evolve_speed', 'use_lucky_egg']
     for flag in old_flags:
         if flag in load:
             task_configuration_error(flag)
diff --git a/pokemongo_bot/cell_workers/evolve_all.py b/pokemongo_bot/cell_workers/evolve_all.py
index fbf5e37471..8503c803c7 100644
--- a/pokemongo_bot/cell_workers/evolve_all.py
+++ b/pokemongo_bot/cell_workers/evolve_all.py
@@ -6,6 +6,7 @@
 class EvolveAll(BaseTask):
     def initialize(self):
         self.evolve_speed = self.config.get('evolve_speed', 3.7)
+        self.use_lucky_egg = self.config.get('use_lucky_egg', False)
 
     def work(self):
         if not self._should_run():
@@ -53,7 +54,7 @@ def _should_run(self):
             return False
 
         # Evolve all is used - Don't run after the first tick or if the config flag is false
-        if self.bot.tick_count is not 1 or not self.bot.config.use_lucky_egg:
+        if self.bot.tick_count is not 1 or not self.use_lucky_egg:
             return True
 
         lucky_egg_count = self.bot.item_inventory_count(Item.ITEM_LUCKY_EGG.value)