diff --git a/monocle/worker.py b/monocle/worker.py index f41d69875..6c9233e2f 100644 --- a/monocle/worker.py +++ b/monocle/worker.py @@ -786,9 +786,10 @@ async def visit_point(self, point, spawn_id, bootstrap, if (normalized not in SIGHTING_CACHE and normalized not in MYSTERY_CACHE): - if (encounter_conf == 'all' + if ((encounter_conf == 'all' or (encounter_conf == 'some' - and normalized['pokemon_id'] in conf.ENCOUNTER_IDS)): + and normalized['pokemon_id'] in conf.ENCOUNTER_IDS)) + and self.player_level != None and self.player_level >= 30): try: await self.encounter(normalized, pokemon.spawn_point_id) except CancelledError: diff --git a/scripts/pickle_landmarks.example.py b/scripts/pickle_landmarks.example.py old mode 100755 new mode 100644