Compare commits

..

37 Commits

Author SHA1 Message Date
Jannik Tappert
e85fac7195
Merge branch 'beta' into gitlocalize-30699 2024-08-25 20:52:52 +02:00
Blitzy
96a404a3d5
[Balance] Revert Zippy Zap back to its LGPE Implementation (#3495)
* Update move.ts

* Update Move Description

* Update move.ts

---------

Co-authored-by: xsn34kzx <xsn34kzx@gmail.com>
2024-08-25 11:35:58 -07:00
NightKev
72702abb2f
Fix egg tests (memory use: ~2.4G -> ~550M) (#3757) 2024-08-25 19:07:06 +01:00
Jannik Tappert
2df5da2f61
[QOL] Trainers will display their title after defeat in the name box (#3738)
* Enemy trainers will now show their title after defeat

* Basically titles are now always shown (like in the real games)

* Revert "Basically titles are now always shown (like in the real games)"

This reverts commit 6943860539.
2024-08-25 19:52:07 +02:00
flx-sta
49f4f8ea71
[Localization] fix run-history locale files namings (#3745)
* fix `run-history` locale files namings

* fix imports in `config.ts`
2024-08-25 19:44:35 +02:00
chaosgrimmon
451307a7d8
Merge pull request #3732 from pom-eranian/variant_png_to_json
[Sprite] Variant Fixes and Images Converted to Color Swap JSON
2024-08-25 13:43:09 -04:00
Mumble
933cfcbad3
[Refactor][QoL] Game Audio + New Settings (#3527)
* Changed how non-BGM are loaded into the game + moved into directories

* some leftovers

* Apply suggestions from code review

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

* Added setting for Field Volume + rewrote playSound() and updateSoundVolume() functions to reflect the new settings.

* Main -> Beta (#3635)

* Fixed issue with falsy issue within condition to get a stat for IV scanner

* add fix setting code to prevent form/variant bug when default form/variant setting is wrong.
in addition, that fix code include gender fix, so i revert old gender fix.
update wrong log message.

* [Hotfix] Fix Memory Mushroom not showing relearner moves (#3619)

* Fix Memory Mushroom not showing relearner moves

* Fix rollout test

* Rewrite player faint logic in FaintPhase (#3614)

* 867 runerigus sprite (#3629)

cropped static frames, fixed cropped sprite
set runerigus exp to use the shiny exp's animation
verified all hex colors are unchanged

- fixed ultra necrozma exp front variant swapped arrays.
- xatu female eye color fix

* [Bug] Preventing the MBH from being stolen in Endless (#3630)

* Endless MBH Fix

* add import

* Revert "add import"

This reverts commit 814a4059c2.

* Revert "Endless MBH Fix"

This reverts commit 8eb4481301.

* removed newline

---------

Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: frutescens <info@laptop>

* [Bug] Fix type-hints for immunity (#3620)

* enable mock containers to be found by name

* enable mock text to be found by name

* add test coverage for type-hints

Only for "immunity" and "status moves"

* fix wrong message key of curse(ghost type) (#3631)

Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>

* [Hotfix] Steal-able Mini Black Hole Pt 2  (#3632)

* Still have no idea where Eternatus is given the MBH....

* typedocs

---------

Co-authored-by: frutescens <info@laptop>

* [Hotfix] Abilities that prevent ATK drops no longer stop other stat drops (#3624)

* Abilities that prevent ATK drops no longer stop other stat drops

* Apply suggestions from code review

Co-authored-by: Mumble <kimjoanne@protonmail.com>

* Add `isNullOrUndefined()` utility function

---------

* Grip Claw now shows the proper pokemon nickname (#3634)

Co-authored-by: frutescens <info@laptop>

---------

Co-authored-by: Opaque02 <66582645+Opaque02@users.noreply.github.com>
Co-authored-by: KimJeongSun <leo@atlaslabs.ai>
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
Co-authored-by: cam <lrlrliwoo@gmail.com>
Co-authored-by: Mumble <kimjoanne@protonmail.com>
Co-authored-by: frutescens <info@laptop>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com>

* [Bug] Preventing the MBH from being stolen in Endless (#3630)

* Endless MBH Fix

* add import

* Revert "add import"

This reverts commit 814a4059c2.

* Revert "Endless MBH Fix"

This reverts commit 8eb4481301.

* removed newline

---------

Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: frutescens <info@laptop>

* [Hotfix] Steal-able Mini Black Hole Pt 2  (#3632)

* Still have no idea where Eternatus is given the MBH....

* typedocs

---------

Co-authored-by: frutescens <info@laptop>

* Deleted phases.ts (#3618)

* Updated sound terms

* Added space for localization

* Update src/locales/ko/settings.ts

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

* Update src/locales/zh_TW/settings.ts

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

* Update src/locales/pt_BR/settings.ts

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

* Update src/locales/zh_CN/settings.ts

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

* Update src/locales/de/settings.ts

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

* Update src/locales/ko/settings.ts

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

* Update src/locales/fr/settings.ts

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

* Update src/locales/it/settings.ts

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

* Include sound effects that were loaded in as BGM.

* Removed stray placeholder localization

---------

Co-authored-by: Frutescens <info@laptop>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Opaque02 <66582645+Opaque02@users.noreply.github.com>
Co-authored-by: KimJeongSun <leo@atlaslabs.ai>
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
Co-authored-by: cam <lrlrliwoo@gmail.com>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
2024-08-25 17:40:14 +01:00
MokaStitcher
163fadbd62
[Bug] Prevent being able to start with a hidden ability that's not unlocked for some Pokemon (#3663)
* prevent being able to start with a hidden ability that's not unlocked for some Pokemon

* fix starter ui for pokemon with a single ability and only ability 2 unlocked
2024-08-26 00:25:40 +09:00
gitlocalize-app[bot]
3b4b45f83c
Translate modifier.json via GitLocalize (#3730)
Co-authored-by: Leo Kim <leo@atlaslabs.ai>
2024-08-26 00:24:52 +09:00
Lugiad
ac543d3662
Merge pull request #3751 from pagefaultgames/gitlocalize-30710
[Localization] [ES] Reviewed and finished pokemon-info.json
2024-08-25 17:07:11 +02:00
Mumble
1ab472cbdf
[Bug] Achievements/Vouchers doesn't update if Cursor doesn't move (#3747)
Co-authored-by: frutescens <info@laptop>
2024-08-25 07:14:47 -07:00
Asdar
606050fc4d Translate pokemon-info.json via GitLocalize 2024-08-25 11:55:47 +00:00
Adrian T.
03de6cfe36
[Ability] Implement Forecast (#3534)
* initial forecast implementation

* updates

* bug fixes and add tests

* bug fixes

* update docs

* fix issues post-merge

* add show ability

* add support for simulated abilities

* add simulated conditions and fix tests

* fix simulated conditions
2024-08-25 17:23:09 +08:00
AJ Fontaine
19b7ebe94c
[Balance] More TM fixes including Acid Spray, Expanding Force 2024-08-25 01:46:45 -07:00
flx-sta
971ef88c79
fix move-left lock rarities condition (#3744) 2024-08-25 03:59:22 +01:00
Frederico Santos
31a11e08bb
Merge pull request #3743 from pagefaultgames/main
Main to Beta sync
2024-08-25 02:36:41 +01:00
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
1446 changed files with 4802 additions and 1845 deletions

45
.github/CODEOWNERS vendored Normal file
View File

@ -0,0 +1,45 @@
# Order is important; the last matching pattern takes the most precedence.
# everything (whole code-base) - Junior Devs
* @pagefaultgames/junior-dev-team
# github actions/templates etc. - Dev Leads
/.github @pagefaultgames/dev-leads
# --- Translations ---
# all translations - Translation Leads
/src/locales @pagefaultgames/translation-leads
# Catalan (Spain/Spanish)
/src/locales/ca_ES @pagefaultgames/catalan-translation-team
# German
/src/locales/de @pagefaultgames/german-translation-team
# English
/src/locales/en @pagefaultgames/english-translation-team
# Spanish
/src/locales/es @pagefaultgames/spanish-translation-team
# French
/src/locales/fr @pagefaultgames/french-translation-team
# Italian
/src/locales/it @pagefaultgames/italian-translation-team
# Japenese
/src/locales/ja @pagefaultgames/japanese-translation-team
# Korean
/src/locales/ko @pagefaultgames/korean-translation-team
# Brasilian (Brasil/Portuguese)
/src/locales/pt_BR @pagefaultgames/portuguese_br-translation-team
# Chinese (simplified)
/src/locales/zh_CN @pagefaultgames/chinese_simplified-translation-team
# Chinese (traditional)
/src/locales/zh_TW @pagefaultgames/chinese_traditional-translation-team

View File

@ -1,7 +1,7 @@
name: Feature Request
description: Suggest an idea for this project
title: "[Feature] "
labels: ["enhancement"]
labels: ["Enhancement"]
body:
- type: markdown
attributes:

View File

@ -30,7 +30,7 @@
- [ ] The PR is self-contained and cannot be split into smaller PRs?
- [ ] Have I provided a clear explanation of the changes?
- [ ] Have I considered writing automated tests for the issue?
- [ ] If I have text, did I add placeholders for them in locales?
- [ ] If I have text, did I add make it translatable and added a key in the English language?
- [ ] Have I tested the changes (manually)?
- [ ] Are all unit tests still passing? (`npm run test`)
- [ ] Are the changes visual?

View File

@ -53,6 +53,7 @@ Check out [Github Issues](https://github.com/pagefaultgames/pokerogue/issues) to
- Pokémon Sun/Moon
- Pokémon Ultra Sun/Ultra Moon
- Pokémon Sword/Shield
- Pokémon Legends: Arceus
- Pokémon Scarlet/Violet
- Firel (Custom Laboratory, Metropolis, Seabed, and Space biome music)
- Lmz (Custom Jungle biome music)

View File

@ -17,6 +17,12 @@ body {
background: #484050;
}
@media (display-mode: fullscreen) {
body {
background: #000000;
}
}
#links {
width: 90%;
text-align: center;

Some files were not shown because too many files have changed in this diff Show More