56 Commits

Author SHA1 Message Date
ImperialSympathizer
efb00553c9 styling and text coloring fixes 2024-07-10 15:06:12 -04:00
ImperialSympathizer
860e875587 rebase encounters branch with pokerogue/main 2024-07-10 14:51:06 -04:00
Lugiad
696d8f27f5
[Localization] modifier-select-ui-handler Locales (#2527)
* Update modifier-select-ui-handler.ts

* Update i18next.d.ts

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Update modifier-select-ui-handler.ts

* Update modifier-select-ui-handler.ts

* Update modifier-select-ui-handler.ts

* Update modifier-select-ui-handler.ts

* Update modifier-select-ui-handler.ts

* Update modifier-select-ui-handler.ts

* Update modifier-select-ui-handler.ts

* Update modifier-select-ui-handler.ts

* Update modifier-select-ui-handler.ts

* Update modifier-select-ui-handler.ts

* Update src/locales/ko/modifier-select-ui-handler.ts

Co-authored-by: yun <97648143+ddullgi@users.noreply.github.com>

* Update src/locales/zh_CN/modifier-select-ui-handler.ts

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

* Update src/locales/de/modifier-select-ui-handler.ts

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

* Update config.ts

* Update modifier-select-ui-handler.ts

* Update src/locales/pt_BR/modifier-select-ui-handler.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update src/locales/es/modifier-select-ui-handler.ts

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

* Update modifier-select-ui-handler.ts [Localization(it)]

* Update src/locales/es/modifier-select-ui-handler.ts

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Adaptive buttons and cursors

* Update modifier-select-ui-handler.ts

* Update modifier-select-ui-handler.ts

---------

Co-authored-by: yun <97648143+ddullgi@users.noreply.github.com>
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: GoldTra <162721984+GoldTra@users.noreply.github.com>
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
Co-authored-by: InnocentGameDev <asdargmng@gmail.com>
Co-authored-by: hjh <j1441257360@163.com>
2024-07-04 16:40:54 -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
Dakurei
c818f0e1df
[Enhancement] Avoids 'flashbanging' for players in Shop UI (#2504)
* Fix - Avoids 'flashbanging' for players playing at x5 speed by making the transition time constant regardless of the speed chosen

* Forgot to delete a debugging value
2024-06-22 09:58:07 -04:00
Dakurei
eb224381a6
Fix - The wave is no longer displayed under the overlay as it used to be (even before the black overlay ...) (#2498)
+ Its previous color just made it harder to see that the text was underneath the overlay
2024-06-21 20:47:00 -04:00
Jannik Tappert
cf5fa887e9
[QoL] Improve shop readibility (#2267)
* Change Rouge Text Color to green, add black shadow behind name text

* Also added shader to cost text

* Update src/ui/modifier-select-ui-handler.ts

* Changed colors that didnt fit the contrast scaling thanks to @dakurai on discord.

* Removed a useless line and added a comment

* Apply suggestions from code review

Co-authored-by: Dakurei <maxime.palanchini@gmail.com>

* Revert changes

* Change colors for better contrast score (makes reading easier)

  + Corrects colors that were totally white when they should have been f8f8f8 like the others

* Created a new overlay especially for the shop

  + This one is an almost black color with a higher opacity. This makes the shop elements easier to read, as they blend much less into the UI underneath

* Add a filter on modifiers displayed in the shop

  + Add a getModifierBar() getter to retrieve the battle-scene bar directly
  + Modified the updateModifiers() method to filter the items displayed (modifiers held by Pokémon can be hidden)
  + Shop overlay hidding transition lengthened to the same duration as its showing

* Apply suggestion from @bennybroseph

* Apply suggestion from @brain-frog

* Fix - Removal of a warning in the generation of the typedoc for which my modification is responsible

---------

Co-authored-by: Dakurei <maxime.palanchini@gmail.com>
2024-06-22 00:04:25 +01: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
Matthew Olker
e6c24dceab Revert "[QoL] Reorganize Enum Locations (#2142)"
This reverts commit cf06ff3b8d3bca1195150533b9f72f46271b167f.
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
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
Matthew
3022aabc32
Cleanup format, show correct value for money rewards (#1926) 2024-06-08 02:09:12 +01:00
prime
f5f98ec537
[Bug] fixed wrong stacking of move info overlay issues (#1888)
* fixed wrongly stacking overlay issues

- starter selection
 - IVs are now behind the overlay
 - the overlay should clear when exiting it via controller (requires tests as i don't have a controller)
- TM
 - will prevent C/Shift from showing the overlay until the next item selection, when selecting a TM as item reward.
 - will prevent C/Shift from showing the overlay when canceling item selection

* removed reference to previously deleted resource

* fixed override
2024-06-07 16:45:49 -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
Tempoanon
5eab016903
Revert "[Localization] modifier-select-ui-handler Locales (#1567)" (#1652)
This reverts commit 5c79e6258b45316a2a0550f2028446d61fb015d2.
2024-05-31 10:48:26 -04:00
Lugiad
5c79e6258b
[Localization] modifier-select-ui-handler Locales (#1567)
* Update i18n.ts

* Update modifier-select-ui-handler.ts

* Update config.ts

* Update config.ts

* Update config.ts

* Update config.ts

* Update config.ts

* Update config.ts

* Update config.ts

* Update config.ts

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Update modifier-select-ui-handler.ts

* Update config.ts

* Add files via upload

* Update modifier-select-ui-handler.ts

* Update modifier-select-ui-handler.ts

* Update src/locales/ko/modifier-select-ui-handler.ts

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

* Update src/locales/ko/modifier-select-ui-handler.ts

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

* Update src/locales/ko/modifier-select-ui-handler.ts

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

* Update src/locales/ko/modifier-select-ui-handler.ts

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

* Update src/locales/ko/modifier-select-ui-handler.ts

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

* Update modifier-select-ui-handler.ts

---------

Co-authored-by: returntoice <dieandbecome@gmail.com>
2024-05-31 10:39:13 -04:00
Matthew Olker
ed7a4045d8 show luck after reroll 2024-05-30 13:45:30 -04:00
Matthew Olker
c822a89878 Fix money text hidden in select modifiers 2024-05-30 11:27:17 -04: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 77a88e0895f7c3389cb223651b90d918af778fe9.

* 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
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 70324c415955477a3f569a5c342df4561537da56.
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
Flashfyre
5e7356636e Update shiny luck mechanics and count both fusion components 2024-04-26 11:31:39 -04:00
John Martin
145267c9a6
Fixed leftover text re-corrections. (#283)
* Minor text corrections to item descriptions.

* Update modifier-type.ts; minor text correction updates

* Update modifier-type.ts; further text re-corrections.

* Update modifier-type.ts; leftover re-corrections.

* Minor text corrections in modifier menu.
2024-04-24 23:29:47 -04:00
Flashfyre
5bed242002 Add Lock Capsule item and update reroll logic 2024-04-05 10:14:49 -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
30c7156c1a Revert "Add UI reskin by LJ Birdman (WiP)"
This reverts commit 0200a2688a08bb5ef84f562cd0b01948134455d6.
2024-03-31 16:51:53 -04:00
Flashfyre
0200a2688a Add UI reskin by LJ Birdman (WiP) 2024-03-31 16:49:53 -04:00
Flashfyre
4e911a9be9 Fix TM item icons using memories 2024-03-30 20:40:48 -04:00
Flashfyre
56f4a71ca6 Add daily runs (WiP) 2024-03-16 22:06:56 -04:00
Flashfyre
ffd785d534 Rebalance item weights and add Rogue tier 2024-02-28 23:13:05 -05:00
Flashfyre
24bf116b37 Expand tutorials 2024-02-14 10:44:55 -05:00
Flashfyre
ac456fc5ba Add item shop when choosing items
Add item shop when choosing items; add full restore item; add egg art to egg gacha; fix some minor text errors
2024-02-04 00:30:19 -05:00
Flashfyre
80095a64fc Add money items 2024-01-18 22:30:03 -05:00
Flashfyre
8063472bac Add accounts, login, and registration 2023-12-30 20:19:33 -05:00
Flashfyre
cbbb8e972b Add achievement system and UI
Add achievement system and UI; fix counting invalid inputs in UI handlers for input delay
2023-11-12 00:31:40 -05:00
Flashfyre
55a61158cf Update Phaser version 2023-11-10 16:41:02 -05:00
Flashfyre
83fae68abf Add rerolling modifiers for money and fix field UI layering issues 2023-11-10 15:51:34 -05:00
Flashfyre
4702ef7737 Add tooltips for modifiers 2023-11-02 00:55:20 -04:00
Flashfyre
5567b39f20 Add enemy buffs to balance endless mode 2023-10-29 16:05:17 -04:00
Flashfyre
96a15ccb0d Adjust game volume 2023-10-21 08:58:39 -04:00
Flashfyre
83c70889fc Implement trainer battles and various changes
Implement trainer battles; add dialogue functionality; add random session seed for predictable random results; remove capitalization from text; add full party heal after every 10 waves
2023-10-18 18:01:15 -04:00
Flashfyre
9faa489f19 Add endless mode
Add endless mode; prevent stat booster items from being transferred or stolen
2023-05-31 19:54:57 -04:00
Flashfyre
29771cfa8e Fix modifier select screen transition issue 2023-04-22 11:46:52 -04:00
Flashfyre
4b89794ab3 Add modifier transfer functionality 2023-04-21 14:05:16 -04:00
Flashfyre
3546f3b5a7 Refactor source files and add berries 2023-04-20 15:46:05 -04:00
Flashfyre
2ee39119d6 Add chance of modifier tier upgrade 2023-04-12 12:48:02 -04:00
Flashfyre
638750f75b Move modifier types to separate file 2023-04-12 11:57:15 -04:00
Flashfyre
8e6e1fd233 Refactor controls and add random starter function 2023-04-11 00:24:55 -04:00