Commit Graph

4056 Commits

Author SHA1 Message Date
Opaque02 b781562553
Updated rival battle to have space between words again (#3893)
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
2024-08-29 18:16:51 +02:00
flx-sta 44294f1aec
[Localization] Use gender context for achievments/achv (#3871)
* i18n: prepare female DE achievments

and copy keys in base language: en

* adapt gender context for achv

* add a TODO about an odd `this` usage

* remove debugging leftover code

whops

* add `playerGender` to settings helper

* fix test runs

And revert some changes
2024-08-29 09:13:35 -07:00
Opaque02 27d52af077
Changed Mode.ADMIN enum to be in line with the handler (#3892) 2024-08-29 15:59:06 +01:00
Opaque02 59ff4e9941
Admin panel beta (#3846)
* feat: Add hasAdminRole property to UserInfo interface and update initLoggedInUser and updateUserInfo functions

This commit adds the hasAdminRole property to the UserInfo interface in the account.ts file. The initLoggedInUser function is updated to set the hasAdminRole property to false by default. The updateUserInfo function is also updated to set the hasAdminRole property to false when bypassLogin is true. This change allows for better management of user roles and permissions.

Co-authored-by: frutescens <info@laptop>
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>

* Updated UI for admin panel and menu

* Remove random blank line from merge

* Fix imports in `src/ui/ui.ts`

---------

Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: frutescens <info@laptop>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-08-29 10:22:01 +01:00
Blitzy d86c47a39f
[Sprite] Update Rose Sprite (#3890) 2024-08-29 01:57:22 -07:00
Blitzy 8f2699e6ea
[Enhancement] Update Team Skull Sprites (#3886)
* Update Team Skull Sprites

* Add files via upload

* Update skull_grunt_f.json

* Update skull_grunt_m.json

* Fix eol

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-08-28 23:38:21 -07:00
Mumble 781e25848d
fixed infinite loop (#3887)
Co-authored-by: frutescens <info@laptop>
2024-08-28 22:44:26 -07:00
EmberCM 35f522fd99
Fix text disappearing while in transferMode (#3740)
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-08-28 17:17:18 -07:00
Mumble e0bcb2ef27
[P3 Bug] Run History function saves the most-recent session data possible (#3838)
Co-authored-by: frutescens <info@laptop>
2024-08-28 15:00:38 -04:00
gitlocalize-app[bot] 447d47ef47
Translate trainer-names.json via GitLocalize (#3860)
Co-authored-by: José Ricardo <josefleury@discente.ufg.br>
2024-08-28 20:29:15 +02:00
gitlocalize-app[bot] fd81a5d3b3
Translate settings.json via GitLocalize (#3867)
Co-authored-by: Asdar <asdargmng@gmail.com>
2024-08-28 20:27:12 +02:00
Mumble 170a5831bf
[Bug] Updating ModifierItems' audio keys (#3853)
Co-authored-by: frutescens <info@laptop>
2024-08-28 11:01:15 -07:00
gitlocalize-app[bot] ad4b4a0af7
[Localisation] [ES] Reviewed and translated missing settings.json (#3865)
* Translate settings.json via GitLocalize

* Translate settings.json via GitLocalize

---------

Co-authored-by: Rafa <rhijano@hotmail.com>
Co-authored-by: Asdar <asdargmng@gmail.com>
2024-08-29 01:06:39 +09:00
gitlocalize-app[bot] 35af6b2cbc
Translate pokemon-summary.json via GitLocalize (#3864)
Co-authored-by: Jannik Tappert <tappertjannik@googlemail.com>
2024-08-28 10:15:56 +02:00
chaosgrimmon c543fd7832
Merge pull request #3854 from chaosgrimmon/lycanroc-midnight
[Sprite] Shiny Lycanroc Midnight using non-shiny palette
2024-08-28 01:18:03 -04:00
NightKev 4124ad0b93
Create the appropriate `startBattle()` functions in the helper classes (#3855) 2024-08-27 17:47:09 -07:00
Enoch 214a9275a9
Add missed natureFragment (#3859) 2024-08-27 17:37:20 -07:00
gitlocalize-app[bot] f34137a950
[Localization][KO] Translate missed things (settings, bgm-name) (#3857)
* Translate bgm-name.json via GitLocalize

* Translate settings.json via GitLocalize

---------

Co-authored-by: Enoch <enoch.jwsong@gmail.com>
2024-08-27 17:34:58 -07:00
Adrian T. 5f3383ff04
[Dev] Cleanup some opponent overrides + add new opp form override (#3733)
* replace interger types, add opp form override

* move code to EnemyPokemon class

* Update src/field/pokemon.ts

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

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-08-27 17:34:16 -07:00
chaosgrimmon f9e3b373d9
[Sprite] Shiny Lycanroc Midnight using non-shiny
Palette taken from static back
2024-08-27 17:45:06 -04:00
gitlocalize-app[bot] 4ba8080333
[Localisation] [DE] Evil Team Dialogue (#3851)
* Translate dialogue-female.json via GitLocalize

* Male dialogue

---------

Co-authored-by: Jannik Tappert <tappertjannik@googlemail.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
2024-08-27 23:34:56 +02:00
chaosgrimmon c154c52517
[Bug] Show variant icons when forms share masterlist entry (#3767) 2024-08-27 13:25:36 -07:00
schmidtc1 d3dfd006f8
[Bug] Fixes Unseen Fist ignoring abilities (#3708)
* Inserts break to prevent fall through in checkFlag

* Adds break to IGNORE_PROTECT case for safety

* Revert "Adds break to IGNORE_PROTECT case for safety"

This reverts commit 2589faf69e.

* Adds break to IGNORE_PROTECT properly
2024-08-27 13:06:21 -07:00
Sumwatt d6dbd25e91
Makes Decorate Bypass Protect (#3845) 2024-08-27 11:40:00 -07:00
Mumble 5de11be05b
[Beta][Bug] Sounds in Dialogue Changes (#3837)
* Fixing localization sounds.

* Normalizing loud files

---------

Co-authored-by: frutescens <info@laptop>
2024-08-27 11:25:49 -07:00
Amani H. 34fb5461d7
[Bug] Add Pre-Form Checks (#3839)
Co-authored-by: Paul Sarda <paul@sarda.dev>
2024-08-27 11:25:33 -07:00
chaosgrimmon 85e95a751d
[Sprite] Add missing Gigantamax Kingler back variants (#3696)
* [Sprite] Add Gigantamax Kingler back palette

Edited from front counterpart.

* [Sprite] Use Gigantamax Kingler back palettes
2024-08-27 11:04:18 -07:00
Opaque02 7f76739591
Updated IV scanner legacy theme text colour (#3637) 2024-08-27 11:03:29 -07:00
Blitzy 52b07954e5
[Feature] Implement Additional Evil Teams (#3290)
* Implement new Evil Leaders + Grunts

* Add in data for Admins + more dialogue options for Grunts

* Update Locales

Update trainers.ts

* Update trainers.ts

* Update src/locales/fr/trainers.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Update src/locales/fr/trainers.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Update src/locales/fr/trainers.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Update trainers.ts

* Update src/locales/de/trainers.ts

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

* Apply suggestions from code review

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>

* Fix Linter

* Update trainer-config.ts

* Add admin battle themes, rename admins internally

Adds the Galactic, Skull, and Macro Cosmos admin battle themes. Also renames Faba, Plumeria, and Oleana internally to keep consistent with the other admins. Re-exported their graphics as well to fix minor issues with them.

* Update trainers.ts

* Add doubles grunts to locale, support ca_ES

The doubles trainer classes will need localized.

* Slight Grunt pool adjustments

* Update trainer-config.ts

* Update trainer-config.ts

* Add files via upload

* Update trainer-config.ts

* Delete Unused Sprite

* Delete unused Sprite 2

* Update dialogue-female.json

* Update dialogue-male.json

* Update trainer-config.ts

* Update trainer-titles.json

* Update trainer-titles.json

* Update trainer-classes.json

* Apply suggestions from code review

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

* Fix music formatting

* Slight Admin Pool Adjustments

* linter fix

* Formatting fix / Ability fix

---------

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@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: Madmadness65 <blaze.the.fireman@gmail.com>
Co-authored-by: xsn34kzx <xsn34kzx@gmail.com>
2024-08-27 19:45:58 +02:00
NightKev 5b400af5b7
Fix daily mode test being unreliable (#3840) 2024-08-26 20:17:27 -07:00
chaosgrimmon 930e3289f2
Merge pull request #3703 from chaosgrimmon/skiddo-gogoat
[Sprite] Fix rare Skiddo and Gogoat exp backs
2024-08-26 20:50:10 -04:00
gitlocalize-app[bot] 71b45f0c46
Translate pokemon-info.json via GitLocalize (#3756)
Co-authored-by: Niccolò <niccolo.pulcini.07@gmail.com>
2024-08-26 16:43:32 -07:00
gitlocalize-app[bot] 264d7f584a
Translate settings.json via GitLocalize (#3835)
Co-authored-by: Niccolò <niccolo.pulcini.07@gmail.com>
2024-08-26 16:10:38 -07:00
gitlocalize-app[bot] 1a76a238cb
[Localizatio] [pt_BR] Updated many translations (#3830)
* Translate ability.json via GitLocalize

* Translate arena-flyout.json via GitLocalize

* Translate dialogue-female.json via GitLocalize

* Translate modifier-type.json via GitLocalize

* Translate move.json via GitLocalize

* Translate settings.json via GitLocalize

* Translate tutorial.json via GitLocalize

---------

Co-authored-by: José Ricardo <josefleury@discente.ufg.br>
2024-08-26 23:43:35 +02:00
gitlocalize-app[bot] 6ccb6fc776
Translate settings.json via GitLocalize (#3832)
Co-authored-by: Jannik Tappert <tappertjannik@googlemail.com>
2024-08-26 23:19:26 +02:00
gitlocalize-app[bot] b0933007d8
Translate settings.json via GitLocalize (#3833)
Co-authored-by: Lugiad <adrien.grivel@hotmail.fr>
2024-08-26 23:19:11 +02:00
gitlocalize-app[bot] 17faea0eed
Translate pokemon-form.json via GitLocalize (#3792)
Co-authored-by: José Ricardo <josefleury@discente.ufg.br>
2024-08-26 23:10:38 +02:00
NightKev d234466d61
[Balance] Make sure trainers are using fully evolved Pokémon by gym 3 (#3499)
* Make sure trainers are using fully evolved Pokemon by gym 3

* Expand comment info

Co-authored-by: Mumble <kimjoanne@protonmail.com>

* Implement suggestions

* Update `getPokemonSpecies()` to throw an error if passed `undefined`

---------

Co-authored-by: Mumble <kimjoanne@protonmail.com>
2024-08-26 23:05:16 +02:00
chaosgrimmon f5757f0a3a
[Sprite] Fix exp back epic Bombirdier (#3688)
* [Sprite] Add Bombirdier exp back epic palette

Taken from static back palette

* [Sprite] Use Bombirdier exp back epic palette

* Delete public/images/pokemon/variant/exp/back/962_3.png

* Delete public/images/pokemon/variant/exp/back/962_3.json
2024-08-26 14:03:57 -07:00
gitlocalize-app[bot] 6b38c7213a
[Localization] [DE] ReRemove the event text (#3739)
* Translate dialogue-female.json via GitLocalize

* Translate dialogue-male.json via GitLocalize

---------

Co-authored-by: Jannik Tappert <tappertjannik@googlemail.com>
2024-08-26 23:00:19 +02:00
Mumble c52f439dc1
Corrections and adjustments (#3831)
Co-authored-by: frutescens <info@laptop>
2024-08-26 21:50:19 +01:00
gitlocalize-app[bot] de2abac09d
Translate bgm-name.json via GitLocalize (#3791)
Co-authored-by: Asdar <asdargmng@gmail.com>
2024-08-26 22:42:33 +02:00
gitlocalize-app[bot] fddf6cb76c
Translate trainer-classes.json via GitLocalize (#3788)
Co-authored-by: José Ricardo <josefleury@discente.ufg.br>
2024-08-26 22:28:37 +02:00
gitlocalize-app[bot] 856d468c35
Translate pokemon-info.json via GitLocalize (#3789)
Co-authored-by: José Ricardo <josefleury@discente.ufg.br>
2024-08-26 22:26:47 +02:00
Jannik Tappert 9f1c0a92b5
Clearly define the pichu evolutions (this does not change the behaviour just makes it clea in the code!) (#3781) 2024-08-26 22:20:55 +02:00
chaosgrimmon f2dd9b9435
[Sprite] Recolour shiny exp Galarian Ponyta (#3765)
Recolour by koda_want_to_sleep
2024-08-26 22:19:16 +02:00
gitlocalize-app[bot] d722645932
Translate bgm-name.json via GitLocalize (#3764)
Co-authored-by: Lugiad <adrien.grivel@hotmail.fr>
2024-08-26 22:15:02 +02:00
gitlocalize-app[bot] 290cb01f17
Translate pokemon-summary.json via GitLocalize (#3773)
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
2024-08-26 22:13:31 +02:00
Asdar 00917b6de1
[Localisation] [JA] Japanese backlog localisation to json (#3782)
* Re-Added localisation for Meloetta Pirouette

* "Refactored Japanese backlog (json migration)"

* Update pokemon-form.json IT

Mixed with Meloetta PR

* Fixed Meloetta changes sneaking in the JA PR

* Fixed Meloetta changes sneaking in the JA PR again

* Update src/locales/ja/menu-ui-handler.json

This is why translation PRs should not sit for 2 weeks

Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com>

---------

Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com>
2024-08-26 22:12:53 +02:00
gitlocalize-app[bot] fe575da036
[Localisation] [ES] Review and finish up of ability-trigger.json (#3784)
* Translate ability-trigger.json via GitLocalize

* Translate ability-trigger.json via GitLocalize

---------

Co-authored-by: Rafa <rhijano@hotmail.com>
Co-authored-by: Asdar <asdargmng@gmail.com>
2024-08-26 13:11:24 -07:00