Skip to content

Encounter limited to lvl30+ #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sebast1219 wants to merge 45 commits into
base: develop
Choose a base branch
from
Open

Encounter limited to lvl30+ #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
7792ae7
WIP
Noctem Apr 28, 2017
5321881
WIP2
Noctem Apr 28, 2017
b7d0ad1
WIP3
Noctem Apr 30, 2017
d2441b7
Use pogeo's AltitudeCache
Noctem May 2, 2017
ec1cc6f
Update solve_captchas
Noctem May 2, 2017
9861703
DB improvements
Noctem May 2, 2017
da68e70
Small Travis improvement
Noctem May 3, 2017
013d745
WIP4
Noctem May 10, 2017
b0cd60f
Update JS
Noctem May 10, 2017
b06b4fc
Update jquery to 3.2.1
Noctem May 11, 2017
88e5f2d
lint and clang-format main.js
Noctem May 11, 2017
e8d4f31
Update displaying scan area for new shape types
Noctem May 11, 2017
90ad98b
Speed up PokéStop responses
Noctem May 11, 2017
7784e98
Use AioSightingCache in web_sanic
Noctem May 12, 2017
6ca81f8
Update web.py for pogeo changes
Noctem May 13, 2017
9b72cb7
Skip tasks that are now done server-side
Noctem May 13, 2017
9075028
Add favicon and tidy up HTML
Noctem May 13, 2017
5ed1dcf
Merge branch 'develop' into WIP
Noctem May 17, 2017
8ff947c
Change requirements to use pogeo develop branch
Noctem May 17, 2017
98b9cab
Merge branch 'develop' into WIP
Noctem May 19, 2017
90441a1
Merge branch 'develop' into WIP
Noctem May 19, 2017
d291663
Use AioSpawnCache
Noctem May 19, 2017
e4baa9c
Use pogeo shapes instead of shapely for landmarks
Noctem May 23, 2017
b810e2b
Add a script for converting landmarks config
Noctem May 28, 2017
12d1a85
Bug fixes
Noctem May 30, 2017
0ea754e
Merge branch 'develop' into WIP
Noctem May 30, 2017
aa6770d
Merge remote-tracking branch 'upstream/develop' into develop
Jun 11, 2017
b2d9ecd
Jun 11, 2017
ff23ca3
Jun 12, 2017
f687ebc
Jun 12, 2017
f8e8190
Jun 12, 2017
993ca61
Jun 12, 2017
a1785e2
Jun 12, 2017
eb4c1e8
Jun 12, 2017
af9171a
Merge remote-tracking branch 'upstream/develop' into develop
Jun 21, 2017
96d84c0
Jun 21, 2017
4ffff07
Jun 22, 2017
741363a
Jun 22, 2017
8a2c5e1
Merge remote-tracking branch 'upstream/develop' into develop
Jun 25, 2017
5476e33
sebast1219 Jun 26, 2017
677a9ab
Removing cp from this branch
sebast1219 Jun 26, 2017
ae997b8
Resetting error codes
sebast1219 Jun 26, 2017
9d7f45f
Clean branch
sebast1219 Jun 26, 2017
bbcd3f4
sebast1219 Jun 26, 2017
462bc0f
sebast1219 Jun 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions monocle/worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Copy link

@peterchabs peterchabs Jun 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, but doesn't this mean that if there is no level 30 worker nearby it just won't encounter?

Copy link
Author

@sebast1219 sebast1219 Jun 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In fact we shouldn't encounter with a bot less than lvl30 because IV and CPs are same just for lvl30+

Copy link

@lota7 lota7 Jun 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As long as information is sent to webooks even if no encounter happened.
So we atleast can get notified of a pokemon with no IV info, than no pokemon at all.

Copy link
Author

@sebast1219 sebast1219 Jun 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No encounter doesn't mean no pokemon...
Encounter is used to get IV, CP and moves

Copy link
Contributor

@evenly-epic-mule evenly-epic-mule Jun 28, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. self.player_level and self.player_level >= 30 sould be fine too, you don't need the check if it is != None
  2. I now understand it maybe it would be better this way:
if (self.player_level and self.player_level >= 30 and
        ((encounter_conf == 'some' and normalized['pokemon_id'] in conf.ENCOUNTER_IDS)
         or encounter_conf == 'all')):

or something like that

try:
await self.encounter(normalized, pokemon.spawn_point_id)
except CancelledError:
Expand Down
Empty file modified scripts/pickle_landmarks.example.py
100755 → 100644
View file
Open in desktop
Empty file.