[UI] Reorganize and cleanup images/ui folder #461
Merged
Conversation
This file contains 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
11 tasks
Tempo-anon
approved these changes
Feb 9, 2025
| this.loadImage("summary_moves", currentFolder); | ||
| this.loadImage("summary_moves_effect", currentFolder); | ||
| this.loadImage("summary_moves_overlay_row", currentFolder); | ||
| this.loadImage("summary_moves_overlay_pp", currentFolder); | ||
| for (let t = 1; t <= 3; t++) { |
There was a problem hiding this comment.
the whole thing is magic strings that depend on the existing files. This is just a shortcut instead of doing
this.loadImage(`summary_tabs_1`, currentFolder);
this.loadImage(`summary_tabs_2`, currentFolder);
this.loadImage(`summary_tabs_3`, currentFolder);
I guess I could export the Page enum from the summary UI handler and use its length instead of 3, but I'm not sure how useful that would be in the long run?
But I will add a comment to explain what these correspond to.
# Conflicts: # src/data/battle-anims.ts # src/loading-scene.ts # src/phases/encounter-phase.ts # src/scene-base.ts
# Conflicts: # src/loading-scene.ts # src/ui/run-history-ui-handler.ts
|
Suggestion to rename the "statuses" files and keys to "status" |
|
Created an ImagesFolder enum instead of what I was doing before, so dismissing the review |
frutescens
approved these changes
Feb 13, 2025
CodeTappert
pushed a commit
that referenced
this pull request
Feb 14, 2025
* remove unneeded 'uiTheme' parameter from text related functions * remove legacy-specific code and images in ui handlers * improve handling of localized images and atlases * refactor UI elements that change color based on window type * make scrollbar proper nineslices and dependant on window type * change legacy theme to light. Remove legacy files loading * use same json for language dependant atlases * make windows and cursor ui theme dependant * use old legacy summary move cursor for both themes * change ui theme settings to dark/light * doc update * create main/shadow color combinations for text color * replace uses of getTextColor with setTextColor and getBBCodeFrag calls * update pr template * code review suggestions & documentation * code review suggestions * add doc to textColor enum * move window dependent keys array * [UI] Reorganize and cleanup images/ui folder (#461) * delete ui/legacy folder * move time of day icons to their own folder * move pokemon battle info images to their own folder * move party ui images to their own folder * move summary ui images to their own folder * move various cursors to their own folder * move icons to their own folders * move info bars to their own folder * consolidate windows folder * consolidate game-icons folder * consolidate cursors folder * cleanup * move status and type atlases to their own folder * create an enum to keep track of valid images folders * rename status icons and type icons files
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Goes with #419
The main changes to review are in
loading-sceneandscene-baseWhat are the changes the user will see?
nothing (compared to the UI Theme PR)
Why am I making these changes?
to avoid having too many changed files on the main PR
What are the changes from a developer perspective?
ImagesFolderenum to keep track of the various folders where images are storedloadImages,loadAtlasandLoadSpritesheetfunctions in SceneBase to expect anImagesFolderstatusesandtypesimages tostatus_iconsandtype_iconsand moved them to the ui folderloading-scene.tsThere are still a few unsorted images but the folder should be way easier to navigate now
Screenshots/Videos
new folder structure
How to test the changes?
run the game and make sure there are no black and green boxes I guess lol
Checklist
betaas my base branchnpm run test:silent)npm run create-test) or updated existing tests related to the PR's changes?Are there any localization additions or changes? If so: