Commit Graph

4035 Commits

Author SHA1 Message Date
Frederico Santos
2c4f02098f chore: Fix import formatting in ui.ts file 2024-08-25 02:35:16 +01:00
Frederico Santos
f6fd091d9b
Doc update (#3742)
* Update feature_request.yml

Fix auto labels

* add CODEOWNERS file

* Update CODEOWNERS

* Update pull_request_template.md

---------

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-08-25 02:09:29 +01:00
Mumble
c7184558c2
[Enhancement][UI] Merging Achievements and Vouchers into a single Page (#3424)
* Merging Achievements/Vouchers

* Fixed bug

* Fixed bug

* Removed vouchers-ui-handler.ts

* fixed update bug

* sample localization change

* Fixing imports

* Organized localizations

* Not a Cat commit unless something's forgotten

* Made Action button/text position responsive to language.

* typedocs

* idk why phaser

* ugh

* Fixed cursors

* why

* Removing stray file

* Merge conflicts yay

---------

Co-authored-by: Frutescens <info@laptop>
2024-08-25 00:36:18 +01:00
Mumble
f6551efc36
[Bug] Run History Day 1 patch (#3715)
* Money Display Fix + Partially localized import data

* Fixed Japanese text.

---------

Co-authored-by: frutescens <info@laptop>
2024-08-25 00:03:28 +01:00
Dakurei
9bcbc66db0
Change background-color to black if display-mode is fullscreen (#1605)
+ fullscreen which is the mode defined in manifest.webmanifest
2024-08-24 23:56:50 +01:00
MokaStitcher
1e4b3a45dd
[QoL] Add arrows in the Stats screen to show it is scrollable (#3489)
* [qol] add animated arrows in the Stats screen to show that the list is scrollable

* make legacy theme checks more explicit

* add some documentation + code cleanup
2024-08-24 23:56:35 +01:00
雪霁
872f05d2a7
centralize module typing overrides (#1786)
* optimize typings with declaration file
2024-08-24 12:46:16 -07:00
pom-eranian
ee8c1625e2 Reverted 935 charcadet values on masterlist 2024-08-24 14:20:23 -04:00
Madmadness65
d15c01378d Minor filename correction
Misspelled "forme".
2024-08-24 13:15:41 -05:00
Madmadness65
208aaf11cd
Add battle music for Legendary Pokémon forms (#3723) 2024-08-24 13:07:11 -05:00
pom-eranian
55cebd84b8 [Sprite]
(_masterlist.json )  Set 472, 469, 751, 970  to use json instead of images.

469 Yanmega - fix & variant convert to json - @rival-kieran
472 Gliscor - fix & variant convert to json - @rival-kieran
751 Dewpider - fix & variant convert to json - @vari
970 Glimmora - fix & variant convert to json - @vari
2024-08-24 13:03:28 -04:00
Frederico Santos
0df40893b2 Add modeChain to gameInfo for debug purposes 2024-08-24 17:59:41 +01:00
Frederico Santos
2d0cf54a7f revert modechain debug info 2024-08-24 17:47:21 +01:00
Frederico Santos
38d4a594a0 revert fix 2024-08-24 17:44:36 +01:00
Frederico Santos
0f6170b3f7 GetModeChain in window.gameInfo for prod debugging 2024-08-24 17:42:20 +01:00
ifzeroequalsone
7ed71ceb90
[Bug] Clicking Right from Lock Rarities moves to transfer or check team (#2177)
* Clicking Right from Lock Rarities moves to transfer or check team

* make cursor left movement more natural

---------

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-08-23 23:12:31 -07:00
NightKev
4867ffb229
[Test] Update new Disguise test with test framework changes (#3724) 2024-08-24 01:51:39 -04:00
NightKev
41a0dfe192
[Bug] Fix duplicate FaintPhase if Mimikyu faints to Disguise damage (#3686)
* Fix duplicate `FaintPhase` if Mimikyu faints to Disguise damage

* Add regression test
2024-08-23 22:04:49 -07:00
José Ricardo
1813009443
candy upgrade (#3720) 2024-08-24 02:28:47 +01:00
RedstonewolfX
e5e71c1702
[Enhancement] Make the scrollbar cursor size more natural in the starter select UI (#3627)
* Improve scroll bar

Remaking these changes on the beta branch since you're supposed to do it for the PR checklist

* Fix potential divide by zero error

Thank you to KimJeongSun for bringing this up

Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>

* Fix parenthases order

Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>

---------

Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>
2024-08-23 16:51:01 -07:00
flx-sta
4ab222ad9d
[Localization] "Fake" translations cleanup (#3719)
* Removed the one fake translation in zh_CN

* Removed fake translations from zh_TW

---------

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>
2024-08-23 16:21:58 -07:00
flx-sta
ba3b5f567e Merge branch 'ME/mystery-encounters-beta' into ME/beta/translation-json-migration 2024-08-23 15:01:21 -07:00
flx-sta
5c040aeb4d add retries to berries-abound.Option1: should reward the player with X berries based on wave 2024-08-23 14:58:55 -07:00
flx-sta
24fb80801a migrate ME translations to json 2024-08-23 14:58:32 -07:00
ImperialSympathizer
13e7f79079 small change to teleporting hijinks dialogue 2024-08-23 17:22:22 -04:00
ImperialSympathizer
3e25ad2aa4
Merge pull request #152 from AsdarDevelops/teleporting-hijinks
Adds teleporting hijinks encounter
2024-08-23 16:49:31 -04:00
ImperialSympathizer
36d60f5f98 add unit tests for Teleporting Hijinks 2024-08-23 16:37:34 -04:00
flx-sta
87af50388e
[Localization] Migrate translation files to json (#3709)
* add jsonc import support

* migrate en: ability-trigger, ability, achv & arena-flyout to json/c

* remove jsonc support

gitlocalize doesn't recognize it

* migrate arena-flyoutr.jsonc to json

* EN: migrate arena-tag

* EN: migrate battle-info.json

* EN: migrate `battle-message-ui-handler`

* EN: migrate `battle-scene`

* EN: migrate `battle`

* EN: migrate `battler-tags`

* EN: migrate `berry`

* EN: migrate `bgm-name`

* EN: migrate `biome`

* EN: migrate `challenges`

* EN: migrate `command-ui-handler`

* EN: migrate `common`

* EN: migrate `dialogue`

* EN: migrate `egg`

* EN: migrate `fight-ui-handler`

* EN: migrate `filter-bar`

* EN: migrate `game-mode`

* EN: migrate `game-stats-ui-handler`

* EN: migrate `growth`

* EN: migrate `menu-ui-handler`

* EN: migrate `menu`

* EN: migrate `modifier-select-ui-handler`

* EN: migrate `modifier-type`

* EN: migrate `modifier`

* EN: migrate `move-trigger`

* EN: migrate `move`

* EN: migrate `nature`

* EN: migrate `party-ui-handler`

* EN: migrate `pokeball`

* EN: migrate `pokemon-form`

* EN: migrate `pokemon-info-container`

* EN: migrate `pokemon-info`

* EN: migrate `pokemon-summary`

* EN: migrate `pokemon`

* EN: migrate `save-slot-select-ui-handler`

* EN: migrate `settings`

* EN: migrate `splash-messages`

* EN: migrate `starter-select-ui-handler`

* EN: migrate `status-effect.json`

* EN: migrate `trainers`

* EN: migrate `tutorial`

* EN: migrate `voucher`

* EN: migrate `weather` and `terrain`

* rename `dialogue-double-battle.json`

* DE: migrate `ability-trigger`

* DE: migrate `trainers`

* DE: migrate `tutorial`

* EN: migrate to `achv-f/-m`

* rename `dialogue-endboss.json` to `dialogue-final-boss.json`

endboss is not typical english

* EN: fix gender files

* EN: fix some dialogue gender issues

* Migrate DE to JSON

* EN: fix `modifier-type.json`

* remove ca_ES for now

* remove de/dialogue.ts (remnant)

* Migrate ES (spanish)

removing all dialogues content has been confirmed by Asdar Develops

* Removed fake translations from ability-trigger

* Removed fake translations from achievements and fixed female pronouns

* Removed fake translations all the way to moves.json

* Finished removing fake translations from es folder

* migrate fr (french)

* FR: update config.ts

* migrate it (italian)

* Removed fake translations in French json

* Readding two lines I accidentally deleted to fr dialogue-male

* migrate ja (Japanese)

* migrate ko (Korean)

* migrate pt_BR (Brasil)

* remove event texts from json files

* Removed fake translations in Italian

* Removed Japanese fake translations everywhere except dialogues

* Removed fake translations from Japanase (dialogues only)

* Translate trainer-names.json via GitLocalize

* Fixed a devilish typo in fr locale

* add new translationkeys to en/settings

* add empty `ca_ES` translations

* fix config export names

* fix ts-compiler with i18n issue

* fix battle-stat.test.ts

* fix some namings in plugins/i18n.ts

* move `i18n.d.ts` content into `i18next.d.ts`

and remove `defaultValue` key

* fix type issues after beta merge

* migrate zh_CN (Chinese simplified)

* migrate zh_TW (Chinese tranditional)

* fix tests for "missing" translations

---------

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>
Co-authored-by: SangaraSorama <sangara.diamant@gmail.com>
2024-08-23 20:52:09 +01:00
Mumble
929da80037
Run History Export Data Patch (#3712)
Co-authored-by: frutescens <info@laptop>
2024-08-23 20:30:44 +01:00
Mumble
c5a66326dd
[QoL][Feature] Hall of Fame + Run History (#3251)
* Fixed SaveSessionData issue + Added loss details + removed Modifiers

* Final changes

* Updated code with the current repo + mode localization

* Final touches before moving to a clean branch

* Manual merging

* Some more merging + updating

* Fixed import

* TypeDocs issues

* Fixed relevant typedoc issues

* Manual merge

* More fixes

* So many commits for so little

* Localization Updates

* Very barebones implementation of 'favorite' runs - not planning to implement any time soon though

* menu-ui-handler.ts localizations

* Update src/locales/ko/run-history-ui-handler.ts

Thank you!

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

* Update src/locales/de/run-history-ui-handler.ts

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

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

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

* The German name for Squirtle is silly

* Fixed Run-Entry Def

* Commented out networking functionality

* Commenting out network functionality pt2

* Update src/locales/pt_BR/menu-ui-handler.ts

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

* Update src/locales/pt_BR/run-history-ui-handler.ts

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

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

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

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

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

* Update src/locales/zh_CN/run-history-ui-handler.ts

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

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

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

* Update src/locales/fr/run-history-ui-handler.ts

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

* Update src/locales/it/menu-ui-handler.ts

Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>

* Update src/locales/it/run-history-ui-handler.ts

Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>

* Update src/locales/fr/run-history-ui-handler.ts

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

* Update src/locales/de/run-history-ui-handler.ts

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

* Update src/locales/de/run-history-ui-handler.ts

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

* Update src/locales/de/run-history-ui-handler.ts

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

* Fixed SaveSessionData issue + Added loss details + removed Modifiers

* Final changes

* Updated code with the current repo + mode localization

* Final touches before moving to a clean branch

* Manual merging

* Some more merging + updating

* Fixed import

* TypeDocs issues

* Fixed relevant typedoc issues

* Manual merge

* More fixes

* So many commits for so little

* Localization Updates

* Very barebones implementation of 'favorite' runs - not planning to implement any time soon though

* menu-ui-handler.ts localizations

* Update src/locales/ko/run-history-ui-handler.ts

Thank you!

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

* Update src/locales/de/run-history-ui-handler.ts

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

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

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

* The German name for Squirtle is silly

* Fixed Run-Entry Def

* Commented out networking functionality

* Commenting out network functionality pt2

* Fixed cursor-close out freeze and replaced hall of fame background

* Removed console.log

* Fixed cursor freeze bug + changed hall of fame background

* cursor freeze bug fix pt 2

* Revert "Disable egg gacha in rewards (#3304)"

This reverts commit 3a87c8657f.

* Merging menu-ui-handler.ts

* Merging phases.ts

* Manual merge for game-data.ts

* Manual merge locales/en/config.ts

* Manual merge of menu-ui-handler.ts

* Manual ui.ts merge

* Update src/locales/fr/run-history-ui-handler.ts

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

* Revert "Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue into runHistoryNew"

This reverts commit 5c6fcf6ec4, reversing
changes made to 751bf4a433.

* Revert "Revert "Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue into runHistoryNew""

This reverts commit f6c3580ad0.

* Added ending art to victorious runs

* Added darker overlay instead

* Hall of Fame art

* Actual BG Images

* some bug fixing

* some bug fixing p2

* some minor changes

* some minor changes

* Changed order of runs displayed to newest --> oldest

* console.log for debugging

* Export/Import Run History function

* added import validation

* Update src/locales/fr/run-history-ui-handler.ts

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

* Felt coder's guilt for bad buttons implementation

* strict-null changes

* New Localizations

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

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

* Apply suggestions from code review

Thank you!

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

* Apply suggestions from code review

run-info-ui-handler comments fix

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

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

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

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

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

* Update src/locales/es/run-history-ui-handler.ts

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

* Lost this file somehow

* Added do not delete comments

* Apply suggestions from code review

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

* flx Changes

* Localizations

* Fixing Git test issues

* Fixed issues found by Starkrieg

* removed console log

* Fixed cursor bugs

* github pages issue

* Update src/ui/run-info-ui-handler.ts

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

* Update src/ui/run-history-ui-handler.ts

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

* Corrade's comments

* The things I do for Github PAges

* Preventing menu freeze

* Double trainer battles and fresh start challenge

* Update src/locales/fr/run-history-ui-handler.ts

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

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

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

* Update src/locales/pt_BR/run-history-ui-handler.ts

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

* Update src/locales/pt_BR/menu-ui-handler.ts

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

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

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

* Update src/locales/de/run-history-ui-handler.ts

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

* Update src/locales/it/run-history-ui-handler.ts

Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>

* Update src/locales/it/menu-ui-handler.ts

Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>

* Update src/locales/ko/run-history-ui-handler.ts

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

* Apply suggestions from code review

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

* Localizations + Error Message Update

Co-authored-by: protimita <protimitajp@gmail.com>
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

* small fixes

* flx-sta suggestions + Localizations

Co-authored-by: Asdar <asdargmng@gmail.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

* Update src/locales/it/run-history-ui-handler.ts

Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>

* Added dynamic text positioning based on container size + small fixes

* Thanks Adri1 ! Quick Fix for localizing wave in RunInfo

* Transfered defeat parsing to smaller functions and added page modes

* Update src/locales/fr/run-history-ui-handler.ts

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

* Run History UI handler documentation

* Fixed rival names

* some comments

* Apply suggestions from code review

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: Asdar <asdargmng@gmail.com>
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Finished documentation

* Fixed incorrect rival name handling

* Corrected limit-handling

* Update src/locales/fr/run-history-ui-handler.ts

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

* Cleaned up getrunhistorydata() per flx-sta's suggestions

* Added some override tags?

* Added scopes/override notes to classes/class variables/class functions

* Moved code from phases.ts to game-over-phase.ts

* Fixing game-data whoops

* ughhhhh

* Update src/ui/run-history-ui-handler.ts

Co-authored-by: Adrián T. <99520451+Vassiat@users.noreply.github.com>

* Fixed cursor and updated money. Note - need to fix money handling for Asian languages

* Money appears according to settings

* typedocs blah blah

* cleaning up manage data options

* Final flx fixes + No Run History handling

* Translation update.

---------

Co-authored-by: Frutescens <info@laptop>
Co-authored-by: Enoch <enoch.jwsong@gmail.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: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Asdar <asdargmng@gmail.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
Co-authored-by: protimita <protimitajp@gmail.com>
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
Co-authored-by: Adrián T. <99520451+Vassiat@users.noreply.github.com>
2024-08-23 19:23:16 +01:00
flx-sta
2a51d500b3
[Localization] POC gitlocalize with en & es (#3705)
* Migrate en (English)

* Migrate es (Spanish)

* fix es/config.ts export

* fix ts-compiler with i18n issue

* fix battle-stat.test.ts

* move `i18n.d.ts` content into `i18next.d.ts`

and remove `defaultValue` key
2024-08-23 17:09:19 +01:00
Adrián T.
f417a262de
[Misc] Update eslint.config.js for space after commas (#3649)
* Update eslint.config.js for space after commas

* run eslint

* run eslint, again
2024-08-23 16:36:10 +08:00
Mumble
3cd1a60df8
[Bug] Giving gender to Dipplin (#3702)
Co-authored-by: frutescens <info@laptop>
2024-08-22 21:32:38 -07:00
Enoch
de5d645847
[Localization] Add localization hard-coded message in move, pokemon. (#3639)
* Add localization missing messages.

* Apply suggestions from code review

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

* Apply suggestions from code review

Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>

* Update src/locales/fr/move-trigger.ts

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

* Update src/locales/fr/battle.ts

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

* Apply suggestions from code review

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Apply suggestions from code review - ES

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

---------

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Asdar <asdargmng@gmail.com>
2024-08-23 09:59:35 +09:00
ImperialSympathizer
5af5992db4 adds teleporting hijinks encounter 2024-08-22 17:39:02 -04:00
schmidtc1
3baa1400cc
[Bug] Fixes Moody increasing and decreasing the same stat (#3694)
* Replaces selectableStats array with the proper decreaseStatArray

* Adds docs to MoodyAbAttr

* Updates docs, creates unit tests for moody
2024-08-22 13:57:38 -07:00
ImperialSympathizer
0b81f6fd77 test patch fix 2024-08-22 14:22:46 -04:00
ImperialSympathizer
c9d80a3a42 test patch fix 2024-08-22 14:21:39 -04:00
ImperialSympathizer
c44336a55c test patch fix 2024-08-22 14:20:21 -04:00
ImperialSympathizer
0388e107d7 test dialogue changes 2024-08-22 14:16:45 -04:00
ImperialSympathizer
189e15c745 MEs to pokerogue beta branch 2024-08-22 14:15:54 -04:00
ImperialSympathizer
46c053c2ac MEs to pokerogue beta branch 2024-08-22 14:13:58 -04:00
Frederico Santos
4455a0e4eb
Merge pull request #3693 from pagefaultgames/main
Main to Beta sync
2024-08-22 18:39:56 +01:00
ImperialSympathizer
87c450a128
Merge pull request #151 from AsdarDevelops/updating-to-main
Updating to main
2024-08-22 13:16:32 -04:00
ImperialSympathizer
d0844d16a3 fix ME null checks and unit tests with beta update 2024-08-22 13:05:27 -04:00
ImperialSympathizer
39c6c375f8 fix ME null checks and unit tests with beta update 2024-08-22 13:03:05 -04:00
Adrian T.
03ee764e23
[QoL] Settings Option: Shop Cursor Target (#3666)
* [QoL] Post Reroll UI Targeting

* removed hasRolled from battlescene and handled in UI

* Added getter for reroll count and ternary

* Explicit catch instead of falsy

* Fixed Settings errors with proper labeling

* changed setting label to translate as well

* translations and fixes

* move option further down

* change integer to number

* change integer to number

* update implementation

* remove unused method

* change name set to update

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

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

* Update src/system/settings/settings.ts

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

* Update src/locales/fr/settings.ts

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

* Update src/locales/pt_BR/settings.ts

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

* Update src/locales/ko/settings.ts

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

* Update src/locales/zh_CN/settings.ts

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

* Update src/locales/it/settings.ts

Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>

* Revert "Update src/locales/ko/settings.ts"

This reverts commit 08c0b89f4caf7c33f49722200d7aeb20b79b0ba5.

* Update src/locales/ko/settings.ts

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

* Revert "Revert "Update src/locales/ko/settings.ts""

This reverts commit a57d8777f2.

---------

Co-authored-by: Matthew Kroeger <mattk932009@gmail.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
2024-08-22 09:26:10 -07:00
Enoch
a7acf752db
[Localization] Add localization hard-coded message in ability (AIR_LOCK, CLOUD_NINE) (#3641)
* localize ability message "The effects of the weather disappeared."

* Update src/locales/de/ability-trigger.ts

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

* Apply suggestions from code review

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/it/ability-trigger.ts

Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>

* Update src/locales/fr/ability-trigger.ts

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

* Apply suggestions from code review

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update src/locales/es/ability-trigger.ts

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

---------

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Asdar <asdargmng@gmail.com>
2024-08-23 01:23:47 +09:00
Mumble
0cd52b86d2
[Refactor] Move Daily Pokerus Start Generation to its own function in data/pokemon-species (#3501)
* Moving daily Pokerus generation to game-data

* Moved pokerus starter generation to pokemon-species

* Added JsDocs

* Update src/data/pokemon-species.ts

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

* boo typedocs boo

---------

Co-authored-by: Frutescens <info@laptop>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-08-23 00:20:14 +08:00
NightKev
828897316e
[Test] Replace doAttack() with move.select() in tests (#3567)
* Consolidate `doSelectTarget()` into `doAttack()`

* Fix ternary

* Add error message to aid in debugging tests

* Update docs

* [Test] Change `doAttack()` to `selectMove()`

* Add `select()` to `src/test/utils/helpers/moveHelper.ts`

* Replace instances of `game.selectMove()` with `game.move.select()`

* Fix imports

* Replace `selectMove()` with `move.select()` helper

Fix broken tests for Pastel Veil and Sweet Veil

* Update tsdocs
2024-08-22 06:49:33 -07:00