Commit Graph

580 Commits

Author SHA1 Message Date
pom-eranian
f95c06a152 Merge branch 'variant_update_oct' of https://github.com/pom-eranian/pokerogue into variant_update_oct 2024-10-12 14:05:19 -04:00
pom-eranian
bc5b018ef2 [fix] masterlist -removed incorrect entry 2024-10-12 14:04:49 -04:00
pom-eranian
fd2f840bc0 527 528 Woobat Swoobat [Epic Rare] @ rival_kieran
base fix on  woobat back, swoobat front, back
palette files for front, back
added to masterlist
variant icons
2024-10-12 13:50:41 -04:00
pom-eranian
bd428caadf [fix] 359 - masterlist - removed ghost entry for exp absol 2024-10-12 13:18:35 -04:00
pom-eranian
b411c787b8 Merge branch 'variant_update_oct' of https://github.com/pom-eranian/pokerogue into variant_update_oct 2024-10-11 19:31:44 -04:00
pom-eranian
0530b3681c
Merge pull request #17 from pom-eranian/var-honchkrow
198 430 Murkrow Honchkrow [Epic Rare] @ hamez
2024-10-11 19:12:46 -04:00
pom-eranian
e1118ef92c Merge remote-tracking branch 'upstream/beta' into variant_update_oct 2024-10-11 19:11:48 -04:00
pom-eranian
78c853aea0 198 430 Murkrow Honchkrow Variants [Epic Rare] 2024-10-11 17:42:23 -04:00
pom-eranian
11822573ea Murkrow Honchkrow - Icons for variant & female murkrow 2024-10-11 16:25:43 -04:00
pom-eranian
d7b59c1553 Honchcrow Murkrow [Base fixes] 2024-10-11 16:17:21 -04:00
pom-eranian
f0cc1fc88b
[Sprite] Hisui Goodra, Sliggoo, Shiftry (#4642)
* [Sprite][Anim] 275 Shiftree- cropped ear fix - @hamez

* 705 6706 Sliggoo Hisuian Goodra [Color Fixes] - @ rival_kieran

- Fix to Kalosian Sligoo (705). Front exp should now use shaders properly.
- Fix to all of Hisuian Goodra's base sprites + Variants to allow them to use shaders properly (as they didn't before). .json file included.
- Fix to Hisuian Goodra's back static Rare Variant which used colors from the Epic variant on accident on cheeks + spots and drips.
- Hisuian Goodra's eyes on Variant (Rare, Epic) exps were mapped to the wrong color compared to the statics, this has been fixed.
- All images should be indexed.

