Commit Graph

4199 Commits

Author SHA1 Message Date
Tempoanon 3976d115d8
Synchronize Beta with main hotfix #5
Synchronize Beta with Main
2024-09-29 17:03:52 -04:00
NightKev 6187830de7
[Hotfix] Fix crash in GTS ME: replace `pokemon` with `tradePokemon` (#4503) 2024-09-29 03:47:45 -04:00
ImperialSympathizer 3e8b3930a8
[Hotfix] Change early exit on Dark Deal species calc (#4500)
Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
2024-09-28 22:59:23 -04:00
AJ Fontaine 7bb49a3199
[Hotfix] Fix Gimmighoul evolution (#4473)
* Fix Gimmighoul evolution

* Fix counter

* Stack text fix

* Fix Treasure tracker not saving

* Apply suggestions from code review

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

---------

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-09-28 22:11:02 -04:00
Pancakes 000b8d9b2b
Update .env.beta 2024-09-28 17:35:13 -04:00
innerthunder a69da4bc06
Remove potential desync from `PokemonHealPhase` (#4497) 2024-09-28 21:40:42 +01:00
ImperialSympathizer 771b0edcb0
[Hotfix] Fix Black Sludge disappearing on session reload (#4496)
Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
2024-09-28 14:21:42 -04:00
Blitzy 357056ebeb
[Balance] Change Kyogre / Pichu eggmoves (#4491) 2024-09-28 14:18:21 -04:00
Lugiad b1194cdfb6
Update training-session-dialogue.json (#4495) 2024-09-28 18:44:22 +01:00
Pancakes 8ce5de6d45
Update FUNDING.yml 2024-09-28 13:13:18 -04:00
ImperialSympathizer d87234504c
prevent MEs incorrectly spawning on existing session saves (#4494)
Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
2024-09-28 17:59:48 +01:00
Jannik Tappert 3a5f3c39cd
Fixing Placeholder in afterYou (#4493) 2024-09-28 16:24:03 +01:00
Lugiad 0464d8f666
Update modifier-type.json (#4492) 2024-09-28 15:24:57 +01:00
Lugiad f460f9a0e8
[Localization] [P3 Bug] Incorrect French hotfix (#4483)
* Update uncommon-breed-dialogue.json

* Update bug-type-superfan-dialogue.json

* Update settings.json

* Update uncommon-breed-dialogue.json

* Update settings.json
2024-09-28 02:59:15 -04:00
ImperialSympathizer 5d819aacf2
sanitize all money when saving session data to server (#4485)
* sanitize all money when saving session data to server

* update money sanitization

---------

Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
2024-09-28 04:48:15 +01:00
NightKev 3def9fc15d
[Hotfix] Swap force switch out check from `isBoss` to `wave % 10` (#4484) 2024-09-27 22:51:32 -04:00
ImperialSympathizer 2b3dbcc72f
[Hotfix] Fix black sludge ME causing non-integer money (#4482)
* Fix tag lapsing on battle start in MEs with free enemy moves

* lapse endure tag as well

* fix black sludge item money calculation

* Update src/modifier/modifier.ts

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

---------

Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-09-27 22:34:25 -04:00
NightKev 7eb755ca9c
Prevent the last valid pokemon from being forced to switch (#4481) 2024-09-28 03:07:42 +01:00
ImperialSympathizer 1b6593d242
[Hotfix] Fix ME lapsing non flinch or endure battler tags (#4479)
* Fix tag lapsing on battle start in MEs with free enemy moves

* lapse endure tag as well

---------

Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
2024-09-27 21:38:15 -04:00
NightKev c9664b66d3
[Hotfix] Prevent bosses from being forced to flee by Dragon Tail/etc (#4478) 2024-09-27 21:26:19 -04:00
ImperialSympathizer 2e7f6a2f4f
[Hotfix] hotfix for expert breeder ME crashing if player loses with queued enemy stat changes (#4476)
Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
2024-09-27 20:07:47 -04:00
Frederico Santos e5af2dc49a
Merge pull request #4466 from pagefaultgames/beta
Release #5
2024-09-27 22:50:04 +01:00
Xavion3 4364ab36b9
Revert "[Bug] [Balance] Gimmighoul evolution adjustments/fixes (#4463)" (#4472)
This reverts commit 1a19065a45.
2024-09-27 23:35:26 +02:00
AJ Fontaine 1a19065a45
[Bug] [Balance] Gimmighoul evolution adjustments/fixes (#4463)
* Fix Gimmighoul evolution

* Fix counter

* Less janky maxStack check

---------

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-27 16:57:46 -04:00
Lugiad d28c77db21
[Localization] Missing items translations (#4470)
* Update modifier-type.json

* Update modifier-type.json

* Update modifier-type.json

* Update modifier-type.json

* Update modifier-type.json

* Update modifier-type.json

* Update modifier-type.json

* Update modifier-type.json

* Update modifier-type.json

* Update modifier-type.json

* Update modifier-type.json

* Update modifier-type.json

* Update modifier-type.json

* Update modifier-type.json

* Update modifier-type.json

* Update modifier-type.json

* Update src/locales/ko/modifier-type.json

* Update src/locales/ko/modifier-type.json

* Update modifier-type.json

* Update src/locales/it/modifier-type.json

* Update src/locales/it/modifier-type.json

* Update src/locales/ko/modifier-type.json

* Update modifier-type.json

* Update src/locales/es/modifier-type.json

* Update src/locales/ja/modifier-type.json

* Update src/locales/ko/modifier-type.json

Co-authored-by: returntoice <171243264+returntoice@users.noreply.github.com>

* Update modifier-type.json

* Update modifier-type.json

* Update modifier-type.json

* Update modifier-type.json

* Update modifier-type.json

* Update modifier-type.json

* Update modifier-type.json

* Update battler-tags.json

* Update modifier-type.json

* Update battler-tags.json

* Update battler-tags.json

---------

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: returntoice <171243264+returntoice@users.noreply.github.com>
2024-09-27 16:56:40 -04:00
Xavion3 edbb09f4d6
[Beta][P2 Bug] Fix macho brace stat calculation for HP (#4467) 2024-09-27 13:11:08 -04:00
Jannik Tappert b426340aee
[Localization][DE] Fix BattlerTags typo (#4464) 2024-09-27 11:10:16 -04:00
Yonmaru40 a99ec0c6c5
[localization] Zh_cn ME parameters hotfix (#4462)
* Update mysterious-chest-dialogue.json

* Update shady-vitamin-dealer-dialogue.json

* Update slumbering-snorlax-dialogue.json

* Update training-session-dialogue.json
2024-09-27 15:23:41 +01:00
ImperialSympathizer b2df7d785b
fix bug-type superfan's team on waves 160+ (#4459)
Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
2024-09-26 21:49:12 -07:00
NightKev 933309cd00
Fix Meloetta-related bugs in mono-type challenges (#4460)
Remove Meloetta from the `TYPE_OVERRIDES` array so wrong-form
Meloetta can't be sent into battle.
This was missed when Meloetta was changed in a previous PR

Also disallow Meloetta from being added to the party in
starter select if it's in the wrong form
for the current mono-type challenge
2024-09-26 21:48:57 -07:00
AJ Fontaine c7f00d0a4d
Reinstate temporary evolution delay fix (#4458) 2024-09-26 19:13:15 -07:00
ImperialSympathizer 5997744aa2
[Beta][Bug] Major/minor ME bug fixes (#4451)
* major/minor ME bug fixes

* potential fix for failed save with rental pokemon

* Update src/system/game-data.ts

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

* Update src/system/game-data.ts

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

* more bug fix cleanup and PR feedback

* fix Uncommon Breed ME crash

* real fix to Fun and Games force switch issues

* add isBattleMysteryEncounter() helper function

* add isBattleMysteryEncounter() helper function

* fix unintentional replace all errors

* fix catches not updating dex

---------

Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-26 18:43:28 -04:00
Blitzy 6e18c76e25
[Balance] [Fix] Fix accidental Jirachi revert / Update Spritzee (#4455)
* Fix Jirachi / Change Spritzee

* Update egg-moves.ts
2024-09-26 17:35:38 -05:00
DanStevensonx 59cb6539a7
[Localization] Minor Spanish Typo Corrections (#4454)
Co-authored-by: Lugiad <adrien.grivel@hotmail.fr>
2024-09-26 15:33:39 -07:00
damocleas 69cac23421
[Balance] Various Pokemon and Move Balance Changes, labels for E-Floette and Ursaluna-BM (#4414)
* Gmax Changes for Venusaur, Blastoise, Lapras, Regenerator Mega Audino, Darkrai and Cosmog upped 6 -> 7 cost

* Changed Heal Order to 5pp to match other Recovery options

* Updated Ursaluna-BM and Eternal-Floette to Sub-Legend for easier handling, Adjust catchrates to Metagross to match Baxcalibur line, and Iron Leaves/Walking Wake catchrate to match the other paradox legends

* Actually updated catchrate for Iron Leaves and Walking Wake

* Added comments for all changes

* part 2 passive changes for the update, Pidgey, Lickitung, Stantler, Regigigas, Frillish, Litten, Chien Pao

* fix space

* Updated Meloetta Cost, Updated Krabby Passive
2024-09-26 23:07:27 +01:00
Madmadness65 2aeacc6de9
September egg move changes (#4453) 2024-09-26 17:00:25 -05:00
podar 34bf0069ca
[P1] Fixing continue menu option when game finishes (#4287)
* [Bug] Fixing continue error when game finishes

* migrate: `GameData.tryClearSession` to async/await

* install dev: msw module

* add: game-data test => tryClearSession tests

---------

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-26 13:55:08 -07:00
Lugiad cb27d32fe5
[Localization] Tiny French typos (#4452)
* Update part-timer-dialogue.json

* Update an-offer-you-cant-refuse-dialogue.json
2024-09-26 15:34:06 -04:00
Jannik Tappert 9f31e36d24
[Beta][Bug] Rename files so it load the correct status file in languages with a - (#4450) 2024-09-26 12:43:12 -04:00
Lugiad 909be8ed72
[Localization] Splash texts Updates (#4424)
* Update splash-messages.json

* Update splash-messages.json

* Update splash-messages.json

* Update splash-messages.json

* Update splash-messages.json

* Update splash-messages.json

* Update splash-messages.json

* Update splash-messages.json

* Update splash-messages.json

* Update splash-messages.json

* Update splash-messages.json

* Update splash-messages.json

* Update splash-messages.json

* Update splash-messages.json

* Update splash-messages.json

* Apply suggestions from code review

* Update splash-messages.json

* Update splash-messages.json

* Update splash-messages.json

* Update src/locales/pt_BR/splash-messages.json

* Update src/locales/pt_BR/splash-messages.json

* Update src/locales/pt_BR/splash-messages.json

* Update src/locales/pt_BR/splash-messages.json

* Update src/locales/pt_BR/splash-messages.json

* Apply suggestions from code review

Co-authored-by: José Ricardo <josefleury@discente.ufg.br>

* Update splash-messages.json [localization]

italian localization

* Apply suggestions from code review

Readded count

* Apply suggestions from code review

Removed non translated text from spanish

* Removed non translated splash messages from all other languages

* I missed simplified chinese

* Update src/locales/es/splash-messages.json

* Update src/locales/ja/splash-messages.json

* Update src/locales/es/splash-messages.json

* Update src/locales/ko/splash-messages.json

* Update src/locales/zh_TW/splash-messages.json

* Update src/locales/zh_CN/splash-messages.json

---------

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: José Ricardo <josefleury@discente.ufg.br>
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
2024-09-26 12:34:20 -04:00
damocleas 8044c76e71
[Localization] Fix for English 'Battles Won', updated tutorial # of Pokerus mons from 3 -> 5 (#4449)
* Fixed 'count, number' on 'Battles Won' splash text

* english tutorial

* German tutorial

* Spanish tutorial

* French tutorial

* Italian Tutorial

* Japanese tutorial, needs fix

* Korean Tutorial, needs fix

* PT / Brazil Tutorial

* zh_cn tutorial, needs check

* zh_tw tutorial, needs check
2024-09-26 12:31:04 -04:00
Lugiad eba1920ee6
[Bug] [Localization] Formes key correction (#4447)
* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json
2024-09-26 11:01:24 -04:00
Jannik Tappert af99297e5b
[Localization][DE] Translation First Test of Pontoon PR (#4432)
* Pontoon: Update French (fr) localization of PokeRogue

Co-authored-by: Sangara <sangara.diamant@gmail.com>

* Pontoon: Update German (de) localization of PokeRogue

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

* Pontoon: Update German (de) localization of PokeRogue

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

* Pontoon: Update German (de) localization of PokeRogue

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: Jannik <dertapp@googlemail.com>

* Apply suggestions from code review

---------

Co-authored-by: Sangara <sangara.diamant@gmail.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: Jannik <dertapp@googlemail.com>
2024-09-26 16:40:51 +02:00
MokaStitcher a25ccbcde6
[UI] Make Egg List and Egg Summary scrollable (#4391) 2024-09-26 01:51:49 -07:00
RedstonewolfX 06331ccdf6
[Daily] Daily standardization (#3776)
* Disable Luck in Daily Runs

If the Game Mode is Daily Run, the player's Luck is set to 0, and the Luck value is hidden.

* Give free map in daily

Adds a Map to the player's pool of starting items for Daily Runs.

* Disable Eviolite in Daily Runs

Disables Eviolite spawning in Daily Run mode.

* Write shop test and add new overrides

Adds new overrides that allow you to force content to be locked or unlocked
These overrides were also added to the OverridesHelper to make them available to tests

Adds a new check function for content unlocks, which returns `true` if it is overrode to be unlocked, `false` if it is overrode to be locked, and the unlock data mapped to a Boolean otherwise

All existing checks (other than the ones that involve actually unlocking things) for unlockables have been changed to use this

Added a pair of new exporting booleans, specifically for my test, that check if Eviolite or Mini Black Hole are in the loot table

* Prevent shinies from altering runs

Places variant rolls inside of an ExecuteWithSeedOffset block, using the current floor's RNG seed as the seed and the Pokémon's ID as the offset.

---------

Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@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>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
2024-09-26 01:39:59 -07:00
Yonmaru40 6520a74cb4
[Localization] ZH_cn fix 9-26 (#4443)
* Update absolute-avarice-dialogue.json

* Update an-offer-you-cant-refuse-dialogue.json

* Update berries-abound-dialogue.json

* Update bug-type-superfan-dialogue.json

* Update clowning-around-dialogue.json

* Update dancing-lessons-dialogue.json

* Update dark-deal-dialogue.json

* Update delibirdy-dialogue.json

* Update dark-deal-dialogue.json

* Update fiery-fallout-dialogue.json

* Update fight-or-flight-dialogue.json

* Update fun-and-games-dialogue.json

* Update global-trade-system-dialogue.json

* Update lost-at-sea-dialogue.json

* Update mysterious-challengers-dialogue.json

* Update mysterious-chest-dialogue.json

* Update part-timer-dialogue.json

* Update safari-zone-dialogue.json

* Update shady-vitamin-dealer-dialogue.json

* Update slumbering-snorlax-dialogue.json

* Update teleporting-hijinks-dialogue.json

* Update the-expert-pokemon-breeder-dialogue.json

* Update the-pokemon-salesman-dialogue.json

* Update the-strong-stuff-dialogue.json

* Update the-winstrate-challenge-dialogue.json

* Update training-session-dialogue.json

* Update trash-to-treasure-dialogue.json

* Update uncommon-breed-dialogue.json

* Update weird-dream-dialogue.json

* Update achv.json

* Update bgm-name.json

* Update challenges.json

* Update fight-ui-handler.json

* Update modifier-select-ui-handler.json

* Update party-ui-handler.json

* Update pokemon-form.json

* Update trainer-classes.json

* Update trainer-titles.json

* Update trainer-classes.json

* Update trainer-names.json

* Update dialogue.json

* Update move.json
2024-09-26 00:48:38 -04:00
chaosgrimmon f7223103e0
[Sprite/Misc] Arceus_Fairy cleanup (#4444)
* Delete public/images/pokemon/shiny/493_fairy.png

* Delete public/images/pokemon/shiny/493_fairy.json
2024-09-26 00:48:19 -04:00
flx-sta 67d8ec1d42
[P1 Bug] Fix freeze after replacing first pokemon (#4427)
* fix: new pokemon not being hidden initially

When switching the active pokemon (slot 1) with the new one, the new ones visibility is `true` causing a crash with animation frames

* chore: fix typo

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>

---------

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
2024-09-25 22:33:30 -04:00
innerthunder 029d26b4c9
[Beta][P2 Bug] Fix Sappy Seed applying its secondary effect against targets with Substitute (#4430)
* Fix Sappy Seed applying Leech Seed through Substitutes

* Add docs
2024-09-25 22:32:20 -04:00
pom-eranian 0500e34f87
[Sprite][Color][Anim] Various Pokemon Sprite Fixes (#4346)
* 451 - Skorupi [Animation Fix] - @rival_kieran

- Fixed chopped up legs in Front Base, Front Shiny, Back Base and Back Shiny.
- Fixed in all animations a single choppy/weird animation loop that cut off and gave the animation itself a weird janky feeling. Removed it entirely.
- Fixed .json files accordingly. All files should be indexed, too.

* 582 Vanillite [Position Fix] - @rival_kieran

- Moves Front Base and Front Shiny to the center of the stage via adding padding to the right side of the sprite (currently the total width is 96 pixels wide, biggest allowed) and by centering the frames.
- Both should work and Vanillite doesn't have variants yet.

* 696 697 Tyrunt Tyrantrum [Colorfixes] - @ rival_kieran

- Fixed Front Shiny exp for Tyrunt (used to have the base color in 5/6 of the frames of its exp on the tailspike, it should load properly now without flicker).
- !! IMPORTANT !! Back Shiny exp for Tyrunt is currently unused because there's a worse copy of it in the /variant/exp/back folder (and I've checked and this is the one the masterlist calls for) it'd be best to revert it as the one in /variant/exp/back has extra colors due to two weird pixels + there's no real need as Tyrunt doesn't have a Base Replace
- Epic variant has been tweaked for all sprites to un-custom the eye (as it had been edited to have a slit eye instead of the ring it should have in Tyrantrum and a slightly modified ring in Tyrunt) and slightly tweak the claws (in Tyrunt, the arm claws had an extra unneeded color as border that caused issues, in Tyrantrum they weren't split properly for a change the Epic introduced). (This affects: Static Front, Static Back, Front exp, Back exp)
- Base sprites have been edited so all variants can load from shader/.json file. .json file has been put in its respective folder and should work.
- All spritesheets should be indexed and clean.

* 774 Minior ordered palettes on static sprites

* 774 minior ordered palette on exp front

* 774 Minior ordered palette exp back

* 774 Minior ordered palettes on shiny back

* 774 Minior ordered palettes on shiny exp front & back

* 774 Minior standard json for all front & back exp

all front colors have identical json values
all back colors have identical json values

* 493 Arceus fairy

* ordered palette for default silvally

palette is identical between front, back, exp front and exp back.

* standarized palettes for all silvally base images

all palettes have the same order
al images of the same type have the exact same palette
indexed rgb files

* 773-water

matched all palettes
indexed all images

* 773-bug

matched all palettes
indexed all images

* 773-psychic

matched all palettes
indexed all images

* 773-dark

matched all palettes
indexed all images

* 773-fire

matched all palettes
indexed all images

* 773-grass

matched all palettes
indexed all images

* 773-rock

matched all palettes
indexed all images

* 773-dragon

matched all palettes
indexed all images

* 773-ghost

matched all palettes
indexed all images

* 773-ground

matched all palettes
indexed all images

* 773-electric

matched all palettes
indexed all images

* 773-fairy

matched all palettes
indexed all images

* 773-flying

matched all palettes
indexed all images

* 773-poison

matched all palettes
indexed all images

* 773-steel

matched all palettes
indexed all images

* 773-ice

matched all palettes
indexed all images

* forgot 2 flying files

* 773-fighting

matched all palettes
indexed all images

* 454 Toxicroak (Base + Shiny Fix) @ vari

Adjusted base sprites to get rid of floating mouth corner.
Sprites have been saved in indexed format.

* 453 454 Croagunk Toxicroak gender variants  @ vari

Recolored the new base sprites in the Variant colors. Affected sprites: All Toxicroak front sprites

added a gender difference - Rare male and epic female changed colors compared to the previous version. Affected sprites: Male rare sprites, female epic sprites.

* 4144 articuno galar json palettes

* 4146 galarian moltres palette json

* 4145 galarian zapdos palette json

* variant masterlist: set galar birds to use json palette

* [Sprite] 60 62 Poliwag Poliwrath - cleaned up stray pixels

* 280 281 282 Ralts Kirlia Gardevoir

fixed clipped horn on kirlia front and back
standard palettes
ignore mega gardevoir and gallade for now.

* 773 Silvally - created all variant palette files

* Removed variant image and anim json files

deleted "*_2"  & "*_3" as they are no longer needed.
added palette file for normal-type exp front
2024-09-25 22:29:34 -04:00