Commit Graph

963 Commits

Author SHA1 Message Date
Wlowscha
76a3e612dd
Tracking forms in held item manager 2025-06-08 22:09:55 +02:00
Wlowscha
2024281580
Baton switch logic in party ui handler now using held item 2025-06-08 18:34:58 +02:00
Wlowscha
d3f84ab41e
Merge remote-tracking branch 'upstream/beta' into held-item-refactor 2025-06-08 12:05:04 +02:00
Sirz Benjie
1c4edabd1d
[Refactor] Ensure that new phases are created through the phase manager
https://github.com/pagefaultgames/pokerogue/pull/5955

* Add newPhase method to phase-manager

* Update calls to append/prepend phase to use string phase

* Replace instantiations of new phase with phase manager
2025-06-07 23:55:30 -07:00
Sirz Benjie
93745f14b7
[Refactor] Decouple phase system from battle-scene (#5953)
* Move phase logic into its own class

* Move ts ignore comment
2025-06-07 17:59:30 -07:00
Bertie690
1ff45687c5
[Refactor] Merged interfaces/ into @types/; removed runtime orphan modules
https://github.com/pagefaultgames/pokerogue/pull/5951
2025-06-07 17:28:01 -07:00
Wlowscha
e98004cefa
Merge branch 'held-item-refactor' of https://github.com/Wlowscha/pokerogue into held-item-refactor 2025-06-07 10:27:47 +02:00
Wlowscha
b0156f0861
Merge branch 'beta' into held-item-refactor 2025-06-07 10:27:20 +02:00
Wlowscha
064bebb205
Temporary stopgap on maxUpgradeCount to avoid game crashing on modifier select ui handler 2025-06-07 10:26:35 +02:00
SmhMyHead
0336858708
[UI/UX] Legendary UP Gacha timer (#5921)
* [UI/UIX] Legendary UP Gacha timer

* Update egg-gacha-ui-handler.ts

Seems "fixedInt" was needed on the delay of the playTimeTimer so the game speed doesn't affect it.

* New timer container by damocleas.

* gacha_legendary.png second version from @damocleas

* Use phaser object chaining methods

---------

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-06-06 21:20:02 +00:00
Sirz Benjie
855868bfea
[Refactor] Cleanup achvs ui handler (#5919) 2025-06-06 21:15:13 +00:00
Sirz Benjie
1fc42b3231
[Misc] Add phase#is method to help reduce circular imports (#5868)
* Move phase types out of phase interceptor

* Create isXPhase method and add properties to each phase

* Replace instanceof phase with isXPhase

* Fix missing union types for phaseName

* Update doc comment in phase.ts

* Fix incomplete comment in encounter-phase

* Make phaseName as public and fix more uses

* Move phaseName property declaration before constructor in move anim phase

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

* Rename isXPhase to is

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-06-06 21:08:23 +00:00
Lugiad
9021e4b41e
[i18n] More Controller settings localization (#5920) 2025-06-06 19:52:35 +00:00
ShinigamiHolo
2a769e2733
[UI/UX] Adding more space in Egg Gacha for another languge (#5934) 2025-06-06 19:45:12 +00:00
Sirz Benjie
178de207f1
[Refactor] Cleanup egg list ui handler (#5890)
Cleanup egg list ui handler

Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
2025-06-06 21:34:38 +02:00
Lugiad
e82e182507
[UI/UX] [Localization] Russian Gatcha Text Resize (#5929)
Russian Gatch Text Resize

Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
2025-06-06 18:33:13 +02:00
Sirz Benjie
193c5ffb0c
[UI/UX] Move Reload Required text to bottom of settings (#5928)
* Move Reload Required text to bottom of settings

* Remove unneeded reloadRequiredText field
2025-06-05 15:18:07 -07:00
NightKev
9dcb904649
[Misc] Improve enum naming (#5933)
* Rename `Abilities` to `AbilityId`

* Rename `abilities.ts` to `ability-id.ts`

* Rename `Moves` to `MoveId`

* Rename `moves.ts` to `move-id.ts`

* Rename `Species` to `SpeciesId`

* Rename `species.ts` to `species-id.ts`

* Rename `Biome` to `BiomeId`

* Rename `biome.ts` to `biome-id.ts`

* Replace `Abilities` with `AbilityId` in comments

* Replace `Biome` with `BiomeId` in comments

* Replace `Moves` with `MoveId` in comments

* Replace `Species` with `SpeciesId` in comments
2025-06-04 14:54:27 -07:00
damocleas
7cd89cd4f7
Update Discord Invite Link 2025-06-02 14:33:39 -04:00
Sirz Benjie
9f892b906c
[Beta][Bug][UI/UX] Fix name position and types not being updated in battle info (#5913)
Fix name position and types not being updated in battle info
2025-06-02 12:59:10 +00:00
Lugiad
369b3307cd
[UI/UX] Moves menu position adjustments (#5917) 2025-06-01 15:40:57 -07:00
Wlowscha
db4cbe02ff
Merge branch 'beta' into held-item-refactor 2025-06-01 20:25:10 +02:00
Wlowscha
096c3e018e
Created items folder 2025-05-31 22:57:26 +02:00
SmhMyHead
831381e4ce
[UI/UIX] Default cursor to new move when learning a move (#5908) 2025-05-31 11:54:02 -04:00
Lugiad
ccd9480240
[Localization] Secondary pending languages inclusion (#5903)
* 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 mysterious-chest-dialogue.json

* Update mysterious-chest-dialogue.json

* 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 i18n.ts

* Update settings.ts

* Update settings-display-ui-handler.ts

* Update starter-select-ui-handler.ts

* Update i18n.ts

* Update i18n.ts

* Update settings.ts

* Update settings-display-ui-handler.ts

* Update i18n.ts

* Update starter-select-ui-handler.ts

* Update utils.ts

* Update utils.ts

* Add files via upload

* Rename statuses_dk.json to statuses_da.json

* Update statuses_da.json

* Update and rename types_dk.json to types_da.json

* Rename statuses_dk.png to statuses_da.png

* Rename types_dk.png to types_da.png

* Delete src/locales/dk directory

* Add files via upload

* Apply suggestions from code review

* Delete src/locales/da directory

* Delete src/locales/tr directory

* Update i18n.ts

* Update i18n.ts

* Update utils.ts

* Main -> Beta (1.1.6) (#4751)

* Comment out startGame call on manifest fetch failure

* [Hotfix] Fix status damage triggering before berry usage (#4732)

* [Hotfix] Fix Eternatus egg tier (#4734)

* [Hotfix] Fix manifest getting loaded before the game is initialized (#4739)

* fix locales path for offline builds (#4739)

* [Sprite] Hotfix cut off Binacle sprite (#4741)

* [Sprite][hotfix] Fixed cropping on 658 static greninja and ash greninja (#4743)

* [Sprite][hotfix] Fixed cropping on static greninja and ash greninja

* [Hotfix] Fix crash when Mist would block a stat drop (#4746)

---------

Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
Co-authored-by: PigeonBar <56974298+PigeonBar@users.noreply.github.com>
Co-authored-by: chaosgrimmon <31082757+chaosgrimmon@users.noreply.github.com>
Co-authored-by: pom-eranian <lrlrliwoo@gmail.com>

* Update settings-display-ui-handler.ts

* Delete src/utils.ts

* Update common.ts

* Delete src/utils.ts

* Update common.ts

* Romanian workspace (#25)

* Russian workspace (#26)

* Update settings-display-ui-handler.ts

* Update settings-display-ui-handler.ts

* Update settings.ts

* Update settings-display-ui-handler.ts

* Update i18n.ts

* Update settings.ts

* Update settings-display-ui-handler.ts

* Update common.ts

* Update and rename statuses_ca-ES.json to statuses_ca.json

* Update and rename types_ca-ES.json to types_ca.json

* Add files via upload

* Delete public/images/statuses_ca-ES.png

* Delete public/images/types_ca-ES.png

* Update locales submodule

---------

Co-authored-by: Moka <54149968+MokaStitcher@users.noreply.github.com>
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
Co-authored-by: PigeonBar <56974298+PigeonBar@users.noreply.github.com>
Co-authored-by: chaosgrimmon <31082757+chaosgrimmon@users.noreply.github.com>
Co-authored-by: pom-eranian <lrlrliwoo@gmail.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-05-30 23:54:17 +00:00
Wlowscha
1bd47cbde3
Merge branch 'beta' into held-item-refactor 2025-05-31 01:33:49 +02:00
damocleas
0988cacc48
Merge branch 'beta' into cleanup-evolution-scene-handler 2025-05-30 19:29:00 -04:00
Wlowscha
28c04877db
Held items now show up in summary 2025-05-31 01:16:15 +02:00
Sirz Benjie
9a60cc9c71
[Refactor] Cleanup filter bar (#5896)
* Cleanup filter bar

* Move DropDownColumn to its own file

---------

Co-authored-by: Amani H. <109637146+xsn34kzx@users.noreply.github.com>
2025-05-30 23:12:35 +00:00
Sirz Benjie
ed0251ea90
[Refactor] Cleanup egg-counter-container (#5892) 2025-05-30 23:08:52 +00:00
Wlowscha
d728052c28
Moved modifier-bar to its own file 2025-05-31 00:30:36 +02:00
Sirz Benjie
901ed73247
Cleanup evolution scene handler 2025-05-29 22:51:36 -05:00
Sirz Benjie
8fcb33d11a
[Bug] Fix improperly named sprite key for enemy boss' battle UI (#5888) 2025-05-30 02:11:53 +02:00
Wlowscha
3f045ec7a6
Working leftovers in new style 2025-05-30 01:50:15 +02:00
Sirz Benjie
d5789105f3
[Refactor][UI/UX] Cleanup battle-info ui code (#5696)
* Create battle-info directory and move battle-info.ts to it

* Move player and enemy battle info to their own files

* Move subclass specific parts of constructor to subclass constructor

* Fixup mock gameobject methods to match phaser gameobject returns

* Make statOrder specific to subclass

* Create getShinyDescriptor function in utils

* Move icon construction to its own function

* Cleanup enemybattleinfo constructor to use chaining

* Make flyout exclusive to EnemyBattleInfo

* Move EnemyPokemon specific init Logic to its class

* Break up initInfo into different methods

* Remove hp bar segment dividers from base battle info

* Move setMini to pokemoninfo

* Breakup updateInfo into smaller parts

* Remove hp info handling from base updateInfo

* Use phaser object chaining methods

* Add some docs

* Add missing chain usage

* Use getShinyDescriptor in pokemon-info-container

* Minor cleanup of updatePokemonExp

* Fixup setSizeToFrame mock

* Ensure pokemon hp numbers are not visible during stat display

* Update src/utils/common.ts

Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>

* Make summary-ui-handler use new shinyDescriptor method

* Remove `undefined` parameter pass

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

* Address kev's review comments

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

* Ensure hp number display fades in/out

* Ensure ribbon and caught indicator fade with stat display

* Update src/ui/battle-info/battle-info.ts

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

* Move construction of stats and type icons to their own methods

* Make setPositionRelative return this

* Improve doc comment on paddingX param

* Fix mock sprite's setPositionRelative

---------

Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Co-authored-by: Amani H. <109637146+xsn34kzx@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-05-28 17:29:03 +00:00
Lugiad
c236996a02
[UI/UX] [Localization] starterInfoText adjustments and clean up (#5859)
* starterInfoText adjustments and clean up

* starterInfoText adjustments and clean up

* Update starter-select-ui-handler.ts

* Update starter-select-ui-handler.ts

---------

Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
2025-05-27 22:08:49 +00:00
NightKev
68dddbc424
[Dev] Enable Biome checking of pokemon.ts (#5720)
* [Dev] Enable biome parsing of `pokemon.ts`

* Apply unsafe fixes

* Add + apply rule disallowing the use of the `integer` type alias

* Fix typo in comment; remove unnecessary `!!`

* Re-apply Biome after merge

* Re-apply Biome "unsafe" fixes after merge

* Fix import

* Add comment to `getFusionIconAtlasKey` too
2025-05-27 07:50:54 -07:00
Wlowscha
65a90a3a8d
[UI/UX] Party UI handler refactor (part I) (#5821)
* Splitting process input for menu into its own function

* Making logic for return button more expressive

* Breaking up processOptionMenuInput

* Extracting filterResult logic from processInput

* Inverting order of several conditional checks (if the function always returns after seeing the summary option, may as well check for it straight away...)

* Moving edge case for release option into processReleaseOption

* Splitting up options for when selectCallback is present

* Added some TODOs for later

* Extracted setOptionsCursor function

* Extracted updateOptionsWindow()

* Changing options so that each case is completely separate (almost)

* Added some TODOs

* Reorganizing option processing

* Fixed Baton Pass; logging for testing

* Fixed case of switching out by selecting the Pokemon command

* Clearing options when switching out

* Changed condition on switch for clarity

* Updating TODO

* Fixed options not clearing after item transfer

* Splitting up processing of transfer and move recall mode; ensuring that the cancel option works properly

* Breaking up processInput()

* Removed some redundant playSelect

* Cleaned up some TODOs

* Added private to all new methods

* Apply suggestions from code review

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

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-05-27 04:12:29 -07:00
Lugiad
3b2753f27c
[i18n] Moved Ball "Cancel" label to a different locale file (#5866) 2025-05-22 20:14:52 -07:00
Sirz Benjie
f0e806c508
[Misc] Move allMoves to data-lists.ts (#5860) 2025-05-21 20:18:24 -07:00
damocleas
4a39adacf8
[UI/UX] Remove Redundant Unlock Passive text (#5845)
* Update starter-select-ui-handler.ts

* Update pokedex-page-ui-handler.ts
2025-05-21 03:05:39 +00:00
Lugiad
f01e7599ac
[UI/UX] [Localization] Update Japanese starterInfoText (#5852)
Update Japanese starterInfoText
2025-05-21 02:21:35 +00:00
Lugiad
9746f1a2a6
[UI/UX] [Localization] Update Korean starterInfoText 2025-05-19 17:39:17 -07:00
Lugiad
a9ec3b324c
[UI/UX] [i18n] Text ratio adjustment for es-MX Egg Gatcha (#5839) 2025-05-19 22:03:42 +00:00
Lugiad
bd14ed640c
[Localization] Localizable "Cancel" text in Ball selection menu (#5836)
"Cancel" text localizable
2025-05-19 17:00:51 -05:00
Lylian BALL
4f541a8dce
[Bug] Fix some moves using illusion type instead of real type (#5772)
* fix revelation dance using the type of the illusion instead of the actual type

* fix other move that might get the illusion type as well

* fix other move that might get the illusion type as well

* fix abilities that might get the illusion type as well

* fix illusion icon in party ui handler

* Fix TSDoc for `Pokemon#getTypes`

* Remove now-unnecessary changes to `.getTypes()` calls

Revert `overrides.ts` changes

* Replace `|| false` with `!!`

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-05-05 18:31:11 -07:00
Sirz Benjie
3161461b6c
[Bug][UI/UX] Update battle-info inside pokemon#damageAndUpdate (#5778)
* Update battle-info inside pokemon#damageAndUpdate

* Ensure updatePokemonHp does not skip last hp number
2025-05-05 18:35:51 -04:00
Sirz Benjie
ae25a70b4d
[Bug][UI/UX] Ensure pokemon hop when animations are selected (#5781)
Ensure pokemon hop when animations are selected
2025-05-05 17:36:22 -04:00
Bertie690
6d90649b92
[Refactor/Bug/Ability] Reworked BattleData, fixed Rage Fist, Harvest, Belch + Implemented Cud Chew (#5655)
* Grabbed reverted changes from stuff

* Added version migrator for rage fist data + deepMergeSpriteData tests

* fixed formattign

* Fied a few

* Fixed constructor (maybe), moved deepCopy and deepMergeSpriteData to own file

`common.ts` is hella bloated so seems legit

* Moved empty moveset verification mapping thing to upgrade script bc i wanted to

* Fixed tests

* test added

* Fixed summondata being cleared inside summonPhase, removed `summonDataPrimer`

like seriously how come no-one checked this

* Fixed test

I forgot that we outsped and oneshot

* Fixed test

* huhjjjjjb

* Hopefully fixed bug

my sanity and homework are paying the price for this lol

* added commented out console.log statement

uncomment to see new berry data

* Fixed migrate script, re-added deprecated attributes out of necessity

* Fixed failing test by not trying to mock rng

* Fixed test

* Fixed tests

* Update ability.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 overrides.ts

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

* Update berry-phase.ts

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

* Update encounter-phase.ts

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

* Update game-data.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>

* Added utility function `randSeedFloat`

basically just `Phaser.math.RND.realInRange(0, 1)`

* Applied review comments, cleaned up code a bit

* Removed unnecessary null checks for turnData and co.

I explicitly made them initialized by default for this very reason

* Added tests for Last Resort regarding moveHistory

* Update pokemon.ts

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

* Update pokemon.ts

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

* Update pokemon.ts

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

* Update pokemon.ts

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

* Update pokemon.ts

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

* Update pokemon.ts

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

* Update pokemon.ts

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

* Update pokemon.ts

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

* Update battle-scene.ts

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

* Update the-winstrate-challenge-encounter.ts

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

* Update pokemon.ts

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

* Update pokemon.ts

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

* Update pokemon.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.ts

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

* Update move.ts

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

* Update move.ts

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

* Update battle-anims.ts

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

* Update pokemon.ts comments

* Fixed a few outstanding issues with documentation

* Updated switch summon phase comment

* Re-added BattleSummonData as TempSummonData

* Hppefully fixed -1 sprite scale glitch

* Fixed comment

* Reveted `pokemon-forms.ts`

* Fuxed constructor

* fixed -1 bug

* Revert "Added utility function `randSeedFloat`"

This reverts commit 4c3447c851.

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-05-02 00:06:07 -05:00
Xavion3
8eeec9511b
[Bug] Correctly get cursor position in command UI (#5740)
Correctly get cursor position in command UI

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-05-02 01:18:38 +00:00