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

hotfix10: API v0.69.1 / Rename Pokemon bug #589

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

Conversation

j4ck0p3
Copy link

@j4ck0p3 j4ck0p3 commented Jul 31, 2017

latest PokeGOAPI-Java; latest hash api; legendaries released;

FernandoTBarros and others added 30 commits February 24, 2017 13:15
git@github.com:FernandoTBarros/BlossomsPokemonGoManager.git into
itemRequiredEvolve

Conflicts:
	pom.xml
	src/me/corriekay/pokegoutil/data/enums/PokeColumn.java
evolution
Refactoring search bar using proper rowFilter by Java
Maintaining selection after search or after operations like refresh,
transfer and evolve
itemRequiredEvolve

Conflicts:
	src/me/corriekay/pokegoutil/data/enums/PokeColumn.java
	src/me/corriekay/pokegoutil/utils/windows/PokemonTable.java
decrease class complexity and fixing some codeclimate issues.
Updating PokeGOAPI for updating Hash Key login to the last version 
Including two new buttons for favorite yes or no
Configuring checkstyle SuppresionCommentFilter for the
NullPointerException in PokemonTableModel class
Erasing some throws tag in javadoc comment
Turning on JavaFX nature again.
…ir own column now. Left statements in code but commented so this could later be re-enabled through boolean flag when column hiding becomes an option or through a preference setting to collapse the two columns back into a single column.

Minor modification to show DPS Column using 2 decimals like it was shown in the movetype columns before.
…ithout_ and candy count _with_ "Transfer After Evolve" enabled, separated by a "/". The use of a separator character requires the column type to be changed from NULLABLE_INT to STRING.

However, this poses a problem when sorting as this would position 10's and 20's, etc. together with 1's and 2's and so forth. To prevent this the first value in front of the "/" character needs to be treated as an integer type during sort.

To allow for this, a new column type "NUMBER_STRING" is defined and linked to a dedicated comparator. This comparator then looks for the "/" character and if found, splits the string into two parts of which the first part is than converted back to integer during the sort comparison.

The split variables receiving the separated values are pre-initialized with "-1" for the parts preceding a possibly present "/", so that for pokémon which cannot be evolved, the NO_VALUE_SIGN is sorted separately from those with a zero count.
…ype.

Also fixed abbreviateType to check for an empty type variable instead of "none" since that already got stripped in the call to PokemonUtils.formatType().

This makes the discussion what to return in case no second type is present a moot issue, as the code already would have returned "__" had the if check in abbreviateType been correct in the first place.
…ame length and 1's, 2's and 3's don't get shown next to '10's, 20's and 30's when sorting on pokémon level
Changed all occurences of either "pokemon" or "pokemons" to "Pokémon" since
A) it's a name so should start with a capital
B) both single and plural forms are spelled the same
C) it should be consistent throughout BPGM

Changed an accidental { to [ in the rename pattern length indicator for IV_STAM_UNI

Changed some message prompts to make "Multi" a conditional part in the message, showing only if there is more than 1 Pokémon transfered.
…e_2% patterns where a mix of Move and Move Type. While returning the Type they were treated as Moves during formatting, which made the example look incorrect. Ghost did not get returned as "Gh" but as "gh" for a non-STAB move and "GH" for a STAB move.

To correct for this omission I've added two rename patterns, e.g. %move_1% and %move_2% and applied the STAB logic to these returned abbreviations instead of to the move type patterns. These now get returned as intended (i.e. first character in uppercase, second character in lowercase)

Also took the opportunity to correct a spelling error (Eletric -> Electric)
Instead of adding the HP Left as a separate column, I opted to combine it with the Full HP value in same way as I did with the dual evolvable count values.

Since I also wasn't happy with the left-aligned display of these values and right-aligned looking just as ugly, I also added a new renderer for the NUMBER_STRING columntype to make it show its values centered.
…olumn defaults to using the Full HP part on the right in the NUMBER_STRING comparator since sorting on Health yields the same result as sorting on HP Left.
…t list.

It is required for the centered display of the NUMBER_STRING columns
FernandoTBarros and others added 18 commits April 8, 2017 12:46
open
Fixing codeclimate issues
Hability to configure unicode icons in config.json file
Conflicts:
	pom.xml
	src/main/resources/version.txt
	src/me/corriekay/pokegoutil/data/managers/AccountManager.java
	src/me/corriekay/pokegoutil/utils/helpers/LoginHelper.java
JavaFX and Swing on the new login dialog.
Maybe I try to get it back when I have time!
Returning the abbreviation in uppercase with STAB and in lowercase if no STAB.

Corrected HP rename pattern to only return the full HP.
Reverted %move_type_1% and %move_type_2% back to old behavior.
And refactoring from PokemonMeta to getItemTemplates()
Updated POM to use the new API with encryption update.
Repository owner deleted a comment Aug 2, 2017
Repository owner deleted a comment Aug 2, 2017
@j4ck0p3 j4ck0p3 changed the title Refactor login / End Of July update hotfix10: API v0.69.1 / Rename Pokemon bug Aug 2, 2017
Repository owner deleted a comment Aug 3, 2017
Repository owner deleted a comment Aug 14, 2017
Repository owner deleted a comment Sep 4, 2017
Repository owner deleted a comment Sep 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants