Rename EvolveAll to EvolvePokemon task name

PokemonGoF · Aug 2, 2016 · 3cfa209 · 3cfa209
1 parent 2378aee
commit 3cfa209
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 18 deletions.
diff --git a/configs/config.json.cluster.example b/configs/config.json.cluster.example
@@ -21,12 +21,15 @@
         "type": "TransferPokemon"
       },
       {
-        "type": "EvolveAll",
+        "type": "EvolvePokemon",
         "config": {
-          "evolve_all": "NONE",
-          "evolve_cp_min": 300,
-          "evolve_speed": 20,
-          "use_lucky_egg": false
+            "evolve_all": "none",
+            "first_evolve_by": "cp",
+            "evolve_above_cp": 500,
+            "evolve_above_iv": 0.8,
+            "logic": "or",
+            "evolve_speed": 20,
+            "use_lucky_egg": false
         }
       },
       {

diff --git a/configs/config.json.example b/configs/config.json.example
@@ -21,7 +21,7 @@
         "type": "TransferPokemon"
       },
       {
-        "type": "EvolveAll",
+        "type": "EvolvePokemon",
         "config": {
             "evolve_all": "none",
             "first_evolve_by": "cp",

diff --git a/configs/config.json.path.example b/configs/config.json.path.example
@@ -21,12 +21,15 @@
         "type": "TransferPokemon"
       },
       {
-        "type": "EvolveAll",
+        "type": "EvolvePokemon",
         "config": {
-          "evolve_all": "NONE",
-          "evolve_cp_min": 300,
-          "evolve_speed": 20,
-          "use_lucky_egg": false
+            "evolve_all": "none",
+            "first_evolve_by": "cp",
+            "evolve_above_cp": 500,
+            "evolve_above_iv": 0.8,
+            "logic": "or",
+            "evolve_speed": 20,
+            "use_lucky_egg": false
         }
       },
       {

diff --git a/configs/config.json.pokemon.example b/configs/config.json.pokemon.example
@@ -21,12 +21,15 @@
         "type": "TransferPokemon"
       },
       {
-        "type": "EvolveAll",
+        "type": "EvolvePokemon",
         "config": {
-          "evolve_all": "NONE",
-          "evolve_cp_min": 300,
-          "evolve_speed": 20,
-          "use_lucky_egg": false
+            "evolve_all": "none",
+            "first_evolve_by": "cp",
+            "evolve_above_cp": 500,
+            "evolve_above_iv": 0.8,
+            "logic": "or",
+            "evolve_speed": 20,
+            "use_lucky_egg": false
         }
       },
       {

diff --git a/pokemongo_bot/cell_workers/__init__.py b/pokemongo_bot/cell_workers/__init__.py
@@ -2,7 +2,7 @@
 
 from catch_lured_pokemon import CatchLuredPokemon
 from catch_visible_pokemon import CatchVisiblePokemon
-from evolve_all import EvolveAll
+from evolve_pokemon import EvolvePokemon
 from incubate_eggs import IncubateEggs
 from move_to_fort import MoveToFort
 from nickname_pokemon import NicknamePokemon

diff --git a/pokemongo_bot/cell_workers/evolve_all.py → pokemongo_bot/cell_workers/evolve_pokemon.py b/pokemongo_bot/cell_workers/evolve_all.py → pokemongo_bot/cell_workers/evolve_pokemon.py
@@ -3,7 +3,7 @@
 from pokemongo_bot.item_list import Item
 from pokemongo_bot.cell_workers.base_task import BaseTask
 
-class EvolveAll(BaseTask):
+class EvolvePokemon(BaseTask):
     def initialize(self):
         self.api = self.bot.api
         self.evolve_all = self.config.get('evolve_all', [])