Commit Graph

365 Commits

Author SHA1 Message Date
Frederico Santos
f506a70d11
Merge branch 'beta' into discord-oauth 2024-07-10 19:56:24 +01:00
AJ Fontaine
0c18e95fa4
[Bug] Fix Meditite back and female variant sprites (#2929) 2024-07-09 09:58:16 -04:00
chaosgrimmon
67d5d70a7b
[Sprite] Shiny Minior Fixes (#2876)
* [Sprite] Shiny Meteor Minior not in shell

Taken from non-shiny sprite and animation.

* [Sprite] Back shiny Meteor Minior not in shell

Taken from non-shiny sprite and animation.

* [Sprite] Shiny exp Minior Cores wrong colours

* [Sprite] Shiny exp Minior Core backs wrong colours
2024-07-06 19:47:47 -04:00
Dakurei
7847aa1644
[Enhancement] Fixes sizing and legacy theme problem for bgm-bar (#2603)
* Adds TextStyle for bgm-bar ui

* Makes the ui bgm-bar truly dynamic + cleans up unused code

  + Removes all hard-coded characters from the string to allow for different typographical rules in different languages

* Applies the necessary modifications to locales following the deletion of the hard-coded character to form strings

* Use same style as above + reduce shadow offset

* Creates and loads a resource for the bgm-bar ui

  + Can be redesigned by someone with more talent if needed, since it won't affect the ability bar

* Using the new resource in bgm-bar ui

* Use of more space by default following deletion of the 'noteText' text zone
2024-07-05 20:50:19 +01:00
chaosgrimmon
4c34858e89
[Sprite] Fix Espeon's tail partially missing (#2795)
* [Sprite] Fixes Espeon tail

Taken from initial commit, pre-Texture Packer compression

* [Sprite] Fixes (replaced) shiny Espeon tail

Taken from initial commit, pre-Texture Packer compression

* [Sprite] Fix variant Espeon tails
2024-07-04 21:43:42 -04:00
chaosgrimmon
38ed57f063
[Sprite] Shiny Spritzee colour correction (#2781)
* [Sprite] Exp shiny Spritzee

* [Sprite] Exp non-shiny Spritzee
2024-07-04 01:24:29 -04:00
chaosgrimmon
63599ef52e
[Sprite] Female Scyther missing variant palettes (#2770)
* [Sprite] Missing female Scyther front variant palettes

Taken from existing male counterpart.

* [Sprite] Missing female Scyther back variant palettes

Taken from existing male counterpart.

* [Sprite] Adding female Scyther variants
2024-07-03 12:45:43 -04:00
chaosgrimmon
7f8e796fae
[Sprite] Shiny Galarian Darmanitan Standard form using Unovan Zen form sprites (#2755)
* [Sprite] Correct Galarian Darmanitan front sprite

* [Sprite] Correct Galarian Darmanitan back sprite
2024-07-02 10:19:04 -04:00
chaosgrimmon
95c4ed017a
[Sprite] Swap static epic Dudunsparce back names (#2739)
* Rename 982-three-segment_3.png to 982-temp_3.png

temp change to swap non-destructively

* Rename 982_3.png to 982-three-segment_3.png

* Rename 982-temp_3.png to 982_3.png
2024-07-01 11:04:20 -04:00
chaosgrimmon
5e3dcc3ad9
[Sprite] One more Mimikyu Disguised form tag (#2711) 2024-06-29 17:26:42 -04:00
chaosgrimmon
bc94858c40
[Sprite] Fixes Busted Mimikyu variants and icons; Fixes #2683 (#2690)
* [Sprite] Gives Disguised form explicit identifier

`null` defaults to `disguised`, as is desired.

* [Sprite] Renamed Disguised form has exp sprites

* [Sprite] Add Busted Mimikyu to masterlist

* Rename static non-shiny front 778.png to 778-disguised.png

* static non-shiny front

* exp non-shiny front

* static non-shiny back

* exp non-shiny front

* static non-shiny back

* static shiny front

* static shiny front

* non-shiny icon

* exp non-shiny back

* shiny icon

* static var front

* exp non-shiny back

* exp shiny front

* exp shiny front

* exp shiny back

* static shiny back

* exp var front

* static var back

* Delete public/images/pokemon/variant/exp/778_3.png

* Delete public/images/pokemon/variant/exp/778_3.json

* exp shiny back

* exp shiny back

* rare icon

* epic icon

* exp var back

* static var front BUSTED

* static var back BUSTED

* exp var front BUSTED

* exp var back BUSTED

* [Sprite] Static Mimikyu Busted sprite fix

Fixes eyeholes on torso

* [Sprite] Exp Mimikyu sprite fixes

Fixes eyeholes on torsos

* Trim static shiny front sprite size

Addresses issue #2683

* [Sprite] Match static shiny Disguised w non-shiny

Addresses issue #2683
2024-06-29 13:54:02 -04:00
Yonmaru40
59cf02e64b
[localization] Zh_cn type image change (#2639)
* Add files via upload

* Delete public/images/types_zh-CN.png.png

* Add files via upload
2024-06-26 21:33:28 -05:00
chaosgrimmon
f3eeb6abea
[Sprite] Fix variant icons from Gen7 (#2624)
* [Sprite] Remove unused icons from 6v

* [Sprite] Fix variant icons from Gen7

* [Sprite] Compress icons_7v
2024-06-26 16:18:28 -04:00
Amani H
f7f8988cdb
[Item] Add Light Ball, Thick Club, Metal Powder, and Quick Powder (#1899)
* Add Light Ball, Thick Club, and Metal/Quick Powder

* Fix Typo, Account for Fusions

* Fix Errors with Fusions

* Group Items into Generator

* Refactor Generator and Type, Fix Localization (en)

* Adjust Generator, Add Override Type

* Fix Enum Import

* Localize for de, es, fr, it, ko, zh_CN, zh_TW

* Add Unit Tests

* Add Type

* Fix Items Atlas

* Change Cubone Passive Ability, Adjust Weight
2024-06-26 13:48:10 -05:00
Madmadness65
edb4c7e4a2 Add missing shiny icons for legacy UI
This will resolve the error of the graphic being missing when loading the game.
2024-06-25 20:53:06 -05:00
Teju Rajbabu
c8db3bff4c
[QOL] UI Improvement - Shiny Icon (#2372)
* Test changes to change variant label color based on Tint

* Revert "Test changes to change variant label"

This reverts commit 0ad0f62930.

* minimal recovery changes

* Finalized recovery and implemented ShinyIcon

* add setY in MockSprite

* added back some unintentional removed code

* added shiny_icons

* Initial test for tier change

* implemented Shiny Icon full functionality

* slight setY change for non-Base starters
2024-06-25 13:48:48 -04:00
chaosgrimmon
92791ae27a
[Sprite] Compress Mega Gyarados Palette (#2586)
* [Sprite] Compress Mega Gyarados Common Palette

* [Sprite] Compress Mega Gyarados Variant Palette

* [Sprite] Compress Mega Gyarados Default Palette
2024-06-25 10:12:35 -04:00
Amani H
136652caa9
[Item] Implement Eviolite Behavior (#2161)
* Add Eviolite with Unit Tests

* Localize for de, es, fr, it, ko, zh_CN, zh_TW

* Adjust German Localization

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

* Adjust Italian Localization

* Change Multiplier Type

* Adjust Unit Test Import

* Change Constructor

* Make Unit Tests Localized

* Comment Out of Reward Pool

---------

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
2024-06-24 21:00:59 -05:00
Matthew
d2f4c5b59c
[UI] UI Small Adjustments (#2525)
* UI Small Adjustments

* Fix Unit Tests

* Null check event display before clear

* better empty move placeholder debug name
2024-06-23 12:09:23 -04:00
chaosgrimmon
d32119f921
[Sprite] Reposition Glameow Animation Frames (#2502)
* [Sprite] Glameow Front

Taken from 2f17903d30/public/images/pokemon

* [Sprite] Shiny Glameow Front

Taken from 2f17903d30/public/images/pokemon/shiny

* [Sprite] Shiny Glameow Back

Taken from 2f17903d30/public/images/pokemon/back/shiny

* [Sprite] Glameow Back

Taken from 2f17903d30/public/images/pokemon/back
2024-06-22 10:03:03 -04:00
Matthew
f016e2dbca
fix type sprites displaying wrong for languages with a hyphen (#2454) 2024-06-20 09:59:30 -04:00
Matthew
3d9b134332
[UI] Update Challenge UI (#2393)
* Update Challenge UI

* Update interpolation and localization

* Update src/locales/de/challenges.ts

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

* Update src/locales/de/challenges.ts

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

---------

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
2024-06-19 20:40:08 +01:00
Frederico Santos
ee5d689575 feat: Add Google and Discord login functionality
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
2024-06-19 17:31:56 +01:00
chaosgrimmon
2a2cb41130
[Bug] Prevent Variant Mega Blastoise Crashes (#2401)
* [Sprite] Temporary Front Exp Mega Blastoise Variants

* [Sprite] Temporary Back Exp Mega Blastoise Variants
2024-06-19 09:45:21 -04:00
chaosgrimmon
2ef376e4df
[Sprite] Opaque pixels on exp shiny Mimikyu (#2345)
* [Sprite] Opaque pixels on exp shiny Mimikyu

* [Sprite] Opaque pixels on exp back shiny Mimikyu
2024-06-17 13:24:57 -04:00
chaosgrimmon
4e8a2e87d2
[Sprite] Replace Togedemaru Animation Datafiles (#2255)
* [Sprite] Replace Exp front Togedemaru .json

animation stretched 11% upon artist request: https://discord.com/channels/1125469663833370665/1229465263532019712/1251422382745325609

* [Sprite] Replace exp back Togedemaru .json

taken from exp/back/shiny/777.json

* [Sprite] Extend exp front shiny Togedemaru .json

animation stretched 11% upon artist request: https://discord.com/channels/1125469663833370665/1229465263532019712/1251422382745325609
2024-06-15 12:14:59 -04:00
Matthew
fc73a26372
[Bug] Fixed Alolan Persian Animations (#2236)
* Fixed Alolan Persian Animations

* Update Masterlist
2024-06-14 20:15:00 -04:00
Matthew
709cf00451
Remove Unneeded Icons (#2207) 2024-06-14 17:23:02 -04:00
chaosgrimmon
fd3c0cdb3e
[Sprite] Fix Cursola mixed animation spritesheets (#2204)
* [Sprite] Give shiny Cursola fixed spritesheet

Replaced with the correct base shiny, which has purple eyes

* [Sprite] Revert exp nonshiny Cursola replacement 

Taken from https://raw.githubusercontent.com/pagefaultgames/pokerogue/b1704781192697a8042c0dc4e1098f242706cacf/public/images/pokemon/exp/864.png
2024-06-14 16:50:09 -04:00
Matthew Olker
dcf66eee03 remove ZoneIdentifier files 2024-06-14 12:55:05 -04:00
Matthew Olker
02d5654be4 Pride Update 2024-06-14 12:42:37 -04:00
chaosgrimmon
5bdc6537e0
[Bug] Fix Animation for Variant Exp Meadow Vivillon (#2195)
* [Bug] Epic Drifblim using Drifloon sprite

* [Bug] Give Vivillon-Meadow appropriate Animation Frames

Taken from 666-fancy_2.json

* [Bug] Give Vivillon-Meadow appropriate Animation Frames

Taken from 666-fancy_2.json
2024-06-13 22:26:10 -04:00
Ei
e336466cc9
[Bug] Fixed the extra pixels in plains_bg (#2154) 2024-06-12 19:19:38 -04:00
Greenlamp2
8af02ff2dc
deleted palete unused in masterlist to fix tests (#2065) 2024-06-11 03:36:21 +02:00
Madmadness65
32d222c9cd
Implement Arceus Plates and Silvally Memories (#1195)
* Implement Arceus Plates and Silvally Memories

* German localization for items

* Run linter on changes, add items to zh_TW localization

* linter cleanup

* Finish localization for other languages

Names for items sourced from Bulbapedia. Names for the items in Portuguese could not be reliably sourced, so they were as directly translated as possible.

* Add custom Blank Memory item

Currently does nothing, but the idea is that it would be used if the all-in-one form change item idea is followed through.

* Update item atlas

* Use move.type instead of type.value

The type effectiveness now works again.

* Update comments

* Fix type changing affecting only Silvally

* Condense switch cases down to a single line

As per Brain Frog's suggestion.
2024-06-10 09:58:34 -04:00
Tempoanon
f6ad30b58f
[Feature] Add evil teams assets (#1577)
* Fix tinted caught icon false positive

* Remove unused import

* Rename and optimize

* Block comment

* Draft of evil team grunt pokemon pools

* Add graphics and music

* Add grunt spawn logic

* Add Giovanni

* Add team leader graphics

Giovanni and Ghetsis already have sprites, so they do not need added.

* Add teams for other evil team bosses

* Fix some typos and change hp bars to 2/2/2

* Fix sprites and add random team boss

* Add forced grunt encounter and update dialogue

* Update locales

* also lint en trainers

* More merge conflicts

* Deleted some duplicate images

* Correctly renamed the grunt files

* Forgot about team rocket

* New Magma Sprites

* Adjusted the trimming. Now they dont have as huge of a shadow bbelow them

* Fix grunt sprites

* Add real dialogue

* German Localization of the Dialogue

* Changes

* Tweak waves grunts spawn on

* Fix some typos in dialogue

* Y is canon

* Disable evil team spawns

* Fix another merge conflict

---------

Co-authored-by: Madmadness65 <blaze.the.fireman@gmail.com>
Co-authored-by: Jannik Tappert <tappertjannik@googlemail.com>
2024-06-09 19:02:29 -04:00
Matthew
ce3a9c9c87
artist request base shiny revert (#1980) 2024-06-09 12:28:56 +10:00
Madmadness65
a224f5e822 Add Partner Pikachu & Eevee party icons
This also necessitated giving them unique front & back sprites too, even if they are currently just duplicates of the normal forms. This change will help players identify when they are using/have encountered a Partner Pikachu or Eevee.
2024-06-07 13:58:48 -05:00
MadridPawmot
f3de114d2b
[enhancement] Added Sailor trainer class (#1411)
* Add files via upload

* Update trainer-type.ts

* Update biomes.ts

* Update trainer-config.ts

* Update trainer-names.ts

* Update trainer-names.ts

* Update trainers.ts

* Update trainers.ts

* Added German translation

Thanks to CodeTappert

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts to resolve conflicts

* Fixed syntax error

* Update biomes.ts

* Re-added possible biomes for the Sailor trainer class

* Added data for dialogue lines for the sailor class

* Added dialogue from FRLG

* Added locale

* Added locale

* Added locale

* Update trainers.ts

* Added locale

* Added locale

* Added Korean translation

* Added locale

* Added Portuguese translation

* Added locale

* Added locale

* Added Mandarin Chinese translation

* Added Cantonese Chinese translation

* Added images

* Recentered sprite

* Added Spanish translation for the dialogue

* Delete duplicate

* Delete duplicate

* Updated dialogue with requested changes

* Update Spanish translation to reflect the changes

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts
2024-06-06 11:55:32 -05:00
MrWaterT
ba66f2c916
[Bug] Remove text on summary bg (#1709) 2024-06-06 11:31:31 -04:00
Benjamin Odom
5e52be676f
[QoL] Add Time of Day Widget to Arena Flyout (#1846)
* Time of Day Sample

* Add Proper Time of Day Tracking

* Add Settings
2024-06-05 22:57:55 -05:00
chaosgrimmon
7da8bdfdb6
[Bug] Epic Drifblim using Drifloon sprite (#1788) 2024-06-04 09:26:03 -04:00
Benjamin Odom
98cff12fd1
[QoL] Add Arena Info Flyout for Weather, Terrain, etc. (#1734)
* Initial Commit

* Add Time of Day Icons and Remove Fight UI Dependancy

* Rename to Match

* Update battle-scene.ts

* Add Settings

* Add Comments
2024-06-03 21:18:09 -05:00
chaosgrimmon
eddc6d73bf
[Bug] Fix undesired opaque pixels (#1719) 2024-06-02 09:41:05 -05:00
chaosgrimmon
59b1e58507
[Bug] Female variant Rhyhorn line missing .json palette [#1681] (#1718)
* [Bug] Female variant Rhyperior missing .json palette

Adds the missing variant back palette map. Taken from the male variant back.

* [Bug] Female variant Rhyperior missing .json palette

Adds the missing variant front palette map. Taken from the male variant.

* [Bug] Female variant Rhydon line missing .json palette 

Lets the game know that variants, both front and back, for Rhydon, Rhyhorn, and Rhyperior exist.

* [Bug] Female variant Rhydon, Rhyperior missing .json palette 

Adds the missing variant front palette maps. Taken from the male variants.

* [Bug] Female variant Rhydon, Rhyperior missing .json palette 

Adds the missing variant back palette maps. Taken from the male variant backs.
2024-06-02 09:40:37 -05:00
chaosgrimmon
289b42441f
[Bug] Add variant Larvesta icons (#1717)
* [Bug] Add variant Larvesta icons

The game wants them in pokemon_cons_5v.json, where they are currently not. All Solosis and Tympole_3 sprites placements adjusted for adequate spacing.

* [Bug] Add variant Larvesta icons 

Adds the icons to the spritesheet, and moves around some other icons for optimal use of space and spacing.
2024-06-02 09:39:01 -05:00
Greenlamp2
060b1b2ccc
Menu - Controls Rebind - Gamepad & Keyboard (Cleaner git log) (#1666)
* squased merge rebind_menu

* azerty to qwerty

* add a check to preven a crash in firefox

* reset navigation menu on quit

* removed dual lock mekanism

* navigation display update icons on new bind

* added submit binding

* removed attribute no longer used

* change protected to abstract

* remove last bind protection since action and cancel are protected + renamed default controller to controller

* removed default alt qwerty keys in config

* fix some errors for doc

* fix tests

* fix some more errors for docs

* fix some more errors for docs final ?

* added alt bind for menu navigation + update icons on delete/home
2024-06-01 13:56:32 +01:00
chaosgrimmon
218cf025a3
[Bug] Fix rare shiny Cleffa using default icon (#1642)
* [Bug] Fix rare shiny Cleffa using default icon

Rare shiny Cleffa's icon was showing up as the default colouration, or as shiny Lugia's icon.
This fixes that by adding it to the spritesheet pokemon_icons_2v and its .json, where the console log suggested it should belong.

* [Bug] Fix rare shiny Cleffa using default icon

Rare shiny Cleffa's icon was showing up as the default colouration, or as shiny Lugia's icon.
This fixes that by adding it to the spritesheet pokemon_icons_2v and its .json, where the console log suggested it should belong.
2024-05-31 17:15:41 -05:00
Amani H
e0bc1d8781
[Item] Add Toxic Orb and Flame Orb (#1574)
* Add Toxic Orb and Flame Orb

* Change Weighting Logic & Functions

* Adjust Party Filter during Weighting

* Add Dynamic Weight Ceilings

* Refactor for Performance/Cleanliness

* Adjust Party Filter to Check Status Applicability

* Cover Same & Different Status Cases

* Adjust Full Heal & Restore Weighting

* Cover Unwanted Status Case

* Fix Wrong Status Effect on Reload
2024-05-31 14:31:11 -05:00
MadridPawmot
63a416a65b
[enhancement] Added Firebreather trainer class (#1409)
* Add files via upload

* Update trainer-type.ts

* Update biomes.ts

* Update trainer-config.ts

* Update trainer-names.ts

* Add Spanish localization

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Finished adding placeholder strings for each language

* Updated German translation

Thanks to CodeTappert

* Updated trainer.ts to resolve conflicts

* Update trainers.ts to resolve conflicts

* Update trainers.ts

* Fixed syntax error

* Update dialogue.ts

* Re-added dialogue back

* Added firebreather name string to Korean locale

* Added dialogue string to locale

* Added dialogue string to locale

* Update dialogue.ts

* Added dialogue string to locale

* Added dialogue string to locale

* Added dialogue string to locale

* Added dialogue string to locale

* Added dialogue string to locale

* Added requested changes

* Added requested changes

* Added requested changes

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts

* Finished adding requested changes to locales

* Added requested changes
2024-05-31 14:05:04 -05:00