Commit Graph

4033 Commits

Author SHA1 Message Date
ImperialSympathizer a38a66dd78
Merge pull request #3787 from AsdarDevelops/mystery-encounters-beta
Moving MEs branch to main repo
2024-08-26 14:54:47 -04:00
ImperialSympathizer d926d1e9ad fix flaky test 2024-08-26 14:43:30 -04:00
ImperialSympathizer 71d1f72597 resolve lint issues 2024-08-26 14:26:01 -04:00
ImperialSympathizer 30b0822c01 fix broken imports 2024-08-26 14:21:12 -04:00
ImperialSympathizer 6f4d0386d5 fix hanging comma in json 2024-08-26 14:17:04 -04:00
ImperialSympathizer b9a7064d5c add ME unique trainer dialogue to both dialogue jsons 2024-08-26 14:13:19 -04:00
ImperialSympathizer 6d61af396f revert template changes 2024-08-26 14:08:55 -04:00
ImperialSympathizer 35ddf97831 add missing ME dialogue back in 2024-08-26 14:07:50 -04:00
ImperialSympathizer 0d2af52d26 Merge branch 'mystery-encounters-beta' of https://github.com/InnocentGameDev/PokeRogue-Events into mystery-encounters-beta
pull dialogue updates
2024-08-26 14:01:42 -04:00
ImperialSympathizer 24641136e0 resolve dialogue merge conflicts 2024-08-26 14:01:30 -04:00
ImperialSympathizer 0b20327c78
Merge pull request #153 from AsdarDevelops/ME/beta/translation-json-migration
Migrate translation files to `json`
2024-08-26 14:01:04 -04:00
ImperialSympathizer ff4efbc4b1
Merge branch 'pagefaultgames:main' into mystery-encounters-beta 2024-08-26 13:45:00 -04:00
Adrian T. 2d0a4326b6
fix failing belly drum test (#3768) 2024-08-26 09:14:59 -07:00
gitlocalize-app[bot] bbbb6d6f79
[Localization] [DE] Rest of german translation (#3714)
* Translate dialogue-misc-female.json via GitLocalize

* Translate dialogue-misc-male.json via GitLocalize

* Translate run-history.json via GitLocalize

* Translate settings.json via GitLocalize

* Update src/locales/de/settings.json

---------

Co-authored-by: Jannik Tappert <tappertjannik@googlemail.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
2024-08-26 23:26:36 +08:00
Asdar 2744ede93c
Re-Added localisation for Meloetta Pirouette (#3779) 2024-08-26 16:24:11 +02:00
gitlocalize-app[bot] 2d445c9661
Translate move.json via GitLocalize (#3759)
Co-authored-by: Jannik Tappert <tappertjannik@googlemail.com>
2024-08-26 16:23:30 +02:00
gitlocalize-app[bot] 656a8bf646
Translate bgm-name.json via GitLocalize (#3736)
Co-authored-by: Jannik Tappert <tappertjannik@googlemail.com>
2024-08-26 22:22:12 +08:00
gitlocalize-app[bot] 76e7297596
Translate pokemon-info.json via GitLocalize (#3772)
Co-authored-by: Leo Kim <leo@atlaslabs.ai>
2024-08-26 11:17:39 +02:00
gitlocalize-app[bot] 26376175ae
Translate run-history.json via GitLocalize (#3774)
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
2024-08-26 14:57:53 +09:00
gitlocalize-app[bot] 530ed1067f
Translate menu.json via GitLocalize (#3771)
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
2024-08-26 14:57:04 +09:00
gitlocalize-app[bot] ff09b31ffb
Translate bgm-name.json via GitLocalize (#3770)
Co-authored-by: returntoice <dieandbecome@gmail.com>
2024-08-26 14:42:03 +09:00
innerthunder 0221c9faba
[Ability][Move] Rewrite Type Resolution and Effectiveness Calculation Functions (#3704)
* Make type/category read-only

* Fix protean/libero tests

* Refactor Pokemon type effectiveness calculation

* Merge getMoveEffectiveness and getAttackMoveEffectiveness

* Move priority-blocking ability check

* Fix incorrect early stopping implementation in MultiHitAttr

* Fix Aerilate, etc. affecting variable-type moves

* Thunder Wave now respects Attack type immunities

* Use final move types for pre-defend abilities

* Steal some things from flx's PR hehe

* Fix Thousand Arrows + "No effect" messages

* Fix status type effectiveness check

* Another status move effectiveness update + some docs

* changing status logic again...

* Fix unnecessary "No Effect" message for Volt Absorb, etc

* Add type effectiveness unit test

* Add Galvanize integration tests

* Add multi-hit test to galvanize tests

* Add power check to first Galvanize test

* Add missing doc line

Co-authored-by: Amani H. <109637146+xsn34kzx@users.noreply.github.com>

* Resolve torranx's nits

* Apply suggestions from Kev's code review

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

* More suggestions I missed

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

* Optimize effectiveness test and make others more stylish (#3)

* Resolve Kev's remaining nits and some test issues

---------

Co-authored-by: Amani H. <109637146+xsn34kzx@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: flx-sta
Co-authored-by: frutescens
2024-08-25 19:11:01 -07:00
NightKev 443e4bd24c
Multi-target damage reduction is now properly calculated (#3734) 2024-08-25 17:40:43 -07:00
Leo Kim 387d3ac999
[Enhancement] Slightly improve the challenge selection UI, achievement UI, and achievement message window. (#3731)
* resize achv box default width

* add language font size option. DE font size 80px

* resize challenge desc window width. fix cursor width. shrink font size of desc. set middle align start label
2024-08-25 17:11:03 -07:00
Blitzy 0bdb23d41f
[Balance] Give Partner Eevee and G-Max Eevee access to their signatures / Fix G-Max Pikachu Learnset (#2474)
* Add Moves to Eevee

* Add Level Up Moves to G-Max Eevee

* Fix Pikachu G-Max Learnset
2024-08-25 15:26:19 -07:00
damocleas b7d71df466
[Balance] Gigantamax State/Form Rebalance (#2442)
* [Balance] Gigantamax State/Form Rebalance (WIP)

* GMAX Ability for Orbeetle adjusted

* fixed typo on CHLOROPHYLL

* Adjusted stats so there was a less intense drop in some stats

* Added comments to GMAX Pikachu, Eevee, Meowth

* Updated ability for GMAX Kingler and Eevee

* Added Stellar typing to GMAX Eevee

* Fixed typing on GMAX Eevee and Snorlax

* GMax Garbodor- Toxic Debris > Corrosion

* Corrected Trubbish passive to not overlap with GMax Garbodor

* Update pokemonFixed Coalossal, Flapple, and Centiskorch BST, Alcremie Ability Change

* Changed Alcremie Passive in adjustment with Gmax ability

* Undid Eevee being Stellar

* Gmax Sandaconda Sand Stream -> Sand Spit

* Balance Sweep of changes by damo, less dropped stats and simpler spreads

* fixed 5 Appletun BST I missed

* fixed missing Hatterene BST
2024-08-25 22:51:00 +02:00
Asdar 1c715d74b1
[Localisation] [IT] Old PRs to .json and screenshots (#3737)
* [Localisation] Italian PRs to .json and screenshots

* Update src/locales/it/trainer-titles.json

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

---------

Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
2024-08-25 13:44:08 -07:00
Lugiad 6b11632114
[Localization] Some French corrections + new dialogues translations (#3727)
* Update ability-trigger.json

* Update ability.json

* Update achv-female.json

* Update achv-male.json

* Update battle-info.json

* Update bgm-name.json

* Update egg.json

* Update menu.json

* Update modifier-type.json

* Update modifier.json

* Update modifier.json

* Update trainer-classes.json

* Update move.json

* Update dialogue-male.json

* Update dialogue-male.json

* Update dialogue-female.json

* Update dialogue-male.json

* Update dialogue-female.json

* Update dialogue-male.json

* Update dialogue-female.json

* Update dialogue-double-battle-female.json

* Update dialogue-double-battle-male.json

* Update dialogue-male.json

* Update dialogue-male.json

* Update dialogue-female.json

* Update bgm-name.json

* Update bgm-name.json

* Update move.json

* Update bgm-name.json

* Update dialogue-male.json

* Update dialogue-female.json

* Update dialogue-male.json

* Update dialogue-female.json

* Update dialogue-male.json

* Update dialogue-male.json

* Update dialogue-male.json

* Update dialogue-female.json

* Update dialogue-male.json

* Update dialogue-female.json

* Update dialogue-male.json

* Update dialogue-female.json

* Update modifier.json

* Update dialogue-male.json

* Update dialogue-female.json

* Update dialogue-male.json

* Update dialogue-female.json
2024-08-25 22:09:01 +02:00
gitlocalize-app[bot] 3bcc9f76f1
Translate modifier-type.json via GitLocalize (#3758)
Co-authored-by: Asdar <asdargmng@gmail.com>
2024-08-25 22:06:36 +02:00
schmidtc1 93f658b624
[Bug] Fixes Lunar Blessing only healing twice on the user instead of ally (#3701)
* Sets Lunar Blessing selfTarget healing to false

* Removes redundant lines

* Adds unit test for Lunar Blessing

* Adjusts unit tests to spy on function calls
2024-08-26 03:58:28 +08:00
NightKev 4162762a0e
[Test] Refactor/consolidate Forecast tests (#3754) 2024-08-25 12:24:44 -07:00
gitlocalize-app[bot] 4ac726f79e
Translate menu.json via GitLocalize (#3752)
Co-authored-by: Asdar <asdargmng@gmail.com>
2024-08-25 12:19:32 -07: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
NightKev 762aa9e49b
Update the GitHub pull request template (#3755) 2024-08-25 17:28:29 +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