Beta Merge 27/07 #3141

f-fsantos · 2024-07-25T12:40:49Z

What are the changes?

Why am I doing these changes?

What did change?

Screenshots/Videos

How to test the changes?

Checklist

I'm using beta as my base branch
There is no overlap with another PR?
The PR is self-contained and cannot be split into smaller PRs?
Have I provided a clear explanation of the changes?
Have I considered writing automated tests for the issue?
Have I tested the changes (manually)?
- Are all unit tests still passing? (npm run test)
Are the changes visual?
- Have I provided screenshots/videos of the changes?

feat: Add link to Discord in menu UI feat: Add Discord and Google login functionality Add container around discord and google icons refactor: Update environment variable names for Discord and Google client IDs feat: Add "Or use" translation for login options in multiple languages feat: Update menu UI translations for multiple languages Code review fixes refactor: Update Discord and Google client IDs in environment variables

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

this also reduces output noise in tests

Co-authored-by: lnuvy <lnuvy.code@gmail.com>

* Localization(pt): translated bgm-name.ts * fix

[QoL] Add Discord and Google Login

[Feature][ENV] make i18n debugging an optional env setting

* Update TMs for more Indigo Disk changes * Fix typo, more Stored Power

* Refactor challenges and add fresh start * Add achievement for fresh start challenge

* Fix random damage roll to be 85-100% instead of 85-99% * Update battle.test.ts to reflect the fix

* [Help] [Move/Bug] Patches Psychic Terrain applicability edge cases Was cancelling moves even if targeted mons weren't on the terrain. * [Bug `]Pokemon.isGrounded` does not exist Replaced with `Pokemon.isGrounded()`, which does. * [Bug] Psychic Terrain priority move cancel ignoring ungrounded * [Bug] Semi-invulnerable should not be grounded

* Prevent sizing error * Make reboot not necessary for show BGM * Makes the BGM Bar active by default + It had originally been decided that this would not be active by default because it was to be displayed outside the pause menu, but since its behavior has changed between this decision and its integration, the default deactivation is no longer necessary

* Translate forgotten sentences on phases * Translate to de forgotten sentences on phases * Translate to es forgotten sentences on phases * Translate to fr forgotten sentences on phases * Translate to it forgotten sentences on phases * Translate to ko forgotten sentences on phases * Translate to pt br forgotten sentences on phases * Translate to zh cn forgotten sentences on phases * Translate to zh tw forgotten sentences on phases * remove duplicate message * remove duplicate message * Update src/locales/pt_BR/battle.ts Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br> * Update src/locales/de/battle.ts Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> * Update src/locales/de/battle.ts Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> * Update battle.ts [Localization(it)] * Update src/locales/zh_CN/battle.ts Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com> --------- Co-authored-by: Alexis <alexis.faizeau@animedigitalnetwork.fr> Co-authored-by: 송지원 <jiwsong@gmarket.com> 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: Niccolò <123510358+NicusPulcis@users.noreply.github.com> Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>

* Translate pokemon summary * Translate pokemon summary to fr * Translate pokemon summary to de * Translate pokemon summary to es * Translate pokemon summary to it * Translate pokemon summary to ko * Translate pokemon summary to pt br * Translate pokemon summary to zh cn * Translate pokemon summary to zh tw * Fix import * Update partially for en and ko * Update interface name for en * Merge trainerLabel&Text and calculate typeLabel width * Update src/locales/es/pokemon-summary.ts Co-authored-by: GoldTra <162721984+GoldTra@users.noreply.github.com> * Apply translations key to all languages with interface TranslationEtries * Update ko/translationKey of status * Update ko/translationKey of pokemonInfo * Update de/translationKeys of memostring and metFragment * Update de/translationKeys of memostring and metFragment 2 * Update src/locales/ko/pokemon-summary.ts Co-authored-by: Enoch <enoch.jwsong@gmail.com> * Update src/locales/ko/pokemon-summary.ts Co-authored-by: returntoice <dieandbecome@gmail.com> * Update src/locales/pt_BR/pokemon-summary.ts Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br> * Update src/locales/ko/pokemon-summary.ts * Update src/locales/pt_BR/pokemon-summary.ts Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br> * Update pokemon-summary.ts [Localization(it)] * remove unused code * Update src/locales/zh_CN/pokemon-summary.ts Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com> * Update src/locales/zh_CN/pokemon-summary.ts Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com> * Update src/locales/zh_CN/pokemon-summary.ts Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com> * Update src/locales/es/pokemon-summary.ts Co-authored-by: Arxxer <javiptn7@gmail.com> * Update src/locales/es/pokemon-summary.ts Co-authored-by: Arxxer <javiptn7@gmail.com> --------- Co-authored-by: Alexis <alexis.faizeau@animedigitalnetwork.fr> Co-authored-by: Mr.WaterT <water.t.works@gmail.com> Co-authored-by: Alexis Faizeau <faizeau.alexis@gmail.com> Co-authored-by: GoldTra <162721984+GoldTra@users.noreply.github.com> Co-authored-by: returntoice <dieandbecome@gmail.com> Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br> Co-authored-by: 송지원 <jiwsong@gmarket.com> Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com> Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com> Co-authored-by: Arxxer <javiptn7@gmail.com>

