Commit Graph

4804 Commits

Author SHA1 Message Date
José Ricardo Fleury Oliveira
2b0d754ab2 Update translation for "breedersInSpace" in pt_BR splash-messages.json 2024-09-21 01:02:14 -03:00
José Ricardo
35e075dc02
Update src/locales/pt_BR/achv.json 2024-09-21 01:01:24 -03:00
Lugiad
9b5c85c281
Merge branch 'beta' into mystery-encounters-translations 2024-09-21 03:24:12 +02:00
Madmadness65
f2a042c3f0
[Enhancement] Add Team Star as potential evil team (#4019)
* 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.

* Add dialogue for all Team Star trainers

Dialogue put together courtesy of @Blitz425

* Add additional Macro Grunt dialogue lines

As suggested to be included by @Blitz425

* Add dialogue entries in dialogue.ts

Forgot them with my last commit, whoops

* Add back Team Star trainer types

Latest merge of beta into this PR deleted them for some reason

* Update Team Star boss team compositions

Bunch up Eeveelutions more in first fight, move random Rotom form to first fight. Remove Espeon, Umbreon, and Rotom from second fight, add legendary beasts and paradox beasts in their place, remove Zacian chance from second fight.

Co-authored-by: Tempoanon <163687446+Tempo-anon@users.noreply.github.com>

* fix missing semicolon

* Guarantee Sylveon is always Terastallized

* Guarantee Starmobiles on admin's teams

Also resizing the Starmobiles by 1.5 like Gigantamax Pokémon (it is still just regular Revavroom visually for now).

* Adjust trainer pools for Grunts and Admins

* Add new custom sprites for Starmobiles

This adds front and shiny front sprites made by Kieran. Party icons and back sprites are still placeholders for now.

* Minor pool adjustments

Eevee moved to Uncommon on grunts, Varoom replaced with Hisui Qwilfish for Atticus, and Heracross replaced with Pawmi for Eri.

* Remove Leon's Zamazenta, rename Team Star Boss

As to not have overlap between the champion and Star boss teams.
Also doubled the weights of the Starmobile forms.

* Force movesets for Starmobiles

Also fix accidentally giving Mela a Venusaur instead of a Revavroom. (it was just a testing thing, I swear)

* Correct movesets

Didn't realize copied movesets were desired, ech

---------

Co-authored-by: Tempoanon <163687446+Tempo-anon@users.noreply.github.com>
2024-09-20 18:17:44 -07:00
Chapybara-jp
798213a50b
Update bug-type-superfan-dialogue.json 2024-09-21 01:34:02 +02:00
Chapybara-jp
2640e4ded7
Update berries-abound-dialogue.json 2024-09-21 01:30:21 +02:00
Chapybara-jp
7739897a9c
Update an-offer-you-cant-refuse-dialogue.json 2024-09-21 00:40:58 +02:00
Lugiad
d6bb14e7f9
Merge branch 'beta' into mystery-encounters-translations 2024-09-20 23:56:15 +02:00
flx-sta
0aac6c6647
[Dev][Test] Add "Mystery Encounter" type for create-test script + minor timeout fixes (#4350)
* add: mystery encounter to create-test

* remove: leftover `TIMEOUT`

in boss-pokemon.test

* add regex to replace ` ` with `_`

This was never done before. for any

* remove: manual test timeout overwrites
2024-09-20 17:54:37 -04:00
Jannik Tappert
518f8388b5
Update src/locales/de/achv.json 2024-09-20 23:36:09 +02:00
Jannik Tappert
ad0c2f796f
Update src/locales/de/achv.json 2024-09-20 23:35:46 +02:00
Lugiad
ee78d505e0
Update src/locales/ja/trainer-names.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
2024-09-20 23:27:07 +02:00
Lugiad
9d3379e76c
Merge branch 'beta' into mystery-encounters-translations 2024-09-20 23:20:58 +02:00
Lugiad
69bea491d9
Update achv.json 2024-09-20 23:20:02 +02:00
Lugiad
9722566d33
Update achv.json 2024-09-20 23:19:40 +02:00
MokaStitcher
5f5b439e42
[P2 Bug] Fix sturdy and endure causing an extra stat boost to boss Pokemon (#4347)
* [bug] fix sturdy and endure causing an extra stat boost to boss Pokemon

* [doc] add doc for handleBossSegmentCleared
2024-09-20 17:19:33 -04:00
Lugiad
ca0e9af041
Update achv.json 2024-09-20 23:19:23 +02:00
Lugiad
d8a012c21d
Update achv.json 2024-09-20 23:19:03 +02:00
flx-sta
4cc3b0daae
[Test] Make berries abound test more robust (#4339)
* make `berries-abound` test more robust

the "should reward the player with X berries based on wave" test was failing due to berry max stacks and the party only having 1 pokemone.
Increased it to 3 to reduce that probability

* berries abound test: change `defaultParty`

increase size of default-party to 3

* add: some missing types in berries-abound encounter

for ease of reading

* fix: berries abound tests

the "Should skip battle when fastest pokemon is faster than boss" test was failing due to the party being more than 1 pokemon.
2024-09-20 17:18:48 -04:00
Lugiad
fe647fc192
Update achv.json 2024-09-20 23:18:45 +02:00
Lugiad
31c6bc2d15
Update achv.json 2024-09-20 23:18:26 +02:00
flx-sta
4c9c66f898
[Test] Fix Teleporting Hijinks tests (#4349)
set enemy passive ability by default to `Ball Fetch` to prevent random passive abilities that raise stats too
2024-09-20 17:18:18 -04:00
Lugiad
30064d69f2
Update achv.json 2024-09-20 23:18:12 +02:00
Lugiad
1451b62083
Update achv.json 2024-09-20 23:17:54 +02:00
Lugiad
b75915ed91
Update achv.json 2024-09-20 23:17:36 +02:00
Lugiad
00e8d3c54c
Update achv.json 2024-09-20 23:17:15 +02:00
flx-sta
0a5e9ff9e6
[Test] Fix The Pokemon Salesman tests (#4345)
The expects didn't account for the possible shiny, which appends a `_shiny` to some dialogue tokens.
I've added regexes to account for that possibility
2024-09-20 17:14:55 -04:00
Lugiad
90fdefc16d
Update achv.json 2024-09-20 23:14:31 +02:00
Lugiad
8958803960
Update achv.json 2024-09-20 23:14:11 +02:00
Jannik Tappert
20ab2b9272
Localizable Trainer Name + Cleffa Species name can be used in all 3 pokemon names (#4331) 2024-09-20 14:12:35 -07:00
flx-sta
1a5cbf8ecb
[Refactor][Tests] Set default test timeout to 20s (#4338)
* set default test timeout to 20s

* remove "TIMEOUT" reference from create-test-boilerplate

* remove TIMEOUT from tests

* test: remove leftover `20 sec timeout` references

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

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-09-20 23:05:45 +02:00
Lugiad
eebfa3517b
Merge branch 'beta' into mystery-encounters-translations 2024-09-20 18:43:20 +02:00
Lugiad
de065f184c
Update src/locales/zh_CN/trainer-names.json
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
2024-09-20 18:43:05 +02:00
Lugiad
60de45fa5d
Update src/locales/zh_CN/mystery-encounters/the-expert-pokemon-breeder-dialogue.json
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
2024-09-20 18:37:39 +02:00
José Ricardo Fleury Oliveira
a8a301e32f Merge branch 'mystery-encounters-translations' of https://github.com/Adri1/pokerogue into mystery-encounters-translations 2024-09-20 13:33:20 -03:00
José Ricardo Fleury Oliveira
798f760a18 translated all MEs 2024-09-20 13:33:18 -03:00
flx-sta
facdf3cdb9
[Qol][Misc] Make create-test script interactive (#4303)
* add: inquirer module

* make create-test interactive

To be more intuitive

* restructure create-test-boilerplate.js code

* move: test type choices into function

* fix: type choices only contain types

the "exit" option is added separately

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

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-09-20 08:24:08 -07:00
Lugiad
e59b4fd4ab
Update dialogue.json 2024-09-20 16:45:53 +02:00
Lugiad
22957c630a
Merge branch 'beta' into mystery-encounters-translations 2024-09-20 16:28:31 +02:00
DustinLin
0eea2031fb
[Bug] Fixing seed sower uturn switchout bug for trainer battles (#4113)
* refactor wildFlee for seed sower animation bug

* better naming functions

* review suggestions

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-09-20 10:27:43 -04:00
Lugiad
107312003a
Merge branch 'beta' into mystery-encounters-translations 2024-09-20 16:26:00 +02:00
MokaStitcher
4feb45f532
[P3Bug][UI] Fix run history scrolling and other small bugs (#4326) 2024-09-20 10:19:45 -04:00
MokaStitcher
2610a64980
[Bug] Fix candy count when not skipping to summary (#4342) 2024-09-20 10:16:07 -04:00
Lugiad
f6d9a3d09d
Merge pull request #19 from KimJeongSun/ko-expert-breeder
[Localization][KO] the expert breeder
2024-09-20 16:08:22 +02:00
Leo Kim
0167115ea4
Update src/locales/ko/mystery-encounters/the-expert-pokemon-breeder-dialogue.json 2024-09-20 23:05:19 +09:00
Leo Kim
dc2445f645
Update src/locales/ko/mystery-encounters/the-expert-pokemon-breeder-dialogue.json
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
2024-09-20 22:58:33 +09:00
Leo Kim
bf66b584e5
Update src/locales/ko/trainer-names.json
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
2024-09-20 22:58:19 +09:00
Leo Kim
ff5a65af6f
Update src/locales/ko/mystery-encounters/the-expert-pokemon-breeder-dialogue.json
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
2024-09-20 22:57:44 +09:00
Lugiad
fbd91204b4
Update src/locales/ja/dialogue.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
2024-09-20 15:48:01 +02:00
Lugiad
d98af2388f
Update src/locales/ja/mystery-encounter-messages.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
2024-09-20 15:47:32 +02:00