Commit Graph

94 Commits

Author SHA1 Message Date
ImperialSympathizer
ce55c13c12 resolve conflicts, import issues, and cleanup from rebase 2024-07-10 15:31:03 -04:00
ImperialSympathizer
666ec135ba bug fixes, cleanup, and tests 2024-07-10 14:52:27 -04:00
ImperialSympathizer
860e875587 rebase encounters branch with pokerogue/main 2024-07-10 14:51:06 -04:00
EmberCM
10dd16fa1e
[QoL] Add red color to the quantity if the item is at it's held limit (#2221)
* Add red color to the quantity if the item is at it's held limit

* Add shadow back to option text

* Attempt to fix transfer item crash and add tests for transferring items

* remove .js file extensions from test file imports

* Fix import paths for transfer-item.test
2024-07-05 13:50:19 -04:00
José Ricardo Fleury Oliveira
fead078bc5
Localization: Add new translations for party UI handler (#2566)
* Localization: Add new translations for party UI handler

* fixes

* Update src/locales/fr/party-ui-handler.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Update src/locales/de/party-ui-handler.ts

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>

* minor fix

* Update src/locales/fr/party-ui-handler.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Update src/locales/ko/party-ui-handler.ts

Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>

* change order and name of "Do what with this Pokémon?" message

* reverted imports

* update party-ui-handler translations for multiple languages

* Update src/locales/fr/party-ui-handler.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Update src/locales/de/party-ui-handler.ts

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>

* Update src/locales/de/party-ui-handler.ts

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>

* Update src/locales/zh_CN/party-ui-handler.ts

Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>

* Update src/locales/ko/party-ui-handler.ts

Co-authored-by: Enoch <enoch.jwsong@gmail.com>

* Update src/locales/ko/party-ui-handler.ts

Co-authored-by: Enoch <enoch.jwsong@gmail.com>

* Update src/locales/ko/party-ui-handler.ts

Co-authored-by: Enoch <enoch.jwsong@gmail.com>

* minor fix

* pt tweak

* Update src/locales/ko/party-ui-handler.ts

Co-authored-by: Enoch <enoch.jwsong@gmail.com>

* Update src/locales/ko/party-ui-handler.ts

Co-authored-by: returntoice <dieandbecome@gmail.com>

* Update src/locales/ko/party-ui-handler.ts

Co-authored-by: returntoice <dieandbecome@gmail.com>

* Update src/locales/ko/party-ui-handler.ts

Co-authored-by: returntoice <dieandbecome@gmail.com>

* Update src/locales/ko/party-ui-handler.ts

Co-authored-by: Enoch <enoch.jwsong@gmail.com>

* Update src/locales/es/party-ui-handler.ts

Co-authored-by: GoldTra <162721984+GoldTra@users.noreply.github.com>

---------

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: GoldTra <162721984+GoldTra@users.noreply.github.com>
2024-07-04 21:40:11 -04:00
Matthew
d2f4c5b59c
[UI] UI Small Adjustments (#2525)
* UI Small Adjustments

* Fix Unit Tests

* Null check event display before clear

* better empty move placeholder debug name
2024-06-23 12:09:23 -04:00
EmberCM
bce874b99a
[QoL] Move fusion icon to right of gender icon in party ui (#2470) 2024-06-22 23:06:13 -04:00
Franck TROUILLEZ
a4b07158f9
[QoL] Add ALL option when transferring items to Pokemons (#1694)
* Add ALL option to transfer menu

It adds a new attribute to the PartyUiHandler to track whether the transfer is meant for all items of only for a particular one

It also introduces translations for PartyUiHandler, even though only the 'ALL' option can be translated for now.

* Use updated translation key for i18n for partyUiHandler:ALL

* Fix duplicated import

* Use optionCursor instead of optionCursorWithScroll to check if we need to transfer ALL
2024-06-15 12:32:15 +02:00
Matthew
dc30dd33b2
[QoL] Reorganize Enum Locations (#2185)
* moving enums

* import updates

* fix tsconfig paths importing (#2184)

* reverse index.ts addition

---------

Co-authored-by: Devin Korb <meepdarknessmeep@gmail.com>
2024-06-13 18:44:23 -04:00
Tempoanon
855ceda192
Revert "[QoL] Add red color to the quantity if the item is at it's held limit…" (#2178)
This reverts commit 048993b2c2.
2024-06-13 11:57:39 -04:00
Matthew Olker
e6c24dceab Revert "[QoL] Reorganize Enum Locations (#2142)"
This reverts commit cf06ff3b8d.
2024-06-13 11:30:47 -04:00
Matthew
cf06ff3b8d
[QoL] Reorganize Enum Locations (#2142)
* moving enums
2024-06-13 11:11:12 -04:00
EmberCM
048993b2c2
[QoL] Add red color to the quantity if the item is at it's held limit (#2117)
* Add red color to the quantity if the item is at it's held limit

* Add shadow back to option text
2024-06-13 10:38:13 -04:00
Xavion3
d06e5d2fc6
Fix doubles battles bugs with challenges (#1986)
* Fix doubles battles bugs with challenges

* Make a fully illegal party gameover instead of error
2024-06-09 14:37:33 +02:00
Xavion3
696ff6eae3
Add Challenges (#1459)
* Initial challenge framework

* Add type localisation

* Change how challenges are tracked

Also fixes the difficulty total text

* MVP

Renames challenge types, temporarily hides difficulty, and implements challenge saving.

* Attempt to fix one legal pokemon in a double battle

* Make monotype ignore type changing effects

* Make isOfType correctly detect normal types

* Try to fix double battles again

* Make challenge function more like classic

* Add helper function for fainted or not allowed

* Add framework for fresh start challenge and improve comments

* Try to fix evolution issues

* Make form changing items only usable from rewards screen

* Update localisation

* Additional localisation change

* Add achievements for completing challenges

* Fix initialisation bug with challenge achievements

* Add support for gamemode specific fixed battles

Also make monogen challenges face the e4 of their generation

* Add better support for mobile in challenges

* Localise illegal evolution/form change message

* Update achievement names

* Make alternate forms count for monogen

* Update monotype achievement icons

* Add more comments

* Improve comments

* Fix mid battle form changes

* Reorder mode list

* Remove currently unused localisation entry

* Add type overrides for monotype challenges

Meloetta always counts for psychic and castform always counts for normal

* Change how form changes are handled

Now attempts a switch at the start of each turn instead of immediately

* Add start button to challenge select screen

* Make starter select back out to challenge screen if using challenges

* Fix daily runs

* Update tests to new game mode logic
2024-06-08 01:07:23 -04:00
Lee ByungHoon
d592187f2c
[Localization] Add localization in party-ui-handler (#1712)
* [Localization] Add localization in party-ui-handler

* [Localization] Add "Release", "Apply", "Teach" localization, changed translation of Korean

* [Localization] Translated party-ui-handler's localization to Deutsch
2024-06-07 15:08:34 -04:00
prime
1c98106642
[QoL] Move Info Overlay (#1585)
* move info implemented for starter selection

a move info box is displayed when editing the starter moveset.

also menus have now onHover triggers.

todo:
- show ui when selecting TMs
- show ui when selecting moves to remember (memory mushroom)

* More Move Info Overlays

Added overlays during Memory Mushroom use and when viewing TMs.
Furthermore a settings option can enable/disable those overlays.

* Added missing ko language entry

... though translation still remains necessary

* updated ui

also added overrides for item rewards

* minor ui update

moved values to the right in the tm move info box

* fixed typedoc issues

* removed settings in to prepare for merge

* updated settings option

added settings option to new settings implementation

* minor changes

removed unused graphic
moved settings option to accessibility
2024-06-05 20:28:12 -05:00
dielle000
bda3013c19
Allow selection of item quantity when transferring items (fixes #723) (#1394)
* Transferring item does not kick out of transfer menu

* Select simultaneously the item to transfer and the quantity

* eslint fix

* eslint fix

* Reset quantity on scroll

* Documentation

* eslint fix
2024-05-30 16:58:10 -05:00
Greenlamp2
622885767d
Enforce Consistent Spacing with ESLint's space-before-blocks and keyword-spacing Rules (#1308)
* added rule no-trailing-spaces

* added rule space-before-block

* added rule keyword spacing
2024-05-23 19:19:20 -05:00
Greenlamp2
e2be6ba002
added rule no-trailing-spaces (#1307) 2024-05-23 18:45:04 -05:00
Greenlamp2
bac6c22973
ESLint - The Essential Linter and Formatter for JavaScript and TypeScript (#1224)
* eslint config + packages

* updated eslint config

* fix the issue eslint adding ;;;; at interfaces

* first round with eslint --fix .

* removed config for unused export

* Revert "first round with eslint --fix ."

This reverts commit 77a88e0895.

* removed config for camelCase

* for real this time, first round of eslint --fix .

* halfway to manual eslint fix

* eslint done

* added "how to setup" the hook to eslint --fix each new file before commit (if wanted)

* removed eslintrc config file duplicat

* fix human error + ignore build folder + merge overrides

* added curly brace style + eslint

* applied double quote linter rule

* added lefthook

* test precommit

* test precommit

* test precommit

* test precommit

* test precommit

* test precommit

* test precommit

* github action to run eslint

* added node_modules to ignore eslint

* different action for typescript

* no need for different glob (default src)

* node 20

* node 20

* removed no longer needed install file

* remove hooks part from README

* eslint fixes

---------

Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
2024-05-23 11:03:10 -04:00
arColm
80f6b62d1b
Implement Revival Blessing (#343) 2024-05-19 18:02:17 -05:00
Greenlamp2
d98f7733d4
Rework - Inputs management to include all gamepad mapping V2 (#429)
* rework of the input handling, including different gamepad and keyboard

* rework of the input handling, including different gamepad and keyboard

* first version of a too complex inputHandler based on phaser3-merged-input

* removed useless control management and kept it simple for our use case, investigating to put out button_XX()

* renamed inputHandler to inputController

* aggregate directions and some action into a same method + fix menu return value

* added back repeated input feature on keeping down a key

* cleanup + return type

* fix submit/action doing two things simultaneously, still same behaviour as before

* extracted UI inputs out of battle-scene

* tab -> spaces

* tab -> spaces what about now github ?

* tab -> spaces final (maybe)

* tried to fix the plugin loading issue on prod

* remove Plugins things as it's too uncertain how it works on prod

* seems old code source is indented with tab

* cleanup

* cleanup

* cleanup

* putting in an enum file the enum buttons

* fix repeating stats button + change message in event when the key is repeating

* added return type for ui-inputs

* added return type for inputs-controller

* adapted the code to integrate changes of bennybroseph
2024-05-05 10:30:00 -04:00
Flashfyre
9fc6bdde21 Revert "Rework - Inputs management to include all gamepad mapping (#390)"
This reverts commit 70324c4159.
2024-05-03 13:04:32 -04:00
Greenlamp2
70324c4159
Rework - Inputs management to include all gamepad mapping (#390)
* rework of the input handling, including different gamepad and keyboard

* rework of the input handling, including different gamepad and keyboard

* first version of a too complex inputHandler based on phaser3-merged-input

* removed useless control management and kept it simple for our use case, investigating to put out button_XX()

* renamed inputHandler to inputController

* aggregate directions and some action into a same method + fix menu return value

* added back repeated input feature on keeping down a key

* cleanup + return type

* fix submit/action doing two things simultaneously, still same behaviour as before

* extracted UI inputs out of battle-scene

* tab -> spaces

* tab -> spaces what about now github ?
2024-05-03 12:59:10 -04:00
thicco-catto
fc1a9f0283
Select Move UI Shows PP (#372)
* Select move UI shows PP

* Removed testing forced max pp

* PP only shows when using PP restoring items

* Removed testing max pp again

* Update src/phases.ts

* Update src/ui/party-ui-handler.ts

---------

Co-authored-by: Samuel H <flashfireex@gmail.com>
2024-05-01 10:16:58 -04:00
Nero
55dc339647
Bug Fixes and QoL: Minor changes to UI related bugs (#356)
* bug fix: updates move description correctly

viewing the description of move slot 1 in a pokemon's move summary UI only updated the first time it was viewed per session, exiting the party UI and re-entering caused the moves in a pokemon's summary screen to not automatically populate the description box unless you moved the cursor down to move 2 and then back up to move 1

* slight logic changes to fix party UI controls

when battlerCount = 2 (double battle), starting in party slot 1 and pressing DOWN -> UP -> RIGHT would move the cursor back down when it should be moving it to the right: these changes fix that

* finalised the minor UI changes

* finalising

* refactor

* removed console logs used for testing

* bug fix: updates move description correctly

viewing the description of move slot 1 in a pokemon's move summary UI only updated the first time it was viewed per session, exiting the party UI and re-entering caused the moves in a pokemon's summary screen to not automatically populate the description box unless you moved the cursor down to move 2 and then back up to move 1

* slight logic changes to fix party UI controls

when battlerCount = 2 (double battle), starting in party slot 1 and pressing DOWN -> UP -> RIGHT would move the cursor back down when it should be moving it to the right: these changes fix that

* finalised the minor UI changes

* finalising

* refactor

* removed console logs used for testing
2024-04-30 12:42:20 -04:00
Flashfyre
5e7356636e Update shiny luck mechanics and count both fusion components 2024-04-26 11:31:39 -04:00
Flashfyre
b863ab88a7 Fix some minor superficial bugs 2024-04-26 01:18:08 -04:00
Flashfyre
c76f8c5e7e Add tiered shiny variants 2024-04-18 22:52:26 -04:00
Flashfyre
ca778e07d5 Implement Pokemon fusion icons 2024-04-10 10:57:06 -04:00
Flashfyre
e8b5d7aa3e Unsplicing no longer requires an item 2024-04-02 20:51:43 -04:00
Flashfyre
70d61700d0 Re-implement UI reskin with working legacy toggle
Re-implement UI reskin with working legacy toggle; add return to title option to menu
2024-03-31 21:14:35 -04:00
Flashfyre
7efd8aa834 Improvements to spliced name generation 2024-03-06 23:57:11 -05:00
Flashfyre
1861823673 Add fusion icon on party and summary screen 2024-03-06 23:20:53 -05:00
Flashfyre
f48464d48d Minor refactoring 2024-02-29 20:08:58 -05:00
Flashfyre
4e93f1e52c Display enemy trainer briefly when switching 2024-02-22 00:00:51 -05:00
Flashfyre
e4bac55d75 Add indicator for additional starter moves and initial egg moves UI
Add indicator for additional starter moves and initial egg moves UI; port scrolling to abstract options UI
2024-02-21 15:47:44 -05:00
Flashfyre
dadc08d16e Add Terestallization mechanics
Add Terestallization mechanics; implement Stellar type; fix bug with held item weights
2024-02-17 00:40:03 -05:00
Flashfyre
63b37ea8c8 Fix minor visual bug in double battle party screen 2024-02-14 23:33:55 -05:00
Flashfyre
052564f902 Update final boss fight and restructure some files 2024-01-13 12:24:24 -05:00
Flashfyre
6084d3aaa6 Add form change system 2024-01-09 23:34:43 -05:00
Flashfyre
8063472bac Add accounts, login, and registration 2023-12-30 20:19:33 -05:00
Flashfyre
de29ea9c05 Add missing west Shellos icon 2023-12-24 15:32:21 -05:00
Flashfyre
e07e267ddc Refactor windows and add alternate window skins 2023-12-20 22:22:15 -05:00
Flashfyre
534d5a907c Fix eggs ignoring forms 2023-12-20 00:35:41 -05:00
Flashfyre
dad6401f67 Add evolution pausing and fix visual bug with evolution scene 2023-12-14 12:55:11 -05:00
Flashfyre
67ac5d3139 Truncate names in battle info and party UI when too long 2023-12-09 23:41:36 -05:00
Flashfyre
e2a6a93209 Rebalance base stat boosters and make max stack count rely on IVs 2023-12-09 00:33:29 -05:00
Flashfyre
b7687a9a30 Add gen 6-7 sprites and update icon set 2023-12-07 00:52:20 -05:00