diff --git a/configs/config.json.pokemons.example b/configs/config.json.pokemons.example index 77d25c6baf..700da8edb4 100644 --- a/configs/config.json.pokemons.example +++ b/configs/config.json.pokemons.example @@ -43,18 +43,18 @@ "Flareon": { "always_catch": true }, "// Growlithe evolves to Arcanine": {}, - "Growlithe": { "catch_above_cp": 465, "catch_above_iv": 0.8, "cp_iv_logic": "and" }, + "Growlithe": { "catch_above_cp": 465, "catch_above_iv": 0.8, "logic": "and" }, "// Dragonair evolves to Dragonite": {}, - "Dragonair": { "catch_above_cp": 0, "catch_above_iv": 0.8, "cp_iv_logic": "and" }, + "Dragonair": { "catch_above_cp": 0, "catch_above_iv": 0.8, "logic": "and" }, "// Grimer evolves to Muk": {}, - "Grimer": { "catch_above_cp": 448, "catch_above_iv": 0.8, "cp_iv_logic": "and" }, + "Grimer": { "catch_above_cp": 448, "catch_above_iv": 0.8, "logic": "and" }, "// Magikarp evolves to Gyarados": {}, - "Magikarp": { "catch_above_cp": 91, "catch_above_iv": 0.9, "cp_iv_logic": "and" }, + "Magikarp": { "catch_above_cp": 91, "catch_above_iv": 0.9, "logic": "and" }, "// Exeggcute evolves to Exeggutor": {}, - "Exeggcute": { "catch_above_cp": 384, "catch_above_iv": 0.8, "cp_iv_logic": "and" }, + "Exeggcute": { "catch_above_cp": 384, "catch_above_iv": 0.8, "logic": "and" }, "// Eevee evolves to many versions, like Vaporeon, Flareon": {}, - "Eevee": { "catch_above_cp": 376, "catch_above_iv": 0.8, "cp_iv_logic": "and"}, + "Eevee": { "catch_above_cp": 376, "catch_above_iv": 0.8, "logic": "and"}, "// A-Tier pokemons": {}, "Slowbro": { "always_catch": true }, @@ -92,172 +92,172 @@ "Kangaskhan": { "always_catch": true } }, "release": { - "any": {"release_under_cp": 0, "release_under_iv": 0, "logic": "or" }, + "any": {"release_below_cp": 0, "release_below_iv": 0, "logic": "or" }, "// Legendary pokemons (Goes under S-Tier)": {}, - "Lapras": { "release_under_cp": 1041, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Moltres": { "release_under_cp": 1132, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Zapdos": { "release_under_cp": 1087, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Articuno": { "release_under_cp": 1039, "release_under_iv": 0.8, "cp_iv_logic": "and" }, + "Lapras": { "release_below_cp": 1041, "release_below_iv": 0.8, "logic": "and" }, + "Moltres": { "release_below_cp": 1132, "release_below_iv": 0.8, "logic": "and" }, + "Zapdos": { "release_below_cp": 1087, "release_below_iv": 0.8, "logic": "and" }, + "Articuno": { "release_below_cp": 1039, "release_below_iv": 0.8, "logic": "and" }, "// S-Tier pokemons (if pokemon can be evolved into tier, list the representative)": {}, - "Mewtwo": { "release_under_cp": 1447, "release_under_iv": 0.8, "cp_iv_logic": "and"}, - "Dragonite": { "release_under_cp": 1221, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Snorlax": { "release_under_cp": 1087, "release_under_iv": 0.8, "cp_iv_logic": "and" }, + "Mewtwo": { "release_below_cp": 1447, "release_below_iv": 0.8, "logic": "and"}, + "Dragonite": { "release_below_cp": 1221, "release_below_iv": 0.8, "logic": "and" }, + "Snorlax": { "release_below_cp": 1087, "release_below_iv": 0.8, "logic": "and" }, "// Mew evolves to Mewtwo": {}, - "Mew": { "release_under_cp": 1152, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Arcanine": { "release_under_cp": 1041, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Vaporeon": { "release_under_cp": 984, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Gyarados": { "release_under_cp": 938, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Exeggutor": { "release_under_cp": 1032, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Muk": { "release_under_cp": 909, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Weezing": { "release_under_cp": 784, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Flareon": { "release_under_cp": 924, "release_under_iv": 0.8, "cp_iv_logic": "and" }, + "Mew": { "release_below_cp": 1152, "release_below_iv": 0.8, "logic": "and" }, + "Arcanine": { "release_below_cp": 1041, "release_below_iv": 0.8, "logic": "and" }, + "Vaporeon": { "release_below_cp": 984, "release_below_iv": 0.8, "logic": "and" }, + "Gyarados": { "release_below_cp": 938, "release_below_iv": 0.8, "logic": "and" }, + "Exeggutor": { "release_below_cp": 1032, "release_below_iv": 0.8, "logic": "and" }, + "Muk": { "release_below_cp": 909, "release_below_iv": 0.8, "logic": "and" }, + "Weezing": { "release_below_cp": 784, "release_below_iv": 0.8, "logic": "and" }, + "Flareon": { "release_below_cp": 924, "release_below_iv": 0.8, "logic": "and" }, "// Growlithe evolves to Arcanine": {}, - "Growlithe": { "release_under_cp": 465, "release_under_iv": 0.8, "cp_iv_logic": "and" }, + "Growlithe": { "release_below_cp": 465, "release_below_iv": 0.8, "logic": "and" }, "// Dragonair evolves to Dragonite": {}, - "Dragonair": { "release_under_cp": 609, "release_under_iv": 0.8, "cp_iv_logic": "and" }, + "Dragonair": { "release_below_cp": 609, "release_below_iv": 0.8, "logic": "and" }, "// Grimer evolves to Muk": {}, - "Grimer": { "release_under_cp": 448, "release_under_iv": 0.8, "cp_iv_logic": "and" }, + "Grimer": { "release_below_cp": 448, "release_below_iv": 0.8, "logic": "and" }, "// Magikarp evolves to Gyarados": {}, - "Magikarp": { "release_under_cp": 91, "release_under_iv": 0.8, "cp_iv_logic": "and" }, + "Magikarp": { "release_below_cp": 91, "release_below_iv": 0.8, "logic": "and" }, "// Exeggcute evolves to Exeggutor": {}, - "Exeggcute": { "release_under_cp": 384, "release_under_iv": 0.8, "cp_iv_logic": "and" }, + "Exeggcute": { "release_below_cp": 384, "release_below_iv": 0.8, "logic": "and" }, "// Eevee evolves to many versions, like Vaporeon, Flareon": {}, - "Eevee": { "release_under_cp": 376, "release_under_iv": 0.8, "cp_iv_logic": "and" }, + "Eevee": { "release_below_cp": 376, "release_below_iv": 0.8, "logic": "and" }, "// A-Tier pokemons": {}, - "Slowbro": { "release_under_cp": 907, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Victreebel": { "release_under_cp": 883, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Machamp": { "release_under_cp": 907, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Poliwrath": { "release_under_cp": 876, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Clefable": { "release_under_cp": 837, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Nidoking": { "release_under_cp": 864, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Venusaur": { "release_under_cp": 902, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Charizard": { "release_under_cp": 909, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Golduck": { "release_under_cp": 832, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Nidoqueen": { "release_under_cp": 868, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Vileplume": { "release_under_cp": 871, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Blastoise": { "release_under_cp": 888, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Omastar": { "release_under_cp": 780, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Aerodactyl": { "release_under_cp": 756, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Golem": { "release_under_cp": 804, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Wigglytuff": { "release_under_cp": 760, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Dewgong": { "release_under_cp": 748, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Ninetales": { "release_under_cp": 763, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Magmar": { "release_under_cp": 792, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Kabutops": { "release_under_cp": 744, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Electabuzz": { "release_under_cp": 739, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Starmie": { "release_under_cp": 763, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Jolteon": { "release_under_cp": 746, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Rapidash": { "release_under_cp": 768, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Pinsir": { "release_under_cp": 741, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Scyther": { "release_under_cp": 724, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Tentacruel": { "release_under_cp": 775, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Gengar": { "release_under_cp": 724, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Hypno": { "release_under_cp": 763, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Pidgeot": { "release_under_cp": 729, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Rhydon": { "release_under_cp": 782, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Seaking": { "release_under_cp": 712, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Kangaskhan": { "release_under_cp": 712, "release_under_iv": 0.8, "cp_iv_logic": "and" }, + "Slowbro": { "release_below_cp": 907, "release_below_iv": 0.8, "logic": "and" }, + "Victreebel": { "release_below_cp": 883, "release_below_iv": 0.8, "logic": "and" }, + "Machamp": { "release_below_cp": 907, "release_below_iv": 0.8, "logic": "and" }, + "Poliwrath": { "release_below_cp": 876, "release_below_iv": 0.8, "logic": "and" }, + "Clefable": { "release_below_cp": 837, "release_below_iv": 0.8, "logic": "and" }, + "Nidoking": { "release_below_cp": 864, "release_below_iv": 0.8, "logic": "and" }, + "Venusaur": { "release_below_cp": 902, "release_below_iv": 0.8, "logic": "and" }, + "Charizard": { "release_below_cp": 909, "release_below_iv": 0.8, "logic": "and" }, + "Golduck": { "release_below_cp": 832, "release_below_iv": 0.8, "logic": "and" }, + "Nidoqueen": { "release_below_cp": 868, "release_below_iv": 0.8, "logic": "and" }, + "Vileplume": { "release_below_cp": 871, "release_below_iv": 0.8, "logic": "and" }, + "Blastoise": { "release_below_cp": 888, "release_below_iv": 0.8, "logic": "and" }, + "Omastar": { "release_below_cp": 780, "release_below_iv": 0.8, "logic": "and" }, + "Aerodactyl": { "release_below_cp": 756, "release_below_iv": 0.8, "logic": "and" }, + "Golem": { "release_below_cp": 804, "release_below_iv": 0.8, "logic": "and" }, + "Wigglytuff": { "release_below_cp": 760, "release_below_iv": 0.8, "logic": "and" }, + "Dewgong": { "release_below_cp": 748, "release_below_iv": 0.8, "logic": "and" }, + "Ninetales": { "release_below_cp": 763, "release_below_iv": 0.8, "logic": "and" }, + "Magmar": { "release_below_cp": 792, "release_below_iv": 0.8, "logic": "and" }, + "Kabutops": { "release_below_cp": 744, "release_below_iv": 0.8, "logic": "and" }, + "Electabuzz": { "release_below_cp": 739, "release_below_iv": 0.8, "logic": "and" }, + "Starmie": { "release_below_cp": 763, "release_below_iv": 0.8, "logic": "and" }, + "Jolteon": { "release_below_cp": 746, "release_below_iv": 0.8, "logic": "and" }, + "Rapidash": { "release_below_cp": 768, "release_below_iv": 0.8, "logic": "and" }, + "Pinsir": { "release_below_cp": 741, "release_below_iv": 0.8, "logic": "and" }, + "Scyther": { "release_below_cp": 724, "release_below_iv": 0.8, "logic": "and" }, + "Tentacruel": { "release_below_cp": 775, "release_below_iv": 0.8, "logic": "and" }, + "Gengar": { "release_below_cp": 724, "release_below_iv": 0.8, "logic": "and" }, + "Hypno": { "release_below_cp": 763, "release_below_iv": 0.8, "logic": "and" }, + "Pidgeot": { "release_below_cp": 729, "release_below_iv": 0.8, "logic": "and" }, + "Rhydon": { "release_below_cp": 782, "release_below_iv": 0.8, "logic": "and" }, + "Seaking": { "release_below_cp": 712, "release_below_iv": 0.8, "logic": "and" }, + "Kangaskhan": { "release_below_cp": 712, "release_below_iv": 0.8, "logic": "and" }, "// Koffing evolves to Weezing (A-Tier)": {}, - "Koffing": { "release_under_cp": 403, "release_under_iv": 0.8, "cp_iv_logic": "and" }, + "Koffing": { "release_below_cp": 403, "release_below_iv": 0.8, "logic": "and" }, "// Below is B-tier and lower pokemons": {}, - "Magikarp": { "release_under_cp": 91, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Caterpie": { "release_under_cp": 156, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Weedle": { "release_under_cp": 156, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Diglett": { "release_under_cp": 158, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Metapod": { "release_under_cp": 168, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Kakuna": { "release_under_cp": 170, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Rattata": { "release_under_cp": 204, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Abra": { "release_under_cp": 208, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Zubat": { "release_under_cp": 225, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Chansey": { "release_under_cp": 235, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Pidgey": { "release_under_cp": 237, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Spearow": { "release_under_cp": 240, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Meowth": { "release_under_cp": 264, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Krabby": { "release_under_cp": 276, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Sandshrew": { "release_under_cp": 278, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Poliwag": { "release_under_cp": 278, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Horsea": { "release_under_cp": 278, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Gastly": { "release_under_cp": 280, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Ekans": { "release_under_cp": 288, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Shellder": { "release_under_cp": 288, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Vulpix": { "release_under_cp": 290, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Voltorb": { "release_under_cp": 292, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Geodude": { "release_under_cp": 297, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Doduo": { "release_under_cp": 297, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Onix": { "release_under_cp": 300, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Mankey": { "release_under_cp": 307, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Pikachu": { "release_under_cp": 309, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Magnemite": { "release_under_cp": 312, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Tentacool": { "release_under_cp": 316, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Paras": { "release_under_cp": 319, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Jigglypuff": { "release_under_cp": 321, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Ditto": { "release_under_cp": 321, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Staryu": { "release_under_cp": 326, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Charmander": { "release_under_cp": 333, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Goldeen": { "release_under_cp": 336, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Squirtle": { "release_under_cp": 352, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Cubone": { "release_under_cp": 352, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Venonat": { "release_under_cp": 360, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Bulbasaur": { "release_under_cp": 374, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Drowzee": { "release_under_cp": 374, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Machop": { "release_under_cp": 381, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Psyduck": { "release_under_cp": 386, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Seel": { "release_under_cp": 386, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Kabuto": { "release_under_cp": 386, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Bellsprout": { "release_under_cp": 391, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Omanyte": { "release_under_cp": 391, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Kadabra": { "release_under_cp": 396, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Oddish": { "release_under_cp": 400, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Dugtrio": { "release_under_cp": 408, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Rhyhorn": { "release_under_cp": 412, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Clefairy": { "release_under_cp": 420, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Slowpoke": { "release_under_cp": 424, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Pidgeotto": { "release_under_cp": 427, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Farfetch'd": { "release_under_cp": 441, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Poliwhirl": { "release_under_cp": 468, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Nidorino": { "release_under_cp": 480, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Haunter": { "release_under_cp": 482, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Nidorina": { "release_under_cp": 489, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Graveler": { "release_under_cp": 501, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Beedrill": { "release_under_cp": 504, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Raticate": { "release_under_cp": 504, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Butterfree": { "release_under_cp": 508, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Hitmonlee": { "release_under_cp": 520, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Ponyta": { "release_under_cp": 530, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Hitmonchan": { "release_under_cp": 530, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Charmeleon": { "release_under_cp": 544, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Wartortle": { "release_under_cp": 552, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Persian": { "release_under_cp": 568, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Lickitung": { "release_under_cp": 568, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Ivysaur": { "release_under_cp": 571, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Electrode": { "release_under_cp": 576, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Marowak": { "release_under_cp": 578, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Gloom": { "release_under_cp": 590, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Porygon": { "release_under_cp": 590, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Seadra": { "release_under_cp": 597, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Jynx": { "release_under_cp": 600, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Weepinbell": { "release_under_cp": 602, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Tangela": { "release_under_cp": 607, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Fearow": { "release_under_cp": 609, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Parasect": { "release_under_cp": 609, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Machoke": { "release_under_cp": 614, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Arbok": { "release_under_cp": 616, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Sandslash": { "release_under_cp": 631, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Alakazam": { "release_under_cp": 633, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Kingler": { "release_under_cp": 636, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Dodrio": { "release_under_cp": 640, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Tauros": { "release_under_cp": 643, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Primeape": { "release_under_cp": 650, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Magneton": { "release_under_cp": 657, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Venomoth": { "release_under_cp": 660, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Golbat": { "release_under_cp": 672, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Raichu": { "release_under_cp": 708, "release_under_iv": 0.8, "cp_iv_logic": "and" }, - "Cloyster": { "release_under_cp": 717, "release_under_iv": 0.8, "cp_iv_logic": "and"} + "Magikarp": { "release_below_cp": 91, "release_below_iv": 0.8, "logic": "and" }, + "Caterpie": { "release_below_cp": 156, "release_below_iv": 0.8, "logic": "and" }, + "Weedle": { "release_below_cp": 156, "release_below_iv": 0.8, "logic": "and" }, + "Diglett": { "release_below_cp": 158, "release_below_iv": 0.8, "logic": "and" }, + "Metapod": { "release_below_cp": 168, "release_below_iv": 0.8, "logic": "and" }, + "Kakuna": { "release_below_cp": 170, "release_below_iv": 0.8, "logic": "and" }, + "Rattata": { "release_below_cp": 204, "release_below_iv": 0.8, "logic": "and" }, + "Abra": { "release_below_cp": 208, "release_below_iv": 0.8, "logic": "and" }, + "Zubat": { "release_below_cp": 225, "release_below_iv": 0.8, "logic": "and" }, + "Chansey": { "release_below_cp": 235, "release_below_iv": 0.8, "logic": "and" }, + "Pidgey": { "release_below_cp": 237, "release_below_iv": 0.8, "logic": "and" }, + "Spearow": { "release_below_cp": 240, "release_below_iv": 0.8, "logic": "and" }, + "Meowth": { "release_below_cp": 264, "release_below_iv": 0.8, "logic": "and" }, + "Krabby": { "release_below_cp": 276, "release_below_iv": 0.8, "logic": "and" }, + "Sandshrew": { "release_below_cp": 278, "release_below_iv": 0.8, "logic": "and" }, + "Poliwag": { "release_below_cp": 278, "release_below_iv": 0.8, "logic": "and" }, + "Horsea": { "release_below_cp": 278, "release_below_iv": 0.8, "logic": "and" }, + "Gastly": { "release_below_cp": 280, "release_below_iv": 0.8, "logic": "and" }, + "Ekans": { "release_below_cp": 288, "release_below_iv": 0.8, "logic": "and" }, + "Shellder": { "release_below_cp": 288, "release_below_iv": 0.8, "logic": "and" }, + "Vulpix": { "release_below_cp": 290, "release_below_iv": 0.8, "logic": "and" }, + "Voltorb": { "release_below_cp": 292, "release_below_iv": 0.8, "logic": "and" }, + "Geodude": { "release_below_cp": 297, "release_below_iv": 0.8, "logic": "and" }, + "Doduo": { "release_below_cp": 297, "release_below_iv": 0.8, "logic": "and" }, + "Onix": { "release_below_cp": 300, "release_below_iv": 0.8, "logic": "and" }, + "Mankey": { "release_below_cp": 307, "release_below_iv": 0.8, "logic": "and" }, + "Pikachu": { "release_below_cp": 309, "release_below_iv": 0.8, "logic": "and" }, + "Magnemite": { "release_below_cp": 312, "release_below_iv": 0.8, "logic": "and" }, + "Tentacool": { "release_below_cp": 316, "release_below_iv": 0.8, "logic": "and" }, + "Paras": { "release_below_cp": 319, "release_below_iv": 0.8, "logic": "and" }, + "Jigglypuff": { "release_below_cp": 321, "release_below_iv": 0.8, "logic": "and" }, + "Ditto": { "release_below_cp": 321, "release_below_iv": 0.8, "logic": "and" }, + "Staryu": { "release_below_cp": 326, "release_below_iv": 0.8, "logic": "and" }, + "Charmander": { "release_below_cp": 333, "release_below_iv": 0.8, "logic": "and" }, + "Goldeen": { "release_below_cp": 336, "release_below_iv": 0.8, "logic": "and" }, + "Squirtle": { "release_below_cp": 352, "release_below_iv": 0.8, "logic": "and" }, + "Cubone": { "release_below_cp": 352, "release_below_iv": 0.8, "logic": "and" }, + "Venonat": { "release_below_cp": 360, "release_below_iv": 0.8, "logic": "and" }, + "Bulbasaur": { "release_below_cp": 374, "release_below_iv": 0.8, "logic": "and" }, + "Drowzee": { "release_below_cp": 374, "release_below_iv": 0.8, "logic": "and" }, + "Machop": { "release_below_cp": 381, "release_below_iv": 0.8, "logic": "and" }, + "Psyduck": { "release_below_cp": 386, "release_below_iv": 0.8, "logic": "and" }, + "Seel": { "release_below_cp": 386, "release_below_iv": 0.8, "logic": "and" }, + "Kabuto": { "release_below_cp": 386, "release_below_iv": 0.8, "logic": "and" }, + "Bellsprout": { "release_below_cp": 391, "release_below_iv": 0.8, "logic": "and" }, + "Omanyte": { "release_below_cp": 391, "release_below_iv": 0.8, "logic": "and" }, + "Kadabra": { "release_below_cp": 396, "release_below_iv": 0.8, "logic": "and" }, + "Oddish": { "release_below_cp": 400, "release_below_iv": 0.8, "logic": "and" }, + "Dugtrio": { "release_below_cp": 408, "release_below_iv": 0.8, "logic": "and" }, + "Rhyhorn": { "release_below_cp": 412, "release_below_iv": 0.8, "logic": "and" }, + "Clefairy": { "release_below_cp": 420, "release_below_iv": 0.8, "logic": "and" }, + "Slowpoke": { "release_below_cp": 424, "release_below_iv": 0.8, "logic": "and" }, + "Pidgeotto": { "release_below_cp": 427, "release_below_iv": 0.8, "logic": "and" }, + "Farfetch'd": { "release_below_cp": 441, "release_below_iv": 0.8, "logic": "and" }, + "Poliwhirl": { "release_below_cp": 468, "release_below_iv": 0.8, "logic": "and" }, + "Nidorino": { "release_below_cp": 480, "release_below_iv": 0.8, "logic": "and" }, + "Haunter": { "release_below_cp": 482, "release_below_iv": 0.8, "logic": "and" }, + "Nidorina": { "release_below_cp": 489, "release_below_iv": 0.8, "logic": "and" }, + "Graveler": { "release_below_cp": 501, "release_below_iv": 0.8, "logic": "and" }, + "Beedrill": { "release_below_cp": 504, "release_below_iv": 0.8, "logic": "and" }, + "Raticate": { "release_below_cp": 504, "release_below_iv": 0.8, "logic": "and" }, + "Butterfree": { "release_below_cp": 508, "release_below_iv": 0.8, "logic": "and" }, + "Hitmonlee": { "release_below_cp": 520, "release_below_iv": 0.8, "logic": "and" }, + "Ponyta": { "release_below_cp": 530, "release_below_iv": 0.8, "logic": "and" }, + "Hitmonchan": { "release_below_cp": 530, "release_below_iv": 0.8, "logic": "and" }, + "Charmeleon": { "release_below_cp": 544, "release_below_iv": 0.8, "logic": "and" }, + "Wartortle": { "release_below_cp": 552, "release_below_iv": 0.8, "logic": "and" }, + "Persian": { "release_below_cp": 568, "release_below_iv": 0.8, "logic": "and" }, + "Lickitung": { "release_below_cp": 568, "release_below_iv": 0.8, "logic": "and" }, + "Ivysaur": { "release_below_cp": 571, "release_below_iv": 0.8, "logic": "and" }, + "Electrode": { "release_below_cp": 576, "release_below_iv": 0.8, "logic": "and" }, + "Marowak": { "release_below_cp": 578, "release_below_iv": 0.8, "logic": "and" }, + "Gloom": { "release_below_cp": 590, "release_below_iv": 0.8, "logic": "and" }, + "Porygon": { "release_below_cp": 590, "release_below_iv": 0.8, "logic": "and" }, + "Seadra": { "release_below_cp": 597, "release_below_iv": 0.8, "logic": "and" }, + "Jynx": { "release_below_cp": 600, "release_below_iv": 0.8, "logic": "and" }, + "Weepinbell": { "release_below_cp": 602, "release_below_iv": 0.8, "logic": "and" }, + "Tangela": { "release_below_cp": 607, "release_below_iv": 0.8, "logic": "and" }, + "Fearow": { "release_below_cp": 609, "release_below_iv": 0.8, "logic": "and" }, + "Parasect": { "release_below_cp": 609, "release_below_iv": 0.8, "logic": "and" }, + "Machoke": { "release_below_cp": 614, "release_below_iv": 0.8, "logic": "and" }, + "Arbok": { "release_below_cp": 616, "release_below_iv": 0.8, "logic": "and" }, + "Sandslash": { "release_below_cp": 631, "release_below_iv": 0.8, "logic": "and" }, + "Alakazam": { "release_below_cp": 633, "release_below_iv": 0.8, "logic": "and" }, + "Kingler": { "release_below_cp": 636, "release_below_iv": 0.8, "logic": "and" }, + "Dodrio": { "release_below_cp": 640, "release_below_iv": 0.8, "logic": "and" }, + "Tauros": { "release_below_cp": 643, "release_below_iv": 0.8, "logic": "and" }, + "Primeape": { "release_below_cp": 650, "release_below_iv": 0.8, "logic": "and" }, + "Magneton": { "release_below_cp": 657, "release_below_iv": 0.8, "logic": "and" }, + "Venomoth": { "release_below_cp": 660, "release_below_iv": 0.8, "logic": "and" }, + "Golbat": { "release_below_cp": 672, "release_below_iv": 0.8, "logic": "and" }, + "Raichu": { "release_below_cp": 708, "release_below_iv": 0.8, "logic": "and" }, + "Cloyster": { "release_below_cp": 717, "release_below_iv": 0.8, "logic": "and"} } } \ No newline at end of file diff --git a/pokemongo_bot/cell_workers/evolve_all_worker.py b/pokemongo_bot/cell_workers/evolve_all_worker.py index 4206540cbe..5cc356dc28 100644 --- a/pokemongo_bot/cell_workers/evolve_all_worker.py +++ b/pokemongo_bot/cell_workers/evolve_all_worker.py @@ -170,22 +170,22 @@ def should_release_pokemon(self, pokemon_name, cp, iv): return False else: release_config = self._get_release_config_for(pokemon_name) - cp_iv_logic = release_config.get('cp_iv_logic') + cp_iv_logic = release_config.get('logic') if not cp_iv_logic: - cp_iv_logic = self._get_release_config_for('any').get('cp_iv_logic', 'and') + cp_iv_logic = self._get_release_config_for('any').get('logic', 'and') release_results = { 'cp': False, 'iv': False, } - if 'release_under_cp' in release_config: - min_cp = release_config['release_under_cp'] + if 'release_below_cp' in release_config: + min_cp = release_config['release_below_cp'] if cp < min_cp: release_results['cp'] = True - if 'release_under_iv' in release_config: - min_iv = release_config['release_under_iv'] + if 'release_below_iv' in release_config: + min_iv = release_config['release_below_iv'] if iv < min_iv: release_results['iv'] = True