ea7d0ce59e
Merge remote-tracking branch 'origin/summaryOption1' into summaryOption1
2024-07-06 13:16:59 -07:00
4c565958da
Merge remote-tracking branch 'upstream/main' into summaryOption1
2024-07-06 13:14:12 -07:00
c1ad4e121d
This should fix the summaryOption feature without bugging confirm-ui-handler in other cases
2024-07-06 13:12:53 -07:00
fcb43b0f2c
Quick fix
2024-07-06 11:42:11 -07:00
2a34daace3
Merge branch 'pagefaultgames:main' into summaryOption1
2024-07-06 09:54:58 -07:00
9e1980bd8f
Allow Roaming Form Gimmighoul to be caught ( #2760 )
2024-07-06 11:16:08 -05:00
6f17301aeb
Update TM compatibility for Knock Off ( #2762 )
2024-07-06 11:14:22 -05:00
6316d08d35
Update battle.ts [Localization(it)] ( #2300 )
...
Co-authored-by: EnochG1 <enoch.jwsong@gmail.com>
2024-07-05 19:38:46 -04:00
9ce9cb75b9
Update egg.ts [Localization(it)] ( #2299 )
...
Co-authored-by: EnochG1 <enoch.jwsong@gmail.com>
2024-07-05 19:36:59 -04:00
dbba0d410f
Update menu-ui-handler.ts [Localization(it)] ( #2298 )
...
Co-authored-by: EnochG1 <enoch.jwsong@gmail.com>
2024-07-05 19:34:02 -04:00
2157b48d41
Update modifier-type.ts [Localization(it)] ( #2297 )
...
* Update modifier-type.ts [Localization(it)]
* Update src/locales/it/modifier-type.ts
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
* Update src/locales/it/modifier-type.ts
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
---------
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
2024-07-05 19:30:59 -04:00
9d28fc454d
[Ability] Add ability bar popup for Parental Bond ( #2818 )
2024-07-05 18:52:58 -04:00
e8036b237c
[Localization] Attack missed text is now localizable and uses the Gen 9 format instead of Gen 4 like before ( #2809 )
...
* localize attack missed message (pokemon's attack missed!)
* Update src/locales/de/battle.ts
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update src/locales/ko/battle.ts
* Update src/locales/pt_BR/battle.ts
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
* Update src/locales/fr/battle.ts
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
* Localized the attack Missed message so that it now uses the Gen 9 message and no longer the Gen 4 one
* Update src/locales/pt_BR/battle.ts
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
* Update src/locales/ko/battle.ts
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
* Update src/locales/fr/battle.ts
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
* Update src/locales/zh_CN/battle.ts
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* Update src/locales/zh_TW/battle.ts
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* Update src/locales/es/battle.ts
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
* Update src/locales/it/battle.ts
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
* Update src/phases.ts
---------
Co-authored-by: EnochG1 <enoch.jwsong@gmail.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
2024-07-05 23:29:13 +01:00
7847aa1644
[Enhancement] Fixes sizing and legacy theme problem for bgm-bar ( #2603 )
...
* Adds TextStyle for bgm-bar ui
* Makes the ui bgm-bar truly dynamic + cleans up unused code
+ Removes all hard-coded characters from the string to allow for different typographical rules in different languages
* Applies the necessary modifications to locales following the deletion of the hard-coded character to form strings
* Use same style as above + reduce shadow offset
* Creates and loads a resource for the bgm-bar ui
+ Can be redesigned by someone with more talent if needed, since it won't affect the ability bar
* Using the new resource in bgm-bar ui
* Use of more space by default following deletion of the 'noteText' text zone
2024-07-05 20:50:19 +01:00
0f510996f0
[Bug] Fix strong winds calculation ( #2423 )
...
* Fix strong winds calculation
* add unit test
* Add strong winds effect message
* Update src/locales/de/weather.ts
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update src/locales/es/weather.ts
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update src/locales/fr/weather.ts
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update src/locales/it/weather.ts
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update src/locales/ko/weather.ts
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
---------
Co-authored-by: torranx <torranicles@gmail.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
2024-07-05 19:59:53 +01:00
160a5ce5aa
Revert "[QoL] Summary option when new Pokemon caught and party is full ( #2242 )" ( #2816 )
...
This reverts commit 759e4d0288
2024-07-05 14:01:11 -04:00
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
759e4d0288
[QoL] Summary option when new Pokemon caught and party is full ( #2242 )
...
* Option to view Summary before adding new Pokemon to party
* Fixed issues described by HopsWas
* Adjusted makeRoomForConfirmUi to improve window spacing
* Fixed ESLint issue + addressed OrangeRed review
* Fixed Github pages issue
* Removed duplicate unshiftPhase
* Fixed phase order
---------
Co-authored-by: Frutescens <info@laptop>
2024-07-05 13:46:36 -04:00
732ce1c330
[Localization] update korean translation on learning move UI ( #2810 )
2024-07-05 13:38:27 -04:00
c5886bc2a2
[Tests] add unit-tests for battle-stat.ts ( #2752 )
...
* add test coverage for battle-stat.getBattleStatName()
* add test coverage for battle-stat
* apply mockI18next() to status-effect.test.ts
* add testUtils jsdocs and optimize imports
2024-07-05 11:30:48 -04:00
42304070a0
Fix typos ( #2805 )
2024-07-05 10:06:25 +01:00
a37593826b
[Localization] fix zh-cn typo in party-ui-handler ( #2802 )
2024-07-05 01:09:48 -04:00
25a619708a
[BUG] Magic Guard-Spiky Shield Fix ( #2803 )
...
* Added new condition for PostDefendContactAbAttr
* Magic Guard-Spiky Shield interaction fix
---------
Co-authored-by: Frutescens <info@laptop>
2024-07-05 01:06:36 -04:00
ed80ad4bef
[Localization(ko)] fixed Magma/Galactic name mixup in bgm title ( #2800 )
2024-07-05 00:41:03 -04:00
09ab89a2c3
[Localization(ko)] Translate missed thigs ( #2797 )
...
Co-authored-by: 송지원 <jiwsong@gmarket.com>
2024-07-04 23:12:57 -04:00
359644ee81
[Bug] Updated SacrificialAttrOnHit to account for the move failing ( #2792 )
2024-07-04 21:51:51 -04:00
4c34858e89
[Sprite] Fix Espeon's tail partially missing ( #2795 )
...
* [Sprite] Fixes Espeon tail
Taken from initial commit, pre-Texture Packer compression
* [Sprite] Fixes (replaced) shiny Espeon tail
Taken from initial commit, pre-Texture Packer compression
* [Sprite] Fix variant Espeon tails
2024-07-04 21:43:42 -04:00
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
5ac5850082
Localization: Localize luck indicator text and shiny labels ( #2644 )
...
* feat: localize luck indicator text
* Localization: Localize luck indicator text and shiny labels
* Update src/locales/zh_CN/common.ts
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* Update src/locales/ko/common.ts
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
* Update src/locales/de/common.ts
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update src/locales/es/common.ts
Co-authored-by: InnocentGameDev <asdargmng@gmail.com>
* Update src/locales/fr/common.ts
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
---------
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: InnocentGameDev <asdargmng@gmail.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
2024-07-04 21:34:18 -04:00
04d456a60e
Localization: Localized Gacha Machine Names ( #2645 )
...
* Localization: Localized Gacha Machine Names
* Update src/locales/zh_TW/egg.ts
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* Update src/locales/zh_TW/egg.ts
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
* Update src/locales/de/egg.ts
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update src/locales/fr/egg.ts
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
* Update src/locales/ko/egg.ts
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
* Update src/locales/zh_TW/egg.ts
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* Update src/locales/zh_CN/egg.ts
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* Update src/locales/es/egg.ts
Co-authored-by: InnocentGameDev <asdargmng@gmail.com>
* Update Brazilian Portuguese translation for egg.ts
* added smaller text size option
* update egg.ts translations for German and Brazilian Portuguese
* some updates
* update egg.ts translations for Spanish and Brazilian Portuguese
* Update EggGachaUiHandler to use array.includes for language check
* update German translation for legendary egg gatcha
* Update src/locales/es/egg.ts
Co-authored-by: InnocentGameDev <asdargmng@gmail.com>
* update translations for egg.ts in Spanish and Brazilian Portuguese
---------
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
Co-authored-by: InnocentGameDev <asdargmng@gmail.com>
2024-07-04 21:26:56 -04:00
2bfefa630b
[Bug] Added new condition for PostDefendContactAbAttr for Magic Guard and Iron Barbs/Rough Skin ( #2793 )
...
Co-authored-by: Frutescens <info@laptop>
2024-07-04 18:18:09 -04:00
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
aeb0e0470a
[Localization] Update French dialogues + typos in general ( #2724 )
...
* Update dialogue.ts
* Update dialogue.ts
* Update dialogue.ts
* Update dialogue.ts
* Update dialogue.ts
* Update dialogue.ts
* Update dialogue.ts
* Update dialogue.ts
* Update dialogue.ts
* Update dialogue.ts
* Update src/locales/fr/dialogue.ts
Co-authored-by: Dakurei <maxime.palanchini@gmail.com>
* Update src/locales/fr/dialogue.ts
Co-authored-by: Dakurei <maxime.palanchini@gmail.com>
* Update src/locales/fr/dialogue.ts
Co-authored-by: Dakurei <maxime.palanchini@gmail.com>
* Update src/locales/fr/dialogue.ts
Co-authored-by: Dakurei <maxime.palanchini@gmail.com>
* Update src/locales/fr/dialogue.ts
Co-authored-by: Dakurei <maxime.palanchini@gmail.com>
* Update src/locales/fr/dialogue.ts
Co-authored-by: Dakurei <maxime.palanchini@gmail.com>
* Update src/locales/fr/dialogue.ts
Co-authored-by: Dakurei <maxime.palanchini@gmail.com>
* Update src/locales/fr/dialogue.ts
Co-authored-by: Dakurei <maxime.palanchini@gmail.com>
* Update src/locales/fr/dialogue.ts
Co-authored-by: Dakurei <maxime.palanchini@gmail.com>
* Update src/locales/fr/dialogue.ts
Co-authored-by: Dakurei <maxime.palanchini@gmail.com>
* Update dialogue.ts
* Update modifier-type.ts
* Update starter-select-ui-handler.ts
* Update pokemon-info.ts
* Update menu-ui-handler.ts
* Update berry.ts
* Update status-effect.ts
---------
Co-authored-by: Dakurei <maxime.palanchini@gmail.com>
2024-07-04 16:38:19 -04:00
538cb3eb5c
[QoL][Refactor] replace `-1` with `RELEARN_MOVE` and `0` with `EVOLVE_MOVE` ( #2779 )
...
* replace `-1` and with `RELEARN_MOVE` and `0` with `EVOLVE_MOVE`
* add documentation for RELEARN_MOVE & EVOLVE_MOVE
* Update src/data/pokemon-level-moves.ts
2024-07-04 14:31:43 -04:00
aadaafba9d
[Localization] punctuation fix in descriptions in korean modifier-type.ts ( #2789 )
2024-07-04 14:03:01 -04:00
38ed57f063
[Sprite] Shiny Spritzee colour correction ( #2781 )
...
* [Sprite] Exp shiny Spritzee
* [Sprite] Exp non-shiny Spritzee
2024-07-04 01:24:29 -04:00
dac3f76979
[Localization] fix line break for zh-cn moves ( #2786 )
2024-07-04 01:22:17 -04:00
49e5ad764c
Let eternatus keep stat changes when changing form ( #2728 )
2024-07-03 23:28:02 -05:00
a6091de5df
Update translation for "Lax" to "Frouxa" ( #2784 )
2024-07-03 22:53:14 -05:00
f4a1c83a7d
Fix several incorrect movesets ( #2776 )
2024-07-03 22:37:23 +02:00
e42c329adf
[Beta] Add deployment workflow for beta environment ( #2595 )
...
* feat: Add deployment workflow for beta environment
This commit adds a new GitHub Actions workflow file, deploy-beta.yml, which is responsible for deploying the application to the beta environment. The workflow is triggered on push and pull request events. It checks if the repository is 'pagefaultgames/pokerogue' before running the deployment steps. The deployment includes checking out the code, setting up the Node.js environment, installing dependencies, building the application, setting up SSH for secure communication, deploying the build on the server using rsync, and purging the Cloudflare cache. The deployment is only performed when the push event is triggered on the default branch.
It also changes the deploy.yml workflow to be triggered only when a release is generated.
* feat: Update deployment workflow for beta environment
* Update deploy-beta name
* chore: Update deploy-beta.yml to use 'f-fsantos:beta-environment' as the ref name
* chore: Update deploy-beta.yml to use 'f-fsantos:beta-environment' as the ref name
* chore: Update deploy-beta.yml to use '2595/merge' as the ref name
* chore: Update deploy-beta.yml to include event name in deployment message
* chore: Update deploy-beta.yml to use 'pull_request' event and '2595/merge' as the ref name
* chore: Update deploy-beta.yml to include SSH public key
* chore: Update deploy-beta.yml to include SSH public key
---------
Co-authored-by: Temps Ray <temps.ray@gmail.com>
2024-07-03 16:01:32 -04:00
34058a57ed
Don't apply Classic bonus to friendship decreases ( #2552 )
2024-07-03 14:36:00 -05:00
8d4bd06808
Merge branch 'pagefaultgames:main' into summaryOption1
2024-07-03 12:26:16 -07:00
ef5a29f9b2
Implement support for relearner only moves ( #1667 )
...
Currently only used by Zangoose
2024-07-03 21:13:25 +02:00
9269649edf
Merge branch 'pagefaultgames:main' into summaryOption1
2024-07-03 11:59:12 -07:00
52478efd96
Fixed phase order
2024-07-03 11:51:51 -07:00
a59865afd5
Fixed Github pages issue
2024-07-03 11:50:08 -07:00
f334b61604
Adjusted makeRoomForConfirmUi to improve window spacing
2024-07-03 11:50:08 -07:00
c078028538
Fixed issues described by HopsWas
2024-07-03 11:50:08 -07:00
489cf1df52
Option to view Summary before adding new Pokemon to party
2024-07-03 11:50:08 -07:00
Frutescens
Mumble
Madmadness65
AJ Fontaine
Niccolò
innerthunder
Jannik Tappert
Dakurei
Tempoanon
flx-sta
EmberCM
Leo Kim
mercurius-00
sodam
Enoch
san98215
chaosgrimmon
José Ricardo Fleury Oliveira
Lugiad
Xavion3
Frederico Santos