Commit Graph

4597 Commits

Author SHA1 Message Date
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
Madmadness65
a0484bbde1
[Item] Add Deep Sea Scale & Deep Sea Tooth items (#5078)
* Add Deep Sea Scale & Tooth items

Also changes Clamperl's evolution method from gender-specific to requiring one of the Deep Sea items to be held.

* Move Deep Sea items to Great tier

Also gives every species stat booster item a `rare` boolean to split these items from the rest of the species stat booster items. Updated the existing tests accordingly to account for the split.

* Reduce Great tier species booster item weight

* Fix global scene on evolution conditions

* Merge branch 'beta' into deep-sea-items

* Change how the held item is found in evolution condition

It should no longer look through the entire party's modifiers when seeing if Clamperl is eligible to use a Linking Cord.

* Fix wrong type being boosted

---------

Co-authored-by: damocleas <damocleas25@gmail.com>
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-05-23 07:36:30 +00:00
Lugiad
3b2753f27c
[i18n] Moved Ball "Cancel" label to a different locale file (#5866) 2025-05-22 20:14:52 -07:00
Sirz Benjie
f0e806c508
[Misc] Move allMoves to data-lists.ts (#5860) 2025-05-21 20:18:24 -07:00
Sophia
d1b0bbb155
[Bug]: Fix #5010: roar and whirlwind missing fail message when against a trainer (#5659)
* [BUG] Fixes #5010 Roar and Whirlwind don´t display a fail message
Roar and Whirlwind should now display a fail message when
used against a trainer with only one pokémon left

* Apply suggestions from code review made by SirzBenjie
2025-05-21 07:14:16 +00:00
damocleas
4a39adacf8
[UI/UX] Remove Redundant Unlock Passive text (#5845)
* Update starter-select-ui-handler.ts

* Update pokedex-page-ui-handler.ts
2025-05-21 03:05:39 +00:00
AJ Fontaine
1cf19b49f2
[Balance] Moveset generation adjustments (#5801)
* Moveset generation adjustments

* Remove shiny explosion check, prevent 2 self-KO moves
2025-05-20 19:59:39 -07:00
Lugiad
f01e7599ac
[UI/UX] [Localization] Update Japanese starterInfoText (#5852)
Update Japanese starterInfoText
2025-05-21 02:21:35 +00:00
itgalex24
288e4e7e7e
[Bug] [Move] Synchronoise hitting Tera Type fix (#5779)
* synchronoize fix

* Add regression test for synchronoise

---------

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-05-20 23:12:54 +00:00
Sirz Benjie
663c64fdb4
[Misc] Fix trailing whitespace (#5856)
Remove trailing whitespace
2025-05-20 14:46:23 -07:00
AJ Fontaine
23e1d88c3a
[Balance] Update TM compatibility for Curse (#5791)
* Update Curse TM compat with former egg moves/level ups

* Pumpkaboo is not Phantump
2025-05-20 19:40:05 +00:00
Lugiad
9746f1a2a6
[UI/UX] [Localization] Update Korean starterInfoText 2025-05-19 17:39:17 -07:00
Lugiad
a9ec3b324c
[UI/UX] [i18n] Text ratio adjustment for es-MX Egg Gatcha (#5839) 2025-05-19 22:03:42 +00:00
Lugiad
bd14ed640c
[Localization] Localizable "Cancel" text in Ball selection menu (#5836)
"Cancel" text localizable
2025-05-19 17:00:51 -05:00
Sirz Benjie
9ae969117b
[Bug][UI/UX] Fix fiery fallout message bug (#5834)
* Fix fiery fallout message bug

* Ensure pokemon names are replaced when there is no separator
2025-05-18 00:22:09 -05:00
Sirz Benjie
4376a22a7c
[Bug] Fix field moves always playing their animations (#5830) 2025-05-17 14:04:16 -07:00
Jimmybald1
998619e7e5
[Bug] IVs of trainers were incorrectly using the battle seed (#5822)
* Fixed IVs of trainers using the Battle Seed.

* Renamed the randSeedInt functions that use the Battle Seed to randBattleSeedInt functions

* Incorrectly used this in common

* Fixed tests that were still calling the old function name

---------

Co-authored-by: damocleas <damocleas25@gmail.com>
Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
Co-authored-by: AJ Fontaine <36677462+Fontbane@users.noreply.github.com>
Co-authored-by: Dean <69436131+emdeann@users.noreply.github.com>
Co-authored-by: lxy-lxy-lxy <55084073+lxy-lxy-lxy@users.noreply.github.com>
Co-authored-by: Xavion3 <xavion333@gmail.com>
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Co-authored-by: Lylian BALL <131535108+PyGaVS@users.noreply.github.com>
Co-authored-by: Jimmybald1 <147992650+IBBCalc@users.noreply.github.com>
2025-05-17 10:36:16 -05:00
Dean
0c48fff14b
[Bug] Fix Substitute sprite crash & revived Pokemon softlock (#5829)
Break `resetSummonData` into two methods

Co-authored-by: damocleas <damocleas25@gmail.com>
Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
Co-authored-by: AJ Fontaine <36677462+Fontbane@users.noreply.github.com>
Co-authored-by: lxy-lxy-lxy <55084073+lxy-lxy-lxy@users.noreply.github.com>
Co-authored-by: Xavion3 <xavion333@gmail.com>
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Co-authored-by: Lylian BALL <131535108+PyGaVS@users.noreply.github.com>
2025-05-17 10:35:38 -05:00
Sirz Benjie
9b1a222935
[Bug] Fix old session load modifier crash (#5814)
Fix inability to load saves due to modifier type being nulled
2025-05-12 22:33:52 +02:00
Dean
d790b30a30
[Bug][Hotfix] Fix Transformed Sprites not loading properly (#5808)
* Fix ditto sprite not loading properly

* Remove review comment
2025-05-11 18:23:37 -07:00
Sirz Benjie
6c6821b47d
[Bug] [Move] Fix KO causing effects to occur twice (#5811)
* Fix firstTarget calculation when a target was fainted

* Update type annotation in applyMoveEffects

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

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-05-11 21:10:19 -04:00
Sirz Benjie
09e38bad39
Set lastHit to true when target faints during multi-hit move 2025-05-10 19:05:18 -05:00
Dean
0712f86462
[Bug][Hotfix] Fix crashes when loading save with a transformed pokemon (#5806)
* Fix speciesForm being saved incorrectly

* Fix transformed icon

* Fix moveset loading errors
2025-05-09 01:34:28 -07:00
Dean
5a58abfddf
[Bug][Hotfix] Suppress Illusion if NG is already active (#5797)
* Suppress preSummon attrs off field

* Add test case
2025-05-07 21:04:24 -07:00
Jimmybald1
530b2b8a00
[Bug] Fix seed not being reset in Select Biome Phase (#5794)
Fix seed not being reset now that Select Biome Phase goes before New Battle

Co-authored-by: Jimmybald1 <147992650+IBBCalc@users.noreply.github.com>
2025-05-07 21:03:22 -07:00
NightKev
cf1367cece
[Bug] PokemonSummonData movesets will now be loaded correctly (#5793) 2025-05-07 21:02:16 -07:00
NightKev
fa6c51d1e2
[Bug] Prevent some corrupt eggs from crashing the game (#5787)
If an egg is somehow a species that doesn't have an associated egg tier
(such as Pikachu), `Egg#getEggTier` now falls back to `EggTier.COMMON`
2025-05-07 21:01:54 -07:00
lxy-lxy-lxy
5ba294ffee
[Bug] Lock Capsule not locking rarities consistently (#5786) 2025-05-07 08:05:32 -07:00
Lylian BALL
4f541a8dce
[Bug] Fix some moves using illusion type instead of real type (#5772)
* fix revelation dance using the type of the illusion instead of the actual type

* fix other move that might get the illusion type as well

* fix other move that might get the illusion type as well

* fix abilities that might get the illusion type as well

* fix illusion icon in party ui handler

* Fix TSDoc for `Pokemon#getTypes`

* Remove now-unnecessary changes to `.getTypes()` calls

Revert `overrides.ts` changes

* Replace `|| false` with `!!`

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-05-05 18:31:11 -07:00
Sirz Benjie
4203513db2
[Bug] Ensure shiny and variant status respects illusion properly (#5784)
Ensure shiny and variant status respects illusion properly
2025-05-05 19:49:59 -05:00
Sirz Benjie
3161461b6c
[Bug][UI/UX] Update battle-info inside pokemon#damageAndUpdate (#5778)
* Update battle-info inside pokemon#damageAndUpdate

* Ensure updatePokemonHp does not skip last hp number
2025-05-05 18:35:51 -04:00
Sirz Benjie
ae25a70b4d
[Bug][UI/UX] Ensure pokemon hop when animations are selected (#5781)
Ensure pokemon hop when animations are selected
2025-05-05 17:36:22 -04:00
Xavion3
a3039ef6a6
[Bug] Fix shiny save bug (#5780)
Correctly determine shininess and variant during saving
2025-05-05 17:34:35 -04:00
lxy-lxy-lxy
7547b37e85
[Bug] Fix local save encoding crash and Psychic anim (#5775)
* fix error: utf8 to base64

* fix error: space missed
2025-05-05 08:32:56 -05:00
Dean
e3028c6219
[Bug][Hotfix] Always show hit result message (#5769)
Always show hit result
2025-05-04 18:35:44 -04:00
Dean
c31bd9ef61
[Bug][Hotfix] Secondary effects no longer trigger status immunity messages (#5764)
Fix secondary effects triggering status immunity messages
2025-05-03 23:04:04 -07:00
AJ Fontaine
b353b0de62
[Hotfix] Fix evil grunts using wrong template (#5763) 2025-05-03 22:59:37 -07:00
Bertie690
b5cfa88455
[Tiny] Removed unused loc in v1_9_0.ts (#5760) 2025-05-03 20:07:50 -07:00
damocleas
a5311779b4
[Misc] More Spring (#5759)
extendo evento
2025-05-03 12:59:55 -04:00
NightKev
cedeaf8668
[Bug] Fix crash when loading a save with a statused Pokemon (#5756) 2025-05-02 19:55:48 -07:00
AJ Fontaine
24939ad2e0
[Balance][Mystery][Beta] Salesman doesn't offer event mons without HA or shiny (#5746)
Don't offer event mons without HA or shiny
2025-05-03 01:52:51 +00:00
Madmadness65
a8382d71fc Remove Mudbray from spring event
At the request of Damocleas
2025-05-02 20:45:35 -05:00
damocleas
bf0abd3ddc
[Move] [Beta] Undo Order Up Sheer Force change (#5750)
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-05-02 20:32:59 -05:00
Blitzy
75d01adf9a
[Bug] Disable Illusion in Fusions (#5752)
Update ability.ts
2025-05-02 21:05:48 -04:00
damocleas
3a89b7bb75
[Balance] [Beta] 1.9 Egg Move Followup (#5749)
Update egg-moves.ts for Aerodactyl Amaura Diglett
2025-05-02 17:38:30 -04:00
damocleas
8f0eee9c4c
[Balance] [Mystery Encounter] Many Minor Mystery Encounter Adjustments (#5726)
* Update slumbering-snorlax-encounter.ts

* Add Slumbering Snorlax to Tall Grass, remove Absolute Avarice from Plains

* Update absolute-avarice-encounter.ts

* Update absolute-avarice-encounter.ts

* Update slumbering-snorlax-encounter.ts

* Update slumbering-snorlax-encounter.ts

* Update the-expert-pokemon-breeder-encounter.ts

* Update slumbering-snorlax-encounter.ts nature

* Update bug-type-superfan-encounter.ts move reward

* Update bug-type-superfan-encounter.ts moves again

* fix encounter waves

* Update absolute-avarice-encounter.test.ts

* add Nature import

* Update bug-type-superfan-encounter.test.ts

* greedent moves

* test moves

* Updated mysterious-chest-encounter.ts trap/reward chance

* swapped Macho Brace stats, +2 / 10% for HP stats and +1 / 5% for all else

* Update bug-type-superfan-encounter.ts moves

* Update the-expert-pokemon-breeder-encounter.ts tera

* Update bug-type-superfan-encounter.test.ts fix test
2025-05-02 01:11:02 -04:00
Bertie690
6d90649b92
[Refactor/Bug/Ability] Reworked BattleData, fixed Rage Fist, Harvest, Belch + Implemented Cud Chew (#5655)
* Grabbed reverted changes from stuff

* Added version migrator for rage fist data + deepMergeSpriteData tests

* fixed formattign

* Fied a few

* Fixed constructor (maybe), moved deepCopy and deepMergeSpriteData to own file

`common.ts` is hella bloated so seems legit

* Moved empty moveset verification mapping thing to upgrade script bc i wanted to

* Fixed tests

* test added

* Fixed summondata being cleared inside summonPhase, removed `summonDataPrimer`

like seriously how come no-one checked this

* Fixed test

I forgot that we outsped and oneshot

* Fixed test

* huhjjjjjb

* Hopefully fixed bug

my sanity and homework are paying the price for this lol

* added commented out console.log statement

uncomment to see new berry data

* Fixed migrate script, re-added deprecated attributes out of necessity

* Fixed failing test by not trying to mock rng

* Fixed test

* Fixed tests

* Update ability.ts

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

* Update ability.ts

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

* Update overrides.ts

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

* Update berry-phase.ts

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

* Update encounter-phase.ts

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

* Update game-data.ts

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

* Update move-phase.ts

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

* Added utility function `randSeedFloat`

basically just `Phaser.math.RND.realInRange(0, 1)`

* Applied review comments, cleaned up code a bit

* Removed unnecessary null checks for turnData and co.

I explicitly made them initialized by default for this very reason

* Added tests for Last Resort regarding moveHistory

* 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>

* 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>

* 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 battle-scene.ts

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

* Update the-winstrate-challenge-encounter.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>

* Update ability.ts

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

* Update move.ts

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

* Update move.ts

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

* Update move.ts

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

* Update battle-anims.ts

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

* Update pokemon.ts comments

* Fixed a few outstanding issues with documentation

* Updated switch summon phase comment

* Re-added BattleSummonData as TempSummonData

* Hppefully fixed -1 sprite scale glitch

* Fixed comment

* Reveted `pokemon-forms.ts`

* Fuxed constructor

* fixed -1 bug

* Revert "Added utility function `randSeedFloat`"

This reverts commit 4c3447c851.

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-05-02 00:06:07 -05:00
damocleas
fa86ea3214
[Misc] Spring Stuff (#5742)
* Update timed-event-manager.ts

* spr25 images

* Update the-pokemon-salesman-encounter.ts rolls
2025-05-01 22:54:59 -04:00
Dean
7a9fc3fc8d
[Bug] Clear status immediately in menus (#5739)
Add asPhase parameter
2025-05-01 22:50:56 -04:00
Sirz Benjie
3af1bdbcff
[Bug][Ability] Fix change move type abilities (#5665)
* Make type changing moves change type after abilities but before ion deluge/electrify

* Create unified test file for galvanize, pixilate, and refrigerate

* Make type boost items like silk scarf affect the move after its type change

* Add tests for type boost item interaction

* Remove leftover log messages

* Update spies in type-change ability tests

* Add automated tests for normalize

* Fix test name injection for tera blast

* Add automated test for tera blast normalize interaction

* Restore pokemon as a type-only import in moves.ts

* Add aerilate to type changing tests

* Rename galvanize test file

* Fix utils import

* Apply suggestions from code review

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

* Remove unnecessary mockRestore

* Remove unnecessary nullish coalescing

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

* Update src/field/pokemon.ts

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

---------

Co-authored-by: Madmadness65 <59298170+Madmadness65@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-05-01 22:41:57 -04:00