Commit Graph

5367 Commits

Author SHA1 Message Date
NightKev
af77e2ef7f Fix merge issues and apply Biome 2025-07-13 00:49:14 -07:00
NightKev
6edf75ca42 Merge branch 'beta' into rest 2025-07-13 00:47:48 -07:00
NightKev
8cf1b9f766
[Dev] Enable Biome import sorting (#6052)
* [Dev] Enable Biome import sorting

Additional changes:

- Implement import aliases

- Convert default exports to named exports

- Remove relative imports

* Apply changes

* Misc fixes

* Merge cleanup
2025-07-13 00:21:25 -07:00
Bertie690
bda0f39df0
Update obtain-status-effect-phase.ts
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-07-13 08:48:42 +02:00
Jonathan Bankston
22c386ea9e
[BUG] Fix Transform and Imposter issues (#6008)
* Fixed Transform and Imposter Bug

* Updated Comments

* Revised Comments

* Revised Changes on how tranformed pokemon are referenced to align with reviewer's suggestions

* Removed unused BattlerTag type for transform

* Removed addition of the transform tag to a pokemon in the PokemonTransformPhase

* Moved the check for whether Transform can be used within the TransformAttr class as suggested and removed uneccesary moveId check

* Consolidated if statement regarding isTransformed

* Removed overrides

* Added move condition to Transform + fixed up imposter target selection

* Condensed tests into 1 file + added more automated tests

This includes a couple regression tests for the fusion shenanigans

* Fixed comment

* Updated override typo for unimplemented methods

* Remove redundant parentheses

* Apply suggestions from code review

Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>

---------

Co-authored-by: Bertie690 <taylormw163@gmail.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
2025-07-12 23:39:48 -07:00
Bertie690
1bfdd8f24b
Update modifier.ts
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-07-13 08:38:09 +02:00
Bertie690
19c0fba6f4
Update modifier.ts
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-07-13 08:38:03 +02:00
Bertie690
259a9b328d
Update pokemon.ts
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-07-13 08:37:44 +02:00
NightKev
1f9eaf49c6 Remove missed line in TSDocs 2025-07-12 23:26:14 -07:00
Bertie690
e1c999566e
Update pokemon.ts documentation 2025-07-13 08:20:43 +02:00
Sirz Benjie
1cb1797f3b
Merge branch 'beta' into rest 2025-07-13 00:05:14 -06:00
Bertie690
664f2fab0d
[Refactor/Bug] Fix Protean not applying due to terrain + minor cleanup of move phase (#5855)
* Squashed protean/libero changes

* Update protean-libero.test.ts

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

* Update protean-libero.test.ts

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

* Update ability.ts

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

* Update move-phase.ts

* Fixed counter move logic using inverted conditional

* Update move-phase.ts

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

* Update move-phase.ts

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

* Update ability.ts commentfix

* Update src/data/abilities/ability.ts

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

---------

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-07-13 05:59:38 +00:00
Bertie690
12fbff71d2
[Test] Added tests for Intimidate, Fishious Rend/Bolt Beak, Payback and Moongeist Beam & co. (#5858)
* Added additional tests for intimidate & ability-ignoring moves

* Added a few basic tests for Fishious Rend and Bolt Beak

* Fixed comment

* Fixe test and added commetn

* Update first-attack-double-power.test.ts

* Fixed incorrect ignore-abilities.test.ts test suite description

* Update ignore-abilities.test.ts suite name

* Fix first-attack-double-power.test.ts

* Actually fixed import

* Update intimidate.test.ts

* Fix test imprts

* Added guard dog tests

* Fixed tests

* Renamed test file

* Added Payback tests

* Fixed accidental unusde class

* Fixed tests

* Fixed flaky test due to 1 length trainer thing

* dd

---------

Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
2025-07-13 05:55:05 +00:00
Sirz Benjie
940c3c6f42
[Refactor] Cleanup fight UI (#5883)
* Cleanup fight ui handler

* Add types to fight-ui-handler#show

* Fix poor logic in toggleInfo

* Make addInfoToggle capable of taking in multiple toggles
2025-07-12 17:54:43 -07:00
Bertie690
e385c73188
Update corrosion.test.ts 2025-07-12 13:29:20 +02:00
Bertie690
4fd44e8029
Update move.ts 2025-07-12 13:28:26 +02:00
Bertie690
d614588783
Fix pokemon.ts 2025-07-12 13:26:45 +02:00
Bertie690
adeedb84d5
Merge branch 'beta' into rest 2025-07-12 13:20:33 +02:00
Sirz Benjie
edbba6e635
[Bug][Performance] Plug memory leak related to enemy pokemon lingering around (#6083)
Remove animationupdate in sprite cleanupAndComplete
2025-07-11 12:57:19 -07:00
Lugiad
ca4df7233f
[UI/UX] [Localization] Japanese font change and custom size edits (#6026)
* Delete Japanese Galmuri11 font

* Delete Japanese Galmuri9 font

* Added pokemon-bw font for Japanese

* Changed Japanese Font + removed font size adjustment

* Added Japanese Custom Adjustments

* Slightly increased spacing for Ability name+desc labels

* Japanese starterInfoText adjustments

* Japanese custom lineSpacing adjustment

* Spacing for Ability desc labels adjusted

* Friendship count text adjustment

* Japanese former custom adjustments removal

* TextStyle adjustments

* TextStyle.PARTY adjustments

* Added new TextStyle

* Added new TextStyle

* Added new TextStyle

* Added new TextStyle

* Added new TextStyle

* Add new TextStyle

* Add new Text Style

* Add new TextStyle

* Add new TextStyle

* Add new TextStyle

* Add new TextStyle

* Add new TextStyle

* PARTY_CANCEL_BUTTON TextStyle Correction

* PARTY_CANCEL_BUTTON TextStyle Correction

* Removal of old Japanese line spacing parameter

* Removed old Japanese adjustments

* Apply Biome

* PARTY_CANCEL_BUTTON Adjustments

* partyCancelText position adjustment

* Update i18n.ts

* Change TextStyle of valueLimitLabel

* Added new TextStyle

* Add MOVE_LABEL TextStyle

* Add MOVE_LABEL TextStyle

* Line formatting correction

* MOVE_LABEL TextStyle padding correction

* Added GROWTH_RATE_TYPE TextStyle

* Add GROWTH_RATE_TYPE TextStyle

* Line formatting correction

* Egg Moves title text indepentent from pokemonEggMovesContainer

* Egg Moves title text indepentent from pokemonEggMovesContainer

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

* Correction to eggMovesLabel

* Update starter-select-ui-handler.ts

* Added SUMMARY_STATS_GOLD

* Added SUMMARY_STATS_GOLD

* Added proper multiplication symbol

* Added proper multiplication symbol

* Added proper multiplication symbol

* Added proper multiplication symbol

* Added GROWTH_RATE_TYPE

* Added INSTRUCTIONS_TEXT TextStyle

* Added INSTRUCTIONS_TEXT TextStyle

* Added INSTRUCTIONS_TEXT TextStyle

* Added INSTRUCTIONS_TEXT TextStyle

* Added INSTRUCTIONS_TEXT TextStyle

* INSTRUCTIONS_TEXT adjustments

* Added proper multiplication symbol

* Added SUMMARY_DEX_NUM TextStyle

* Added SUMMARY_DEX_NUM

* Revert SUMMARY_DEX_NUM to wrong text

* Add SUMMARY_DEX_NUM

* Removed outdated Japanese custom line spacing

* Removed outdated Japanese custom line spacing

* Removed outdated Japanese custom line spacing

* Correction outdated Japanese custom line spacing

* Added MOVE_LABEL TextStyle

* Fixed corped tooltipbox and tooltipbox scrolling

* Corrected ME descriptiuon scrolling

* Added MOVE_LABEL

* Apply HEADER_LABEL TextStyle

* Apply HEADER_LABEL

* Added custom values for SETTINGS_VALUE

* Apply MOVE_LABEL

* Added STATS_HEXAGON TextStyle

* Apply STATS_HEXAGON TextStyle

* Typo correction

* Delete outadated pokemon-bw font

* Add updated pokemon-bw font

* Update pokemon-bw format

* Added EGG_SUMMARY_NAME and EGG_SUMMARY_DEX TextStyles

* Apply EGG_SUMMARY_NAME and EGG_SUMMARY_DEX

* Add LUCK_VALUE TextStyle

* Apply LUCK_VALUE TextStyle

* Apply LUCK_VALUE TextStyle

* Adjusted LUCK_VALUE

* Apply LUCK_VALUE TextStyle

* Adjustments for Japanese

* Adjusted Japanese custom

* Added FILTER_BAR_MAIN TextStyle

* Apply FILTER_BAR_MAIN TextStyle

* Added japanese to custom TextStyle

* Added English language settings

* Apply Biome

* pokemon-bw font update

* pokemon-bw font updated

* pokemon-bw font update

* pokemon-bw font update

* pokemon-bw font update

* pokemon-bw font update

* pokemon-bw font update

* pokemon-bw font update

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
2025-07-11 13:51:59 -04:00
Sirz Benjie
bc45869912
[Performance] [Refactor] [UI/UX] Cleanup egg gacha UI, Speed Up Machines (#5889)
* Convert egg gacha type into an object literal

* Refactor egg gacha ui handler

* Apply kev's suggestions from code review

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

* Condense Object.freeze inside of gacha-type.ts

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-07-11 17:38:35 +00:00
Bertie690
9958e4fe13
[Test] Remove duplicate tests (#6082)
* Remove duplicate tests from parental bond test file

* Remove duplicate multi lens + pollen puff test
2025-07-11 19:33:15 +02:00
Sirz Benjie
ee02366ccf
[Misc] Make FixedInt support coercion to number primitive (#6081) 2025-07-11 02:09:09 -05:00
Bertie690
8c05693b83
[Docs] Fix typos in localization.md (#6076) 2025-07-09 22:15:16 +00:00
damocleas
c3bad86ae0
[Audio] Replace Abyss biome BGM with custom BGM by Firel (#6075)
* Replace End biome BGM with custom BGM by Firel

* Update locales submodule

* Replaced PMD Abyss music

Penumbra Chasm

* Update arena.ts

* Trim track, update loop point

* Update track

---------

Co-authored-by: Madmadness65 <blaze.the.fireman@gmail.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-07-09 20:42:06 +00:00
Bertie690
4ba6e69aa1
[Docs] Add localization.md (#5970)
* Create localization.md (WIP)

Not done yet but want to save my changes

* Fix up first half of doc

* Update localization.md 0.75

* Update localization.md .8

* Update localization.md

* Update localization.md

* Nearly finished locales md!!!!

just gotta upload images to github so we don't track em

* Fix images in locales md

* Updated README.md to mention new locales markdown & other notable files

Tbh this thing needs an overhaul

* Update CONTRIBUTING.md 0.5

* Fix CONTRIBUTING.md

* Update localization.md

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

* Update localization.md

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

* Update localization.md

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

* Update localization.md

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

* Update localization.md

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

* Fix typo in CONTRIBUTING.md

Reach out reach out oops

* Revert half of CONTRIBUTING.md

* Fix localization.md

* Update localization.md

* Update localization.md

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

* Revert unneeded step in CONTRIBUTING.md

i am 99% sure flag not needed

* Update localization.md to remove unneeded step

* Update CONTRIBUTING.md

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>

* Revert change to CONTRIBUTING.md

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-07-09 14:28:23 +00:00
Madmadness65
cab15c36f0
[Balance] Update biome pools for wild Pokémon (#6074)
* Update biome pools for wild Pokémon

`outputPools` has been run, correcting evolution delays for some Pokémon like Grapploct and Cosmoem, and generally adding spaces to all bracketed lines.

* Revert change to Pawniard line evo delays

Kingambit was evolving before Bisharp due to being an item evolution. The evolution delay for it is now back to level 64.
2025-07-09 14:36:32 +02:00
NightKev
9b0f0b7a0f
[Refactor] Replace .fill().map "loops" with real for loops (#6071) 2025-07-08 00:53:36 -07:00
Sirz Benjie
2fbaca7b5e
[Bug] Prevent save corruption when loading a pokemonData that has no moves (#6070)
Prevent save corruption when loading a pokemonData that has no moves
2025-07-07 23:10:32 -04:00
Sirz Benjie
115d63d0c5
[Bug] Fix anger point procing on every hit if first hit in multi hit was a crit
https://github.com/pagefaultgames/pokerogue/pull/6067

* Fix anger point always procing on multi-hit

when first strike was a crit

* Fix comment spacing

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

* Rename PostDefendCritStatStageChangeAbAttr

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-07-07 18:38:18 -07:00
Madmadness65
e82c788585
[Audio] Add non-final boss Eternatus battle music (#6065)
This battle music will play in Endless when you fight Eternatus (p1 for the 250 waves, p2 for the 1000 waves).
2025-07-06 19:48:33 +00:00
damocleas
aecb6fcb88
[Sprite] Replace Foul Berry Juice sprite (#6066)
* replace bad berry juice

* Update item atlas

Updated bad berry juice sprite is now included

---------

Co-authored-by: Madmadness65 <blaze.the.fireman@gmail.com>
2025-07-06 12:22:06 -07:00
Bertie690
5f8e665a1e
[Test] Fix incorrect reverse mapping in overridesHelper.ts log message
https://github.com/pagefaultgames/pokerogue/pull/6068
2025-07-06 12:00:33 -07:00
AJ Fontaine
bff8cffe14
[Bug] Fix fusion name not showing on evolution (#6055)
Fix evolution phase not using new fusion name
2025-07-04 19:40:28 +00:00
Sirz Benjie
8f0c864547
[Dev] Remove warnings from pnpm interactions (#6061)
* Add pnpm-workspace.yaml to configure dependencies that are allowed to build

* Remove dependency-graph.json

* Go back to && which is cross-platform

* Remove obsolete `depcruise:graph` command

* Set `shellEmulator` config key to `true`

This makes `package.json` scripts work more reliably cross-platform

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-07-04 04:08:53 +00:00
Wlowscha
f6a434689c
[Balance] Berry Juice and Old Gateau do not depend on the instance
https://github.com/pagefaultgames/pokerogue/pull/6016

* Refactored items and respective MEs

* Changed icon names, added bad berry juice, fixed locales

* Berry juice uses a number parameter again, allowing to convert from old saves without a migrator

* Updated encounter with correct sprite

* Update src/data/mystery-encounters/encounters/weird-dream-encounter.ts

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

* Replaced bad berry juice icon

* Repacked atlas

* Re-export item atlas

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Madmadness65 <blaze.the.fireman@gmail.com>
2025-07-03 21:04:59 -07:00
damocleas
e20313e22c [i18n] Update Locales
update locales, hasn't been done in a while
2025-07-03 20:05:05 -04:00
Bertie690
9926a6e799
[Docs] Add links to CONTRIBUTING.md for forking/cloning (#6060)
[Docs] Add links to CONTRIBUTING.md for cloning repo
2025-07-02 21:27:13 +00:00
Bertie690
2fe50cb761
[Test] Made game.move.select fail if move not in moveset (#5998)
* Made `game.phaseInterceptor` fail if move not in moveset

also added a few assorted doc fixes

* Fixed fail comment

* added `map` statement

* Fixed tests

* Fixed test

* Fixed test and comment

* Fixed tests

* Fixed test v2

* Fixed various tests

* Update error msg to not use fullcaps

* Fixed remaining tests

* Fixed test 0.5

* Fixed up tetss

* Fixed test

* Fixed imposter tests

* Fixed imposter tests

* Fiexd remainig tests

* Marked test as TODO

wasn't as if it was doing anything beforehand but w/e

* Update moveHelper.ts

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

* Update moveHelper.ts

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

* Apply Biome

* Update comment in `spikes.test.ts`

* Add faint checks to Spikes test

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-07-02 12:46:26 -07:00
Jonathan Bankston
12aaa31454
[Refactor] Minor run phase rework (#6017)
* Minor Attempt run phase rework to abstract logic to whole team

* Decoupled individual pokemon from run phase logic

* Formatting

* Completed run phase refactor implementation and updated tests

* Updated run phase to extend field phase instead of pokemon phase

* Removed unused phase decleration in tests

* Removed unecessary arg in turn start phase as refactor no longer needs it

* Cleaned up getPlayerField

* Made adjustments based on reviewer suggestions

* Reintrocuded calculateEscapeChance into AttemptRunPhase and removed run utils

* Resolve merge issues

* Minor TSDoc improvement to `BattleScene#getPlayerField`

* Moved early override check to top of calculateEscapeChance

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-07-02 02:57:08 -07:00
Bertie690
a54cd953a6
[Bug] Fix Shields Down blocking status in Core Form, unnecessarily resetting before battle (#6044)
* Fix Minior Form Change issues

* Fix bug

* Update Power Construct conditionals to be less janky

* Fix syntax error

* Fix ability.ts
2025-06-30 00:19:59 -04:00
Bertie690
1bd152a738
[Refactor] Moved various classes/interfaces to own files (#5870)
* Split up Pokemon data types to own files

* Moved `AttackMoveResult` and `TurnMove` to own files

* Moved `customPokemonData` into types folder + fixed comments

* Moved files around + fixed stuff

* Moved `DamageResult` into new file

* Fixed imports

* ran biome

* Fix merge issue
2025-06-28 01:55:47 -07:00
Lugiad
40a92df190
[i18n] [Localization] Translatable Manaphy Egg Tier (#6038)
Translatable Manaphy Egg Tier
2025-06-26 19:04:14 -07:00
Bertie690
25757ca649
[Docs] Fix typo in CONTRIBUTING.md (#6034)
Fix typo in CONTRIBUTING.md
2025-06-27 00:38:31 +00:00
NightKev
07f5c3009c
[Dev] Add player and enemy Nature and IV overrides (#6032)
* [Dev] Add player and enemy Nature and IV overrides

* Fix broken tests
2025-06-26 12:01:54 -07:00
NightKev
c389b7acdb
[Dev] Mark the fixer for Biome's useBlockStatements as "safe" (#6031) 2025-06-25 18:16:30 -07:00
NightKev
ecdaac20fa [Test] Fix Gorilla Tactics tests 2025-06-24 18:40:15 -07:00
Bertie690
3b490e7ab4
[Bug] Status moves blocked by terrain now use correct message
https://github.com/pagefaultgames/pokerogue/pull/5931

* Moved terrain messages to `terrain.ts`, made status failures use correct text

* Revert overrides.ts

* Comment fix

* Fixed confusion message not appearing for misty terrain blockages

* Fixed bug

* re-added import

* Update battler-tags.ts

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

* Added exhaustiveness checking

* ran boime

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-06-24 17:50:35 -07:00
Bertie690
eb1696e93e Fixed infiltrator bug 2025-06-24 12:03:49 -04:00
Bertie690
7d0ee7a9ed Merge remote-tracking branch 'upstream/beta' into rest 2025-06-23 22:54:01 -04:00