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

Pokemon Page improvements #326

Merged
merged 42 commits into from Dec 11, 2017
Merged

Conversation

123FLO321
Copy link
Collaborator

@123FLO321 123FLO321 commented Nov 14, 2017

Description

Added Pokemon Tree to Pokemon page
Added Raid count to Pokemon page
The Pokemon Tree is fully dynamic based on max pokemon id and also shows evolution items.

How Has This Been Tested?

On local instance and working perfectly

Screenshots (if appropriate):

Raid Count:
sc 1

Tree:
sc 2

sc 3

Types of changes

  • New feature (non-breaking change which adds functionality)

@michikrug
Copy link
Collaborator

michikrug commented Nov 14, 2017

I think the raid stuff will not work properly, because RM only stores the current raid for each gym.
So if a gym gets a new raid the old data is gone.

The evolution tree will maybe work also without a new file, because the candy requirements are stored in the pokedex file already.

@123FLO321
Copy link
Collaborator Author

@michikrug

  1. True. Will add a new cron to fix that.
  2. That would be possible, but I think it's cleaner this way. (and potentially faster)

@123FLO321 123FLO321 changed the title [WIP|Help Needed] Pokemon Page improvements [WIP|Help Wanted] Pokemon Page improvements Nov 14, 2017
@123FLO321 123FLO321 changed the title [WIP|Help Wanted] Pokemon Page improvements [WIP] Pokemon Page improvements Nov 15, 2017
@BlackRedStar1988
Copy link

I try to test it and the tree works without problems at all. And the raid too but i must wait to tomorrow for new raids. :D Nice Work.

@BlackRedStar1988
Copy link

Result runs without Problems at me.

@Obihoernchen
Copy link
Collaborator

Obihoernchen commented Nov 28, 2017

looks really nice! +1 and I'll merge

@LordJavi
Copy link

LordJavi commented Dec 8, 2017

Tested and works fine!

@Obihoernchen
Copy link
Collaborator

Please rebase :)

@123FLO321
Copy link
Collaborator Author

done @Obihoernchen


<div>
<a href="<?= $link ?>"><img src="<?= $tree_pokemon->img ?>" alt="<?= $tree_pokemon->name ?>" class="img"></a>
<p class="pkmn-name"><a href="<?= $link ?>">#<?= sprintf('%03d<br>%s', $tree_pokemon->id, $tree_pokemon->name) ?></a></p>
Copy link
Collaborator

Choose a reason for hiding this comment

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

$link does not work if Worldopole is installed in a subdirecotry

@javisabalete
Copy link
Contributor

Works fine! Great job!

@Obihoernchen Obihoernchen merged commit 3788b30 into brusselopole:master Dec 11, 2017
@123FLO321 123FLO321 mentioned this pull request Jan 20, 2018
3 tasks
Obihoernchen pushed a commit that referenced this pull request Jan 21, 2018
* fix 241 evolution

* fix arrow for 2nd evolutions

* woops

* fix tabs
@123FLO321 123FLO321 deleted the pokemon-page branch January 21, 2018 14:24
rahciach pushed a commit to rahciach/Worldopole that referenced this pull request Jan 26, 2018
* fix 241 evolution

* fix arrow for 2nd evolutions

* woops

* fix tabs
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

7 participants