Commit Graph

5399 Commits

Author SHA1 Message Date
Wlowscha
466c4aede2
Replace remaining Modifiers with Rewards (#6091)
* Changing remaining Modifiers to Consumables, and renaming ModifierType to Reward

* Renamed modifier files and moved them into items folder

* Using rewards in most places

* Removed consumables in favor of using rewards directly

* Renamed RewardTier to RarityTier

* Reward ids, function to match rewards

* Getting reward tiers from player pool still

* Messing around with parameters of Reward.apply()

* Always requiring player pokemon in rewards

* Fixing some functions in select-reward-phase and battle-scene

* Fixed various post-merge issues

* Fixed most localization strings (accidentally broken by replacing modifierType with reward)

* Fixed tests for select reward phase

* Using Pokemon.hasSpecies()

* Zero weight for trainer items rewards which are already max stack

* Cleaning up SelectRewardPhase, held item rewards behave the same as any PokemonReward

* Cleaned up some functions

* Introduced RewardCategoryId, distributed RewardIds

* Utility `is` functions for rewards

* Minor fixes

* Moved `HeldItemEffect` to its own file

* rmade some todo comments

* Adding a big comment

* Added tsdocs and removed `RewardClass`

* undid breaking changes

* added TODO

* Moved matchingRewards function to reward-utils.ts

* Added RewardGenerator classes for mints and tera shards

* Introducing default rarity tiers for trainer items and rewards

* RewardFunc now can return RewardGenerator

* Moved pool reward functions to their own file, plus other utility files

* Fixed WeightedModifier to work with the new RewardFunc

* Fixed wrong type import

* Shifting trainer item and reward ids to avoid overlaps

* Added some types

* Updated comment in reward.ts

* Added strong typing ot item maps

* added type safety to held item name map

---------

Co-authored-by: Bertie690 <taylormw163@gmail.com>
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-07-27 17:09:21 -07:00
Sirz Benjie
d3f2659cdf
Merge branch 'beta' into modifier-rework 2025-07-24 16:00:14 -06:00
Sirz Benjie
51d4c33de0
[Misc] Standardize-file-names (#6137)
* Standardize filenames to kebab-case

Co-authored-by: pymilkmaiden <cassiopeiamahler56@gmail.com>

* Move script outside of public folder

* Move update_exp_sprites to scripts

* Add ls-lint to lint file and directory names

* Update lefthook.yml to skip merge / rebase on all pre-commit commands

---------

Co-authored-by: pymilkmaiden <cassiopeiamahler56@gmail.com>
2025-07-24 16:38:31 -04:00
Wlowscha
985d352be8
Moved held item manager to item folder, some name changes 2025-07-24 20:39:56 +02:00
Wlowscha
ccd968d5b8
Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue into new-modifier-rework 2025-07-24 20:36:27 +02:00
Lugiad
58876a2086
[UI/UX] [Localization] Apply single-column Game Stats to more languages (#6135)
Apply sigle-column Game Stats to more languages
2025-07-24 11:48:52 -04:00
Sirz Benjie
ef843debee
[UI/UX] Allow adjustable column count in stats-ui-handler
https://github.com/pagefaultgames/pokerogue/pull/6087

* Make column count modular

Co-authored by: ShinigamiHolo <128856544+ShinigamiHolo@users.noreply.github.com>

* Make game stats ui handler use phaser method chaining

* Adjust max cursor calculation

* Make arrowUp start invisible

* Add implementations for setFlip methods in MockSprite

* Misc cleanup

* Address kev's review comments

* Address kev's review comments

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

* improve clarity of doc comment

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

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
2025-07-23 23:06:17 -04:00
Lugiad
adee68a6d5
[UI/UX] Optimized Pokémon PNGs (#6130)
Optimized Pokémon PNGs
2025-07-23 11:16:09 -07:00
Sirz Benjie
b1e1a383fb
[Bug] Appropriately load delayed attack when target index was player
https://github.com/pagefaultgames/pokerogue/pull/6128
2025-07-22 16:10:43 -07:00
Sirz Benjie
069e8a47d6
[Bug][Refactor] Fix loading arena tags (#6110)
* Improve type safety; add missing loadTag overrides to wish and neutralizing gas

* More automatic type safety for arena tags

* Fixup wording of lead comment in arena-tag.ts

* Apply kev's suggestions from code review

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

* Allow abstract constructors for arena methods

* Address dean's comments from code review

* Add missing newline after interface definition

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

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Format with biome

* Update tsdoc of ConditionalProtectTag

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

* Apply kev's suggestions from code review

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

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
2025-07-22 11:26:27 -07:00
Bertie690
6937effa16
[Misc/Docs] Assorted code cleanups + doc updates (#5745)
* Squashed changes into 1 commit, reverted unneeded stuff

* Update ability-class.ts comments

* Update move.ts comments

* Fixed flaky test

* Applied PR reviews

* Update move.ts

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

* Fixed ab code

* Added comment for BattlerIndex

* ddd

* ren biome

* Update battler-tags.ts

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

* Update battler-tags.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>

* Fixed the things

* Fixed up a few `default` stuff and random enum stuff

* Update move.ts comments

* Revert change to pokemon.ts

* Update battle-scene.ts

* fixed import oopsie

* Update src/field/pokemon.ts

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

* Update src/data/abilities/ability.ts

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

* Update src/data/abilities/ability.ts

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

* Fix incorrect TSDoc

* Update ability.ts

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

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-07-22 10:28:10 -07:00
podar
56e3402c81
[Bug] [QoL] Updating manifest fetching to be more resilient for local development and offline builds. (#4735)
* Fixing local development and offline builds

* Update src/main.ts

---------

Co-authored-by: Moka <54149968+MokaStitcher@users.noreply.github.com>
2025-07-22 00:08:17 -05:00
Bertie690
6aa5c03b75
[Test] Removed unnecessary calls to PhaseInterceptor.to("CommandPhase") (#6108)
* [Test] Removed unnecessary calls to `PhaseInterceptor.to("CommandPhase")`

* minor cleanup to final_boss.test.ts

* Made run to final boss encounter actually go to command phase

* fix final_boss.test.ts select bug

* actually fixed test fr this time

* Fix magnet_rise.test.ts

* Fixed test

* Update test/moves/stockpile.test.ts

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

* Update stockpile.test.ts

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-07-21 17:44:39 +00:00
Bertie690
a382554256
[Test/Ability] Cleaned up Magic Guard/battle tests; fixed innards out interaction (#5911)
* Fixed tests for Magic Guard, Battle phase; fixed innards out stuff

* Fixde magic guard aftermath

* fixed tests

* Fixed innards out

* fixed using sizzly slide instead of will o wisp to inflict burn

* ran boime

* Readd simulated oopsie

* Fix HJK test to use protect + docs and such

* Apply Biome

---------

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-07-21 17:42:27 +00:00
Lugiad
8c825f1714
[UI/UX] Optimized images (#6125) 2025-07-21 10:40:21 -07:00
Bertie690
02cdec25a8
[Dev] Disabled biome noAwaitInLoop rule (#6124) 2025-07-21 09:25:42 -07:00
Madmadness65
1428d8b870
[Balance] Add faint trigger to various form changes (#6122)
* [Balance] Add faint trigger to Battle Bond Greninja's form change

The form change functionality will now be slightly closer to Generation 7/8, as the Greninja will now revert from Ash form to Battle Bond form upon fainting.

* Change how the form change on faint is triggered

It is no longer directly handled by the faint phase, and is instead part of the abilities now, as more than Battle Bond Greninja revert via this method (Disguise Mimikyu, Power Construct Zygarde).

* Adjust Disguise test
2025-07-20 18:59:01 +00:00
NightKev
8dd6608e10
[UI] Status moves only show 1x or 0x for effectiveness hints (#6119) 2025-07-20 09:48:27 +02:00
Lugiad
275ea48744
[UI/UX] [Localization] Optimized type/status icons + new translations (#6120)
* Optimised type/status icons pngs + zh-TW translation

* Optimised type/status icons pngs + zh-TW trans.

* Updated German status icons
2025-07-19 15:57:58 -07:00
Sirz Benjie
2388372cca
[Dev] Add support for manually rolling polyfills. Add polyfill for promise.withResolvers (#6103)
* Add polyfill for Promise.withResolvers

* Import polyfills in main

* Apply kev's suggestions from code review

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

* Address comments from code review

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-07-19 09:06:32 -07:00
Wlowscha
e1edb87990
Merge https://github.com/pagefaultgames/pokerogue into new-modifier-rework 2025-07-19 16:30:48 +02:00
NightKev
556721127c [i18n] Update locales submodule 2025-07-19 02:39:00 -07:00
damocleas
4f4ca5f0c7
[Art][Sprite] Improve Plains Background, add Biome Props (#6118)
* Plains Background Improvement, add Props

* Update CREDITS.md for new biome assets

* Update flower and everstone props
2025-07-19 02:04:15 -04:00
Bertie690
626eb3da87
[Dev] Fixed lefthook to no longer reset submodules on file checkouts
https://github.com/pagefaultgames/pokerogue/pull/6113
2025-07-18 22:42:23 -07:00
NightKev
a81e187164
[i18n] Pokemon#getOpponentDescriptor no longer returns a pokemon name
https://github.com/pagefaultgames/pokerogue/pull/6053
2025-07-18 23:42:51 +00:00
SmhMyHead
def80f2e10
[UI/UX] Baton shows on top, De/Activate form shows on bottom (#6104)
[UI/UX] Batton shows on top, De/Activate form shows on bottom
2025-07-18 03:36:53 +00:00
NightKev
a6e4459ecd
[Dev] Fix if statement in beta deploy script (#6107) 2025-07-17 03:38:58 -07:00
NightKev
4dca988823
[Dev] Update packages (#6088)
* Update packages

* Add default values for tweens

* Add mocks for `InputText` and `BBCodeText`

* Delete deprecated `vitest.workspace.ts`

* Replace `new InputText` with `globalScene.add.rexInputText`

* Disable broken Magic Bounce test

* Disable broken test in `stockpiling.test.ts`
2025-07-16 22:28:17 -07:00
Sirz Benjie
de2d4c8b0e
[AI] Minor fixup of matchup score (#6100)
* Minor fixup of matchup score

* Add some comments discussing deficiencies

* Fixup incomplete comment

* Apply kev's 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-07-16 19:52:57 +00:00
Sirz Benjie
b3f4005a16
[Bug] Fix return in applyChosenModifier; prevent race condition in modifier-ui-handler (#6099)
* Fix return in applyChosenModifier

* Stop race condition in modifier-select-ui

* Fix null errors inside the tween's onUpdate method

* Minor cleanup of tween chains

* Minor cleanup of tween chains

* Minor fixup
2025-07-16 17:25:58 +00:00
damocleas
3d42e976b7
[Balance] Encounter condition adjustments for Legendaries and Random Trainers (#6084)
* Adjust Trainer Chances, Legendary Encounter Waves

* Poipole, Kubfu, and Type: Null checked

* 55 made the default

* Update src/field/arena.ts

Co-authored-by: AJ Fontaine <36677462+Fontbane@users.noreply.github.com>

* Replace `switch (true)` with `if/else`

* fix comment

Co-authored-by: AJ Fontaine <36677462+Fontbane@users.noreply.github.com>

* Update arena.ts random trainer chances in biomes

* Update arena.ts random trainer chances in biomes

* beach.,

---------

Co-authored-by: Madmadness65 <blaze.the.fireman@gmail.com>
Co-authored-by: AJ Fontaine <36677462+Fontbane@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-07-16 11:21:52 -05:00
NightKev
fcdbf16bc3 [Test] Fix first-attack-double-power.test.ts tests
The trainer type overrides appear to be bugged currently
2025-07-15 23:40:27 -07:00
Bertie690
268605a5e3
[Dev] Move typedoc settings to typedoc.json and add tsdoc.json
https://github.com/pagefaultgames/pokerogue/pull/6102

* Move typedoc settings out of tsconfig

* Create typedoc.json

* Apply Biome

* Add `tsdoc.json` for `@todo` and `@linkcode`

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-07-15 23:28:02 -07:00
AJ Fontaine
583b3758c0
[Dev] Move Fixed Battle Configs to own file (#6054) 2025-07-15 21:54:15 -07:00
Bertie690
e05d85977e
[Dev] Updated enum utils to have strong typing (#6024)
* Updated enum utils to refuse non-enum values;
added strong typing on return values

* Moved Enum functions to own file; added type helpers for enums

* Cleaned up some code

* Fixed up tests

* Fix training-session-encounter.ts
2025-07-15 01:14:02 -07:00
NightKev
2e06b10f40 [Test] Fix Bolt Beak/etc test 2025-07-15 00:34:03 -07:00
Sirz Benjie
971a86d20a
[Beta][Bug][UI/UX] Ensure setCursor is called if not first turn (#6098)
Ensure setCursor is called if not first turn
2025-07-14 19:07:12 -04:00
Blitzy
773229effd
[Balance] 1.10 Passive, Egg Move, and Starter Cost Changes (#6097)
* Update egg-moves.ts 38 egg move changes

* Update passives.ts - 23 passive changes

* Updates starters.ts - 2 cost changes

---------

Co-authored-by: damocleas <damocleas25@gmail.com>
2025-07-14 19:06:34 -04:00
Sirz Benjie
6e6f9da1fd
[Bug] Fix grey caught indicator for genderless pokemon (#6095)
Fix grey caught indicator for genderless pokemon
2025-07-14 16:57:38 -04:00
Sirz Benjie
374fb9613a
Revert "[Bug] Genderless Pokemon no longer grey out the caught icon" (#6094)
Revert "[Bug] grey caught indicator for genderless pokemon (#5935)"

This reverts commit 5104f5712f.
2025-07-14 16:35:15 -04:00
fabske0
5104f5712f
[Bug] grey caught indicator for genderless pokemon (#5935)
* grey caught indicator for genderless pokemon

* adding suggestions

---------

Co-authored-by: damocleas <damocleas25@gmail.com>
2025-07-14 15:37:59 -04:00
Sirz Benjie
315d4cf408
Add parameter destructuring (#6092) 2025-07-14 20:19:24 +02:00
Sirz Benjie
de8491505b
[Test] Address flaky tests and add Metronome mock helper (#6093)
- Fix `copycat`, `first-attack-double-power` and `ability-ignore-moves`

* Add utility method for forcing metronome move

* Stop bolt beak / fiscious rend flakiness
2025-07-13 22:20:09 -07:00
NightKev
22e399be8b [Test] Disable flaky test 2025-07-13 21:23:34 -07:00
NightKev
6863044698 [Test] Fix Intimidate test 2025-07-13 20:14:59 -07:00
Lugiad
362dd9e2b9
[UI/UX] HEADER_LABEL TextStyle Fix (#6089) 2025-07-13 17:59:51 -07:00
Wlowscha
97e5ab882a
Minor lint 2025-07-13 16:36:17 +02:00
Wlowscha
4ed0fd0384
More minor fixes 2025-07-13 16:12:27 +02:00
Wlowscha
c7a1b0fac5
Reworked getPartyBerries function, fixed harvest test 2025-07-13 15:59:53 +02:00
Wlowscha
b8324e85f7
Moved getPartyBerries() utility function 2025-07-13 13:20:42 +02:00