Moving use_lucky_egg to be a task configuration

PokemonGoF · Jul 31, 2016 · 81129d3 · 81129d3
1 parent a1af7a6
commit 81129d3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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)