src/data/nature.ts

src/modifier/modifier-type.ts

src/phases.ts

src/data/arena-tag.ts

src/data/pokemon-forms.ts

src/data/ability.ts

src/modifier/modifier-type.ts

src/modifier/modifier.ts

* Fixed modifiers not displaying on summary screen * Addressed Typedoc issues * Documentation added --------- Co-authored-by: Frutescens <info@laptop>

…e/epic shiny variant and preventing illegal variants from legendary gacha (#2940) * Changed PokemonSpecies hasVariants function to also include for pokemon with differend forms * Added check to prevent illegal shiny variants from happening if the egg rolls the gacha legendary and has no variants * Simplified variant check. Fixed spelling on unit test * Bugfix for legacy eggs * Removed formIndex variable * Changed unit test * Added new line to unit test function Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> --------- Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

Tempo-anon

Can you add the following two commits into the beta merge?
#3145
#2940

src/modifier/modifier-type.ts

src/phases.ts

torranx · 2024-07-25T23:45:30Z

src/system/settings/settings.ts

+const SHOP_OVERLAY_OPACITY_OPTIONS: SettingOption[] = new Array(9).fill(null).map((_, i) => {
+  const value = ((i + 1) * 10).toString();
+  return {
+    value,
+    label: value,
+  };
+});


what's the difference of instantiating a new array and using Array.from?

src/data/ability.ts

src/data/battle-stat.ts

src/data/type.ts

src/data/battler-tags.ts

…3151)

Tempo-anon · 2024-07-26T00:30:46Z

Can you add the following two commits into the beta merge? #3145 #2940

White herb is also breaking intimidate unit test. Here's a fix for that #3151

Tempo-anon

Wait I just realized this is a beta->main merge. I thought you created a new branch so still needed any new changes beta would pick up. Getting rid of my blocking request changes then :pikastare:

src/data/battler-tags.ts

src/data/move.ts

src/data/arena-tag.ts

torranx

Couple nits added and I don't see any game breaking bugs, except the possible unwanted implications from the changes in pokemon-species.ts. Otherwise, looks good to me.

