Skip to content
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

Jump to bottom

Split max_distance into max_sniping_distance and max_walking_distance #4978

Merged
merged 2 commits into from
Aug 31, 2016
Merged

Split max_distance into max_sniping_distance and max_walking_distance #4978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ff373a
Split max_distance into max_sniping_distance and max_walking_distance
Jasperrr91 Aug 31, 2016
df66a23
Update configuration_filse.md
Jasperrr91 Aug 31, 2016
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
6 changes: 4 additions & 2 deletions configs/config.json.map.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,10 @@
"config": {
"enabled": true,
"address": "http://localhost:5000",
"//NOTE: Change the max_distance to adjust the max sniping range (km)": {},
"max_distance": 500,
"//NOTE: Change the max_sniping_distance to adjust the max sniping range (m)": {},
"max_sniping distance": 10000,
"//NOTE: Change the max_walking_distance to adjust the max walking range when snipe is off (m)": {},
"max__walking_distance": 500,
"min_ball": 50,
"prioritize_vips": true,
"snipe": true,
Expand Down
9 changes: 6 additions & 3 deletions docs/configuration_files.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,8 @@ This task will fetch current pokemon spawns from /raw_data of an PokemonGo-Map i
* `prioritize_vips` - Will prioritize vips in distance and priority mode above all normal pokemon if set to true
* `min_time` - Minimum time the pokemon has to be available before despawn
* `min_ball` - Minimum amount of balls required to run task
* `max_distance` - Maximum distance the pokemon is allowed to be when sniping. (km)
* `max_sniping_distance` - Maximum distance the pokemon is allowed to be caught when sniping. (m)
* `max_walking_distance` - Maximum distance the pokemon is allowed to be caught when sniping is turned off. (m)
* `snipe`:
- `True` - Will teleport to target pokemon, encounter it, teleport back then catch it
- `False` - Will walk normally to the pokemon
Expand All @@ -634,8 +635,10 @@ This task will fetch current pokemon spawns from /raw_data of an PokemonGo-Map i
"type": "MoveToMapPokemon",
"config": {
"address": "http://localhost:5000",
"//NOTE: Change the max_distance to adjust the max sniping range (km)": {},
"max_distance": 500,
"//NOTE: Change the max_sniping_distance to adjust the max sniping range (m)": {},
Copy link
Contributor

Choose a reason for hiding this comment

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

is that better to use km in sniper distance?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yea I think that's much more readable. I'll add that.

"max_sniping distance": 10000,
"//NOTE: Change the max_walking_distance to adjust the max walking range when snipe is off (m)": {},
"max__walking_distance": 500,
Copy link
Contributor

Choose a reason for hiding this comment

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

Typo here...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ahh it was late, sorry.

"min_time": 60,
"min_ball": 50,
"prioritize_vips": true,
Expand Down
10 changes: 8 additions & 2 deletions pokemongo_bot/cell_workers/move_to_map_pokemon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,10 @@ def get_pokemon_from_social(self):
pokemon['longitude'],
)

if pokemon['dist'] > self.config['max_distance'] and not self.config['snipe']:
if pokemon['dist'] > self.config['max_sniping_distance'] and self.config['snipe']:
continue

if pokemon['dist'] > self.config['max_walking_distance'] and not self.config['snipe']:
continue

# pokemon not reachable with mean walking speed (by config)
Expand Down Expand Up @@ -192,7 +195,10 @@ def get_pokemon_from_map(self):
pokemon['longitude'],
)

if pokemon['dist'] > self.config['max_distance'] and not self.config['snipe']:
if pokemon['dist'] > self.config['max_sniping_distance'] and self.config['snipe']:
continue

if pokemon['dist'] > self.config['max_walking_distance'] and not self.config['snipe']:
continue

# pokemon not reachable with mean walking speed (by config)
Expand Down