Commit Graph

5367 Commits

Author SHA1 Message Date
Wlowscha
fc790b77c5
Splitting up held-item file 2025-05-31 22:31:33 +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
Bertie690
a33638a7a3
[Test] Remove deprecated test funcs (#5906)
* Removed `game.startBattle`

* Removed `game.forceEnemyMove`

* Removed near-unused learn move macro
2025-05-30 16:50:25 -07:00
Wlowscha
8ae0898229
Implemented more suggestions 2025-05-31 01:49:31 +02:00
Wlowscha
45c83ff252
Merge branch 'held-item-refactor' of https://github.com/Wlowscha/pokerogue into held-item-refactor 2025-05-31 01:34:20 +02:00
Wlowscha
1bd47cbde3
Merge branch 'beta' into held-item-refactor 2025-05-31 01:33:49 +02:00
Wlowscha
c3b303414e
Added some suggestions 2025-05-31 01:33:28 +02:00
damocleas
3ab4b8baf2
[Refactor] Cleanup evolution scene handler
[Refactor] Cleanup evolution scene handler
2025-05-30 19:30:41 -04: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
e1be360e74
[GitHub] Change total shard numbers and change job name (#5905) 2025-05-30 14:42:12 -07:00
Sirz Benjie
5eeff18407
[GitHub] Fix gh action path filter (#5904)
* Fix test workflow syntax to use negation properly

* Add missing id and comparison check in tests.yml

* Fix missing curly brace
2025-05-30 12:35:38 -07:00
NightKev
d5f7665b15
[Test] Update test utils (#5848)
* [Test] Add/update test utils

- Add `FieldHelper` which has methods to mock a pokemon's ability
or force a pokemon to be Terastallized

- Add `MoveHelper#use` which can be used to remove the need
for setting pokemon move overrides by modifying the
moveset of the pokemon

- Add `MoveHelper#selectEnemyMove` to make an enemy pokemon
select a specific move

- Add `MoveHelper#forceEnemyMove` which modifies
the pokemon's moveset and then uses `selectEnemyMove`

- Fix `GameManager#toNextTurn` to work correctly in double battles

- Add `GameManager#toEndOfTurn` which advances to the end of the turn

* Update some tests

- Disable broken Good As Gold test
and add `.edgeCase` to Good As Gold

- Fix Powder test

- Update some tests to demonstrate new methods
2025-05-30 12:24:05 -07:00
Sirz Benjie
901ed73247
Cleanup evolution scene handler 2025-05-29 22:51:36 -05:00
Jimmybald1
ff6f9131ae
[Dev] Fixed biome override not working for Daily Mode (#5776) 2025-05-29 20:39:55 -07:00
Sirz Benjie
14e01c3da1
[Test] Add missing methods to many mocks (#5891) 2025-05-29 20:27:39 -07: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
Wlowscha
77f8cd9643
Select modifier phase tentatively working with new held items 2025-05-29 23:46:35 +02:00
Wlowscha
b32400e81a
Removed unused file 2025-05-29 23:42:55 +02:00
Wlowscha
827c462d3f
Introduced AttackBoosterRewardGenerator 2025-05-29 23:33:30 +02:00
Wlowscha
9d726e47d3
Introduced AttackBoosterReward 2025-05-29 23:31:17 +02:00
Wlowscha
517dec2f7e
Introduced HeldItemReward class 2025-05-29 23:29:42 +02:00
Wlowscha
ba01c505d9
Moved some files around, added many held item ids 2025-05-29 23:26:50 +02:00
Wlowscha
d769bd7f11
Extracted logic from modifierSelectCallback 2025-05-29 12:59:19 +02:00
Wlowscha
2a13e2ac5a
New refactors of select-modifier-phase.ts 2025-05-29 11:56:45 +02:00
Wlowscha
f849c0c8e7
Newrefactors of reward-pool-manager.ts 2025-05-29 11:54:39 +02:00
Sirz Benjie
f9e6785c35
[Test] Fix mocks' add method to match phaser signature (#5885) 2025-05-28 20:18:06 -07:00
Sirz Benjie
86fa3198fd
[Test] Fix mock text to make it compatible with method chaining (#5884) 2025-05-28 19:47:27 -07:00
Sirz Benjie
d8c00616fc
[Test] Add iterate, fix each method in mock container (#5882) 2025-05-28 18:00:54 -07: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
damocleas
eb0937a09b
Hotfix 1.9.5 to Beta
Hotfix 1.9.5 to beta
2025-05-27 23:57:16 -04:00
damocleas
ddc160b862
Hotfix 1.9.5 to Main
Hotfix 1.9.5 to main
2025-05-27 23:56:48 -04:00
Wlowscha
82e24bf4bc
Splitting up methods in select-modifier-phase.ts 2025-05-28 00:14:51 +02: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
Sirz Benjie
2deced5565
[Bug][Move] Allow gastro acid to suppress passives if main ability is unsuppressable (#5854)
* Allow gastro acid to suppress passives if main ability is unsuppressable

* Update gastro_acid.test.ts

* Update src/data/moves/move.ts

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

* Add test to ensure unsuppressable main ability is not suppressed

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-05-27 16:46:56 -05:00
Sirz Benjie
6c676f1f11
[Misc] Add decrypt-save.js utility script (#5731)
* Add decrypt-save.js

* Update scripts/decrypt-save.js

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

---------

Co-authored-by: Amani H. <109637146+xsn34kzx@users.noreply.github.com>
2025-05-27 20:41:06 +00:00
Wlowscha
9769cfbc9c
Merge branch 'held-item-refactor' of https://github.com/Wlowscha/pokerogue into held-item-refactor 2025-05-27 21:54:35 +02:00
Wlowscha
e7197816f3
Merge branch 'beta' into held-item-refactor 2025-05-27 21:52:01 +02: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
NightKev
a98f897591 [Bug] Fix Dipplin's weight (was mistakenly set to the lbs value) 2025-05-27 05:02:58 -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
NightKev
999cbf911e [Bug] Fix Pichu form weights (61.5 -> 2) 2025-05-27 03:56:52 -07:00
NightKev
b803f6f18a [i18n] Update locales (#5875) 2025-05-27 03:34:20 -07:00
Sirz Benjie
e053ead67c [Bug] Fix crash caused by switching in a transformed pokemon (#5864)
* Force reset summon data and load assets prior to switch in

* Update src/phases/switch-summon-phase.ts
2025-05-27 03:34:14 -07:00
AJ Fontaine
8410aee3a1 [Sprite] Fix Cacturne and Kyurem variants 2025-05-27 03:34:02 -07:00