Commit Graph

4251 Commits

Author SHA1 Message Date
Lugiad 3dcd57c727
Update fun-and-games-dialogue.json 2024-09-14 16:51:40 +02:00
Lugiad a27e47cbfc
Update mystery-encounter-messages.json 2024-09-14 16:51:14 +02:00
Lugiad 3d32fec244
Update fun-and-games-dialogue.json 2024-09-14 16:50:50 +02:00
Jannik Tappert 031e9595a6 Revert "Teil 1"
This reverts commit 88e8684d72.
2024-09-14 16:22:03 +02:00
Jannik Tappert 88e8684d72 Teil 1 2024-09-14 16:20:07 +02:00
Jannik Tappert 2bb86ebf0e Merge branch 'mystery-encounters-translations' of https://github.com/Adri1/pokerogue into mystery-encounters-translations 2024-09-14 16:10:31 +02:00
Lugiad 76fbac7d67
Update src/locales/es/mystery-encounters/berries-abound-dialogue.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
2024-09-14 16:04:28 +02:00
Lugiad b91bfa7407
Update src/locales/es/mystery-encounters/an-offer-you-cant-refuse-dialogue.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
2024-09-14 16:04:19 +02:00
Lugiad 71e8406335
Update src/locales/es/mystery-encounter-messages.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
2024-09-14 16:03:49 +02:00
Lugiad 994428184b
Update teleporting-hijinks-dialogue.json 2024-09-14 16:02:54 +02:00
Lugiad 23791cd53e
Update dancing-lessons-dialogue.json 2024-09-14 15:56:21 +02:00
Lugiad 1c9b22e571
Update an-offer-you-cant-refuse-dialogue.json 2024-09-14 15:53:40 +02:00
Lugiad 583e316ce4
Merge branch 'beta' into mystery-encounters-translations 2024-09-14 14:38:20 +02:00
innerthunder a7b3344c6d
Fix missing key in "No Effect" message (#4244) 2024-09-14 05:21:31 -07:00
Lugiad e65f7a4355
Merge branch 'beta' into mystery-encounters-translations 2024-09-14 12:58:57 +02:00
Opaque02 783b9d85ee
[Bug] Golden punch bug fix (#4246)
* Fixes damage within pokemon.ts for golden punch, since it has changed from a IntegerHolder (main) to a number (beta). This updates it to pass through the damage as an integer holder instead of a number

* Updated integer holder to number holder as per PR comment
2024-09-14 10:56:28 +02:00
Jannik Tappert eaec95a5d1 Merge branch 'beta' into mystery-encounters-translations 2024-09-14 10:10:42 +02:00
innerthunder 77f0fe6e4b
[Enhancement][EnemyAI] Add support for simulated damage calculations and "Search for KO" move filtering (#3975)
* Create getAttackDamage function

* Add ignoreAbility params to getBattleStat

* Rewrite Pokemon.apply

* renamed damage variables

* Add `ignoreSourceAbility` arg to `getAttackDamage`

* Enemy AI now searches for KO moves

* Add probabilistic test for KO search

* Add tests to `damage_calculation`

* "killMoves" --> "koMoves"

* Clean up `randomMultiplier`

* Clean up damage calculation test

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

* Fix stabMultiplier using base type for Tera bonus

* Restore simulation capabilities for Unaware

* move sourceTeraType closer to where it's used

* Add base damage test

* Exclude counter moves from KO search

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-09-13 22:54:22 -07:00
damocleas 9d3681cf31
[Balance] Gigantamax Form Adjustments (Charizard, Eevee, Duraludon) and 999.9 Weight for all, + undo Voucher Event on beta (#4241)
* Undo egg skip event

* Readded vouchers to original weights

* Gmax Adjustments - Charizard Berserk, Stats for Eevee and Duraludon

* Set weight of 999.9kg for all Gigantamax forms

---------

Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
2024-09-13 20:52:12 -07:00
innerthunder 8164ec596e
[Balance] Remove `isMax` conditions from move and ability effects (#4200)
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Amani H. <109637146+xsn34kzx@users.noreply.github.com>
2024-09-13 20:48:57 -07:00
NightKev e6cffc6a93
Disable broken tests for now (#4242) 2024-09-13 20:48:25 -07:00
innerthunder eea12a62f6
[Bug][Beta] Fix bugs from Substitute implementation (#4226)
* Fix animation issues with Substitute

* Fix Spirit Shackle, etc. incorrectly being removed by Substitute

* Fix sub tag unit tests
2024-09-13 22:15:12 -04:00
PrabbyDD 63feb88eea
[Test] Update roost tests, related to #4164 (#4230)
* updating roost tests to be more consistent

* updating roost tests to be more consistent

* updating roost tests to be more consistent
2024-09-13 22:14:10 -04:00
Mumble c76827156c
[P3 Bug] Run Result 'Victory!' Text not displaying correctly in Legacy UI Mode (#4223)
* idk what happened to legacy-summary:x

* Let's change it up.

---------

Co-authored-by: frutescens <info@laptop>
2024-09-13 22:13:47 -04:00
ImperialSympathizer acb2b66be4
[Feature] Add Mystery Encounters to the game (#3938)
* add .github/workflows/mystery-event.yml

* update mystery-event.yml

* mystery encounters: resolve review comments:

Lost at Sea:
-fix typo in handlePokemonGuidingYouPhase function

Mysterious Chest:
- remove obsolete commented code

mystery-encounter.ts
- remove unused `onDone` field from MysteryEncounterBuilder

* fix typo in CanLearnMoveRequirementOptions

* remove redundance from Pokemon.isAllowedInBattle()

* chore: jsdoc formatting

* fix lost-at-sea tests

* add fallback for biomeMysteryEncounters if empty

* lost-at-sea-encounter: fix and extend tests

* move "battle:fainted" into `koPlayerPokemon`

* add retries to quick-draw tests

* fix lost-at-sea-encounter tests

* clean up battle animation logic

* Update and rename mystery-event.yml to mystery-events.yml

* Update mystery-events.yml

* Fix typo

* Update mystery-events.yml

Fix debug runs

* clean up unit tests and utils

* attach github issues to all encounter jsdocs

* start dialogue refactor

* update sleeping snorlax encounter

* migrate encounters dialogue to new format

* cleanup and add jsdocs

* finish fiery fallout encounter

* fix unit test breaks

* add skeleton tests to fiery fallout

* commit latest test changes

* finish unit tests for fiery fallout

* bug fix for empty modifier shop

* stash working changes

* stash changes

* Update src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts

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

* Update src/test/utils/overridesHelper.ts

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

* Update src/test/utils/overridesHelper.ts

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

* Update src/test/utils/overridesHelper.ts

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

* Update src/test/utils/overridesHelper.ts

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

* Update src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts

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

* Update src/data/battle-anims.ts

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

* nit updates and cleanup

* Update src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts

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

* Apply suggestions from code review

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

* add jsdocs and more cleanup

* add more jsdoc

* add the strong stuff encounter

* add the strong stuff encounter and more unit tests

* cleanup container length checks in ME ui

* add retries to tests

* add retries to tests

* fix trainer wave disable override

* add shuckle juice modifier

* add dialogue bug fixes

* add dialogue bug fixes

* add pokemon salesman encounter and affects pokedex UI display

* add unit tests for pokemon salesman

* temp stash

* add offer you can't refuse

* add unit tests for offer you can't refuse encounter

* remove unnecessary prompt handlers

* add tests for disabled encounter options

* add delibird-y encounter

* add delibird-y encounter

* add absolute avarice encounter

* finish absolute avarice encounter

* add unit tests and enhancements for item overrides in tests

* fix unit test

* cleanup absolute avarice PR

* small bug fixes with latest sync from main

* update visuals loading for safari and stat trainer visuals

* update visuals loading for safari and stat trainer visuals

* update a trainer's test encounter and add unit tests

* add Trash to Treasure encounter

* clean up trash to treasure encounter

* clean up trash to treasure encounter

* add berries abound encounter

* start clowning around encounter

* first implementation pass at clowning around

* add unit tests for clowning around

* add unit tests for clowning around

* clean up ME unit tests

* clean up unit tests

* update unit tests

* add part timer and dancing lessons encounters

* add unit tests for Dancing Lessons and Part-Timer

* reordered biome list and adjusted redirection for project and labels

* Add Weird Dream encounter and slight reworks to Berries Abound/Fight or Flight

* adjusting yml to match new labels

* fix yml whoopsie

* Expanded 'Weird Dream' banlist and fixed a bug with the BST bump range

* adds Winstrate Challenge mystery encounter

* small cleanup for winstrates

* add unit tests for Winstrate Challenge

* fix pokemon not returning after winstrate battle

* commit latest beta merge updates

* fix ME null checks and unit tests with beta update

* fix ME null checks and unit tests with beta update

* MEs to pokerogue beta branch

* test dialogue changes

* test patch fix

* test patch fix

* test patch fix

* adds teleporting hijinks encounter

* add unit tests for Teleporting Hijinks

* small change to teleporting hijinks dialogue

* migrate ME translations to json

* add retries to berries-abound.Option1: should reward the player with X berries based on wave

* add missing ME dialogue back in

* revert template changes

* add ME unique trainer dialogue to both dialogue jsons

* fix hanging comma in json

* fix broken imports

* resolve lint issues

* fix flaky test

* balance tweaks to a few MEs, updates to bug superfan

* add unit tests for Bug-Type Superfan and clean up dialogue

* Adds Fun and Games mystery encounter

* add unit tests for Fun and Games encounter

* update jsdoc

* small ME balance changes

* small ME balance changes

* Adds Uncommon Breed ME and misc. ME bug fixes

* Update getFinalSessionData() to collect Mystery Encounter data

* adds GTS encounter

* various ME bug fixes and balance changes

* latest ME bug fixes

* clean up GTS Encounter and add unit tests

* small cleanup to MEs branch

* add BGM music names for ME music

* bug fixes and balance changes for MEs

* ME data schema updates

* balance changes and bug fixes to MEs

* balance changes and bug fixes to MEs

* update tests for MEs

* add jsdoc to party exp function

* dialogue updates and test fixes for MEs

* dialogue updates and test fixes for MEs

* PR suggestions and fixees

* stash PR feedback and bugfixes

* fix all tests for MEs and cleanup

* PR feedback

* update flaky ME test

* update tests, bug fix MEs, and sprite assets

* remove unintentional console log

* re-enable stubbed function for Phaser text styling

* handle undefined introVisuals properly

* PR feedback from NightKev

* disable Uncommon Breed tests

* locales updates and bug fixes for safari zone

* more PR feedback and update field trip with Rarer Candy

* fix unit test

* Change how reroll button gets disabled in Modifier Shop Phase

* update continue button text logic

* Update src/ui/modifier-select-ui-handler.ts

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

* fix money formatting and some nits

* more nits

* more nits

* update ME tsdocs with links

* update ME tsdocs with links

---------

Co-authored-by: Felix Staud <felix.staud@headwire.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
Co-authored-by: InnocentGameDev <asdargmng@gmail.com>
Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com>
2024-09-14 03:05:58 +01:00
Lugiad b852311ebb
Update src/locales/es/mystery-encounters/berries-abound-dialogue.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
2024-09-14 02:03:59 +02:00
Lugiad 50659ed3cc
Update src/locales/es/mystery-encounters/an-offer-you-cant-refuse-dialogue.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
2024-09-14 02:03:50 +02:00
Lugiad ec0f19f109
Update the-winstrate-challenge-dialogue.json 2024-09-14 02:03:29 +02:00
Lugiad d7a7ff55a7
Update the-strong-stuff-dialogue.json 2024-09-14 01:45:45 +02:00
Lugiad 3015f39ea6
Update the-pokemon-salesman-dialogue.json 2024-09-14 01:26:02 +02:00
Lugiad 4006a6d913
Update shady-vitamin-dealer-dialogue.json 2024-09-13 23:21:22 +02:00
Lugiad c28f5be754
Update teleporting-hijinks-dialogue.json 2024-09-13 23:04:33 +02:00
Lugiad bf234408ab
Update slumbering-snorlax-dialogue.json 2024-09-13 22:12:58 +02:00
Lugiad 7ac2d5b661
Update fight-or-flight-dialogue.json 2024-09-13 21:54:04 +02:00
Lugiad cce837f5b2
Update dancing-lessons-dialogue.json 2024-09-13 21:53:29 +02:00
Lugiad 63717bf88e
Update clowning-around-dialogue.json 2024-09-13 21:53:05 +02:00
Lugiad db674dbbed
Update absolute-avarice-dialogue.json 2024-09-13 21:52:27 +02:00
Lugiad 414f7f22a0
Update shady-vitamin-dealer-dialogue.json 2024-09-13 21:25:22 +02:00
Lugiad 188a5f2d5b
Update src/locales/es/mystery-encounters/absolute-avarice-dialogue.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
2024-09-13 21:03:19 +02:00
Lugiad f53dee7274
Update src/locales/es/modifier-type.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
2024-09-13 21:03:08 +02:00
Lugiad 4f705e55c5
Update absolute-avarice-dialogue.json 2024-09-13 20:55:41 +02:00
Lugiad 6a85b6f3d1
Update safari-zone-dialogue.json 2024-09-13 20:48:53 +02:00
Lugiad 350bbdd48b
Update part-timer-dialogue.json 2024-09-13 20:31:20 +02:00
Lugiad 6b54a68f8f
Update mysterious-chest-dialogue.json 2024-09-13 20:10:40 +02:00
Lugiad 6c8708392b
Merge branch 'beta' into mystery-encounters-translations 2024-09-13 19:16:49 +02:00
seanrmon a085d3d416
[Bug] Fix for unpausing evolutions for secondary Pokémon in a fusion (#4007)
* [Bug] Cannot unpause evolutions for secondary Pokémon in fusion

* [Bug] Fusion Pokémon now inherit "Pause Evolutions" from both Pokémon

---------

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-13 13:03:11 -04:00
Sion Kang 4dfcc96746
ci: Bump actions version (#2341)
* ci: Bump actions version

* Update .github/workflows/eslint.yml

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

* Update .github/workflows/eslint.yml

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

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-13 17:52:52 +01:00
innerthunder 70295280da
[Move] Implement Substitute (#2559)
* Implement Substitute

Squashed commit from working branch

* Fix integration test imports

* Use Override Helper utils + Fix Baton Pass test

* Update src/test/moves/substitute.test.ts

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

* Fix test imports + nits

* Document RemoveAllSubstitutesAttr

* Fix some strict-null issues

* more strict-null fixes

* Fix baton pass test

* Reorganized Substitute translation keys

* Added checks for substitute in contact logic

* Clean up Unseen Fist contact logic

* Remove misleading comment in Download attr

* RIP phases.ts

* Fix imports post-phase migration

* Rewrite `move.canIgnoreSubstitute` to `move.hitsSubstitute`

* Also fixed interactions with Shell Trap and Beak Blast

* Removed some leftover `canIgnoreSubstitute`s

* fix issues after beta merge

* Status move effectiveness now accounts for substitute

* More edge case tests (Counter test failing)

* Fix Counter + Trap edge cases + add Fail messagesd

* Fix leftover nit

* Resolve leftover test issues

* Fix Sub offset carrying over to Trainer fights

* Hide substitute sprite during catch attempts

* Make substitutes baton-passable again

* Remove placeholder locale keys and SPLASH_ONLY

* Fix imports and other nits

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

* ESLint

* Fix imports

* Fix incorrect `resetSprite` timing

* Fix substitute disappearing on hit (maybe?)

* More animation fixes (mostly for Roar)

---------

Co-authored-by: Adrian T. <68144167+torranx@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-13 12:46:22 -04:00
Tempoanon 526f9ae2bc
[Balance] Tweak evil boss teams, fix aesthetic details (#4214)
* oops

* Swap phero and nihi, fix typo

* Actually make the change
2024-09-13 12:44:42 -04:00
Lugiad 050515524b
Merge branch 'beta' into mystery-encounters-translations 2024-09-13 18:36:21 +02:00