e74c2fbaa7
Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue into new-modifier-rework
2025-08-27 22:58:16 +02:00
97a1c493f5
[Item] Held item implementation rework ( #6345 )
...
* Converted held items to new types
* Item steal item
* Apply suggestions from code review
Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
* Default parameter type which only contains "pokemon"
* Fixed comment
* Removed useless parameter from white herb
* Multi hit item has two effects
* Ordering
* Apply suggestions from code review
Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
* Removed some comments
---------
Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
2025-08-27 22:47:31 +02:00
2afd4f57cb
[GitHub] Workflows will now time out after 10 minutes ( #6441 )
2025-08-27 08:39:26 +02:00
4b18ad74b3
[Balance] Adjust moveset generation weighting ( #6387 )
2025-08-26 16:47:51 -07:00
443d747ad1
Merge branch 'main' into beta
2025-08-26 12:34:28 -05:00
95ddcae543
Merge pull request #6431 from pagefaultgames/fix-starterprefs
...
Fix starterpref reset (#6430 ) to main
2025-08-26 12:15:36 -05:00
6745ce7839
Fix starterpref reset ( #6430 )
...
* Prevent an empty starterpreferences object from being saved
* Fix ssui nullish coalescing
* Update src/utils/data.ts
Co-authored-by: Dean <69436131+emdeann@users.noreply.github.com>
* Fix starter preferences clearing, add tests
---------
Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Co-authored-by: Dean <69436131+emdeann@users.noreply.github.com>
2025-08-26 12:11:16 -05:00
12142c0af7
Merge pull request #6424 from pagefaultgames/main
...
Merge main to beta
2025-08-26 01:23:58 -07:00
701eecf947
Revert #6410 starter preferences hotfix ( #6422 )
...
Revert "[Bug] Prevent an empty starterpreferences object from being saved (#6410 )"
This reverts commit c8a66b2e59
2025-08-26 03:15:00 -05:00
2c2003f5f9
Merge pull request #6421 from pagefaultgames/hotfix-1.10.4
...
Hotfix 1.10.4 to beta
2025-08-26 00:02:58 -07:00
f2d46b666d
Merge branch 'beta' into hotfix-1.10.4
2025-08-25 23:59:42 -07:00
cc7391448a
Merge pull request #6420 from pagefaultgames/hotfix-1.10.4
...
Hotfix 1.10.4 to main
2025-08-25 23:58:57 -07:00
63c1c34746
[Hotfix] Fix tyrogue evo ( #6414 )
...
* Fixed tyrogue evo condition
* Added test for tyrogue evolution
* Update src/data/balance/pokemon-evolutions.ts
Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
* Update src/data/balance/pokemon-evolutions.ts
Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
* Update src/data/balance/pokemon-evolutions.ts
Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
* Added missing typeof in suggestion
---------
Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
2025-08-26 06:57:11 +00:00
88e42ba4c4
[Balance][ME]Tweak weird dream do a party heal in option 1, random tera, and no longer revive pokemon in hardcore ( #6409 )
...
* Tweak weird dream option 1
Transfer HP ratio and status onto transformed pokemon
* Make weird dream randomize tera type
2025-08-26 06:54:26 +00:00
4aac5472a9
[Bug] Fix oversight where mons aren't guaranteed damaging moves if none are STAB ( #6406 )
2025-08-26 06:51:35 +00:00
c8a66b2e59
[Bug] Prevent an empty starterpreferences object from being saved ( #6410 )
...
* Prevent an empty starterpreferences object from being saved
* Fix ssui nullish coalescing
* Update src/utils/data.ts
Co-authored-by: Dean <69436131+emdeann@users.noreply.github.com>
---------
Co-authored-by: Dean <69436131+emdeann@users.noreply.github.com>
2025-08-25 23:48:55 -07:00
f0c24cd16e
Remove unnecessary tsdoc comments from `service-worker.js` ( #6417 )
...
Remove typescript comments form `service-worker.js`
2025-08-25 16:45:41 -07:00
622ee5ce80
[Bug] Fix typecheck bug ( #6415 )
...
Add `public/service-worker.js` to `ts`'s exclude
2025-08-25 16:25:53 -07:00
1b6a52e520
[Balance] Moved Future Sight after Weather, before berries ( #6412 )
2025-08-25 14:55:31 -07:00
e95450aa49
Imported systemdata always increments playtime ( #6394 )
...
Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
2025-08-25 23:17:16 +02:00
56752d6f4a
Ensure users that install pokerogue as a PWA do not remain on the old version
2025-08-25 14:08:05 -05:00
1f4efa0e27
Update version to 1.10.4
2025-08-24 19:45:00 -07:00
95d6d66d62
Merge pull request #6385 from pagefaultgames/hotfix-1.10.3
...
Hotfix 1.10.3 to beta
2025-08-24 18:30:14 -07:00
dc31ae257a
Merge branch 'beta' into hotfix-1.10.3
2025-08-24 18:29:37 -07:00
6ef57e52e7
Merge pull request #6401 from pagefaultgames/hotfix-1.10.3
...
Hotfix 1.10.3 to main
2025-08-24 19:58:37 -05:00
d8fe5ad753
Bump to version 1.10.3
2025-08-24 19:52:55 -05:00
e139f714de
Bump locales
2025-08-24 19:52:55 -05:00
4b8c064335
[Bug] [Ability] Fix berserk multi proc ( #6402 )
...
* Fix berserk activating multiple times with multi strike
* Apply kev's suggestions from code review
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Update doc comments
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-08-24 19:47:52 -05:00
6fac1a5052
[Bug] [Ability] Fix cute charm ( #6399 )
...
Fix cute charm not working
2025-08-24 17:49:28 -05:00
a85d8cd5de
[Bug] [Sprite] Fix fusion shiny party icon ( #6397 )
...
* Fix shiny icon with fusion shiny in party
* Fix hover tooltip not working when first splicing a mon
* Fix fusion shiny icon on summary screen
2025-08-24 16:32:12 -05:00
cd610ff2c5
[Bug] [Ability] Fix trace's RNG ( #6398 )
...
* Fix rng in trace
* Fix undefined var
2025-08-24 16:24:12 -05:00
30b7a62988
[Bug] [Sprite] Fix third type icon missing texture ( #6395 )
...
Fix third type icon
2025-08-24 15:03:28 -05:00
efaf7760e4
[Bug] Fix speedup/slowdown buttons not working properly ( #6393 )
...
Fix speedup button resetting to minimum speed
2025-08-24 14:34:21 -05:00
0f8b1f63b5
[Bug/Ability] Fixed bugs with Intimidate triggers after reload/initial switch ( #6212 )
...
* Added TODO test case + documentation for failing intim test
* Fixed comment
* Fixed intimidate bugs fr fr
* Update src/data/phase-priority-queue.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Update src/data/phase-priority-queue.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Cleanup remove phase logic
* Do not add unnecessary activateAbilityPhases for pokemon that do not have their passive enabled
* Remove leftover log messages
* Add TODO comment
Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-08-24 14:09:16 -05:00
049932c001
[Bug] Fix status effects overwriting each other ( #6392 )
...
* Ensure status effects from same source interaction cannot override each other
* Update test/status-effects/general-status-effect.test.ts
Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
2025-08-24 12:51:16 -05:00
ae58f9de4f
[Hotfix] Leech Seed does not get cleared when user faints ( #6388 )
...
Lapsing leech seed tag even when source has left field
2025-08-24 08:58:27 -05:00
8dea0ce840
[GitHub] Update pages workflow to only deploy on main and beta ( #6386 )
2025-08-23 20:28:42 -07:00
bb00b126a6
Merge pull request #6384 from pagefaultgames/hotfix-1.10.2
...
Hotfix 1.10.2 to beta
2025-08-23 17:24:25 -07:00
cc066fc7d1
Merge branch 'beta' into hotfix-1.10.2
2025-08-23 19:13:49 -05:00
58d1209d92
Hotfix 1.10.2
...
Hotfix 1.10.2 to main
2025-08-23 19:09:53 -05:00
c446eaf970
[Sprite] Revert ribbon icons ( #6382 )
2025-08-23 18:59:47 -05:00
746ea69475
[Bug] Fix missing fusion icon ( #6381 )
...
Fix nullish coalescing in `pokemon#isFusion`
2025-08-23 18:58:29 -05:00
c44e589303
[UI/UX][Bug] Saving preferences when leaving ssui ( #6376 )
...
Save starter preferences when leaving ssui
2025-08-23 18:50:44 -05:00
70b47945e8
[Bug] Fix nicknames not showing up in battle ( #6378 )
2025-08-23 23:47:39 +00:00
842f0e88b0
[Bug] Fix saveslot deletion ( #6380 )
...
Fix saveslot deletion
2025-08-23 18:45:15 -05:00
1192825d51
[Bug/i18n] Fix unpause evolution option in party ui ( #6379 )
2025-08-23 15:59:01 -07:00
1b2c694084
[bug/i18n] Fix stealth rock message ( #6377 )
...
replace pokemonName with pokemonNameWithAffix
2025-08-23 17:26:12 -05:00
a8b54eba6d
[Test] Mark failing test/ui/manage-item-button.test.ts as TODO ( #6375 )
...
* Ensure hotfix runs tests
* Unnest promise
* ensure workflows run when pushed to hotfix
* Mark test todo
2025-08-23 16:56:58 -05:00
d2eb3dba53
[Test] Fix leftovers test not running heal phase ( #6370 )
...
Fix leftovers test
2025-08-23 16:02:36 -05:00
af963c7902
[Bug] Fixed delayed attacks pushing to move history twice on charging turn ( #6371 )
2025-08-23 16:00:00 -05:00
Wlowscha