* Set variants to palette, removed old files
2024-10-11 16:08:39 -04:00
pom-eranian
bd83ab9f24 [Sprite][Anim] 275 Shiftree- cropped ear fix - @hamez 2024-10-10 17:17:20 -04:00
pom-eranian
ba2f5dd6fb
Merge pull request #16 from pom-eranian/variant-absol
359 - Absol Mega Absol [Variants] - @ rival_kieran
2024-10-09 09:52:49 -04:00
pom-eranian
fb94e7801b
Merge branch 'beta' into variant_update_oct 2024-10-09 09:49:39 -04:00
pom-eranian
e9b6746606 359 Absol [_masterlist.json]
Enabled variants for absol & mega absol
2024-10-09 09:33:19 -04:00
pom-eranian
92c4093468 359 Absol Variant palettes 2024-10-08 23:17:38 -04:00
pom-eranian
9e16a39287 359 Absol Variant icons 2024-10-08 23:09:18 -04:00
pom-eranian
7a20060746 359 - Absol Mega Absol [Base Fixes] - @ rival_kieran 2024-10-08 19:43:25 -04:00
flx-sta
39cebb76d0
[Bug] i18n messages files fix (#4611)
* fix matching for i18n messages files

* update public/locales head
2024-10-08 13:30:48 -04:00
chaosgrimmon
9bb6398385
[Sprite] Fix stray pixels in Kirlia's animation (#4612)
* [Sprite] Fix Kirlia padding bleedover

* [Sprite] Fix shiny Kirlia padding bleedover
2024-10-08 11:03:47 -04:00
pom-eranian
c59cc215cd 39 40 174 - Variant Palettes 2024-10-07 13:14:20 -04:00
pom-eranian
10b8fb169c 39 40 174 variant icons 2024-10-07 13:13:24 -04:00
pom-eranian
af76c4ce59 40 Wigglytuff (base fix) @ hanniel 2024-10-07 13:10:56 -04:00
chaosgrimmon
1226ab37e1
[Sprite] Compress Bronzor animation (#4593)
* [Sprite] Compress Bronzor front animation

* [Sprite] Compress Bronzor back animation

* [Sprite] Compress shiny Bronzor back animation

* [Sprite] Compress shiny Bronzor front animation
2024-10-06 17:29:39 -04:00
Frederico Santos
c2c41d9be8 Update subproject commit reference for locales 2024-10-06 02:49:03 +01:00
flx-sta
42b75e8440
[Qol] Make i18n money formatter controlled by translators (#4550)
* fix: i18n money formatter

* fix wrongful console.warn on i18n money formatter

* update locales submodule

update reference to `56eeb809eb5a2de40cfc5bc6128a78bef14deea9` (from `3ccef8472dd7cc7c362538489954cb8fdad27e5f`)
2024-10-05 23:01:41 +02:00
chaosgrimmon
2c97b2bda2
[Sprite] Fix variant Farigiraf icon names (#4572) 2024-10-04 10:51:29 -04:00
Jannik Tappert
5f700590be
[QOL] Have Friendship Value be shown in summary (#4490)
* Have Friendship Value be shown in summary

* Fix how "fill" of icon is calced

* Update src/locales/de/pokemon-summary.json

* Actually add the images

* Add correct image files

* Update src/ui/summary-ui-handler.ts

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>

* Update src/ui/summary-ui-handler.ts

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>

* Update src/ui/summary-ui-handler.ts

* Update src/ui/summary-ui-handler.ts

Co-authored-by: MokaStitcher <54149968+MokaStitcher@users.noreply.github.com>

* Made changed suggested in code review

* Update src/locales/en/pokemon-summary.json

---------

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
Co-authored-by: MokaStitcher <54149968+MokaStitcher@users.noreply.github.com>
2024-10-03 10:34:29 -04:00
Frederico Santos
c46507d49b [Update] Update subproject commit reference in locales 2024-10-02 01:58:28 +01:00
Frederico Santos
5e151f5604
[Refactor] External locales (#4529)
* Removed local translation files

added translations submodule

[Enhancement] Add post-merge command to update submodules in lefthook configuration

[Enhancement] Add postinstall script to install lefthook after package installation

[Enhancement] Update postinstall script to run post-merge command after lefthook installation

* Add subproject commit for locales directory

* Remove translation team assignments from CODEOWNERS

* Add recursive submodule checkout to workflow files and update README for translations

* fix: run without locales present (#4539)

some code was hard-wired with  locales having to be present. This is no longer the case now

---------

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-10-01 23:41:09 +01:00
flx-sta
95386861bb
[Qol][Refactor] i18n lazy-loading (#4327)
* move: locales files to `/public` (from `/src`)

* install: i18next-http-backend module

* implement: i18next language lazy-loading

* remove: all `config.ts` files (for locales)

* disable: enConfig import in i18next.d.ts

* remove: console.log from utils.camelCaseToKebabCase()

* remove localization tests

we don't need to test if i18next is working.
This is the job of i18next itself

* mock i18next for tests

* fix: tests that have to use the i18next key now

instead of the english translation

* fix: absolute-avarice-encounter test

* fix: loading mystery-encounter translations

with lazy-load

* fix: 2 mystery encounter translation loading

* replace: i18next mocks any vi.fn() calls

* fix: new namespace usage in ME tests

now using "mysteryEncounters/..."

* fix: delibirdy encounter not being language specific

the encounter was checking if the modifier name includes `Berry` which is only true for english. Instead it has to check if the modifier is an instance of BerryModifier

* fix: the-expert-pokemon-breeder

the new i18n pattern requires a different namespacing which has been adopted

* fix: GTS encounter tests

* add: `MockText.on()`

* fix: berries abound test

* chore: apply review suggestion

from @DayKev

* update i18next.d.ts

* chore: fix i18next.d.ts

* fix: `dialogue-misc` switchup between `en` and `ja`

* move: `SpeciesFormKey` into enum

there was an issue with circular dependencies

* replace: `#app/enums/` with `#enums/` for `SpeciesFormKey` imports

* re-sync locales from `beta`

* rename: `ca_ES` -> `ca-ES`

* rename: `pt_BR` -> `pt-BR`

* rename: `zh_CN` -> `zh-CN`

* rename: `zh_TW` -> `zh-TW`

* fix loading Species-Form-Key in poemon-evo.

* update: i18next `supporterLngs` ...

and remove `nonExplicitSupportedLngs`

* fix: `${namespace}.` -> `${namespace}:`

thanks @MokaStitcher
2024-10-01 21:55:16 +01:00
ImperialSympathizer
5997744aa2
[Beta][Bug] Major/minor ME bug fixes (#4451)
* major/minor ME bug fixes

* potential fix for failed save with rental pokemon

* Update src/system/game-data.ts

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

* Update src/system/game-data.ts

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

* more bug fix cleanup and PR feedback

* fix Uncommon Breed ME crash

* real fix to Fun and Games force switch issues

* add isBattleMysteryEncounter() helper function

* add isBattleMysteryEncounter() helper function

* fix unintentional replace all errors

* fix catches not updating dex

---------

Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-26 18:43:28 -04:00
Jannik Tappert
9f31e36d24
[Beta][Bug] Rename files so it load the correct status file in languages with a - (#4450) 2024-09-26 12:43:12 -04:00
chaosgrimmon
f7223103e0
[Sprite/Misc] Arceus_Fairy cleanup (#4444)
* Delete public/images/pokemon/shiny/493_fairy.png

* Delete public/images/pokemon/shiny/493_fairy.json
2024-09-26 00:48:19 -04:00
pom-eranian
0500e34f87
[Sprite][Color][Anim] Various Pokemon Sprite Fixes (#4346)
* 451 - Skorupi [Animation Fix] - @rival_kieran

- Fixed chopped up legs in Front Base, Front Shiny, Back Base and Back Shiny.
- Fixed in all animations a single choppy/weird animation loop that cut off and gave the animation itself a weird janky feeling. Removed it entirely.
- Fixed .json files accordingly. All files should be indexed, too.

* 582 Vanillite [Position Fix] - @rival_kieran

- Moves Front Base and Front Shiny to the center of the stage via adding padding to the right side of the sprite (currently the total width is 96 pixels wide, biggest allowed) and by centering the frames.
- Both should work and Vanillite doesn't have variants yet.

* 696 697 Tyrunt Tyrantrum [Colorfixes] - @ rival_kieran

- Fixed Front Shiny exp for Tyrunt (used to have the base color in 5/6 of the frames of its exp on the tailspike, it should load properly now without flicker).
- !! IMPORTANT !! Back Shiny exp for Tyrunt is currently unused because there's a worse copy of it in the /variant/exp/back folder (and I've checked and this is the one the masterlist calls for) it'd be best to revert it as the one in /variant/exp/back has extra colors due to two weird pixels + there's no real need as Tyrunt doesn't have a Base Replace
- Epic variant has been tweaked for all sprites to un-custom the eye (as it had been edited to have a slit eye instead of the ring it should have in Tyrantrum and a slightly modified ring in Tyrunt) and slightly tweak the claws (in Tyrunt, the arm claws had an extra unneeded color as border that caused issues, in Tyrantrum they weren't split properly for a change the Epic introduced). (This affects: Static Front, Static Back, Front exp, Back exp)
- Base sprites have been edited so all variants can load from shader/.json file. .json file has been put in its respective folder and should work.
- All spritesheets should be indexed and clean.

* 774 Minior ordered palettes on static sprites

* 774 minior ordered palette on exp front

* 774 Minior ordered palette exp back

* 774 Minior ordered palettes on shiny back

* 774 Minior ordered palettes on shiny exp front & back

* 774 Minior standard json for all front & back exp

all front colors have identical json values
all back colors have identical json values

* 493 Arceus fairy

* ordered palette for default silvally

palette is identical between front, back, exp front and exp back.

* standarized palettes for all silvally base images

all palettes have the same order
al images of the same type have the exact same palette
indexed rgb files

* 773-water

matched all palettes
indexed all images

* 773-bug

matched all palettes
indexed all images

* 773-psychic

matched all palettes
indexed all images

* 773-dark

matched all palettes
indexed all images

* 773-fire

matched all palettes
indexed all images

* 773-grass

matched all palettes
indexed all images

* 773-rock

matched all palettes
indexed all images

* 773-dragon

matched all palettes
indexed all images

* 773-ghost

matched all palettes
indexed all images

* 773-ground

matched all palettes
indexed all images

* 773-electric

matched all palettes
indexed all images

* 773-fairy

matched all palettes
indexed all images

* 773-flying

matched all palettes
indexed all images

* 773-poison

matched all palettes
indexed all images

* 773-steel

matched all palettes
indexed all images

* 773-ice

matched all palettes
indexed all images

* forgot 2 flying files

* 773-fighting

matched all palettes
indexed all images

* 454 Toxicroak (Base + Shiny Fix) @ vari

Adjusted base sprites to get rid of floating mouth corner.
Sprites have been saved in indexed format.

* 453 454 Croagunk Toxicroak gender variants  @ vari

Recolored the new base sprites in the Variant colors. Affected sprites: All Toxicroak front sprites

added a gender difference - Rare male and epic female changed colors compared to the previous version. Affected sprites: Male rare sprites, female epic sprites.

* 4144 articuno galar json palettes

* 4146 galarian moltres palette json

* 4145 galarian zapdos palette json

* variant masterlist: set galar birds to use json palette

* [Sprite] 60 62 Poliwag Poliwrath - cleaned up stray pixels

* 280 281 282 Ralts Kirlia Gardevoir

fixed clipped horn on kirlia front and back
standard palettes
ignore mega gardevoir and gallade for now.

* 773 Silvally - created all variant palette files

* Removed variant image and anim json files

deleted "*_2"  & "*_3" as they are no longer needed.
added palette file for normal-type exp front
2024-09-25 22:29:34 -04:00
Snailman11
9a63a68d25
[P3] [Localization] Added Snow Worker Keys and Dialogue for En, Es, It, Fr, De, Ko, / Suppressed Female (#4373)
* Added Snow Worker Dialogue Keys and Dialogue

Includes en, fr, it, es, de, ko
-placeholders for ja, pt_br, zh_cn, and zh_tw

* Update dialogue.json

* Added \n$ in Spanish and German so the textboxes don't overflow

* Fixed "defeat" Formatting for Singles and Doubles English, and Doubles Korean, Italian, French, Japanese, and German

* Fixed Formatting for English Singles "defeat", and Japanese Doubles "defeat"

* Update src/locales/ko/dialogue.json

Turns the periods into ellipses for Korean Snow worker Doubles

Co-authored-by: returntoice <171243264+returntoice@users.noreply.github.com>

* Update src/locales/ko/dialogue.json

Adds a period to Korean Singles Defeat

Co-authored-by: returntoice <171243264+returntoice@users.noreply.github.com>

* Update dialogue.json

* Update src/locales/ko/dialogue.json

Adds a space on line 310

Co-authored-by: returntoice <171243264+returntoice@users.noreply.github.com>

* Update src/locales/ja/dialogue.json

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

* Update src/locales/zh_TW/dialogue.json

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

* Update src/locales/zh_CN/dialogue.json

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

* Update src/locales/pt_BR/dialogue.json

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

---------

Co-authored-by: Lugiad <adrien.grivel@hotmail.fr>
Co-authored-by: returntoice <171243264+returntoice@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-25 19:20:32 +02: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
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
Madmadness65
f2a042c3f0
[Enhancement] Add Team Star as potential evil team (#4019)
* Add Team Star (WIP)

Still missing dialogue for all new trainer types, team compositions will need refining, and Starmobile graphics still do not exist yet.

* Add dialogue for all Team Star trainers

Dialogue put together courtesy of @Blitz425

* Add additional Macro Grunt dialogue lines

As suggested to be included by @Blitz425

* Add dialogue entries in dialogue.ts

Forgot them with my last commit, whoops

* Add back Team Star trainer types

Latest merge of beta into this PR deleted them for some reason

* Update Team Star boss team compositions

Bunch up Eeveelutions more in first fight, move random Rotom form to first fight. Remove Espeon, Umbreon, and Rotom from second fight, add legendary beasts and paradox beasts in their place, remove Zacian chance from second fight.

Co-authored-by: Tempoanon <163687446+Tempo-anon@users.noreply.github.com>

* fix missing semicolon

* Guarantee Sylveon is always Terastallized

* Guarantee Starmobiles on admin's teams

Also resizing the Starmobiles by 1.5 like Gigantamax Pokémon (it is still just regular Revavroom visually for now).

* Adjust trainer pools for Grunts and Admins

* Add new custom sprites for Starmobiles

This adds front and shiny front sprites made by Kieran. Party icons and back sprites are still placeholders for now.

* Minor pool adjustments

Eevee moved to Uncommon on grunts, Varoom replaced with Hisui Qwilfish for Atticus, and Heracross replaced with Pawmi for Eri.

* Remove Leon's Zamazenta, rename Team Star Boss

As to not have overlap between the champion and Star boss teams.
Also doubled the weights of the Starmobile forms.

* Force movesets for Starmobiles

Also fix accidentally giving Mela a Venusaur instead of a Revavroom. (it was just a testing thing, I swear)

* Correct movesets

Didn't realize copied movesets were desired, ech

---------

Co-authored-by: Tempoanon <163687446+Tempo-anon@users.noreply.github.com>
2024-09-20 18:17:44 -07:00
ImperialSympathizer
7490699bef
[Feature] Adds Expert Pokemon Breeder Mystery Encounter to the game (#4328)
* Adds Expert Breeder Mystery Encounter to the game

* add achievement for Breeders in Space and remove redundant tests

* rename to Expert Pokemon Breeder

* remove unintentional test code

* remove unintentional test code

* test fix with breeder rename

---------

Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
2024-09-19 22:46:27 +02:00
Lugiad
528e231794
[Localization] Update pkmnems font (#4329) 2024-09-19 15:13:37 -04:00
ImperialSympathizer
5888a7758c
Mystery Encounter bug fixes and minor adjustments (#4299)
* 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

---------

Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
2024-09-19 14:44:10 +01:00
Madmadness65
81ea1296b3
[Miscellaneous] Add new Lake and RUins biome BGM by Lmz (#4319)
* Add new biome BGM by Firel

* Add new biome BGM by Lmz

* Update bgm-name.json
2024-09-18 19:00:06 -04:00
Madmadness65
00ba2eebc8
Add new biome BGM by Firel (#4301) 2024-09-17 21:57:34 +01:00
cam
18dc9d216c
[Bug][Move] Clanging Scales animation on incorrect sprite (#4290)
Set focus to 1 on move's target sprite for every frame.
2024-09-17 15:58:49 +01:00
Jannik Tappert
4605ed4c4f
[Localization] Localized status condition icon (#4286)
* Status Condition Icons now can be localized. Already added german

* More
2024-09-16 15:18:57 -04:00
chaosgrimmon
880a46b659
[Sprite] Fix Lycanroc Midday (#4274)
* [Sprite] Midday Lycanroc back

* [Sprite] Midday Lycanroc shiny front

* [Sprite] Midday Lycanroc shiny back
2024-09-15 22:00:47 -04:00
Madmadness65
e32d1612d9 Resize Sun & Moon Flute item sprites
They will no longer appear weirdly offset on the reward selection screen.
2024-09-14 21:09:19 -05:00
Madmadness65
cc5b46d5c1 Compile item atlas
Adds the new item sprites from #2732
2024-09-14 20:46:20 -05:00
AJ Fontaine
540a1c3e21
[Balance] Rework some evolutions (#2732)
* Changes some evolutions

* more work

* Give Onix Iron Defense at 30

* Sirfetch'd and Gholdengo, pause any evolutions

* Fix pause evolution text

* adjust wild evolution delay

* Add localization keys, clean up evo pausing

* Clean up evo delays

* Adjust friendship evos, Leader's Crest sprite by chaosgrimmon

* Fix Nugget crash

* Fixed Gimmighoul fr

* Move Charcadet armors to common

* Locale migration, Lilligant shiny stone

* Cleanup

* Fix language migration error

* Change Cosmog line evo method

* Undo Ursaluna being night only

* Evo items roll during evo pause on Eevee

* Make all time based evos use dusk and dawn times

* Fix paused and unpaused evolution texts being reversed

* Fixed evolution delays

* Moved up Mimic in Mime Jr's moveset

* Remove Cosmoem time conditions, add Gimmighoul tracker

* Remove tracker after Gimmighoul evo

* Change Scyther Steel Wing back to 30, mark custom
2024-09-15 02:32:43 +01:00