WIP refactor getPokestopMarker to show both rocket + reward#552
Open
yw2theorycrafter wants to merge 1 commit intopmsf:developfrom
Open
WIP refactor getPokestopMarker to show both rocket + reward#552yw2theorycrafter wants to merge 1 commit intopmsf:developfrom
yw2theorycrafter wants to merge 1 commit intopmsf:developfrom
Conversation
…d reward simultaneously
whitewillem
reviewed
Sep 6, 2021
Comment on lines
+2409
to
+2425
| var hasRocket = item['incident_expiration'] > Date.now(); | ||
| var hasQuest = item['quest_reward_type'] !== null && lastMidnight < Number(item['quest_timestamp']); | ||
|
|
||
| var showRocket = false; | ||
| var showQuest = false; | ||
| var showLures = false; | ||
|
|
||
| //TODO also factor in the "no*" stuff. | ||
| if (Store.get(['showQuests']) || Store.get(['showAllPokestops'])){ | ||
| showQuest = true; | ||
| } | ||
| if (Store.get(['showRocket']) || Store.get(['showAllPokestops'])){ | ||
| showRocket = true; | ||
| } | ||
| if (Store.get(['showLures']) || Store.get(['showAllPokestops'])){ | ||
| showLures = true; | ||
| } |
Collaborator
There was a problem hiding this comment.
Something like this
var hasRocket = item['incident_expiration'] > Date.now()
var hasQuest = item['quest_reward_type'] !== null && lastMidnight < Number(item['quest_timestamp'])
var showRocket = ((!noTeamRocket && Store.get(['showRocket'])) || Store.get(['showAllPokestops']))
var showQuest = ((!noQuests && Store.get(['showQuests'])) || Store.get(['showAllPokestops']))
var showLures = ((!noLures && Store.get(['showLures'])) || Store.get(['showAllPokestops']))
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Continues PR #548
Note: Untested. I just cherry-picked #548 onto develop and went over it once or twice in the text editor. ☠️
the candy icon + number placement probably needs tweaking
This PR (still) doesn't respect all of the various "no*" config variables.