Commit Graph

36 Commits

Author SHA1 Message Date
Madmadness65
f12730880b
Merge branch 'beta' into new-team 2024-09-19 22:34:33 -05:00
ImperialSympathizer
7490699bef
[Feature] Adds Expert Pokemon Breeder Mystery Encounter to the game (#4328)
* Adds Expert Breeder Mystery Encounter to the game

* add achievement for Breeders in Space and remove redundant tests

* rename to Expert Pokemon Breeder

* remove unintentional test code

* remove unintentional test code

* test fix with breeder rename

---------

Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
2024-09-19 22:46:27 +02:00
Madmadness65
9e3bd1a323
Merge branch 'beta' into new-team 2024-09-13 22:13:02 -05: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
Madmadness65
0e0b68aa8b Add Team Star (WIP)
Still missing dialogue for all new trainer types, team compositions will need refining, and Starmobile graphics still do not exist yet.
2024-09-03 22:28:51 -05:00
chaosgrimmon
db4a63dbb9
[Sprite] Fix Courtney eye whites (#3907) 2024-08-30 00:15:35 -07:00
Blitzy
d86c47a39f
[Sprite] Update Rose Sprite (#3890) 2024-08-29 01:57:22 -07:00
Blitzy
8f2699e6ea
[Enhancement] Update Team Skull Sprites (#3886)
* Update Team Skull Sprites

* Add files via upload

* Update skull_grunt_f.json

* Update skull_grunt_m.json

* Fix eol

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-08-28 23:38:21 -07:00
Blitzy
52b07954e5
[Feature] Implement Additional Evil Teams (#3290)
* Implement new Evil Leaders + Grunts

* Add in data for Admins + more dialogue options for Grunts

* Update Locales

Update trainers.ts

* Update trainers.ts

* Update src/locales/fr/trainers.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Update src/locales/fr/trainers.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Update src/locales/fr/trainers.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Update trainers.ts

* Update src/locales/de/trainers.ts

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>

* Fix Linter

* Update trainer-config.ts

* Add admin battle themes, rename admins internally

Adds the Galactic, Skull, and Macro Cosmos admin battle themes. Also renames Faba, Plumeria, and Oleana internally to keep consistent with the other admins. Re-exported their graphics as well to fix minor issues with them.

* Update trainers.ts

* Add doubles grunts to locale, support ca_ES

The doubles trainer classes will need localized.

* Slight Grunt pool adjustments

* Update trainer-config.ts

* Update trainer-config.ts

* Add files via upload

* Update trainer-config.ts

* Delete Unused Sprite

* Delete unused Sprite 2

* Update dialogue-female.json

* Update dialogue-male.json

* Update trainer-config.ts

* Update trainer-titles.json

* Update trainer-titles.json

* Update trainer-classes.json

* Apply suggestions from code review

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>

* Fix music formatting

* Slight Admin Pool Adjustments

* linter fix

* Formatting fix / Ability fix

---------

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
Co-authored-by: Madmadness65 <blaze.the.fireman@gmail.com>
Co-authored-by: xsn34kzx <xsn34kzx@gmail.com>
2024-08-27 19:45:58 +02:00
Jannik Tappert
60d19c9a2c
[Feature] Unique Evil Team Admins (#3384)
* Hardcoded Pokemon should have proper names

* Add evil admin placeholder images

* Add admin names to locale files

* Add evil team admin dialogue

* current things.

* rename

* team galactic wants to be special

* Revert debug changes

* Added Trainer Names and Titles

* [Hotfix] Fix interactions of some moves not changing types (#3183)

* [Hotfix] Fix wild spawns not having their HA (#3190)

* Add evil admin placeholder images

* Add admin names to locale files

* Add evil team admin dialogue

* Added new sprites

* Make simple admin trainer pools

* Add Korean localization

* Revert this

* [Feature] Named Evil Team Admins

* Dateien removed

* Revert override

* French only needs one pair of evil team bosses :)

* Some things Temp Mentioned in the PR

* Removed NoDuplicates again...Because it only works on the speciality pool....
Also reordered the second admin wave. So we guarantee it is never the same one

* German dialogue

* Offset

* Jördis just better

* Credit for the artists (see https://www.deviantart.com/icejkai/art/Magma-Admin-Courtney-Trainer-Sprite-544510574)

* Order

* Added tsdoc and named it more clear

* Fixed formatting and made it a void function

* Changed offset to number and updated tsdoch

* Improve readability

* Removed extra lines

* Fix this

* Revert override

* colress gets his own pool because @blitzy wants it (and i agree)

* Added Rood (some plasma sage guy)

* has voucher is not false by default. So only it will be set true for evil team leaders, gym leaders, elite 4 and champions

* Apply suggestions from code review

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: returntoice <dieandbecome@gmail.com>

* Added the localization also to japanese

* Update src/locales/ko/trainers.ts

Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>

* CA

* Removed Colress

* Colress Last Stand

---------

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
2024-08-07 10:31:02 -04:00
NightKev
0241abcf61
[Bug] Fix evil team admins (#3341)
* Rename `flare_admin_m copy.json` to `flare_admin_f.json`

* Also fix the Magma Admins
2024-08-04 14:00:49 -04:00
NightKev
10aa85e9db
Fix name of files for Aqua Admin (M) (#3323) 2024-08-03 17:04:57 -05:00
Tempoanon
7048fbe06f
[Feature] Implement generic evil team admins (#3234)
* [Hotfix] Fix interactions of some moves not changing types (#3183)

* [Hotfix] Fix wild spawns not having their HA (#3190)

* Add evil admin placeholder images

* Add admin names to locale files

* Add evil team admin dialogue

* Added new sprites

* Make simple admin trainer pools

* Add Korean localization

* Increase evil boss money multiplier from 2.25 to 2.5

---------

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-08-03 16:34:05 -04:00
Tempoanon
f6ad30b58f
[Feature] Add evil teams assets (#1577)
* Fix tinted caught icon false positive

* Remove unused import

* Rename and optimize

* Block comment

* Draft of evil team grunt pokemon pools

* Add graphics and music

* Add grunt spawn logic

* Add Giovanni

* Add team leader graphics

Giovanni and Ghetsis already have sprites, so they do not need added.

* Add teams for other evil team bosses

* Fix some typos and change hp bars to 2/2/2

* Fix sprites and add random team boss

* Add forced grunt encounter and update dialogue

* Update locales

* also lint en trainers

* More merge conflicts

* Deleted some duplicate images

* Correctly renamed the grunt files

* Forgot about team rocket

* New Magma Sprites

* Adjusted the trimming. Now they dont have as huge of a shadow bbelow them

* Fix grunt sprites

* Add real dialogue

* German Localization of the Dialogue

* Changes

* Tweak waves grunts spawn on

* Fix some typos in dialogue

* Y is canon

* Disable evil team spawns

* Fix another merge conflict

---------

Co-authored-by: Madmadness65 <blaze.the.fireman@gmail.com>
Co-authored-by: Jannik Tappert <tappertjannik@googlemail.com>
2024-06-09 19:02:29 -04:00
MadridPawmot
f3de114d2b
[enhancement] Added Sailor trainer class (#1411)
* Add files via upload

* Update trainer-type.ts

* Update biomes.ts

* Update trainer-config.ts

* Update trainer-names.ts

* Update trainer-names.ts

* Update trainers.ts

* Update trainers.ts

* Added German translation

Thanks to CodeTappert

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts to resolve conflicts

* Fixed syntax error

* Update biomes.ts

* Re-added possible biomes for the Sailor trainer class

* Added data for dialogue lines for the sailor class

* Added dialogue from FRLG

* Added locale

* Added locale

* Added locale

* Update trainers.ts

* Added locale

* Added locale

* Added Korean translation

* Added locale

* Added Portuguese translation

* Added locale

* Added locale

* Added Mandarin Chinese translation

* Added Cantonese Chinese translation

* Added images

* Recentered sprite

* Added Spanish translation for the dialogue

* Delete duplicate

* Delete duplicate

* Updated dialogue with requested changes

* Update Spanish translation to reflect the changes

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts
2024-06-06 11:55:32 -05:00
MadridPawmot
63a416a65b
[enhancement] Added Firebreather trainer class (#1409)
* Add files via upload

* Update trainer-type.ts

* Update biomes.ts

* Update trainer-config.ts

* Update trainer-names.ts

* Add Spanish localization

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Finished adding placeholder strings for each language

* Updated German translation

Thanks to CodeTappert

* Updated trainer.ts to resolve conflicts

* Update trainers.ts to resolve conflicts

* Update trainers.ts

* Fixed syntax error

* Update dialogue.ts

* Re-added dialogue back

* Added firebreather name string to Korean locale

* Added dialogue string to locale

* Added dialogue string to locale

* Update dialogue.ts

* Added dialogue string to locale

* Added dialogue string to locale

* Added dialogue string to locale

* Added dialogue string to locale

* Added dialogue string to locale

* Added requested changes

* Added requested changes

* Added requested changes

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts

* Finished adding requested changes to locales

* Added requested changes
2024-05-31 14:05:04 -05:00
Jannik Tappert
5f82449120
Tate Animation was 5 times slower as the one from Liza. So i just shr… (#1381)
* Tate Animation was 5 times slower as the one from Liza. So i just shrunk down the file for it to have only every fifth frame

* Tates Animation is now smoother and more in sync with liza
2024-05-26 06:20:16 -05:00
Frederico Santos
4a29532b5e
Rename trainer files to use "school_kid" instead of "student" (#962) 2024-05-16 05:17:50 -05:00
Madmadness65
7ddd834786 Replace trainer graphic for Korrina 2024-03-31 09:51:47 -05:00
Flashfyre
b9b07e00b9 Fix snow worker trainer causing crash 2024-03-30 16:37:09 -04:00
Flashfyre
9455330329 Add female worker variant 2024-03-30 15:46:00 -04:00
Flashfyre
4fc92f22d9 Fix naming of doctor and nurse sprites 2024-03-21 01:03:37 -04:00
Flashfyre
a76f795cd5 Trainer updates including names and double battle pairs
Add dynamic trainer pairs; add trainer names with Bulbapedia scraping logic; add Hex Maniac trainer; make namebox stretch to fit name
2024-03-21 00:57:28 -04:00
Madmadness65
22054dddd5 Add Hau as a potential Champion
This fixes the Generation 7 Elite Four not having a corresponding Champion to go along with them.
2024-02-18 19:17:30 -06:00
Madmadness65
7e0bc08772 Minor form name fix 2024-02-15 00:50:04 -06:00
Flashfyre
94b9f8116d Implement new rival sprites 2024-02-14 22:21:03 -05:00
Flashfyre
e62bb6e225 Add female trainer and male rival 2024-02-06 16:15:35 -05:00
Madmadness65
6cff22a9fc Implement generation 9 Pokémon & trainers
Generation 9 Pokémon sprites provided by the Generation 9 Resource Pack on Relic Castle, custom trainer sprites provided by Smogon.
2024-02-05 22:46:45 -06:00
Flashfyre
b12e7106ed Add new player and rival sprites and trainer titles 2024-02-05 23:05:56 -05:00
Madmadness65
f342ea8e67 Fix minor champion oversight
Iris is no longer listed twice for wave 190, and Geeta has been added for the future
2024-01-04 19:28:24 -06:00
Flashfyre
4776851bb8 Add new boss trainers and tweak boss trainer logic 2024-01-04 19:37:07 -05:00
Flashfyre
988438cc81 Add gym leaders, elite four, and champions
Add gym leaders, elite four, and champions; add modifier rewards for initial rival battle
2023-10-20 11:38:41 -04:00
Flashfyre
83c70889fc Implement trainer battles and various changes
Implement trainer battles; add dialogue functionality; add random session seed for predictable random results; remove capitalization from text; add full party heal after every 10 waves
2023-10-18 18:01:15 -04:00
Flashfyre
6d73d71608 Add more logic for trainers (WiP) and various changes
Add WiP logic for trainer Pokemon pools and biome trainer pools; add more music tracks; fix issue with implementation of Mimic move
2023-10-09 20:20:02 -04:00
Flashfyre
48797cb20f Add WiP trainer logic 2023-10-07 16:08:33 -04:00
Flashfyre
2f17903d30 Initial commit 2023-03-28 14:54:52 -04:00