Commit Graph

4763 Commits

Author SHA1 Message Date
Wlowscha
c1469c08fa
Making some held items unstealable and unsuppressable 2025-06-09 10:51:07 +02:00
Wlowscha
c41ae99365
Changed BattleScene.removeModifier and pokemon.loseHeldItem 2025-06-09 10:42:55 +02:00
Wlowscha
565d75225a
Fixed shell bell in ability.ts (why is it here?) 2025-06-09 10:42:11 +02:00
Wlowscha
34864b51b8
Removed a bunch of modifiers 2025-06-09 10:13:13 +02:00
Wlowscha
2f794dbc6e
Using phaseManager 2025-06-09 10:12:46 +02:00
Wlowscha
69b99887d9
Shuckle Juice and Old Gateau 2025-06-09 10:12:17 +02:00
AJ Fontaine
b1c50dd69f
[Bug] Fix TM compatibility for Terapagos and Knock Off (#5958)
Fix TM compatibility for Terapagos and Knock Off
2025-06-08 16:49:50 -07:00
Wlowscha
5ef88a6d4d
[Refactor] Refactor select-modifier-phase.ts (#5886)
* Refactored select-modifier-phase.ts

* Added some missing type signatures

* Changes from suggestions

* Added ModifierSelectCallback type
2025-06-08 15:13:26 -07:00
Wlowscha
76a3e612dd
Tracking forms in held item manager 2025-06-08 22:09:55 +02:00
Wlowscha
12117bb2ac
Using phaseManager 2025-06-08 20:23:42 +02:00
Wlowscha
2b077151ef
Using held items in some places 2025-06-08 20:15:56 +02:00
Wlowscha
1cb956e872
Partial implementation of item steal items 2025-06-08 20:10:32 +02:00
Tiago Rodrigues
37767799cd
[Bug] Gorilla Tactics now activates on protect and miss (#5567)
* [Bug] Fix #5112: Gorilla Tactics only registers succesful moves as move usage

* Apply small fixes from code review

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

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-06-08 12:52:48 -04: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
NightKev
75beec12a8
[Dev] Enable Biome checking of ability.ts (#5948) 2025-06-07 21:43:30 -07:00
Bertie690
35a09af475
[Utils] Create utility function randSeedFloat (#5767) 2025-06-07 19:29:10 -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
Jimmybald1
3114035673
[Balance] Update catch rates to Gen 9 (#5954)
Updated catch rates to gen 9w

Co-authored-by: Jimmybald1 <147992650+IBBCalc@users.noreply.github.com>
2025-06-07 20:54:33 -04:00
Bertie690
ef6029ae4b
[Refactor] Add methods isPlayer and isEnemy to reduce circular imports
https://github.com/pagefaultgames/pokerogue/pull/5902

* Added functions `isPlayer` and `isEnemy` for type checking

* Apply suggestions from Kev code review

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

* Fix merge issue

* Split imports

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-06-07 17:44:58 -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
bac6aa1d3d
Added Baton and Golden Punch 2025-06-08 00:48:27 +02:00
Wlowscha
0b32cfb622
Added multi lens and wide lens 2025-06-08 00:29:14 +02:00
Wlowscha
ff24aae54b
Added Shell Bell, Soul Dew 2025-06-08 00:06:04 +02:00
Wlowscha
bce7472e3d
Added Mystical Rock 2025-06-07 23:48:35 +02:00
Wlowscha
c323375590
Added Crit Boost held items, King's Rock, Focus Band and Quick Claw 2025-06-07 23:33:48 +02:00
Wlowscha
955592bdf6
Added Stat Boost items; generic name and description in HeldItem class 2025-06-07 12:53:47 +02:00
Wlowscha
d39744041e
Remove InstantReviveModifier 2025-06-07 11:24:42 +02:00
Wlowscha
15e729e3e8
Added effect of reviver seed (leveraging consumable logic) 2025-06-07 11:23:46 +02:00
Wlowscha
5c93a0c9b0
Simplified HeldItemReward 2025-06-07 11:19:07 +02:00
Wlowscha
298325f726
Added reviver seed 2025-06-07 11:13:01 +02:00
Wlowscha
d109bc202f
Changed held-items.ts to held-item-id.ts and renamed id object accoridngly 2025-06-07 10:48:30 +02: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
NightKev
c5db827381
[Dev] Enable Biome linting of move-effect-phase.ts (#5947) 2025-06-06 23:09:23 -07:00
Bertie690
a818c2b33f
[Bug] Dancer no longer breaks "last hit only" moves, respects flinch + steadfast (#5945)
* WIP

* Fixed Dancer last hit, flinch move interaction

* Fixed steadfast interaction

* Fixed comment + flaky test

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-06-06 20:50:16 -07:00
Bertie690
88e4ab978b
[Misc] Removed cases of a ? true : false and useless super calls from subclasses (#5943)
* Removed cases of `if (a) {return true}' return false`

* Removed useless `super.xyz` calls from functions

* Fixde missing issur

* Use early return in `Pokemon#isOffsetBySubstitute`

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-06-06 17:00:09 -07: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
PrabbyDD
0c54fc1be0
[Bug] Fix no EXP awarded if all active pokemon faint (#4688)
Party pokemon will now gain EXP from EXP Share
even if all the active pokemon are fainted

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-06-05 18:22:27 -04: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
Wlowscha
39b8dc9a85
[Refactor] Removing unused logic for mbh/grip claw (#5914)
* Removing unused logic for mbh/grip claw

* Updated docstring

---------

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-06-05 21:54:50 +00: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
Wlowscha
9e1bbee58f
Converted wild pokemon pool to held item rewards 2025-06-03 23:19:44 +02:00
damocleas
7cd89cd4f7
Update Discord Invite Link 2025-06-02 14:33:39 -04:00
Madmadness65
ea64024e09
[P3 Bug] Remove Expert Breeder trainer type from ME egg source (#5893)
Remove Expert Breeder trainer type from ME eggs

It effectively duplicated the text in the egg source text box,
and overflowed the visual text box as a result.
2025-06-02 14:32:34 +00: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
9568488161
Lucky egg and Golden egg 2025-06-01 23:48:14 +02:00
Wlowscha
7b2b134619
Merge branch 'beta' into held-item-refactor 2025-06-01 23:01:25 +02:00
Wlowscha
7ba7c9c529
Refactored parameters passed to .apply() methods; introduced generic .applyHeldItems() function; all HeldItems classes specify an ITEM_EFFECT 2025-06-01 23:00:15 +02:00
Lugiad
7859fea26b
[i18n] Translatable Game Speed values (#5916) 2025-06-01 12:37:47 -07:00
Wlowscha
db580a6735
Update modifier bar is now called in the apply of consumable held items 2025-06-01 21:24:16 +02:00
Wlowscha
b885b9c62c
Made heldItems public in heldItemManager 2025-06-01 20:37:22 +02:00
Wlowscha
db4cbe02ff
Merge branch 'beta' into held-item-refactor 2025-06-01 20:25:10 +02:00
Wlowscha
da18bf6ea9
HeldItem .apply() methods do not really need the stack as input, just the pokemon 2025-06-01 20:21:33 +02:00
Wlowscha
41a4c9ec2d
Converted White Herb 2025-06-01 20:14:10 +02:00
Wlowscha
cf19a01c37
Shell bell 2025-06-01 04:03:04 +02:00
Wlowscha
096c3e018e
Created items folder 2025-05-31 22:57:26 +02:00
Wlowscha
318f326e3b
Fixing various imports 2025-05-31 22:37:39 +02:00
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
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
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
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
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
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
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
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