Commit Graph

4868 Commits

Author SHA1 Message Date
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
Leo Kim
54dbf6d4f9
Update src/locales/ko/mystery-encounters/the-expert-pokemon-breeder-dialogue.json 2024-09-23 00:02:28 +09:00
Lugiad
51727df422
Update the-expert-pokemon-breeder-dialogue.json 2024-09-22 15:56:49 +02:00
Lugiad
fea04be0bb
Update the-expert-pokemon-breeder-dialogue.json 2024-09-22 15:52:55 +02:00
Jannik Tappert
db99aa499f
Update src/locales/de/mystery-encounters/the-expert-pokemon-breeder-dialogue.json 2024-09-22 15:46:14 +02:00
Lugiad
6a3e22df99
Update the-expert-pokemon-breeder-dialogue.json 2024-09-22 15:41:29 +02:00
Lugiad
c9b3935049
Update the-expert-pokemon-breeder-dialogue.json 2024-09-22 15:41:05 +02:00
Lugiad
daf3c75bc0
Update the-expert-pokemon-breeder-dialogue.json 2024-09-22 15:40:44 +02:00
Lugiad
ff5f5ff69c
Update the-expert-pokemon-breeder-dialogue.json 2024-09-22 15:40:25 +02:00
Lugiad
5b261fcb50
Update the-expert-pokemon-breeder-dialogue.json 2024-09-22 15:39:57 +02:00
Lugiad
bb7527e578
Update the-expert-pokemon-breeder-dialogue.json 2024-09-22 15:39:34 +02:00
Lugiad
29617e7380
Update the-expert-pokemon-breeder-dialogue.json 2024-09-22 15:38:46 +02:00
Lugiad
17465d49c7
Update the-expert-pokemon-breeder-dialogue.json 2024-09-22 15:37:58 +02:00
Lugiad
fd3fb9a444
Merge branch 'beta' into mystery-encounters-translations 2024-09-22 12:24:23 +02:00
Chapybara-jp
a89fb3f0cd
Update dancing-lessons-dialogue.json 2024-09-22 11:48:14 +02:00
ImperialSympathizer
1c87532e64
[Bugs/Balance] Fix various ME bugs and small balance adjustments (#4369)
* various bug fixes for MEs

* various bug fixes for MEs

* fix final isTransferable rename that was missed

* change Trainer's test vouchers for second option

* change unit test skips

* cut down excess ME track length and loop properly

* ME bug fix cleanup

* updating AI for Slumbering Snorlax ME, and small ME balance changes

* fix ts error

* fix bug type superfan dialogue discrepancy

* ME bug fixes PR feedback

* ME PR nits and fixes

* update naming convention of sprites

* ME balance changes and bug fixes

* fix tests

* fix An Offer You Can't Refuse ME requirements

* clean up post-battle logic for Breeder ME

* party size requirement cleanup

* clean up challenge requirements for disabling certain MEs

---------

Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
2024-09-22 05:47:32 +02:00
Lugiad
7e8e736888
Merge branch 'beta' into mystery-encounters-translations 2024-09-22 03:57:31 +02:00
Amani H.
612dcc5f27
[Balance] Adjust Relevant Abilities to Match Lures (#4231)
* [Balance] Adjust Relevant Abilities to Match Lures

* Add Relevant Unit Tests
2024-09-21 21:40:47 -04:00
Chapybara-jp
cf106cda82
Update clowning-around-dialogue.json 2024-09-22 01:54:32 +02:00
Lugiad
e1e98aca5b
Update global-trade-system-dialogue.json 2024-09-22 01:10:48 +02:00
Lugiad
d99e26aa7f
Merge branch 'beta' into mystery-encounters-translations 2024-09-22 01:08:37 +02:00
Lugiad
065257ca2a
Update src/locales/ja/mystery-encounters/bug-type-superfan-dialogue.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
2024-09-22 01:04:13 +02:00
Lugiad
7339e4dd8f
Update src/locales/es/mystery-encounters/global-trade-system-dialogue.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
2024-09-22 01:03:50 +02:00
Chapybara-jp
5f874d0a10
Update clowning-around-dialogue.json 2024-09-21 23:34:39 +02:00
ImperialSympathizer
0518cfd9d6
Merge pull request #4363 from PigeonBar/gts-infinite-loop
[Bug] [Beta] Fix game freeze from GTS infinite loop
2024-09-21 17:24:20 -04:00
Chapybara-jp
a0928d0ba8
Update clowning-around-dialogue.json 2024-09-21 22:48:22 +02:00
Mumble
50dc438930
[Bug] Preventing Duplicate Species in Trainer Battles (#4368)
* no trainer repeats

* Update src/field/trainer.ts

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

---------

Co-authored-by: frutescens <info@laptop>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-09-21 22:27:19 +02:00
Mumble
4fb76fd117
[Move] Implement Heal Block (#4120)
* Heal Block on new branch

* Add/update code from previous PR

* Re-add i18n from previous PR

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: Asdar <asdargmng@gmail.com>

* Disabling Moves

* Still need to update tests and write docs

* removing partial tags from abilities to feel better

* Pollen Puff works now

* Implemented Psychic Noise

* typedocs

* Documentation

* Update src/data/battler-tags.ts

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

* Update src/data/battler-tags.ts

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

* Update src/data/battler-tags.ts

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

* Turns out the old condition wasn't buggy. Probably mixed up another change I made.

* changed array clear

---------

Co-authored-by: frutescens <info@laptop>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: Asdar <asdargmng@gmail.com>
2024-09-21 13:15:32 -07:00
Jannik Tappert
1e70cb92d1
[BUG] Add enough keys in dialogue.ts for team star (#4362) 2024-09-21 12:39:44 -07:00
Blitzy
ba5e89cf61
Swap Order in Trainer Config (#4367) 2024-09-21 14:15:02 -05:00