Commit Graph

553 Commits

Author SHA1 Message Date
Fuad Ali
da41e94451
Merge 8c01e0264d into 4b70fab608 2025-06-20 00:00:13 -04:00
NightKev
560ebbaee2 Merge branch 'beta' into minor-1.9.6 2025-06-18 18:27:37 -07:00
AJ Fontaine
663e047af8
[Event] W event (#6006)
W event
2025-06-18 19:52:40 -04:00
AJ Fontaine
80ae42d3ba
[Sprite] Minior and Ferrothorn variants (#6005)
* Minior variants

* Add Ferrothorn variants

* Fix shiny Minior front and icons
2025-06-18 19:49:21 -04:00
AJ Fontaine
59a00e0af3
[Sprite] Fix Appletun variants (#6003)
Fix Appletun variants
2025-06-17 23:54:58 -04:00
Fuad Ali
2264a28300 Implement Creeping Fog Mystery Encounter Feature
This Mystery Encounter is a random event that can
occur from wave 50 and above that causes a fog
to appear covering the screen and a wild pokemon
to be hidden underneath it. The player when
facing this encounter may choose one of four
options which includes fighting, using a light
based move or ability to light the way, using a
defog move or ability to clear the fog, or
waiting for the fog to thin out. Depending on
your choice the player might be granted more
experience and better rewards.
The pokemon encountered changes dynamically with
the biome and stage level that the Mystery
Encounter occurs. Changes made:
- Implemented new mystery encounter called
  "Creeping Fog" ("creeping-fog-encounter.ts")
  and added a new corresponding weather type
  called "Heavy Fog" ("weather.ts").
- Updated corresponding weather functions
  and fog affected pokemon functions.
  ("move.ts", "pokemon-forms.ts", "ability.ts",
  "pokemon-evolutions.ts").
- Created new Fog Overlay for the mystery
  encounter ("fog-overlay.ts").
- Created new item called "Micle Berry" to
  grant perfect accuracy ("modifier-type.ts").
- Created Mystery Encounter Creeping Fog unit
  test ("creeping-fog-encounter.test.ts").
- Created new Mystery Encounter Light and Defog
  moves and abilities requirements
  ("requirements-groups.ts").
Signed-off-by: Fuad Ali <fuad.ali@tecnico.ulisboa.pt>
Co-authored-by: Matilde Simões <matilde.simoes@tecnico.ulisboa.pt>
2025-06-12 21:33:59 +01:00
Lugiad
f499ea0568
[UI/UX] [Localization] Type icons corrections (#5952)
* Updated both Spanish type icons

* Update Brazilian Portuguese type icons

* Update Catalan type icons

* Update Traditional Chinese type icons

* Update Turkish type icons

* Update Russian type icons

* Update Catalan type icons

* Delete error

* Update Russian type icon

* Update Russian type icons
2025-06-11 04:44:30 +00:00
SmhMyHead
0336858708
[UI/UX] Legendary UP Gacha timer (#5921)
* [UI/UIX] Legendary UP Gacha timer

* Update egg-gacha-ui-handler.ts

Seems "fixedInt" was needed on the delay of the playTimeTimer so the game speed doesn't affect it.

* New timer container by damocleas.

* gacha_legendary.png second version from @damocleas

* Use phaser object chaining methods

---------

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-06-06 21:20:02 +00:00
Lugiad
ccd9480240
[Localization] Secondary pending languages inclusion (#5903)
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Update mysterious-chest-dialogue.json

* Update mysterious-chest-dialogue.json

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Update i18n.ts

* Update settings.ts

* Update settings-display-ui-handler.ts

* Update starter-select-ui-handler.ts

* Update i18n.ts

* Update i18n.ts

* Update settings.ts

* Update settings-display-ui-handler.ts

* Update i18n.ts

* Update starter-select-ui-handler.ts

* Update utils.ts

* Update utils.ts

* Add files via upload

* Rename statuses_dk.json to statuses_da.json

* Update statuses_da.json

* Update and rename types_dk.json to types_da.json

* Rename statuses_dk.png to statuses_da.png

* Rename types_dk.png to types_da.png

* Delete src/locales/dk directory

* Add files via upload

* Apply suggestions from code review

* Delete src/locales/da directory

* Delete src/locales/tr directory

* Update i18n.ts

* Update i18n.ts

* Update utils.ts

* Main -> Beta (1.1.6) (#4751)

* Comment out startGame call on manifest fetch failure

* [Hotfix] Fix status damage triggering before berry usage (#4732)

* [Hotfix] Fix Eternatus egg tier (#4734)

* [Hotfix] Fix manifest getting loaded before the game is initialized (#4739)

* fix locales path for offline builds (#4739)

* [Sprite] Hotfix cut off Binacle sprite (#4741)

* [Sprite][hotfix] Fixed cropping on 658 static greninja and ash greninja (#4743)

* [Sprite][hotfix] Fixed cropping on static greninja and ash greninja

* [Hotfix] Fix crash when Mist would block a stat drop (#4746)

---------

Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
Co-authored-by: PigeonBar <56974298+PigeonBar@users.noreply.github.com>
Co-authored-by: chaosgrimmon <31082757+chaosgrimmon@users.noreply.github.com>
Co-authored-by: pom-eranian <lrlrliwoo@gmail.com>

* Update settings-display-ui-handler.ts

* Delete src/utils.ts

* Update common.ts

* Delete src/utils.ts

* Update common.ts

* Romanian workspace (#25)

* Russian workspace (#26)

* Update settings-display-ui-handler.ts

* Update settings-display-ui-handler.ts

* Update settings.ts

* Update settings-display-ui-handler.ts

* Update i18n.ts

* Update settings.ts

* Update settings-display-ui-handler.ts

* Update common.ts

* Update and rename statuses_ca-ES.json to statuses_ca.json

* Update and rename types_ca-ES.json to types_ca.json

* Add files via upload

* Delete public/images/statuses_ca-ES.png

* Delete public/images/types_ca-ES.png

* Update locales submodule

---------

Co-authored-by: Moka <54149968+MokaStitcher@users.noreply.github.com>
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
Co-authored-by: PigeonBar <56974298+PigeonBar@users.noreply.github.com>
Co-authored-by: chaosgrimmon <31082757+chaosgrimmon@users.noreply.github.com>
Co-authored-by: pom-eranian <lrlrliwoo@gmail.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-05-30 23:54:17 +00:00
damocleas
eb0937a09b
Hotfix 1.9.5 to Beta
Hotfix 1.9.5 to beta
2025-05-27 23:57:16 -04:00
AJ Fontaine
8410aee3a1 [Sprite] Fix Cacturne and Kyurem variants 2025-05-27 03:34:02 -07:00
pom-eranian
da6cdaf187
[Sprite][Color][QoL] Removed unchanged entries in variant json (#5765)
* Removed unchanged color entries (front)

* Removed unchanged color entries (back)

* Removed unchanged color entries (exp)

* Removed unchanged color entries (exp back)

* Removed unchanged color entries (female front, back, exp)
2025-05-22 03:25:07 +00:00
Madmadness65
ebac2d1126
[Sprite] [P3 Bug] Fix Wishiwashi's shadow appearing broken (#5815)
Fix Wishiwashi's shadow appearing broken

Cropped all of Wishiwashi-solo's frames from 96x96 to 50x50, then re-exported the atlases. This fixed the shadows appearing broken in the animation.
2025-05-21 20:38:24 +00:00
AJ Fontaine
3c934808c0
[Sprite] Fix T1 shiny Eternatus not animating in consistent, remove unused exp for Giratina Origin (#5802)
Remove Origin Giratina exp, fix consistent shiny Etern

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-05-21 03:42:17 +00:00
AJ Fontaine
b42b2f6752
[Test] Fix sprite test due to unused files (#5783)
Fix sprite test due to unused files
2025-05-05 20:38:49 -04:00
AJ Fontaine
92f1cfdd50
[Hotfix] Remove Charcadet line from exp variant masterlist (#5782)
* Remove Charcadet line from exp variant masterlist

* Remove line's backsprite from masterlist
2025-05-05 18:34:17 -04:00
AJ Fontaine
bd913a201c
[Sprite] Fix Clauncher consistent variants, floating Jangmo-o (#5777)
Fix Clauncher consistent variants, flying Jangmo-o
2025-05-05 17:18:24 -04:00
damocleas
fa774268ca
Add files via upload 2025-05-04 10:36:57 -04:00
damocleas
9e433c85a9
Add missing zh-CN Spring Banner 2025-05-03 23:19:18 -04:00
Madmadness65
3cb3fd15ec
[Sprite] Add missing variant icons, fix misnamed variant icons (#5751)
Add missing variant icons, fix misnamed variant icons
2025-05-03 01:50:23 +00:00
damocleas
fa86ea3214
[Misc] Spring Stuff (#5742)
* Update timed-event-manager.ts

* spr25 images

* Update the-pokemon-salesman-encounter.ts rolls
2025-05-01 22:54:59 -04:00
Unicorn_Power
bee06410dd
[Sprite] Variant Spring Implementation (#5483)
* 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>
2025-05-01 20:12:57 -04:00
Madmadness65
a81cac547b
[Sprite] Update Mystical Rock sprite with smaller variant (#5734)
Update Mystical Rock sprite with smaller variant

Co-authored-by: damocleas <damocleas25@gmail.com>
2025-05-01 14:15:36 -04:00
AndrewErting
42f291eab3
[Bug] [UI/UX] Make , . / and \ Bindable Keys (#5707)
Added , . / and \ to the key atlas, json mapping, and cfg_keyboard_qwerty.ts
2025-04-26 01:34:57 +00:00
Sirz Benjie
787feceb14
[Refactor] Refactor variant sprite code part 1 (#5592)
* 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>
2025-04-09 10:43:05 -05:00
Unicorn_Power
a7394130a7
(Beta) Undoing the Pika-etern stuff (#5615) 2025-04-02 17:21:04 -04:00
Unicorn_Power
16bce25333
Pika-e (#5597) 2025-04-01 00:39:54 +02:00
NightKev
efa3662099
[Misc] AFD Event (#5596)
* global timed event manager

* more

* Music change

* Add AFD track loop points

* Add AFD music tracks

* changed music for afd

* Enable Seasonal Splash Text, adjust event values

* Add daily run challenge support

* update event date, change trainer shiny chance to 20%

* add banners lol

* fix activeeventhasbanner function

* Fix banner

* Update locales submodule

---------

Co-authored-by: AJ Fontaine <fontbane@gmail.com>
Co-authored-by: damocleas <damocleas25@gmail.com>
Co-authored-by: Madmadness65 <59298170+Madmadness65@users.noreply.github.com>
Co-authored-by: Dean <me@deann.dev>
Co-authored-by: AJ Fontaine <36677462+Fontbane@users.noreply.github.com>
2025-03-31 15:11:01 -07:00
Lugiad
111390631d
[Localization] LATAM Spanish inclusion (#5582)
* Update i18n.ts

* Update settings.ts

* Update settings-display-ui-handler.ts

* Update starter-select-ui-handler.ts

* Update utils.ts

* Add files via upload

* Update i18n.ts

* Add files via upload

* Update loading-scene.ts

---------

Co-authored-by: Dean <69436131+emdeann@users.noreply.github.com>
2025-03-30 19:29:28 +00:00
Unicorn_Power
2ad030ec16
[Sprite] Animation updated for gen 7 batch 1 (#5558)
* 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
2025-03-30 01:57:15 +00:00
Unicorn_Power
4a560d7185
[Sprite] Reduce Mystical Rock sprite's size (#5570)
* Updating the size to be smaller

* Update item atlas

* Fix Malicious Armor missing outline

Noticed when exporting atlas that the item sprite broke

---------

Co-authored-by: Madmadness65 <blaze.the.fireman@gmail.com>
Co-authored-by: damocleas <damocleas25@gmail.com>
2025-03-28 19:02:47 -04:00
Unicorn_Power
0b1f324f97
[Sprite] [Item] Weather/Terrain Extender Item Sprite (#5542)
* Terrain/weather-extender item

* Fixing indexing for the sprite atlas

* Re-export item atlas, fix extender item's name

Spaces in names use underscores instead of hyphens

---------

Co-authored-by: Madmadness65 <blaze.the.fireman@gmail.com>
2025-03-26 21:47:16 -04:00
Lugiad
f78015d757
[Localization] Catalan reactivation (#5555)
* Add files via upload

* Update settings.ts

* Add files via upload

* Add files via upload

* Update starter-select-ui-handler.ts

* Update utils.ts with Catalan

* Update loading-scene.ts
2025-03-25 13:06:24 -07:00
NightKev
4e1ee9e50b
Revert "[Enhancement] Add form changes for Solgaleo, Lunala, & Marshadow cosmetic forms" (#5512) 2025-03-13 22:32:35 +01:00
Madmadness65
f3f43f4a44
[Enhancement] Add form changes for Solgaleo, Lunala, & Marshadow cosmetic forms (#5344) 2025-03-12 01:00:33 -04:00
MascaChapas27
572556b7b9
[UI/UX] Changed wrong colors in german type icons (#5494)
Co-authored-by: Ángel <odiopds@yahoo.az>
Co-authored-by: damocleas <damocleas25@gmail.com>
2025-03-10 12:59:19 +01:00
Unicorn_Power
9544973f1f
[Sprite] Gmax animation implementation + Palkia-Origin fix (#5468) 2025-03-05 14:05:59 -08:00
Lugiad
c890b7ae46
[Localization] [UI/UX] Added Spanish status icons (#5481) 2025-03-05 21:44:29 +01:00
Xavion3
9ff20af8b7
[UI] Make fight cursor tera icon while tera-ing (#5402)
Co-authored-by: damocleas <damocleas25@gmail.com>
Co-authored-by: Madmadness65 <blaze.the.fireman@gmail.com>
2025-02-27 23:13:35 +01:00
Unicorn_Power
f902716837
[Sprite] Froakie static scuff (#5434) 2025-02-27 19:05:37 +00:00
Lugiad
32ae72150f
Pokémon Day 2025 Event banners (#5432) 2025-02-27 12:59:33 -06:00
Unicorn_Power
d11f02aa3d
[Sprite] Variant json and deletion of the pngs for Vivillon-666 (#5408)
* 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
2025-02-25 06:54:24 -08:00
Unicorn_Power
1c192d434b
[Sprite] 666-Vivillion back exp change and scuff fix (#5382)
* [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
2025-02-24 10:44:41 -05:00
Lugiad
3a4c8eb92e
[UX/UI] [Localization] Summary removed Lv and ID No. as image texts (#5361)
* summary-ui-handler.ts Lv. and ID No. Text

* Remove Lv and ID No.

* Remove Lv and ID No.
2025-02-21 02:08:48 +11:00
Unicorn_Power
5fa77b7177
[Sprite][Exp First batch of exp change (#5231)
* [Sprite][Exp change] Gen 6 - Gen 7

* Sylveon new exp

* 702 Dedenne

* 712-713 exp changes
2025-02-17 20:32:17 -06:00
Unicorn_Power
fd066ac9b2
[Sprite]Batch 5 exp change (#5243)
* 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>
2025-02-17 20:27:19 -06:00
Unicorn_Power
3018a747bd
DuskNoir sprite fix and base sprite fix (#5338) 2025-02-17 20:26:36 -06:00
Unicorn_Power
62bacf52a7
[Sprite] Batch 6 exp change last for Gen 6 (#5248)
* 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.
2025-02-17 20:24:05 -06:00
AJ Fontaine
c7ee0173f6
Fix Impidimp front Arctozolt back variants (#5342) 2025-02-17 20:23:10 -06:00
Unicorn_Power
a8bf385899
[Sprite]Batch 3 of exp changes (#5232)
* Pancham-exp change

* 698 -Exp change and undo experimental need

* 703.exp change and undo experimental

* 694-exp and removal of experimental

* 698-fixing missing pixels and removing uneeded files
2025-02-17 19:52:43 -06:00