Commit Graph

5407 Commits

Author SHA1 Message Date
Wlowscha
ca053c9e8c
Merge c992508dc3 into 4b70fab608 2025-06-20 06:52:28 +00:00
Wlowscha
c992508dc3
Vitamins max stack temporarily set to 30 2025-06-20 08:52:09 +02:00
Wlowscha
90bc14c667
Fixed berries, removed some debug messages 2025-06-20 08:51:21 +02:00
Wlowscha
d2825bad1e
Merge branch 'held-item-refactor' of https://github.com/Wlowscha/pokerogue into held-item-refactor 2025-06-20 08:36:39 +02:00
Wlowscha
3ea89de9c1
Fixed position of enemy modifier bar 2025-06-20 08:33:56 +02:00
Wlowscha
b7f85edfaf
Merge branch 'beta' into held-item-refactor 2025-06-20 07:56:50 +02:00
NightKev
4b70fab608
[Bug] Remove message for Rock Head activation (#6014) 2025-06-19 20:59:55 -07:00
lnuvy
1ff2701964
[Bug] Fix when using arrow keys in Pokédex after catching a Pokémon from mystery event (#6000)
fix: wrap setOverlayMode args in array to mystery-encounter

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-06-19 20:45:54 -04:00
Bertie690
1e306e25b5
[Move] Fixed Chilly Reception displaying message when used virtually
https://github.com/pagefaultgames/pokerogue/pull/5843

* Fixed Chilly Reception displaying message when used virtually

* Fixed lack of message causing Chilly Reception to fail

* Fixed tests

* Reverted bool change + fixed test

* Fixed test
2025-06-19 17:14:05 -07:00
Madmadness65
43aa772603
[UI/UX] Add Pokémon category flavor text to Pokédex (#5957)
* Add Pokémon category flavor text to Pokédex

* Append `_category` to locale entry
2025-06-20 00:04:57 +00:00
Wlowscha
f26cb11e0b
Fixed several bugs related to accessing and visualizing held items 2025-06-19 22:29:46 +02:00
Wlowscha
1e9239720d
Fixing some phases 2025-06-19 20:15:50 +02:00
Wlowscha
f1c6cf4419
Pools can now take a HaldItemConfigurationId without weights; set up table of item tiers; used custom pools in Clowning Around ME 2025-06-19 19:55:17 +02:00
Wlowscha
46204067f5
Restored various changes to held item pool generation; distinguishing target of the generation from the party 2025-06-19 19:37:21 +02:00
Wlowscha
afbdf9afb2
Held item pools take a single pokemon as input, set weights to 0 for max stack items 2025-06-19 19:25:12 +02:00
Wlowscha
78b9d1fa81
Fixed some rogue inputs 2025-06-19 18:29:06 +02:00
Wlowscha
4424af6928
Merge branch 'held-item-refactor' of https://github.com/Wlowscha/pokerogue into held-item-refactor 2025-06-19 18:23:39 +02:00
Wlowscha
ede7fe4615
Replaced ModifierTier with RewardTier 2025-06-19 18:23:29 +02:00
Wlowscha
ebf0f3e352
Converted most MEs, introduced some more utility functions and methods 2025-06-19 18:20:54 +02:00
damocleas
6873a89296
1.9.6 to Beta
1.9.6 to Beta
2025-06-18 23:29:29 -04:00
NightKev
0ba3e52f77 Fix merge issue 2025-06-18 18:30:22 -07:00
NightKev
560ebbaee2 Merge branch 'beta' into minor-1.9.6 2025-06-18 18:27:37 -07:00
AJ Fontaine
4de7858f00
[i18n] Update locales (#6010)
Update locales
2025-06-18 21:19:25 -04:00
NightKev
e3c8e3141e
Merge pull request #6009 from Fontbane/locafix
[i18n] Map "biome" namespace to the filename change to "biomes" (#6001)
2025-06-18 18:14:37 -07:00
NightKev
30b2f95a30 [i18n] Map "biome" namespace to the filename change to "biomes" (#6001)
* [i18n] Map "biome" to the filename "biomes"

* Update locales submodule to bring in file rename
2025-06-18 21:11:15 -04:00
AJ Fontaine
1d669719a0
Bump version name to 1.9.6 2025-06-18 19:53:13 -04:00
AJ Fontaine
663e047af8
[Event] W event (#6006)
W event
2025-06-18 19:52:40 -04:00
AJ Fontaine
80ae42d3ba
[Sprite] Minior and Ferrothorn variants (#6005)
* Minior variants

* Add Ferrothorn variants

* Fix shiny Minior front and icons
2025-06-18 19:49:21 -04:00
Wlowscha
2321de0983
Updated various MEs. HeldItemManager can now generate a configuration from its items. 2025-06-19 00:23:07 +02:00
Sirz Benjie
182397411e
[Bug] Fix infinite memory mushrooms (#5993)
* Set cost to -1 for modifiers chosen as rewards

* Ensure apply modifier conditional retains original behavior
2025-06-18 17:23:16 -04:00
Wlowscha
05fced4866
Merge branch 'beta' into held-item-refactor 2025-06-18 11:38:47 +02:00
AJ Fontaine
59a00e0af3
[Sprite] Fix Appletun variants (#6003)
Fix Appletun variants
2025-06-17 23:54:58 -04:00
Wlowscha
d161aad372
Fixed shady vitamin ME and some HeldItem files 2025-06-18 00:01:34 +02:00
Wlowscha
0e0c5e9fe3
Removed unused getOrInferTier function (was only used by thief and covet) 2025-06-17 23:49:40 +02:00
Wlowscha
c58c1fd21b
Held item overrides now use the new system 2025-06-17 23:37:53 +02:00
Wlowscha
7523f6d9c0
Fixed init-modifier-pools.ts 2025-06-17 23:36:51 +02:00
Wlowscha
f2a339fbe5
Held item generation for enemies follows the new scheme 2025-06-17 23:08:14 +02:00
Bertie690
4119dfbfec
[Test] Fix flaky gastro acid test (#5996) 2025-06-17 13:51:19 -07:00
Wlowscha
39be97ef8e
Daily run items are generated within the new system 2025-06-17 22:03:25 +02:00
NightKev
28b6c7e50d
[i18n] Map "biome" namespace to the filename change to "biomes" (#6001)
* [i18n] Map "biome" to the filename "biomes"

* Update locales submodule to bring in file rename
2025-06-17 12:35:39 -07:00
Wlowscha
9611948d80
Some changes to modifier files 2025-06-17 21:27:03 +02:00
Wlowscha
a15920a605
Fixed select-modifier-phase 2025-06-17 19:33:55 +02:00
Wlowscha
847b938480
Fixed some ui handlers 2025-06-17 19:28:40 +02:00
AJ Fontaine
2065f4fd7f
[Bug] Fix incorrect form key being checked for evo items (#5995) 2025-06-17 10:08:20 -07:00
Wlowscha
74349d431b
Fixed held item evolution condition 2025-06-17 18:59:58 +02:00
Wlowscha
68a9db5a6b
Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue into held-item-refactor 2025-06-17 18:56:00 +02:00
Sirz Benjie
6ff258fb37
[Bug] Fix weather form changes not changing with weather abilities
https://github.com/pagefaultgames/pokerogue/pull/5857

* Add test for forecast

* Fix PostSummonFormChangeByWeatherAbAttr

* Fix overrides in forecast test

* Remove a test whose trigger conditions can no longer happen

* Update src/data/abilities/ability.ts

Co-authored-by: Dean <69436131+emdeann@users.noreply.github.com>

* Fix missing tsdoc param

* Apply kev's suggestions from code review

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

* Simplify PostSummonFormChangeByWeather's canApplyPostSummon

* Fix unused params that messed up after rebase

* Fix form change import

Messed up due to improper rebase

---------

Co-authored-by: Dean <69436131+emdeann@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-06-16 06:02:09 -07:00
AJ Fontaine
e3108603e3
[Refactor] Rework evolution conditions and descriptions (#5679)
* Refactor evo conditions and descriptions

* Fix test

* Fix Shedinja

* Simplify Gimmighoul evolution

* Primeape and Stantler evolve by using their move 10 times

* Basculin white stripe evolves by taking 294 recoil damage

* Primeape and Stantler use modifiers for tracking

* Basculin uses modifier too

* Remove evo count from pokemon data

* No more evo counter data, Gallade/Froslass

* Fix allmoves import

* Clamperl

* Struggle shouldn't count for Basc recoil

* Change to nicer type

* Apply Benjie's suggestions

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

* Address formatting

* Undo new evolution changes

* Remove unused imports

* Fix speciesid

* Fixed up descriptions a little

* Change a key name

* Fix Gimmighoul

* Apply Biome

* Apply Biome unsafe fixes

* Review suggestions

- Convert `EvoCondKey` enum to `const` object

- Use early returns in `SpeciesEvolutionCondition#description`
and `SpeciesFormEvolution#description`

- Replace `!!x.find` with `x.some`
and `y.indexOf() > -1` with `y.includes()`

- Implement `coerceArray`

- Fix Shelmet evolution condition
checking for Shelmet and not Karrablast

- Remove unnecessary type casting in `battle-scene.ts`

* Remove leftover enforce func loop

* Fix circular imports issue

- `getPokemonSpecies` moved to `src/utils/pokemon-utils.ts`
- `allSpecies` moved to `src/data/data-lists.ts`

---------

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-06-16 05:57:51 -07:00
Bertie690
ccceaac877
[Test] Reworked crit override to allow for forced crits (#5738)
* Crit override stuff

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

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

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-06-16 05:36:09 -07:00
AJ Fontaine
ebc6ff2ed3
[Refactor] Clean up shiny/HA reroll methods (#5803) 2025-06-16 05:18:44 -07:00