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.

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

Add 'is_in_battle' db field and icon on map #2500

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

Conversation

michikrug
Copy link
Contributor

@michikrug michikrug commented Feb 23, 2018

Description

Adds 'is_in_battle' db field for gyms and display a fighting icon on the map.

Motivation and Context

Show the users which gyms are currently under attack by adding a little icon on top of the gym image.

How Has This Been Tested?

Tested on local instance.

Screenshots (if appropriate):

bildschirmfoto 2018-03-13 um 11 16 46

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.

@michikrug michikrug changed the title Add Add 'is_in_battle' db field and icon on map Feb 23, 2018
@michikrug michikrug mentioned this pull request Feb 23, 2018
6 tasks
@ghost
Copy link

ghost commented Feb 24, 2018

How long does this data stay in db? I would love to collect data on gym activity.

@michikrug
Copy link
Contributor Author

It is always just the current state when it was scanned.

@sebastienvercammen
Copy link
Member

Tagged breaking change to refer to icon/spritesheet generation as a reminder for our devs.

@sebastienvercammen
Copy link
Member

sebastienvercammen commented Mar 1, 2018

@michikrug Could you rebase? And thoughts on separating the "gym in battle" functionality from your other PR for image generation?

As it stands, we won't be able to merge either PR. Separating them makes merging this PR much easier.

@michikrug
Copy link
Contributor Author

@sebastienvercammen Have rebased.

Currently, the 'is in battle' mark is completely relying on the dynamic image creating PR. Therefore, it will be hard to separate them.

I can try visualizing the battle state differently, so that it does not use the whole image stuff.

@billyjbryant
Copy link
Contributor

Needs to be rebased

@michikrug
Copy link
Contributor Author

@sebastienvercammen rebased and used a simpler way of displaying only the battle state

@darkelement1987
Copy link
Contributor

So this would make things like triggering Pokealarms like 'Gym Team Valor is under attack' a possibility in the future?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants