* 566 567 variant icons and palettes @ bytezor
* Add Archen & Archeops to variant icon atlas
* [554 - 555 + zen ] Variant Implementation
* [626 ] Variant Implementation
* Removal of The base-replacement Genies
* [ 746 ]-[ 746-school ] Implementation
* Variant Palette for 2037-2038
* Variant palette 32-33-34
Plus base fix for front and back 34.
* 645 both forms variant palette
Icons gets pushed at a later date.
* 299 - 476 variant palette
* 299 - 476 _masterlist
somehow mangage to miss this
* Removing 905 who wasnt working correctly
* 422- 421 both forms variant palettes
* 143+ form - 446 variant Palette
* 417 Variant palette
* 498-499-500 variant palette
* 88-89 variant palette
plus the variant json for 500 I missed
* 572 - 573 variant palette.
found another lose one that should be pushed lmao
* 187-188-189 Variant palette
* 871 variant palette
* 780 Variant palette
* 331 332 + female variant palette
* 782-783-784 variant palette
transfer to consistent sprite set. removal of exp. due to statics not lining up.
* 2038 json adjustments on breaking
* 204 205 variant palette
* [Bug][UI/UX] Fix type hint after enemy disappears (#5677)
* Fix type hint after enemy disappears
* Add automated test for type hint bugfix
* Make onField default to true
* Replace reference to Mode with UiMode and battleType with BattleStyle
* [Bug] Fix Login Screen Buttons can be Pressed While Animating (#5170)
* destroy containers when processing external containers
* make form buttons uninteractible until tweens finished instead
* fix holding enter spam
* fix conflicts
* [Balance] Update Gym Leader Teams and Teras (#5670)
* Update Gym Leader Teams
* Set Tera slots for Gym Leaders
* Change Giovanni's Specialty Type to Ground
---
Co-authored-by: damocleas <damocleas25@gmail.com>
* [Bug] Properly handle suppression with Illusion (#5671)
* Remove extra attributes on neutralizing gas
* Add IllusionBreakAbAttr to applyOnLose
* Add test case
* [Bug] Fix order of operations when displaying enemy Boss level (#5685)
* order of operations in creating boss battleInfo
fixed a bug where because of an order of operations error in this file it ignored the position update of the boss life value set in battle-info.ts (around line 562)
* [Dev] Fix imports in `overrides.ts` and `illusion.test.ts` (#5686)
* applin familly variant palette
* 522 523 variant palette
* 403 404 405 variant palette
* 511 512 515 516 variant palette
masterlist have code for 513 514 but fixes was broken add will be added once fixed
* 313 314 variant palettes
plus disabaling Landorus and other 2.
* 692 693 Variant palette.
* 535 536 537 variant palette
fixing up mess found in masterlist json and the masterlist inclusion of 692 693
* 207 female variants palette
plus adjustments of gliscor color to have better contrats.
* 325 326 variant palette
* 345 346 variant palette
* Adding all variant Icons
to the correct folder under variant icons.
* Removal of Variant files triggering errors for sprite test
these arent going to be implemented at this time due to the other 3 not being ready.
* File adjustment
the animation adjsutment for 750 to make the neck look less like a block.
fixing the line issue that appeared in 523 back sprite
* fixing the variant break for 572 573
* 513 514 variant palette
been fully fix and is not working
* 396 397 398 variant palette
* fixing back variant palette and fix for 554
* fixing the missing files for 692 and 693
* Updated masterlist
* fix flagging issue
* Update all Pokemon variant icon atlases
Fixed incorrectly sized Bouffalant icons, re-exported gen 5 icon atlas as it had broken graphics in it
* Last Gen 5 icons
* Export gen 5 variant icon atlas
* 643 644 646 + form variant palette
---------
Co-authored-by: Madmadness65 <blaze.the.fireman@gmail.com>
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Co-authored-by: Chris <75648912+ChrisLolz@users.noreply.github.com>
Co-authored-by: Blitzy <118096277+Blitz425@users.noreply.github.com>
Co-authored-by: damocleas <damocleas25@gmail.com>
Co-authored-by: Dean <69436131+emdeann@users.noreply.github.com>
Co-authored-by: zaccie <zaccie.adams@gmail.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Move exp to its own masterlist, simplify initVariantData
* Update test/sprites/pokemonSprite.test.ts
* Extract loadPokemonVariantAssets out of BattleScene
* move variant.ts and update pokemon.loadAssets
* Add fuzzy matching for applying variant recolors
* Move glsl shaders to their own files
* Remove extra variants from shader masterlist
Their exp sprites have since been removed.
Co-authored-by: Unicorn_Power <189861924+Unicornpowerstar@users.noreply.github.com>
* Make exp sprite keys a set instead of an array
* Remove outdated exp sprite jsons
Co-authored-by: Unicorn_Power <189861924+Unicornpowerstar@users.noreply.github.com>
---------
Co-authored-by: Unicorn_Power <189861924+Unicornpowerstar@users.noreply.github.com>
* 749-750 animation updated.
* Fix the animation json error plus missing files.
back shiny had placement issues and needed to be redone and i forgot to include the static updates.
* Remove the code that got merged by accident again
* Wishiwashi and schooling animations 746
* 728-729-730 Animation implementation
also Variant compatibility
* Final touch ups for 728-729-730
* Yes...... another undo redo
* 2037-2038 Alolan vulpix line animations
plus the Primarina back exp I show how missed
* 2074-2075-2076- animations
plus fixing the back shiny vulpix sprite not working correctly
* 2088-2089 animation and variant support.
* Fixing the base shiny 730
* 780 animation update
* Variant json and deletion of the pngs
* Variant color adjustment
adjusted some color that werent mapped correctly.
adjusted some colors due to contrast issues
* Fixing the reason sprite test kept failing.
.....669
* [Sprite] Vivillion back exp change and scuff fix
scuff is the incorrect labeling in the exp-sprite.json.
fully updated meadow pattern.
all incorrect labeled back sprites are no more a thing.
* fix the last issues with Shiny exp backs
* Last adjustment for the future variant Pr
added 1 color
* 718 and 718-10 exp change and removal of experimental
* 719 exp change and removal of exp
* 362-mega exp change
* 248-mega exp change
* Fix missing pixels on 248-mega back-exp
* screwing up the master.json to properly commit it
Somehow its ignoring the master.json changes when checking mega tyranitar
* Reverted the screw up on Master.json
Trying to fix so test check the correct files and not look for a png that dont exists
* update the exp-sprites.json
after Kev gave me the Info I needed I did this
* fix it and pokemonSprites text is passing
* Final Adjustment for the colors regarding 248-mega.
Adjusted the colors so that it would GLOW and not become darker.
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* 653-654 exp change
* 656 exp change
* 664-665 + 663 exp change.
Will need to remove Exp need in the future
* 714 exp change and removal of Experimental need
Its a better improved version of what we already had all around.
* 656 exp change + static change
Undoing the smiling froakie sadge
* 715 files and base fix
I fix the sprite bug that has been around for the longest time. HELL YEAH
* Finishing touches to 654 variants
Gave Braxien tier 2 and tier 3 custom fire color matching the variants for contrast.
* 707 Klefki animation change and removal of experimental need
Animation is high enough quality plus personality for the pokemon that there wont be a need to try and make 1 better. this is the best animation for klefki
* 704-705 change of exp + 707 Experimental removal
* +707
fix a Json over sight and now are displaying properly
* 708 animation change and removal of Experimental need
Phantump's animation quality is already top notch and dont need to stay in exp prison
* 692-693 exp change
* [Sprite][Color] Fixing Issues with the 658-ash.json to display sprite correctly
- Fix colors not being shown correctly in the json.
- Said fix are adding a new entry to separate the whites that are F8f8f8 by adding f4f4f4
- Changed the wrong color into the correct one on the rare.
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Trim 688.json duration
* Trim 688.json duration
* Fix cut off Binacle back
* Fix cut off shiny Binacle back
* Bump version
* Bump version
* Revert cutting off hair
* Revert cutting off hair
* Remove trailing comma
* Remove trailing comma
* [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
* 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
* [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.
* 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>