…all functionality but keeps the isBeta utils function for future stuff (#3153)

…#3157)

Co-authored-by: sirzento <sirzento@gmx.de>

f-fsantos and others added 30 commits June 19, 2024 17:31

refactor: Add missing properties to initLoggedInUser function

dbb1fc1

Update src/locales/de/menu-ui-handler.ts

ef5847d

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

make i18n debugging an optional env setting

782718c

this also reduces output noise in tests

set development default also to "0"

e929538

fix inaccurate docs for TypeImmunityAbAttr (#2957)

ff1fa15

chore: Add beta branch to GitHub Actions tests workflow

c44b38c

chore: Add beta branch to GitHub Actions linter and gh-pages workflow

4dbed9c

Merge branch 'beta' into discord-oauth

f506a70

Update src/locales/ko/menu-ui-handler.ts

ea4e56b

Co-authored-by: lnuvy <lnuvy.code@gmail.com>

Update src/locales/ko/menu.ts

cf1e457

Co-authored-by: lnuvy <lnuvy.code@gmail.com>

Localization(pt): translated bgm-name.ts (#2955)

84e03be

* Localization(pt): translated bgm-name.ts * fix

Merge remote-tracking branch 'upstream/beta' into feature/i18n-debugging

db38963

update VITE_I18N_DEBUG in .env files

fab5992

chore: Update environment variables for beta and production environments

cbf9bdb

Merge pull request #1693 from f-fsantos/discord-oauth

3674325

[QoL] Add Discord and Google Login

Merge remote-tracking branch 'upstream/beta' into feature/i18n-debugging

3c09eef

chore: Add beta branch to GitHub Actions deploy workflow

616b448

Merge branch 'beta' of github.com:pagefaultgames/pokerogue into beta

85a89b9

Hardcoded Pokemon should have proper names (#2941)

4797878

Merge pull request #2692 from flx-sta/feature/i18n-debugging

fc4b97d

[Feature][ENV] make i18n debugging an optional env setting

Refactor challenges and add fresh start (#2963)

5742f08

[Balance] Update many TM learnsets (#2879)

01f6ec2

* Update TMs for more Indigo Disk changes * Fix typo, more Stored Power

Refactor challenges and add fresh start (#2964)

991051f

* Refactor challenges and add fresh start * Add achievement for fresh start challenge

[Bug] Fix off-by-one error in damage calc (#2970)

6bc191c

* Fix random damage roll to be 85-100% instead of 85-99% * Update battle.test.ts to reflect the fix

Update game-stats-ui-handler.ts (italian) (#2965)

d69bedd

flx-sta added Localization Provides or updates translation efforts Tests Automated tests related UI/UX User interface/-experience related Game Balance Changes that heavily impact the game labels Jul 25, 2024

CodeTappert added Move Affects a move Ability Affects an ability Item Affects an item labels Jul 25, 2024

ben-lear reviewed Jul 25, 2024

View reviewed changes

src/data/nature.ts Show resolved Hide resolved

src/modifier/modifier-type.ts Show resolved Hide resolved

src/phases.ts Show resolved Hide resolved

src/phases.ts Show resolved Hide resolved

src/phases.ts Show resolved Hide resolved

DustinLin reviewed Jul 25, 2024

View reviewed changes

src/data/arena-tag.ts Outdated Show resolved Hide resolved

DustinLin reviewed Jul 25, 2024

View reviewed changes

src/data/pokemon-forms.ts Show resolved Hide resolved

xsn34kzx reviewed Jul 25, 2024

View reviewed changes

src/data/ability.ts Show resolved Hide resolved

src/modifier/modifier-type.ts Show resolved Hide resolved

src/modifier/modifier.ts Show resolved Hide resolved

xsn34kzx mentioned this pull request Jul 25, 2024

[Feature] Remove Pokemon Prefix from Modifier Class Names #3147

Open

frutescens and others added 2 commits July 25, 2024 18:40

[Bug] Caught Pokemon Summary-Modifier Display Fix (#3145)

233c926

* Fixed modifiers not displaying on summary screen * Addressed Typedoc issues * Documentation added --------- Co-authored-by: Frutescens <info@laptop>

Tempo-anon requested changes Jul 25, 2024

View reviewed changes

torranx reviewed Jul 25, 2024

View reviewed changes

[Unittest] remove held item rng (white herb) from intimidate.test.ts (#…

f0335af

…3151)

Tempo-anon previously approved these changes Jul 26, 2024

View reviewed changes

torranx reviewed Jul 26, 2024

View reviewed changes

src/data/battler-tags.ts Show resolved Hide resolved

src/data/move.ts Show resolved Hide resolved

src/data/move.ts Show resolved Hide resolved

EnochG1 requested changes Jul 26, 2024

View reviewed changes

src/data/arena-tag.ts Outdated Show resolved Hide resolved

flx-sta approved these changes Jul 26, 2024

View reviewed changes

torranx approved these changes Jul 26, 2024

View reviewed changes

Emergency delete unlock all functionality - should remove the unlock …

1dac6f7

…all functionality but keeps the isBeta utils function for future stuff (#3153)

f-fsantos dismissed Tempo-anon’s stale review via 1dac6f7 July 26, 2024 15:52

DayKev and others added 2 commits July 27, 2024 01:26

Update getAbility() and getAbilityCount() for the ability changes (…

af82f47

…#3157)

Update src/data/arena-tag.ts

4bfa0e6

Co-authored-by: sirzento <sirzento@gmx.de>

xsn34kzx mentioned this pull request Jul 27, 2024

[Refactor/Documentation] Beta Merge 27/07 Cleanup #3163

Merged

9 tasks

Tempo-anon approved these changes Jul 27, 2024

View reviewed changes

f-fsantos merged commit e98ef1c into main Jul 27, 2024
8 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Beta Merge 27/07 #3141

Beta Merge 27/07 #3141

f-fsantos commented Jul 25, 2024

Tempo-anon left a comment

torranx Jul 25, 2024

Tempo-anon commented Jul 26, 2024

Tempo-anon left a comment

torranx left a comment •

edited

Loading

Beta Merge 27/07 #3141

Beta Merge 27/07 #3141

Conversation

f-fsantos commented Jul 25, 2024

What are the changes?

Why am I doing these changes?

What did change?

Screenshots/Videos

How to test the changes?

Checklist

Tempo-anon left a comment

Choose a reason for hiding this comment

torranx Jul 25, 2024

Choose a reason for hiding this comment

Tempo-anon commented Jul 26, 2024

Tempo-anon left a comment

Choose a reason for hiding this comment

torranx left a comment • edited Loading

Choose a reason for hiding this comment

torranx left a comment •

edited

Loading