Lugiad
0eb0a29e95
Merge branch 'beta' into mystery-encounters-translations
2024-09-23 16:56:59 +02: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
NightKev
1d559f2194
[Test] Fix flaky Shell Side Arm test ( #4383 )
...
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-23 10:55:47 -04:00
flx-sta
8b6e55d5e9
[Test] flakyness in teleporting hijinks encounter test ( #4386 )
2024-09-23 10:55:01 -04:00
Lugiad
05ee1c7d3d
Update src/locales/ja/mystery-encounters/dark-deal-dialogue.json
...
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
2024-09-23 14:27:21 +02:00
Chapybara-jp
200716919a
Update field-trip-dialogue.json
2024-09-23 13:45:14 +02:00
Chapybara-jp
168f4d2e28
Update uncommon-breed-dialogue.json
2024-09-23 12:49:28 +02:00
Chapybara-jp
7fdfa55916
Update weird-dream-dialogue.json
2024-09-23 12:13:26 +02:00
Lugiad
414456b472
Merge branch 'beta' into mystery-encounters-translations
2024-09-23 12:08:54 +02:00
Opaque02
6626df27ba
[QoL] Adding challenge arrows ( #4048 )
...
Arrows allow for dynamic placement based on language
---------
Co-authored-by: MokaStitcher <54149968+MokaStitcher@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-22 23:34:41 -07:00
DustinLin
c387f498c8
[Bug] Fix move Chilly Reception ( #3198 )
...
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>
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: protimita <protimitajp@gmail.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
2024-09-22 20:09:51 -07:00
innerthunder
f2fe430f8a
[Balance] Ability-ignoring effects no longer ignore the source's own Abilities ( #3556 )
...
* Ability-ignoring effects no longer ignore the source's Abilities
* Update src/field/arena.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* RIP `phases.ts`
* `ignoreAbilitySource` --> `ignoringEffectSource`
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-22 19:54:19 -07:00
Yiling Kang
b9b2491f95
[Ability] (Partially) Implement synchronize ability with old psycho shift interaction ( #2746 )
...
* Initial changes for Synchronize ability
* Fix psycho shift interaction causing buggy behaviour
* Update to show ability even if opponent pokemon does not get statused
* Fix some spacing
* Update tests
* Formatting change
* Remove impossible `if` statement
* Add `simulated` support
* Apply suggestions from code review
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
* Don't need those comments
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
2024-09-22 19:38:09 -07:00
Blitzy
107a7497a9
[Balance] Further Minor Adjustments to Evil Teams ( #4376 )
...
* Update trainer-config.ts
* Update Abilities on certain Mons
* Update trainer-config.ts
2024-09-22 21:34:27 -04:00
NightKev
59f28efa1d
Fix crash when using enemy move override ( #4352 )
...
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-22 18:06:53 -07:00
Lugiad
9fbefadde8
Update mysterious-chest-dialogue.json
2024-09-23 02:00:35 +02:00
Lugiad
fe68de3c6c
Update mysterious-chest-dialogue.json
2024-09-23 01:59:13 +02:00
Lugiad
6da4901dc8
Update mysterious-chest-dialogue.json
2024-09-23 01:57:36 +02:00
Lugiad
ca6fa6b477
Update mysterious-chest-dialogue.json
2024-09-23 01:56:37 +02:00
Lugiad
c20967fa96
Update mysterious-chest-dialogue.json
2024-09-23 01:55:38 +02:00
Lugiad
0bfba2de23
Update mysterious-chest-dialogue.json
2024-09-23 01:54:39 +02:00
Lugiad
548fa32528
Update mysterious-chest-dialogue.json
2024-09-23 01:53:08 +02:00
Lugiad
eb5acb45f7
Update mysterious-chest-dialogue.json
2024-09-23 01:52:52 +02:00
Lugiad
5b02098948
Update mysterious-chest-dialogue.json
2024-09-23 01:52:34 +02:00
Lugiad
efba6b9f65
Update battler-tags.json
2024-09-23 00:39:28 +02:00
Chapybara-jp
71bb20ac92
Update weird-dream-dialogue.json
2024-09-23 00:36:23 +02:00
Chapybara-jp
77353a9a70
Update department-store-sale-dialogue.json
2024-09-23 00:02:10 +02:00
Chapybara-jp
08c40d078c
Update delibirdy-dialogue.json
2024-09-22 22:56:35 +02:00
Lugiad
4e82b23a84
Update config.ts
2024-09-22 22:29:45 +02:00
Chapybara-jp
eeac5c83c0
Update dancing-lessons-dialogue.json
2024-09-22 21:46:23 +02:00
Chapybara-jp
53f25c1a9a
Update clowning-around-dialogue.json
2024-09-22 21:42:12 +02:00
Chapybara-jp
e815b27f65
Update bug-type-superfan-dialogue.json
2024-09-22 21:35:15 +02:00
Lugiad
f5650b8b3d
Update src/locales/es/achv.json
...
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
2024-09-22 21:31:26 +02:00
Chapybara-jp
745021c6dc
Update bug-type-superfan-dialogue.json
2024-09-22 21:23:34 +02:00
José Ricardo Fleury Oliveira
585f102024
Merge branch 'mystery-encounters-translations' of https://github.com/Adri1/pokerogue into mystery-encounters-translations
2024-09-22 16:05:41 -03:00
José Ricardo Fleury Oliveira
1884cec385
Update the-expert-pokemon-breeder-dialogue.json in pt_BR locale
2024-09-22 16:05:38 -03:00
Chapybara-jp
94e8aefc7c
Update berries-abound-dialogue.json
2024-09-22 20:59:51 +02:00
Chapybara-jp
b9b71fcf39
Update an-offer-you-cant-refuse-dialogue.json
2024-09-22 20:53:02 +02:00
Lugiad
8793bbfa91
Merge branch 'beta' into mystery-encounters-translations
2024-09-22 20:16:34 +02:00
AJ Fontaine
23b64b94b5
Function to adjust lure weights ( #4354 )
2024-09-22 20:07:45 +02:00
innerthunder
3ef02c9bbd
[Balance] Remove Species Locks from Aura Wheel and Poison Puppeteer ( #4330 )
...
* Remove non-form-change species locks
* Fix typo in localization
* Mark descriptions that need changes
* Update ability.json
* Update move.json
* Update ability.json
* Update src/locales/pt_BR/ability.json
* Update src/locales/pt_BR/move.json
* KO translations
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
* Update src/locales/de/ability.json
* Update src/locales/de/move.json
* Update src/locales/de/move.json
* Update ability.json
* Update move.json
* Update src/locales/it/move.json
* Update src/locales/it/ability.json
* Update src/locales/ja/move.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update src/locales/ja/ability.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update src/locales/es/ability.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
* Update move.json
* Update src/locales/zh_CN/ability.json
Co-authored-by: btsrkex <34084904+btsrkex@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: btsrkex <34084904+btsrkex@users.noreply.github.com>
---------
Co-authored-by: Lugiad <adrien.grivel@hotmail.fr>
Co-authored-by: José Ricardo <josefleury@discente.ufg.br>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
Co-authored-by: btsrkex <34084904+btsrkex@users.noreply.github.com>
2024-09-22 20:07:35 +02:00
Lugiad
16849efc89
Update battle.json
2024-09-22 19:33:45 +02:00
Lugiad
f681524a80
Merge branch 'beta' into mystery-encounters-translations
2024-09-22 19:32:20 +02:00
Lugiad
2028848845
[Localization] BGM Changes in locales (+slight Spanish and French corrections) ( #4302 )
...
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update src/locales/ja/bgm-name.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update src/locales/ja/bgm-name.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update src/locales/ja/bgm-name.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update src/locales/ko/bgm-name.json
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
* Update src/locales/ko/bgm-name.json
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
* Update src/locales/ko/bgm-name.json
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
* Update ability-trigger.json
* Update battle.json
* Update ability.json
---------
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
2024-09-22 19:25:19 +02:00
Lugiad
1c0c5d5f9e
Update bgm-name.json
2024-09-22 17:57:24 +02:00
Lugiad
f8b4c22f95
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-22 17:55:55 +02:00
Lugiad
3fa3fd2303
Merge branch 'beta' into mystery-encounters-translations
2024-09-22 17:55:43 +02:00
Jannik Tappert
7046f854c1
[Feature] The Form Names in the Catching Summary are now localized ( #3628 )
...
* Form names are now localized when catching a pokemon (and probably hatching a egg since its the same dialogue)
* Update src/ui/pokemon-info-container.ts
* Update src/ui/pokemon-info-container.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Update src/ui/pokemon-info-container.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Update pokemon-info-container.ts
* Update pokemon-info-container.ts
* Update pokemon-form.json
* Update pokemon-form.json
* Update pokemon-form.json
* Update pokemon-form.json
* Update pokemon-form.json
* Update pokemon-form.json
* Update pokemon-form.json
* Update pokemon-form.json
* Update pokemon-form.json
* Update pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update pokemon-form.json
* Update pokemon-form.json
* Update pokemon-form.json
* Update pokemon-form.json
* Update pokemon-form.json
* Update pokemon-form.json
* Update pokemon-form.json
* Update pokemon-form.json
* Update pokemon-form.json
* Update pokemon-form.json
* Update src/locales/pt_BR/pokemon-form.json
* Update src/locales/pt_BR/pokemon-form.json
* Update src/locales/pt_BR/pokemon-form.json
* Update src/locales/pt_BR/pokemon-form.json
* Update src/locales/pt_BR/pokemon-form.json
* Update src/locales/pt_BR/pokemon-form.json
* Update pokemon-form.json
* Update pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/ko/pokemon-form.json
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
* Add missed keys, make empty-key displayed, change EN to original formName
* add missed key, add korean translation (partial)
* Korean translation, refactor code
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Update src/locales/de/pokemon-form.json
* Apply suggestions from code review
* Update src/locales/de/pokemon-form.json
* Apply suggestions from code review
* Update pokemon-form.json
* Update src/locales/pt_BR/pokemon-form.json
* Update src/locales/pt_BR/pokemon-form.json
* Update src/locales/pt_BR/pokemon-form.json
* Update src/locales/pt_BR/pokemon-form.json
* Update src/locales/pt_BR/pokemon-form.json
* Update src/locales/pt_BR/pokemon-form.json
* Update src/locales/pt_BR/pokemon-form.json
* Update src/locales/pt_BR/pokemon-form.json
* Update src/locales/pt_BR/pokemon-form.json
* Update pokemon-form.json
* Update src/locales/ja/pokemon-form.json
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
* Update src/locales/ja/pokemon-form.json
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
* Update src/locales/ja/pokemon-form.json
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
* Update src/locales/ja/pokemon-form.json
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
* Update src/locales/ja/pokemon-form.json
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
* Update src/locales/ja/pokemon-form.json
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
* Update src/locales/ja/pokemon-form.json
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update src/locales/it/pokemon-form.json
* Update pokemon-form.json
deleted all of the remaining "form" snippets since it'll be shown as "Form: form name" so the form snippet was useless
* Apply suggestions from code review
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
---------
Co-authored-by: Lugiad <adrien.grivel@hotmail.fr>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: José Ricardo <josefleury@discente.ufg.br>
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
2024-09-22 17:41:38 +02:00
gruxor
590758f616
[QoL] Show move description via info button ( #4165 )
...
* Show move desc via info button
* Update src/ui/move-info-overlay.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-22 17:31:53 +02:00
Lugiad
4475eec607
[Localization] Team Star Translations ( #4356 )
...
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update bgm-name.json
* Update dialogue.json
* Update trainer-classes.json
* Update trainer-classes.json
* Update trainer-classes.json
* Update trainer-classes.json
* Update trainer-classes.json
* Update trainer-classes.json
* Update trainer-classes.json
* Update trainer-classes.json
* Update trainer-classes.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
* Update trainer-names.json
* Update trainer-titles.json
* Update trainer-titles.json
* Update trainer-titles.json
* Update trainer-titles.json
* Update trainer-titles.json
* Update trainer-titles.json
* Update trainer-titles.json
* Update trainer-titles.json
* Update trainer-titles.json
* Update trainer-titles.json
* Update trainer-titles.json
* Update trainer-titles.json
* Update dialogue.json
* Update dialogue.json
* Update dialogue.json
* Update dialogue.json
* Update dialogue.json
* Update dialogue.json
* Update src/locales/de/bgm-name.json
* Update src/locales/de/bgm-name.json
* Update src/locales/de/bgm-name.json
* Update src/locales/de/dialogue.json
* Update src/locales/de/bgm-name.json
* Update src/locales/ko/bgm-name.json
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
* Update src/locales/ko/trainer-classes.json
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
* Update src/locales/de/dialogue.json
* Apply suggestions from code review
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: José Ricardo <josefleury@discente.ufg.br>
* Update src/locales/ko/bgm-name.json
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
* Update trainer-titles.json
* Update src/locales/de/dialogue.json
* Update src/locales/de/dialogue.json
* Update src/locales/de/dialogue.json
* Update src/locales/de/dialogue.json
* Update src/locales/de/dialogue.json
* Update src/locales/de/dialogue.json
* Update src/locales/de/bgm-name.json
* Update src/locales/de/trainer-classes.json
* Update src/locales/de/trainer-classes.json
* Update src/locales/de/trainer-titles.json
* Update src/locales/de/trainer-titles.json
* Update src/locales/de/trainer-names.json
* Update src/locales/de/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
* Update trainer-names.json
* Update trainer-names.json
* Update dialogue.json
* Update dialogue.json
* Update dialogue.json
* Update src/locales/fr/dialogue.json
* Update src/locales/fr/dialogue.json
* Update trainer-classes.json
* Update bgm-name.json
* Update src/locales/de/dialogue.json
Co-authored-by: returntoice <dieandbecome@gmail.com>
* Apply suggestions from code review
Co-authored-by: returntoice <dieandbecome@gmail.com>
* Update trainer-titles.json
---------
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: José Ricardo <josefleury@discente.ufg.br>
2024-09-22 17:31:33 +02:00
