3184 Commits

Author SHA1 Message Date
ImperialSympathizer
c72bed0ee7 small cleanup of changes 2024-07-11 14:58:44 -04:00
ImperialSympathizer
b6ef210584 remove unnecessary styling override on fight or flight option 2024-07-11 14:43:57 -04:00
ImperialSympathizer
f128b47db5 update encounter biome mapping and option coloring/disablement with requirements 2024-07-11 14:37:29 -04:00
Felix Staud
5a79b50f1d lost at sea encounter finishing touches 2024-07-11 10:30:45 -07:00
Felix Staud
85df834811 optimize mystery-encounter-utils.setEncounterExp() 2024-07-11 09:35:15 -07:00
Felix Staud
47f12b665b ME: add damage/heal application utils 2024-07-11 09:23:43 -07:00
ImperialSympathizer
810c50cda2 new Field Trip encounter and add EXP gains to other encounters 2024-07-11 11:40:07 -04:00
Felix Staud
93fbb0e401 add jsdoc to lost-at-sea-encounter 2024-07-11 08:04:33 -07:00
Felix Staud
524d4a4ca7 lost-at-sea ME: fix using DAMAGE_PERCENTAGE for damage calculation 2024-07-11 08:03:12 -07:00
Felix Staud
b7bf22e3e5 fix typo in myster-encounter-intro 2024-07-11 08:02:01 -07:00
Felix Staud
ef4222cbfa Lost at sea myster encounter MVP....
- filled some dialogue
- add placeholders for the pokemons that can help
- rename it to `Lost at Sea` (from Getting lost at the sea
- add damage calculation for 3rd option
2024-07-11 07:57:41 -07:00
Felix Staud
0f9c0c5d24 improve jsdocs in myster-encounter.ts 2024-07-11 07:50:58 -07:00
Felix Staud
5ff1ae617d add alpha config for myst-ec sprites 2024-07-10 20:54:55 -07:00
Felix Staud
81112eeabe myster-encounter-intro.ts improve types and documentation 2024-07-10 20:43:31 -07:00
Felix Staud
d9ea676a92 add KnownFileRoot template literal 2024-07-10 20:34:28 -07:00
Felix Staud
ec7cabc8c8 getting lost at the sea MVP (event) 2024-07-10 18:39:55 -07:00
ImperialSympathizer
253447136a some more small cleanup 2024-07-10 16:32:24 -04:00
ImperialSympathizer
ce55c13c12 resolve conflicts, import issues, and cleanup from rebase 2024-07-10 15:31:03 -04:00
ImperialSympathizer
7bbebb32e2 undo broken load changes 2024-07-10 15:07:18 -04:00
Felix Staud
f1b074755e add MysteryEncounterOptionBuilder.withSceneMoneyRequirement() 2024-07-10 15:06:16 -04:00
Felix Staud
434104f9ee add 2 new MysteryEncounterBuilder methods:
- `.withPrimaryPokemonStatusEffectRequirement()`
- `.withPrimaryPokemonHealthRatioRequirement`
2024-07-10 15:06:16 -04:00
Felix Staud
a8be171305 add MysterEncounterBuilder.withOptionPhase() 2024-07-10 15:06:16 -04:00
Felix Staud
adf52bf604 add MysteryEncounterBuilder.withScenePartySizeRequirement 2024-07-10 15:06:15 -04:00
Felix Staud
25d0bd39ee add MysteryEncounterBuilder.withSceneWaveRangeRequirement() 2024-07-10 15:06:15 -04:00
Felix Staud
5a5806185f make MysteryEncounterBuilder.withEncounterType() static 2024-07-10 15:06:15 -04:00
ImperialSympathizer
efb00553c9 styling and text coloring fixes 2024-07-10 15:06:12 -04:00
ImperialSympathizer
deb1e95e34 add encounter exp utility and small cleanups/refactors 2024-07-10 15:04:48 -04:00
ImperialSympathizer
cf43589260 fix unit tests 2024-07-10 15:04:18 -04:00
ImperialSympathizer
7b35efe95e adds 2 new encounters and colorable text options 2024-07-10 15:03:36 -04:00
ImperialSympathizer
872242c44f remove commented code 2024-07-10 15:03:35 -04:00
ImperialSympathizer
f803de6b23 start adding unit tests 2024-07-10 15:03:33 -04:00
ImperialSympathizer
07ffe1ca64 re-enable dialogue tokens 2024-07-10 15:01:29 -04:00
ImperialSympathizer
7fb1506a97 clean up data token logic 2024-07-10 15:01:29 -04:00
ImperialSympathizer
8e84e40e35 beta bug fixes 2024-07-10 15:01:29 -04:00
ImperialSympathizer
2318d86cb1 Mystery Encounters (#2824)
* squash commits to clean up PR

* add chest sprites

* bug fixes, cleanup, and tests

* small fixes

---------

Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
2024-07-10 15:01:23 -04:00
ImperialSympathizer
1d0109a386 small fixes 2024-07-10 14:52:38 -04:00
ImperialSympathizer
b3aa562bc6 small fixes 2024-07-10 14:52:38 -04:00
ImperialSympathizer
666ec135ba bug fixes, cleanup, and tests 2024-07-10 14:52:27 -04:00
ImperialSympathizer
860e875587 rebase encounters branch with pokerogue/main 2024-07-10 14:51:06 -04:00
Niccolò
ffbc922e09
Update ability-trigger.ts (Italian) (#2949) 2024-07-10 10:18:53 -04:00
Niccolò
63667aa062
[Localization(it)] Localize luck in common.ts (Italian) (#2952) 2024-07-10 10:15:57 -04:00
mercurius-00
c958755ebd
[Localization(zh-cn)] Fix linebreak in move.ts (#2948)
fix linebreak
2024-07-10 10:13:56 -04:00
flx-sta
18dcef5b4a
[Bug] fix starter select alpha in challenge modes (#2924)
* fix starter select alpha in challenge modes

* [NIT] resolve review comment

https://github.com/pagefaultgames/pokerogue/pull/2924#discussion_r1670587051

* chore
2024-07-09 14:05:45 -04:00
schmidtc1
0b5b481de6
[Test] Prevent flying types/levitate from breaking Ceaseless Edge test (#2931)
* Modifies ceaseless edge test to account for flying types/levitate ability

* Removes .js from imports
2024-07-08 22:49:52 -04:00
schmidtc1
7474eac808
[Bug] Removes firstHitOnly from AddArenaTagAttr to allow multi hit set up with Ceaseless Edge (#2727)
* Removes firstHitOnly from AddArenaTagAttr to allow multi hit set up with ceaseless edge

* Creates initial test file with basic cases for ceaseless edge

* Fixes ceaseless edge unit test and expands on case 3

* Adds truthy/falsy expectations prior to use
2024-07-08 16:53:16 -04:00
NightKev
458245f542
[Unittest] Prevent Arena Trap/etc from breaking Costar test (#2923) 2024-07-08 16:37:22 -04:00
Tempoanon
f9327680dd
[Feature] Stop random trainers from spawning near fixed battles (#2610)
* Stop trainer spawns on evil team and E4 floors

* Thanks Xavion

* change "floors" to "wave" in coment

* at test for not spawning 3 waves within fixed trainer battle

* remove out-commented code

* apply code formatting

* Updated test and make sure isWaveTrainer returns a boolean

* Update comment

---------

Co-authored-by: Felix Staud <felix.staud@headwire.com>
2024-07-08 10:33:47 -04:00
mercurius-00
0d9dd1dfc8
Localized moneyPickedUp message (#2788)
* Localized moneyPickedUp message

* Update src/locales/ko/battle.ts

Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>

* Update src/locales/fr/battle.ts

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

* Update src/locales/de/battle.ts

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

* Update src/locales/pt_BR/battle.ts

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

* Update battle.ts

* Update battle.ts

---------

Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
2024-07-08 10:25:46 -04:00
Enoch
2ccb480930
[Localization] localize modifier.ts apply event message & translate in Korean (#2882)
* localize modifier apply event message

* modify korean postposition

* Update src/locales/pt_BR/modifier.ts

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

* Update src/locales/zh_CN/modifier.ts

Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>

* Update src/locales/zh_TW/modifier.ts

Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>

* Update src/locales/de/modifier.ts

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

* aUpdate src/locales/fr/modifier.ts

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

* Update src/locales/fr/modifier.ts

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

* Update src/locales/pt_BR/modifier.ts

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

* Update src/locales/pt_BR/modifier.ts

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

* Update src/locales/pt_BR/modifier.ts

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

* Update src/locales/fr/modifier.ts

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

---------

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
2024-07-08 10:21:50 -04:00
Enoch
9a1ff57941
Modify Korean 'shiny' and gacha texts to match original (#2843) 2024-07-08 10:18:32 -04:00