Commit Graph

520 Commits

Author SHA1 Message Date
ImperialSympathizer
24641136e0 resolve dialogue merge conflicts 2024-08-26 14:01:30 -04:00
chaosgrimmon
451307a7d8
Merge pull request #3732 from pom-eranian/variant_png_to_json
[Sprite] Variant Fixes and Images Converted to Color Swap JSON
2024-08-25 13:43:09 -04:00
Mumble
933cfcbad3
[Refactor][QoL] Game Audio + New Settings (#3527)
* Changed how non-BGM are loaded into the game + moved into directories

* some leftovers

* Apply suggestions from code review

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

* Added setting for Field Volume + rewrote playSound() and updateSoundVolume() functions to reflect the new settings.

* Main -> Beta (#3635)

* Fixed issue with falsy issue within condition to get a stat for IV scanner

* add fix setting code to prevent form/variant bug when default form/variant setting is wrong.
in addition, that fix code include gender fix, so i revert old gender fix.
update wrong log message.

* [Hotfix] Fix Memory Mushroom not showing relearner moves (#3619)

* Fix Memory Mushroom not showing relearner moves

* Fix rollout test

* Rewrite player faint logic in FaintPhase (#3614)

* 867 runerigus sprite (#3629)

cropped static frames, fixed cropped sprite
set runerigus exp to use the shiny exp's animation
verified all hex colors are unchanged

- fixed ultra necrozma exp front variant swapped arrays.
- xatu female eye color fix

* [Bug] Preventing the MBH from being stolen in Endless (#3630)

* Endless MBH Fix

* add import

* Revert "add import"

This reverts commit 814a4059c2.

* Revert "Endless MBH Fix"

This reverts commit 8eb4481301.

* removed newline

---------

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

* [Bug] Fix type-hints for immunity (#3620)

* enable mock containers to be found by name

* enable mock text to be found by name

* add test coverage for type-hints

Only for "immunity" and "status moves"

* fix wrong message key of curse(ghost type) (#3631)

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

* [Hotfix] Steal-able Mini Black Hole Pt 2  (#3632)

* Still have no idea where Eternatus is given the MBH....

* typedocs

---------

Co-authored-by: frutescens <info@laptop>

* [Hotfix] Abilities that prevent ATK drops no longer stop other stat drops (#3624)

* Abilities that prevent ATK drops no longer stop other stat drops

* Apply suggestions from code review

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

* Add `isNullOrUndefined()` utility function

---------

* Grip Claw now shows the proper pokemon nickname (#3634)

Co-authored-by: frutescens <info@laptop>

---------

Co-authored-by: Opaque02 <66582645+Opaque02@users.noreply.github.com>
Co-authored-by: KimJeongSun <leo@atlaslabs.ai>
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
Co-authored-by: cam <lrlrliwoo@gmail.com>
Co-authored-by: Mumble <kimjoanne@protonmail.com>
Co-authored-by: frutescens <info@laptop>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com>

* [Bug] Preventing the MBH from being stolen in Endless (#3630)

* Endless MBH Fix

* add import

* Revert "add import"

This reverts commit 814a4059c2.

* Revert "Endless MBH Fix"

This reverts commit 8eb4481301.

* removed newline

---------

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

* [Hotfix] Steal-able Mini Black Hole Pt 2  (#3632)

* Still have no idea where Eternatus is given the MBH....

* typedocs

---------

Co-authored-by: frutescens <info@laptop>

* Deleted phases.ts (#3618)

* Updated sound terms

* Added space for localization

* Update src/locales/ko/settings.ts

Co-authored-by: Enoch <enoch.jwsong@gmail.com>

* Update src/locales/zh_TW/settings.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/pt_BR/settings.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update src/locales/zh_CN/settings.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/de/settings.ts

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

* Update src/locales/ko/settings.ts

Co-authored-by: returntoice <dieandbecome@gmail.com>

* Update src/locales/fr/settings.ts

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

* Update src/locales/it/settings.ts

Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>

* Include sound effects that were loaded in as BGM.

* Removed stray placeholder localization

---------

Co-authored-by: Frutescens <info@laptop>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Opaque02 <66582645+Opaque02@users.noreply.github.com>
Co-authored-by: KimJeongSun <leo@atlaslabs.ai>
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
Co-authored-by: cam <lrlrliwoo@gmail.com>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
2024-08-25 17:40:14 +01:00
pom-eranian
ee8c1625e2 Reverted 935 charcadet values on masterlist 2024-08-24 14:20:23 -04:00
Madmadness65
d15c01378d Minor filename correction
Misspelled "forme".
2024-08-24 13:15:41 -05:00
Madmadness65
208aaf11cd
Add battle music for Legendary Pokémon forms (#3723) 2024-08-24 13:07:11 -05:00
pom-eranian
55cebd84b8 [Sprite]
(_masterlist.json )  Set 472, 469, 751, 970  to use json instead of images.

469 Yanmega - fix & variant convert to json - @rival-kieran
472 Gliscor - fix & variant convert to json - @rival-kieran
751 Dewpider - fix & variant convert to json - @vari
970 Glimmora - fix & variant convert to json - @vari
2024-08-24 13:03:28 -04:00
Mumble
c5a66326dd
[QoL][Feature] Hall of Fame + Run History (#3251)
* Fixed SaveSessionData issue + Added loss details + removed Modifiers

* Final changes

* Updated code with the current repo + mode localization

* Final touches before moving to a clean branch

* Manual merging

* Some more merging + updating

* Fixed import

* TypeDocs issues

* Fixed relevant typedoc issues

* Manual merge

* More fixes

* So many commits for so little

* Localization Updates

* Very barebones implementation of 'favorite' runs - not planning to implement any time soon though

* menu-ui-handler.ts localizations

* Update src/locales/ko/run-history-ui-handler.ts

Thank you!

Co-authored-by: Enoch <enoch.jwsong@gmail.com>

* Update src/locales/de/run-history-ui-handler.ts

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

* Update src/locales/de/menu-ui-handler.ts

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

* The German name for Squirtle is silly

* Fixed Run-Entry Def

* Commented out networking functionality

* Commenting out network functionality pt2

* Update src/locales/pt_BR/menu-ui-handler.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update src/locales/pt_BR/run-history-ui-handler.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update src/locales/ko/menu-ui-handler.ts

Co-authored-by: Enoch <enoch.jwsong@gmail.com>

* Update src/locales/zh_CN/menu-ui-handler.ts

Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>

* Update src/locales/zh_CN/run-history-ui-handler.ts

Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>

* Update src/locales/fr/menu-ui-handler.ts

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

* Update src/locales/fr/run-history-ui-handler.ts

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

* Update src/locales/it/menu-ui-handler.ts

Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>

* Update src/locales/it/run-history-ui-handler.ts

Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>

* Update src/locales/fr/run-history-ui-handler.ts

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

* Update src/locales/de/run-history-ui-handler.ts

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

* Update src/locales/de/run-history-ui-handler.ts

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

* Update src/locales/de/run-history-ui-handler.ts

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

* Fixed SaveSessionData issue + Added loss details + removed Modifiers

* Final changes

* Updated code with the current repo + mode localization

* Final touches before moving to a clean branch

* Manual merging

* Some more merging + updating

* Fixed import

* TypeDocs issues

* Fixed relevant typedoc issues

* Manual merge

* More fixes

* So many commits for so little

* Localization Updates

* Very barebones implementation of 'favorite' runs - not planning to implement any time soon though

* menu-ui-handler.ts localizations

* Update src/locales/ko/run-history-ui-handler.ts

Thank you!

Co-authored-by: Enoch <enoch.jwsong@gmail.com>

* Update src/locales/de/run-history-ui-handler.ts

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

* Update src/locales/de/menu-ui-handler.ts

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

* The German name for Squirtle is silly

* Fixed Run-Entry Def

* Commented out networking functionality

* Commenting out network functionality pt2

* Fixed cursor-close out freeze and replaced hall of fame background

* Removed console.log

* Fixed cursor freeze bug + changed hall of fame background

* cursor freeze bug fix pt 2

* Revert "Disable egg gacha in rewards (#3304)"

This reverts commit 3a87c8657f.

* Merging menu-ui-handler.ts

* Merging phases.ts

* Manual merge for game-data.ts

* Manual merge locales/en/config.ts

* Manual merge of menu-ui-handler.ts

* Manual ui.ts merge

* Update src/locales/fr/run-history-ui-handler.ts

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

* Revert "Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue into runHistoryNew"

This reverts commit 5c6fcf6ec4, reversing
changes made to 751bf4a433.

* Revert "Revert "Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue into runHistoryNew""

This reverts commit f6c3580ad0.

* Added ending art to victorious runs

* Added darker overlay instead

* Hall of Fame art

* Actual BG Images

* some bug fixing

* some bug fixing p2

* some minor changes

* some minor changes

* Changed order of runs displayed to newest --> oldest

* console.log for debugging

* Export/Import Run History function

* added import validation

* Update src/locales/fr/run-history-ui-handler.ts

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

* Felt coder's guilt for bad buttons implementation

* strict-null changes

* New Localizations

* Update src/locales/fr/menu-ui-handler.ts

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

* Apply suggestions from code review

Thank you!

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

* Apply suggestions from code review

run-info-ui-handler comments fix

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

* Update src/locales/es/menu-ui-handler.ts

Co-authored-by: Asdar <asdargmng@gmail.com>

* Update src/locales/es/menu-ui-handler.ts

Co-authored-by: Asdar <asdargmng@gmail.com>

* Update src/locales/es/run-history-ui-handler.ts

Co-authored-by: Asdar <asdargmng@gmail.com>

* Lost this file somehow

* Added do not delete comments

* Apply suggestions from code review

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

* flx Changes

* Localizations

* Fixing Git test issues

* Fixed issues found by Starkrieg

* removed console log

* Fixed cursor bugs

* github pages issue

* Update src/ui/run-info-ui-handler.ts

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

* Update src/ui/run-history-ui-handler.ts

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

* Corrade's comments

* The things I do for Github PAges

* Preventing menu freeze

* Double trainer battles and fresh start challenge

* Update src/locales/fr/run-history-ui-handler.ts

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

* Update src/locales/ko/menu-ui-handler.ts

Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>

* Update src/locales/pt_BR/run-history-ui-handler.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update src/locales/pt_BR/menu-ui-handler.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update src/locales/de/menu-ui-handler.ts

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

* Update src/locales/de/run-history-ui-handler.ts

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

* Update src/locales/it/run-history-ui-handler.ts

Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>

* Update src/locales/it/menu-ui-handler.ts

Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>

* Update src/locales/ko/run-history-ui-handler.ts

Co-authored-by: Enoch <enoch.jwsong@gmail.com>

* Apply suggestions from code review

Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>

* Localizations + Error Message Update

Co-authored-by: protimita <protimitajp@gmail.com>
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

* small fixes

* flx-sta suggestions + Localizations

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

* Update src/locales/it/run-history-ui-handler.ts

Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>

* Added dynamic text positioning based on container size + small fixes

* Thanks Adri1 ! Quick Fix for localizing wave in RunInfo

* Transfered defeat parsing to smaller functions and added page modes

* Update src/locales/fr/run-history-ui-handler.ts

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

* Run History UI handler documentation

* Fixed rival names

* some comments

* Apply suggestions from code review

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: Asdar <asdargmng@gmail.com>
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Finished documentation

* Fixed incorrect rival name handling

* Corrected limit-handling

* Update src/locales/fr/run-history-ui-handler.ts

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

* Cleaned up getrunhistorydata() per flx-sta's suggestions

* Added some override tags?

* Added scopes/override notes to classes/class variables/class functions

* Moved code from phases.ts to game-over-phase.ts

* Fixing game-data whoops

* ughhhhh

* Update src/ui/run-history-ui-handler.ts

Co-authored-by: Adrián T. <99520451+Vassiat@users.noreply.github.com>

* Fixed cursor and updated money. Note - need to fix money handling for Asian languages

* Money appears according to settings

* typedocs blah blah

* cleaning up manage data options

* Final flx fixes + No Run History handling

* Translation update.

---------

Co-authored-by: Frutescens <info@laptop>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Asdar <asdargmng@gmail.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
Co-authored-by: protimita <protimitajp@gmail.com>
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
Co-authored-by: Adrián T. <99520451+Vassiat@users.noreply.github.com>
2024-08-23 19:23:16 +01:00
ImperialSympathizer
5af5992db4 adds teleporting hijinks encounter 2024-08-22 17:39:02 -04:00
ImperialSympathizer
46c053c2ac MEs to pokerogue beta branch 2024-08-22 14:13:58 -04:00
ImperialSympathizer
39c6c375f8 fix ME null checks and unit tests with beta update 2024-08-22 13:03:05 -04:00
sodam
6ea0f3f18b
[Enhancement] Support for special characters(♪.★,♥,♣) in game font (issue#3180) (#3535)
* added  specialCharacters: "♪.★,♥,♣"

* did refactoring...maybe

* added note
2024-08-21 20:32:03 -07:00
chaosgrimmon
34bf932722
[Sprite] Trim exp Rellor palette (#3674)
* [Sprite] Trim exp Rellor palette

* [Sprite] Trim Rellor exp Palette

* [Sprite] Trim Rellor exp palette
2024-08-21 18:48:39 -07:00
chaosgrimmon
6b21a777a1
[Sprite] Index Rookidee, remove stray pixel (#3653)
* [Sprite] Index front static Rookidee

* [Sprite] Index front exp Rookidee

* [Sprite] Index back static Rookidee

* [Sprite] Index shiny front static Rookidee

* [Sprite] Index back exp Rookidee

* [Sprite] Index shiny back static Rookidee

* [Sprite] Index shiny back static Rookidee

* [Sprite] Index shiny back exp Rookidee
2024-08-21 15:27:25 -07:00
ImperialSympathizer
8899fce571 merge main to MEs branch 2024-08-19 21:50:32 -04:00
ImperialSympathizer
8e3f13db43 adds Winstrate Challenge mystery encounter 2024-08-19 10:54:09 -04:00
NightKev
098811c006
Main -> Beta (#3635)
* Fixed issue with falsy issue within condition to get a stat for IV scanner

* add fix setting code to prevent form/variant bug when default form/variant setting is wrong.
in addition, that fix code include gender fix, so i revert old gender fix.
update wrong log message.

* [Hotfix] Fix Memory Mushroom not showing relearner moves (#3619)

* Fix Memory Mushroom not showing relearner moves

* Fix rollout test

* Rewrite player faint logic in FaintPhase (#3614)

* 867 runerigus sprite (#3629)

cropped static frames, fixed cropped sprite
set runerigus exp to use the shiny exp's animation
verified all hex colors are unchanged

- fixed ultra necrozma exp front variant swapped arrays.
- xatu female eye color fix

* [Bug] Preventing the MBH from being stolen in Endless (#3630)

* Endless MBH Fix

* add import

* Revert "add import"

This reverts commit 814a4059c2.

* Revert "Endless MBH Fix"

This reverts commit 8eb4481301.

* removed newline

---------

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

* [Bug] Fix type-hints for immunity (#3620)

* enable mock containers to be found by name

* enable mock text to be found by name

* add test coverage for type-hints

Only for "immunity" and "status moves"

* fix wrong message key of curse(ghost type) (#3631)

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

* [Hotfix] Steal-able Mini Black Hole Pt 2  (#3632)

* Still have no idea where Eternatus is given the MBH....

* typedocs

---------

Co-authored-by: frutescens <info@laptop>

* [Hotfix] Abilities that prevent ATK drops no longer stop other stat drops (#3624)

* Abilities that prevent ATK drops no longer stop other stat drops

* Apply suggestions from code review

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

* Add `isNullOrUndefined()` utility function

---------

* Grip Claw now shows the proper pokemon nickname (#3634)

Co-authored-by: frutescens <info@laptop>

---------

Co-authored-by: Opaque02 <66582645+Opaque02@users.noreply.github.com>
Co-authored-by: KimJeongSun <leo@atlaslabs.ai>
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
Co-authored-by: cam <lrlrliwoo@gmail.com>
Co-authored-by: Mumble <kimjoanne@protonmail.com>
Co-authored-by: frutescens <info@laptop>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com>
2024-08-19 02:18:43 +01:00
cam
c8ed89e186
867 runerigus sprite (#3629)
cropped static frames, fixed cropped sprite
set runerigus exp to use the shiny exp's animation
verified all hex colors are unchanged

- fixed ultra necrozma exp front variant swapped arrays.
- xatu female eye color fix
2024-08-18 19:44:50 +01:00
cam
abced6cf02
[Sprite] Lumineon female spritesheet fix (#3608)
fix from Vari
2024-08-18 04:17:21 +01:00
cam
5f6cb6ce00
[Sprite] Floette animation fix - Xatu female variant fix (#3610)
* 177-178 icons, variant icons

* 178 icons

* [HotFix][Sprite] Xatu female variants added

* [HotFix][Sprite] Floette json: update to match images

* Xatu variant- reverted _masterlist

reverted _masterlist.json
added anim files for both female variants

* [fix] Xatu female: show variants, added back sprite anim

Edited _masterlist on correct keys
added anim json for back sprites
2024-08-18 04:14:25 +01:00
Frederico Santos
193b074608 feat: update 2024-08-17 17:22:36 +01:00
Frederico Santos
06c110e257 feat: Add August Variant Update event banner 2024-08-17 05:33:31 +01:00
chaosgrimmon
0eb1262f40
[Sprite] Add variant icons for Beta 2 (#3586)
* [Sprite] Variant Icons for Beta 2

* [Sprite] Use INDEXED color mode
2024-08-16 22:21:33 +01:00
cam
60b68c936a
[Sprite] Turtwig and Arceus icons (#3579)
fix from @Opaquer on discord
https://discord.com/channels/1125469663833370665/1273029028210671748/1273995744910639246
2024-08-16 22:18:20 +01:00
ImperialSympathizer
6fe16ff0ba Add Weird Dream encounter and slight reworks to Berries Abound/Fight or Flight 2024-08-15 12:47:50 -04:00
Madmadness65
4e74007af6 Remove unused duplicate ribbon sprites
I already excluded them from the item atlas in my previous commit.
2024-08-14 21:33:49 -05:00
Madmadness65
f6d9a11044 Compress item atlas
Also resized the Herb graphics to be 32x32 like the rest of the items.
2024-08-14 20:58:20 -05:00
Matthew
29b441facb
August 2024 Variant Update (#3470) 2024-08-13 22:30:29 +01:00
prime
38ba0c089f
[Pokemon/Form/Item] Ultra Necrozma (#3514)
* Still attempting to merge ultra necrozma

* Added translations from Adri1

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

---------

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
2024-08-13 21:40:16 +01:00
ImperialSympathizer
f90d8b0575 add part timer and dancing lessons encounters 2024-08-11 22:41:22 -04:00
Leo Kim
14b3907b11
[Enhancement] Add favorite filter in Starter UI (#3431)
* add favorite filter. add favorite starter attribute

* add error handling for undefined favorite attribute

* add placeholders in each locales

* add favorite icon from great art team

* update favorite icon to code

* update korean translation

* align icons

* initialize the starter preferences if they don't exist

* update requested changes
2024-08-09 10:32:30 -04:00
Opaque02
9eb57c0c66
[QoL] IV scanner update to hide the prompt and let you see the stats mid battle on the stats screen (#3285)
* IV scanner PR fix

Updated locales to have updated keys for IV scanner in menu

Updated legacy UI to work with IV scanner changes

Updated code to have player and enemy battle stats for ease of use

Updated logic to make the player side work exactly the same as previously since there should be no HP stat shown for players. Also updated the colours so there's no more grey option for unknown stats

Added HP, updated logic and colours. Need to undo changes to player pokemon to not be as squished because of no HP, and need to see what happens for trainers

Fixing up some git errors

Fixed a bug with double battles not updating the pokemon properly

Updated settings to allow for the ability to skip the IV scanning prompts

Adding functionality to IV scanner to skip prompt and see IVs mid battle

* Merged with latest + fixed bug with IV scanner vs pokemon info container getRootSpeciesId being different

* Updated as per merge comment

* Updating to fix comments

* Updated comments

* Update src/locales/fr/settings.ts

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

* Update src/locales/de/settings.ts

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

* Update src/locales/pt_BR/settings.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update src/locales/ko/settings.ts

Co-authored-by: Enoch <enoch.jwsong@gmail.com>

* Update src/locales/zh_CN/settings.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/zh_TW/settings.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Updating text of IV scanner to be gold

* Updated text colour to use one of the existing golds instead of a custom gold

* Japanese locale

* Updating docs

---------

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
2024-08-08 01:04:12 -04:00
ImperialSympathizer
42eadcb36c add unit tests for clowning around 2024-08-07 22:52:12 -04:00
Jannik Tappert
60d19c9a2c
[Feature] Unique Evil Team Admins (#3384)
* Hardcoded Pokemon should have proper names

* Add evil admin placeholder images

* Add admin names to locale files

* Add evil team admin dialogue

* current things.

* rename

* team galactic wants to be special

* Revert debug changes

* Added Trainer Names and Titles

* [Hotfix] Fix interactions of some moves not changing types (#3183)

* [Hotfix] Fix wild spawns not having their HA (#3190)

* Add evil admin placeholder images

* Add admin names to locale files

* Add evil team admin dialogue

* Added new sprites

* Make simple admin trainer pools

* Add Korean localization

* Revert this

* [Feature] Named Evil Team Admins

* Dateien removed

* Revert override

* French only needs one pair of evil team bosses :)

* Some things Temp Mentioned in the PR

* Removed NoDuplicates again...Because it only works on the speciality pool....
Also reordered the second admin wave. So we guarantee it is never the same one

* German dialogue

* Offset

* Jördis just better

* Credit for the artists (see https://www.deviantart.com/icejkai/art/Magma-Admin-Courtney-Trainer-Sprite-544510574)

* Order

* Added tsdoc and named it more clear

* Fixed formatting and made it a void function

* Changed offset to number and updated tsdoch

* Improve readability

* Removed extra lines

* Fix this

* Revert override

* colress gets his own pool because @blitzy wants it (and i agree)

* Added Rood (some plasma sage guy)

* has voucher is not false by default. So only it will be set true for evil team leaders, gym leaders, elite 4 and champions

* Apply suggestions from code review

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: returntoice <dieandbecome@gmail.com>

* Added the localization also to japanese

* Update src/locales/ko/trainers.ts

Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>

* CA

* Removed Colress

* Colress Last Stand

---------

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
2024-08-07 10:31:02 -04:00
Tempoanon
98ae2bc665
[Localization] Add Japanese Localization (#3332)
* Update fonts

* Add locales/ja files

* Add some more files

* Add more ui stuff

* Fix failing typescript doc being generated

* Add the 4 ui handlers

* Add i18n.ts

* Try something in text.ts

* Fix some more errors

* Add ja type icons

* Add missed message keys

* Update src/plugins/i18n.ts

Co-authored-by: Enoch <enoch.jwsong@gmail.com>

* Update src/ui/text.ts

Co-authored-by: Enoch <enoch.jwsong@gmail.com>

* Update src/plugins/i18n.ts

Co-authored-by: Enoch <enoch.jwsong@gmail.com>

* Apply TLs from xsn34kzx

Co-authored-by: Amani H. <109637146+xsn34kzx@users.noreply.github.com>

* Translate essential text (move, ability descriptions)

* Translate missed move/ability

* Translated battle.ts

- All phrases are taken from USUM script via Poké Corpus https://abcboy101.github.io/poke-corpus/ 
(I used the USUM script because it is in hiragana/katakana. If we decide to change these phrases to Kanji later, I will refer to the SV script to modify them again.)
-

* Update battle.ts

* Update battle.ts

* Update src/locales/ja/battle.ts

Co-authored-by: Enoch <enoch.jwsong@gmail.com>

* Update battle.ts

---------

Co-authored-by: EnochG1 <enoch.jwsong@gmail.com>
Co-authored-by: Amani H. <109637146+xsn34kzx@users.noreply.github.com>
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
2024-08-06 20:36:07 -04:00
chaosgrimmon
ed1605de58
[Sprite] Clean up extra Drifblim-related files (#3371)
* Delete public/images/pokemon/variant/back/426_3.png

* Delete public/images/pokemon/variant/back/426_3.json
2024-08-06 10:15:54 -04:00
ImperialSympathizer
afe1015094 first implementation pass at clowning around 2024-08-05 16:14:05 -04:00
Madmadness65
b6da93a092
Add ORAS Champion theme for Mixed music (#3351) 2024-08-04 19:45:29 -05:00
chaosgrimmon
0572ac4b91
[Sprite] Trim Skeledirge back exp palettes (#3350)
* [Sprite] Trim Skeledirge exp back palette

* [Sprite] Trim Skeledirge shiny back exp palette
2024-08-04 17:53:53 -04:00
NightKev
0241abcf61
[Bug] Fix evil team admins (#3341)
* Rename `flare_admin_m copy.json` to `flare_admin_f.json`

* Also fix the Magma Admins
2024-08-04 14:00:49 -04:00
NightKev
10aa85e9db
Fix name of files for Aqua Admin (M) (#3323) 2024-08-03 17:04:57 -05:00
Tempoanon
7048fbe06f
[Feature] Implement generic evil team admins (#3234)
* [Hotfix] Fix interactions of some moves not changing types (#3183)

* [Hotfix] Fix wild spawns not having their HA (#3190)

* Add evil admin placeholder images

* Add admin names to locale files

* Add evil team admin dialogue

* Added new sprites

* Make simple admin trainer pools

* Add Korean localization

* Increase evil boss money multiplier from 2.25 to 2.5

---------

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-08-03 16:34:05 -04:00
Madmadness65
153d8ba557
[Sprite] Move Victini graphics to Generation 5 atlases (#3320)
* Move Victini graphics to Generation 5 atlases

* Minor change
2024-08-03 15:03:59 -05:00
chaosgrimmon
bb6ec94c02
[Sprite/Misc] Repo Icon cleanup (#3311)
* [Sprite] Missing Gen 7 variant icons

Taken from current icon spritesheet

* [Sprite] Remove non-Gen 6 icon

* Delete public/images/pokemon/icons/variant/6/742_3.png

* Delete public/images/pokemon/icons/variant/6/743_2.png

* Delete public/images/pokemon/icons/variant/6/743_3.png

* Delete public/images/pokemon/icons/variant/6/777_2.png

* Delete public/images/pokemon/icons/variant/6/777_3.png

* Delete public/images/pokemon/icons/variant/6/779_2.png

* Delete public/images/pokemon/icons/variant/6/779_3.png

* Delete public/images/pokemon/icons/variant/6/354-mega_2.png

* Delete public/images/pokemon/icons/variant/6/354-mega_3.png

* [Sprite] Missing Mega Banette variant icons

Taken from the Gen 6 variant icon folder

* [Sprite] Missing Poltchageist/Sinistcha form icons

Renamed duplicates of alternate forms
2024-08-03 15:12:32 -04:00
cam
03ba575ee5
[Sprite] Wo-Chien back sprite (#3307)
* [Fix][Sprite] 4083 Galarian Farfetch'd exp

Fixed cropped feet on exp for default & shiny.
Rearranged spritesheet to fit new size.
Both sritesheets have identical sprite framing.
Both json are identical.

* [Fix][Sprite] 1001 Wo-Chien exp fix

cleaned up tips of antlers
slightly improved back sprite
default + shiny. identical json, identical framing
2024-08-02 17:12:06 -04:00
chaosgrimmon
abbf4974fd
[Sprite] Shiny animated Clawitzer using wrong palette (#3297)
* [Sprite] Recolour shiny Clawitzer

Palette taken from back counterpart

* [Sprite] Recolour shiny Clawitzer

Palette taken from back counterpart
2024-08-02 01:50:08 -04:00
cam
17cc8b5c5e
[Sprite] Victreebil's stem not connected to the head (#3292)
* [Fix][Sprite] 4083 Galarian Farfetch'd exp

Fixed cropped feet on exp for default & shiny.
Rearranged spritesheet to fit new size.
Both sritesheets have identical sprite framing.
Both json are identical.

* [Sprite] 71- Fixed  missing stem

fixed missing stem segment on victreebil's head
default and shiny
png positions are identical
json are identical
2024-08-01 22:01:09 -04:00
ImperialSympathizer
a231f853b8 add Trash to Treasure encounter 2024-08-01 13:39:14 -04:00
chaosgrimmon
b0f8f0e901
[Sprite] Add female Ursaring variant palettes (#3282)
* [Sprite] Female Ursaring variant fronts

Taken from male counterpart

* [Sprite] Female Ursaring variant backs

Taken from male counterpart

* [Sprite] Female Ursaring variants
2024-08-01 10:25:50 -04:00
ImperialSympathizer
fc163d1beb update visuals loading for safari and stat trainer visuals 2024-07-29 19:04:07 -04:00