Commit Graph

3104 Commits

Author SHA1 Message Date
Felix Staud
233f6072d6 chore: remove .js from imports 2024-07-16 16:42:53 -07:00
Felix Staud
fa02f84448 use encounterTestUtils.ts 2024-07-16 16:41:53 -07:00
Felix Staud
94e43e633c add encounterTestUtils.ts 2024-07-16 16:41:47 -07:00
Felix Staud
391054c8e0 extend overridesHelper 2024-07-16 16:41:30 -07:00
Felix Staud
944197330c fix can-learn-move-requirement getAllPokemonMoves 2024-07-16 15:31:42 -07:00
Felix Staud
7a15a0f81e add lost-at-sea option 3 phase check full test 2024-07-16 15:17:48 -07:00
Felix Staud
af989fdaa6 add testUtils.workaround_reInitSceneWithOverrides() 2024-07-16 15:17:26 -07:00
Felix Staud
cb4162252c add overrides helper to gameManager 2024-07-16 15:17:04 -07:00
Felix Staud
75bf80cbad WIP: add lost-at-sea-encounter.test.ts
added a couple of easy tests and 1 int/e2e for option3
2024-07-16 11:36:45 -07:00
Felix Staud
5aceff6d6c chore: format can-learn-move-requirement.ts 2024-07-16 10:46:39 -07:00
Felix Staud
a7eb972d9e ui.getHandler() add generic type with default
https://www.typescriptlang.org/docs/handbook/2/generics.html#generic-parameter-defaults
2024-07-16 10:46:07 -07:00
Felix Staud
d73bf1e81d remove ".js" in imports 2024-07-15 15:16:23 -07:00
Felix Staud
8cd5f34b0c lost at sea enc.: reduce dmg to 25% 2024-07-15 13:59:04 -07:00
Felix Staud
6ac54def30 re-add lost utiltiy methods:
- applyHpChangeToPokemon
- applyDamageToPokemon
- applyHealToPokemon
- koPlayerPokemon
2024-07-15 13:45:25 -07:00
Felix Staud
f2031c78e9 Merge branch 'mystery-battle-events' into event/getting-lost-at-the-sea 2024-07-15 10:31:43 -07:00
ImperialSympathizer
23f6fb17a4 add art issues form and remove some leftover beta branch poison 2024-07-15 12:56:58 -04:00
ImperialSympathizer
e1bb1e2481 clean up safari code and utils 2024-07-15 12:36:10 -04:00
Felix Staud
e2c431b913 polish lost at sea encounter
- fix guide pokemon not receiving exp
2024-07-14 21:32:22 -07:00
Felix Staud
9208fd226b RESET OVERRIDES.TS!! 2024-07-14 21:31:43 -07:00
ImperialSympathizer
da0aea0d1e safari encounter and sprite offset positioning updates 2024-07-14 17:37:03 -04:00
ImperialSympathizer
43ebff59a4 Merge branch 'mystery-battle-events' of https://github.com/InnocentGameDev/PokeRogue-Events into multiple-query-encounter 2024-07-12 21:11:26 -04:00
Felix Staud
7b55811b84 apply surf & fly condition (not water & flying) 2024-07-12 14:55:52 -07:00
Felix Staud
0cb4e53861 undo some MysterEncounterOptionBuilder changes 2024-07-12 14:50:32 -07:00
Felix Staud
b23664cb9e extend MysteryEncounterOptionBuilder 2024-07-12 14:40:47 -07:00
Felix Staud
c4e3a28585 Merge branch 'mystery-battle-events' into event/getting-lost-at-the-sea 2024-07-12 14:38:40 -07:00
ImperialSympathizer
4097d49adc add an optional disabled button label 2024-07-12 17:36:59 -04:00
ImperialSympathizer
a72e76b6fd safari zone 2024-07-12 17:33:55 -04:00
Felix Staud
0a212b3f81 minor changes to CanLearnMoveRequirement 2024-07-12 14:24:37 -07:00
Felix Staud
53f178fde2 replace @ec with i18n variables 2024-07-12 14:10:19 -07:00
Felix Staud
b95e9cbfa4 Merge branch 'mystery-battle-events' into event/getting-lost-at-the-sea 2024-07-12 14:08:52 -07:00
Felix Staud
c9cbdd7d44 lost-at-sea encounter - further progress 2024-07-12 14:07:33 -07:00
Felix Staud
7164b0afe4 add CanLearnMoveRequirement 2024-07-12 13:23:48 -07:00
ImperialSympathizer
515020742d add i18next money formatter for MEs 2024-07-12 16:16:52 -04:00
Felix Staud
72c76c4d39 add Pokemon.isAllowed()
to check if pokemon is allowed even if it's fainted
2024-07-12 13:10:53 -07:00
ImperialSympathizer
39f91167c7 PR cleanup and commit suggestions 2024-07-12 15:57:12 -04:00
Felix Staud
d8fce8b245 add Pokemon.getEggMoves() 2024-07-12 12:56:51 -07:00
ImperialSympathizer
b82e8674cc add number formatting to money strings 2024-07-12 15:54:35 -04:00
ImperialSympathizer
2b855e58e3 move dialogue token injection to i18next 2024-07-12 15:44:34 -04:00
ImperialSympathizer
60c26456f6 move dialogue token injection to i18next 2024-07-12 15:40:30 -04:00
Felix Staud
28d14ae45a minor refactor of abstract EncounterPokemonRequirement 2024-07-12 11:37:58 -07:00
Felix Staud
58d533fb34 migrate lost at sea encounter to new dialogue pattern 2024-07-12 11:17:01 -07:00
Felix Staud
1ae7a86cf9 Merge branch 'mystery-battle-events' into event/getting-lost-at-the-sea 2024-07-12 11:01:51 -07:00
flx-sta
5ff80cd8a2
Merge pull request #64 from AsdarDevelops/option-ui-enhancements
add option mode for UI styling consistency
2024-07-12 10:40:28 -07:00
ImperialSympathizer
bf72985c19
Update src/data/mystery-encounters/mystery-encounter-option.ts
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-07-12 13:37:59 -04:00
ImperialSympathizer
14ec528fea remove extra space 2024-07-12 13:29:47 -04:00
ImperialSympathizer
c99a6382ca add option mode for UI styling consistency 2024-07-12 13:20:14 -04:00
ImperialSympathizer
61330c6967 remove overrides changes 2024-07-12 11:28:22 -04:00
ImperialSympathizer
fb9a4d3dd3 Merge branch 'mystery-battle-events' of https://github.com/InnocentGameDev/PokeRogue-Events into pokemon-salesman 2024-07-12 11:27:02 -04:00
ImperialSympathizer
4412769cd9 small bug fixes 2024-07-11 18:31:48 -04:00
Felix Staud
96554427b5 fix myster-encounter-ui-handler duplicate 2024-07-11 15:27:33 -07:00