frutescens
eef1f82dfc
Flx Change
2024-09-24 14:21:16 -07:00
frutescens
25b27e8d34
Imports
2024-09-24 14:17:21 -07:00
frutescens
7c3b888208
documentation blah
2024-09-24 14:10:55 -07:00
flx-sta
070c710667
Merge branch 'beta' into restrictionMoves
2024-09-24 13:52:22 -07:00
frutescens
542ac83dfd
Final tests before documentation
2024-09-24 13:48:32 -07:00
frutescens
c1a2b76800
Tests
2024-09-24 13:47:52 -07:00
frutescens
11de99b43c
Imprison and Taunt Tests
2024-09-24 13:16:33 -07:00
ImperialSympathizer
254ffcf6d6
Merge pull request #4374 from ben-lear/mystery-encounter-fixes
...
[Beta][Bug/Balance] Mystery Encounter bug fixes and small balance adjustments (part 3)
2024-09-24 15:45:27 -04:00
Mumble
1f09561518
Merge branch 'beta' into restrictionMoves
2024-09-24 12:21:25 -07:00
flx-sta
969b0ea531
Merge branch 'beta' into mystery-encounter-fixes
2024-09-24 11:14:00 -07:00
ImperialSympathizer
d52f691d43
account for undefined egg moves
2024-09-24 14:06:59 -04:00
ImperialSympathizer
219215f54c
fix getEggMoves() helper function
2024-09-24 13:51:02 -04:00
ImperialSympathizer
a1d1de2c0d
more ME dialogue cleanup
2024-09-24 13:41:00 -04:00
ImperialSympathizer
24bbb0931c
change return type of isNullOrUndefined
2024-09-24 13:15:18 -04:00
Tempoanon
baa806ec63
[Beta][P3 Bug] Fix typo in autotomize add message ( #4404 )
...
`pokemonNameWIthAffix` -> `pokemonNameWithAffix`
2024-09-24 11:45:29 -04:00
ImperialSympathizer
6dc1aedb8e
more ME balance changes and bug fixes
2024-09-24 11:34:42 -04:00
ImperialSympathizer
0262635abb
Merge branch 'beta' of https://github.com/ben-lear/pokerogue into mystery-encounter-fixes
2024-09-24 11:33:05 -04:00
ImperialSympathizer
c172fe1838
Merge branch 'mystery-encounter-fixes' of https://github.com/ben-lear/pokerogue into mystery-encounter-fixes
2024-09-24 11:32:49 -04:00
ImperialSympathizer
1513f2a57d
more ME balance changes and bug fixes
2024-09-24 11:32:22 -04:00
Lugiad
22117115c8
[Localization] ME French Typos ( #4399 )
...
* Update a-trainers-test-dialogue.json
* Update absolute-avarice-dialogue.json
* Update an-offer-you-cant-refuse-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update clowning-around-dialogue.json
* Update dark-deal-dialogue.json
* Update field-trip-dialogue.json
* Update fiery-fallout-dialogue.json
* Update fun-and-games-dialogue.json
* Update lost-at-sea-dialogue.json
* Update mysterious-challengers-dialogue.json
* Update mysterious-chest-dialogue.json
* Update part-timer-dialogue.json
* Update slumbering-snorlax-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update the-strong-stuff-dialogue.json
* Update the-winstrate-challenge-dialogue.json
* Update training-session-dialogue.json
* Update uncommon-breed-dialogue.json
* Update weird-dream-dialogue.json
* Update berries-abound-dialogue.json
2024-09-24 10:03:11 -04:00
ImperialSympathizer
e77595ebb8
Update src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
...
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-09-24 09:29:40 -04:00
frutescens
8a2ffdea49
Work?
2024-09-23 23:26:29 -07:00
frutescens
7b08366a70
Changed BattlerTagImmunityAbAttr to look at lists instead
2024-09-23 23:13:07 -07:00
frutescens
bf3a2db47c
Added check for ability's presence mid battle
2024-09-23 21:55:26 -07:00
frutescens
2e7bfb031b
Removed random newlines
2024-09-23 20:57:52 -07:00
frutescens
1d17d7d215
some documentation
2024-09-23 20:56:43 -07:00
frutescens
15b7b525e8
please
2024-09-23 20:41:26 -07:00
frutescens
fa389912c7
Blah
2024-09-23 20:06:02 -07:00
frutescens
87b4af04be
adding tests so that git doesn't auto-fail
2024-09-23 20:04:56 -07:00
frutescens
880736277a
Added exceptions for Rollout and check for active ability
2024-09-23 19:28:31 -07:00
ImperialSympathizer
b2b88c37cf
fix Absolute Avarice test
2024-09-23 19:36:09 -04:00
ImperialSympathizer
ff256f78dd
can no longer go above max rev seed stacks
2024-09-23 19:29:32 -04:00
ImperialSympathizer
4d8d605c02
merge from beta
2024-09-23 19:25:13 -04:00
ImperialSympathizer
05b9e74729
balance adjustments to certain ME battles
2024-09-23 19:23:46 -04:00
flx-sta
b2b314cd68
[Refactor][Tests] Remove manual test timeouts ( #4385 )
...
* remove: manual timeout setting
some more sneaked in after changing the default-timeout to 20s. Possibly older PRs.
* remove: manual test timeouts from chilly reception tests
2024-09-23 17:35:53 -04:00
ImperialSympathizer
23f006bc43
[Enhancement] Remove unnecessary loading of trainer sprites in loading scene ( #4397 )
...
* Remove unnecessary loading of trainer sprites in loading scene
* load trainer assets on demand for run history UI
---------
Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
2024-09-23 17:34:47 -04:00
Tempoanon
eb264cffee
[Beta] Revert "[Enhancement] Set Appropriate Evil Team on Monogen Challenges ( #4355 )" ( #4395 )
...
This reverts commit 35cd615363
2024-09-23 17:34:06 -04:00
frutescens
f8b143d3d0
Test Files
2024-09-23 13:32:44 -07:00
frutescens
66465a5076
Imprison
2024-09-23 13:28:57 -07:00
Lugiad
f32e10d549
[Localization] ME translations ( #4183 )
...
* Update src/locales/es/mystery-encounters/department-store-sale-dialogue.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
* Update src/locales/es/mystery-encounters/fight-or-flight-dialogue.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
* Update src/locales/es/mystery-encounters/fiery-fallout-dialogue.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
* Update src/locales/es/modifier-select-ui-handler.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
* Update src/locales/es/mystery-encounters/field-trip-dialogue.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
* Update bug-type-superfan-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update a-trainers-test-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update bgm-name.json
* Added Korean missingthings at bug-type-superfan-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update shady-vitamin-dealer-dialogue.json
* Update slumbering-snorlax-dialogue.json
* Update teleporting-hijinks-dialogue.json
* Update the-pokemon-salesman-dialogue.json
* Update the-strong-stuff-dialogue.json
* Update the-winstrate-challenge-dialogue.json
* Update training-session-dialogue.json
* Update trash-to-treasure-dialogue.json
* Update trash-to-treasure-dialogue.json
* Update uncommon-breed-dialogue.json
* Update weird-dream-dialogue.json
* Update bgm-name.json
* Update src/locales/ko/mystery-encounters/bug-type-superfan-dialogue.json
Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>
* Update src/locales/ko/mystery-encounters/bug-type-superfan-dialogue.json
Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>
* Update src/locales/zh_CN/mystery-encounters/mysterious-chest-dialogue.json
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* Update src/locales/zh_CN/mystery-encounters/fight-or-flight-dialogue.json
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* one more typo fix
* Update slumbering-snorlax-dialogue.json
* Update absolute-avarice-dialogue.json
* Update an-offer-you-cant-refuse-dialogue.json
* Update berries-abound-dialogue.json
* Update the-pokemon-salesman-dialogue.json
* Update trash-to-treasure-dialogue.json
* Update uncommon-breed-dialogue.json
* Update weird-dream-dialogue.json
* Update weird-dream-dialogue.json
* Update slumbering-snorlax-dialogue.json
* translated a-trainers-test-dialogue.json
* Update src/locales/ja/modifier-select-ui-handler.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update src/locales/ja/mystery-encounter-messages.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Add files via upload
* Update the-expert-breeder-dialogue.json
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update src/locales/pt_BR/trainer-names.json
* Update src/locales/pt_BR/trainer-titles.json
* Update config.ts
* Update config.ts
* Update config.ts
* Delete src/locales/en/the-expert-breeder-dialogue.json
* Delete src/locales/ca_ES/the-expert-breeder-dialogue.json
* Delete src/locales/de/the-expert-breeder-dialogue.json
* Delete src/locales/es/the-expert-breeder-dialogue.json
* Delete src/locales/fr/the-expert-breeder-dialogue.json
* Delete src/locales/it/the-expert-breeder-dialogue.json
* Delete src/locales/ja/the-expert-breeder-dialogue.json
* Delete src/locales/ko/the-expert-breeder-dialogue.json
* Delete src/locales/pt_BR/the-expert-breeder-dialogue.json
* Delete src/locales/zh_CN/the-expert-breeder-dialogue.json
* Delete src/locales/zh_TW/the-expert-breeder-dialogue.json
* Add files via upload
* Update the-expert-breeder-dialogue.json
* Rename the-expert-breeder-dialogue.json to the-expert-pokemon-breeder-dialogue.json
* Update and rename the-expert-breeder-dialogue.json to the-expert-pokemon-breeder-dialogue.json
* updated name and conifg
* Update and rename the-expert-breeder-dialogue.json to the-expert-pokemon-breeder-dialogue.json
* Update and rename the-expert-breeder-dialogue.json to the-expert-pokemon-breeder-dialogue.json
* Update and rename the-expert-breeder-dialogue.json to the-expert-pokemon-breeder-dialogue.json
* Update and rename the-expert-breeder-dialogue.json to the-expert-pokemon-breeder-dialogue.json
* Update and rename the-expert-breeder-dialogue.json to the-expert-pokemon-breeder-dialogue.json
* Update and rename the-expert-breeder-dialogue.json to the-expert-pokemon-breeder-dialogue.json
* Update and rename the-expert-breeder-dialogue.json to the-expert-pokemon-breeder-dialogue.json
* Update and rename the-expert-breeder-dialogue.json to the-expert-pokemon-breeder-dialogue.json
* Start of dialogue
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update absolute-avarice-dialogue.json
* Update absolute-avarice-dialogue.json
* Added the option to have the species name for all 3, made the name of the breeder localizable
* Revert changes that are in another pr
* She is apparently female so needs changes
* Update an-offer-you-cant-refuse-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update trainer-names.json
* Update trainer-names.json
* Update trainer-names.json
* Update trainer-names.json
* Update trainer-names.json
* Update trainer-names.json
* Update trainer-names.json
* Update trainer-names.json
* Update trainer-names.json
* add translation for expert breeder
* Update src/locales/ja/mystery-encounter-messages.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update src/locales/ja/dialogue.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update src/locales/ko/mystery-encounters/the-expert-pokemon-breeder-dialogue.json
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
* Update src/locales/ko/trainer-names.json
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
* Update src/locales/ko/mystery-encounters/the-expert-pokemon-breeder-dialogue.json
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
* Update src/locales/ko/mystery-encounters/the-expert-pokemon-breeder-dialogue.json
* Update dialogue.json
* translated all MEs
* Update src/locales/zh_CN/mystery-encounters/the-expert-pokemon-breeder-dialogue.json
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* Update src/locales/zh_CN/trainer-names.json
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* Update achv.json
* Update achv.json
* Update achv.json
* Update achv.json
* Update achv.json
* Update achv.json
* Update achv.json
* Update achv.json
* Update achv.json
* Update achv.json
* Update achv.json
* Update achv.json
* Update src/locales/ja/trainer-names.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update src/locales/de/achv.json
* Update src/locales/de/achv.json
* Update an-offer-you-cant-refuse-dialogue.json
* Update berries-abound-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update src/locales/pt_BR/achv.json
* Update translation for "breedersInSpace" in pt_BR splash-messages.json
* Update bug-type-superfan-dialogue.json
* Update src/locales/ko/achv.json
Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>
* Update src/locales/es/mystery-encounters/fun-and-games-dialogue.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
* Update src/locales/ja/achv.json
Co-authored-by: protimita <protimitajp@gmail.com>
* Update src/locales/ko/mystery-encounter-messages.json
Co-authored-by: returntoice <dieandbecome@gmail.com>
* Update src/locales/ko/mystery-encounters/delibirdy-dialogue.json
Co-authored-by: returntoice <dieandbecome@gmail.com>
* Update src/locales/ko/mystery-encounters/delibirdy-dialogue.json
Co-authored-by: returntoice <dieandbecome@gmail.com>
* Update src/locales/ko/mystery-encounters/part-timer-dialogue.json
Co-authored-by: returntoice <dieandbecome@gmail.com>
* Update src/locales/ko/trainer-names.json
Co-authored-by: returntoice <dieandbecome@gmail.com>
* Update clowning-around-dialogue.json
* Update clowning-around-dialogue.json
* Update src/locales/es/mystery-encounters/global-trade-system-dialogue.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
* Update src/locales/ja/mystery-encounters/bug-type-superfan-dialogue.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update global-trade-system-dialogue.json
* Update clowning-around-dialogue.json
* Update dancing-lessons-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update src/locales/de/mystery-encounters/the-expert-pokemon-breeder-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update src/locales/ko/mystery-encounters/the-expert-pokemon-breeder-dialogue.json
* Update src/locales/zh_CN/mystery-encounters/the-expert-pokemon-breeder-dialogue.json
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* Update bgm-name.json
* Update battle.json
* Update an-offer-you-cant-refuse-dialogue.json
* Update berries-abound-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json in pt_BR locale
* Update bug-type-superfan-dialogue.json
* Update src/locales/es/achv.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
* Update bug-type-superfan-dialogue.json
* Update clowning-around-dialogue.json
* Update dancing-lessons-dialogue.json
* Update config.ts
* Update delibirdy-dialogue.json
* Update department-store-sale-dialogue.json
* Update weird-dream-dialogue.json
* Update battler-tags.json
* Update mysterious-chest-dialogue.json
* Update mysterious-chest-dialogue.json
* Update mysterious-chest-dialogue.json
* Update mysterious-chest-dialogue.json
* Update mysterious-chest-dialogue.json
* Update mysterious-chest-dialogue.json
* Update mysterious-chest-dialogue.json
* Update mysterious-chest-dialogue.json
* Update mysterious-chest-dialogue.json
* Update weird-dream-dialogue.json
* Update uncommon-breed-dialogue.json
* Update field-trip-dialogue.json
* Update src/locales/ja/mystery-encounters/dark-deal-dialogue.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update src/locales/ko/mystery-encounters/berries-abound-dialogue.json
Co-authored-by: returntoice <171243264+returntoice@users.noreply.github.com>
* Update src/locales/ja/mystery-encounters/berries-abound-dialogue.json
Co-authored-by: returntoice <171243264+returntoice@users.noreply.github.com>
* Add files via upload
* Add files via upload
* Add files via upload
* Add files via upload
* Update mystery-encounter-messages.json
---------
Co-authored-by: DanStevensonx <114961842+DanStevensonx@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: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
Co-authored-by: José Ricardo <josefleury@discente.ufg.br>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: KimJeongSun <leo@atlaslabs.ai>
Co-authored-by: protimita <protimitajp@gmail.com>
Co-authored-by: returntoice <171243264+returntoice@users.noreply.github.com>
2024-09-23 21:37:59 +02:00
PrabbyDD
3d4eadbc3e
[Bug] Flash Fire/etc now trigger even if the attack would miss ( #4337 )
...
* adding immunity check
* making tests
* modifying and adding tests
* making tests more rigorous
* changing hitcheck return to be what it was originally, no significant effect
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-09-23 15:37:21 -04:00
Mumble
145167f3a2
Merge branch 'beta' into restrictionMoves
2024-09-23 12:37:09 -07:00
chaosgrimmon
4557a73ecc
[Sprite] Standardise Sirfetch'd animation ( #4393 )
...
* [Sprite] Match Sirfetch'd animation
Taken from shiny counterpart
* [Sprite] Standardise Sirfetch'd animation
Colours taken from static sprite.
Spritesheet animation taken from shiny counterpart.
* [Sprite] Standardise Sirfetch'd animation
Colours taken from static sprite.
Spritesheet animation taken from shiny counterpart.
2024-09-23 15:36:17 -04:00
frutescens
9f18f0cdb2
Aroma Veil
2024-09-23 12:35:24 -07:00
flx-sta
c4f81c55b0
[Tests][Mystery-Encounter] Fix The Strong Stuff flakyness ( #4394 )
...
* extend: log in encounter phase for better debugging
* fix: `the storng stuff` test flakiness
The enemy pokemon could get contrary or other abilities that cause the expected values to be ... not as expected
* remove accidental it.each
tests were being executed 30-100 times. This is a debugging tool but was never supposed to make it to merge.
2024-09-23 15:32:07 -04:00
Lugiad
3ef692227d
[Localization] Spanish Gitlocalize leftovers ( #4390 )
...
* Update battle.json
* Update move-trigger.json
* Update trainer-classes.json
* Update trainer-titles.json
* Update battle-info.json
* Update battle.json
* Update challenges.json
* Update common.json
* Update game-stats-ui-handler.json
* Update menu-ui-handler.json
* Update pokemon-info-container.json
* Update starter-select-ui-handler.json
* Update tutorial.json
* Update move.json
* Update battle.json
2024-09-23 13:10:02 -04:00
Tempoanon
342bd5c726
[Beta][Bug] Fix out of bounds Genesect form in Ghetsis_2 causing crash ( #4389 )
2024-09-23 12:05:49 -04:00
NightKev
554d4f0a95
[P2 Bug] Dragon Tail now properly respects abilities like Suction Cups ( #4252 )
...
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-23 11:50:42 -04:00
Tempoanon
b9b69ad834
[Move] Implement autotomization weight effects ( #4228 )
...
* Implement Autotomize
* Another linting
* Fix unit tests
* Add nonnull after checking for null
* Update autotomize test
---------
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-23 11:42:17 -04:00
DanStevensonx
d2ba9751b5
[Localization] Fix Spanish Zippy Zap description ( #4387 )
...
* Update move.json
Translated the zippy move since it got lost in the gitlocalize disaster.
* Update move.json
---------
Co-authored-by: Lugiad <adrien.grivel@hotmail.fr>
2024-09-23 10:56:32 -04:00
