mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-27 18:52:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Transition from filters to dex box now works in a visually pleasing way

Browse Source
This commit is contained in:
Wlowscha 2025-02-08 01:56:30 +01:00
parent 1024d5efaf
commit d38418b5ed
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ui/pokedex-ui-handler.ts
View File

@ -905,18 +905,13 @@ export default class PokedexUiHandler extends MessageUiHandler {
case Button.UP: case Button.UP:
if (this.filterBar.openDropDown) { if (this.filterBar.openDropDown) {
success = this.filterBar.decDropDownCursor(); success = this.filterBar.decDropDownCursor();
} else if (this.filterBarCursor === this.filterBar.numFilters - 1) {
// UP from the last filter, move to start button
this.setFilterMode(false);
this.cursorObj.setVisible(false);
success = true;
} else if (numberOfStarters > 0) { } else if (numberOfStarters > 0) {
// UP from filter bar to bottom of Pokemon list // UP from filter bar to bottom of Pokemon list
this.setFilterMode(false); this.setFilterMode(false);
this.scrollCursor = Math.max(0, numOfRows - 9); this.scrollCursor = Math.max(0, numOfRows - 9);
this.updateScroll(); this.updateScroll();
const proportion = (this.filterBarCursor + 0.5) / this.filterBar.numFilters; const proportion = this.filterBarCursor / Math.max(1, this.filterBar.numFilters - 1);
const targetCol = Math.min(8, Math.floor(proportion * 11)); const targetCol = Math.min(8, proportion < 0.5 ? Math.floor(proportion * 8) : Math.ceil(proportion * 8));
if (numberOfStarters % 9 > targetCol) { if (numberOfStarters % 9 > targetCol) {
this.setCursor(numberOfStarters - (numberOfStarters) % 9 + targetCol); this.setCursor(numberOfStarters - (numberOfStarters) % 9 + targetCol);
} else { } else {
@ -934,9 +929,8 @@ export default class PokedexUiHandler extends MessageUiHandler {
this.scrollCursor = 0; this.scrollCursor = 0;
this.updateScroll(); this.updateScroll();
const proportion = this.filterBarCursor / Math.max(1, this.filterBar.numFilters - 1); const proportion = this.filterBarCursor / Math.max(1, this.filterBar.numFilters - 1);
const targetCol = Math.min(8, Math.floor(proportion * 8)); const targetCol = Math.min(8, proportion < 0.5 ? Math.floor(proportion * 8) : Math.ceil(proportion * 8));
this.setCursor(Math.min(targetCol, numberOfStarters)); this.setCursor(Math.min(targetCol, numberOfStarters));
console.log(this.filterBar.numFilters, proportion, targetCol);
success = true; success = true;
} }
break; break;