Commit Graph

818 Commits

Author SHA1 Message Date
Lugiad
334c26849f
Merge branch 'beta' into hebrew-pr 2024-11-04 02:21:30 +01:00
Mumble
684fb93e39
the fix (#4733)
Co-authored-by: frutescens <info@laptop>
2024-10-31 22:22:26 +01:00
Lugiad
abc9264b3d
[Localization] Spanish modification form es to es-ES (#4753)
* Update and rename statuses_es.json to statuses_es-ES.json

* Rename statuses_es.png to statuses_es-ES.png

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

* Rename types_es.png to types_es-ES.png

* Update i18n.ts

* Update settings.ts

* Update settings-display-ui-handler.ts

* Update starter-select-ui-handler.ts

* Update utils.ts

* Update settings-display-ui-handler.ts

* Update loading-scene.ts

* Update timed-event-manager.ts

* change remaining 'es' to 'es-ES' in various UIs

* change halloween event banner from es to es-ES

* update to latest locale commit

---------

Co-authored-by: Moka <54149968+MokaStitcher@users.noreply.github.com>
2024-10-31 21:54:05 +01:00
Mumble
b3a0ca9475
[Misc] Update Donation Link (#4763)
Co-authored-by: frutescens <info@laptop>
2024-10-29 19:31:24 -07:00
Opaque02
1cbe8b1505
[P3] Fixing form name being incorrect for some evolved pokemon (#4742)
* Fixing form name being incorrect for some evolved pokemon

* Updated to include showing the root speciesId if the speciesId locale key doesn't exist
2024-10-29 17:30:20 -04:00
Frederico Santos
51b2a4d7fe
Something (#4728)
* [Feature] Add event-based friendship multiplier and update TrainerConfig for event modifiers

* [UI][Dev] Improve event banner placement (#4726)

* [ui] automatically place event banner and timer in the title screen

* add new event banner

* ugh

* [Refactor] Clean up TrainerConfig and remove unused timed event

---------

Co-authored-by: Moka <54149968+MokaStitcher@users.noreply.github.com>
2024-10-26 17:14:17 +01:00
Opaque02
a2419c4fc3
[Misc] Add admin for (un)linking 3rd party accounts (#4198)
* Updated admin panel to allow the concept of unlinking accounts

* Don't look too hard at this commit, nothing to see here

* Admin stuff

* Fixed linking and unlinking and updated menu options

* Undid some changes and cleaned up some code

* Updated some logic and added some comments

* Updates to admin panel logic

* Stupid promises everyone hates them and they deserver to die

* Promise stuff still

* Promises working thanks to Ydarissep on discord - pushing with debug code before it decides to stop working again

* Removed debugging code

* All discord functionality seems to be working here?? Not sure what happened but yay

* Fixed up some bugs and code

* Added registered date to the panel

* Fixed and updated some minor error message related stuff

* Minor changes

* Fixed some minor bugs, made the save related errors have error codes, and added updated icons

* Updated search field error

* Missed a couple of things to push

* Fixed linting and doc errors

* Revert dev related code and clean up dev comments

* Reverting utils

* Updating front end to match back end from Pancakes' comments

* make getFields and getInputFieldConfigs a single function of FormUiHandler

* remove outdated doc

* Apply suggestions from code review

Moka review changes

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

* Added docs

* eslint fixes

* Fixed error not showing up in certain conditions

---------

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: MokaStitcher <millennium.stitcher@gmail.com>
Co-authored-by: MokaStitcher <54149968+MokaStitcher@users.noreply.github.com>
Co-authored-by: innerthunder <brandonerickson98@gmail.com>
2024-10-23 22:00:07 +02:00
Moka
16b7194366
[P3] Fix Egg Summary not showing new abilities in blue (#4712) 2024-10-23 11:05:13 -04:00
NightKev
39abac65be
Add eslint rule to enforce indenting of case statements (#4692) 2024-10-20 02:44:36 +01:00
Lugiad
f24f87f210
Merge branch 'beta' into hebrew-pr 2024-10-18 14:55:38 +02:00
MokaStitcher
c5b3220b86
[Beta P3][UI] Fix item/cursor placement in reward screen (#4678) 2024-10-17 13:46:51 -04:00
Amani H.
85b8ca6467
[Dev] Bump Game Version, Overhaul Version Migration (#4388)
* Bump Version, Remove "Outdated" Message

* Fix `src/ui/ui.ts`

* Fix `src/system/game-data.ts`

* Clean Up & Organize Version Migration

* Rename Methods & Session Migration Adjustment

* Collapse Version Migrators to Single File as Arrays

* Address NITs

* Restructure Migration Initialization

* Fix Spacing, Increment to v1.6.0

* Revert Back to v1.1.0

* Add `gameVersion` to Mocked Game

* Add More Documentation

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-10-17 00:48:28 +01:00
PigeonBar
1907824670
[P1] Fix party UI crash from unsanitized lastCursor pointing to empty Pokemon slot (#4672) 2024-10-16 11:10:35 -04:00
innerthunder
093f3d90f5
[Balance] Add Memory Mushroom to Shop (#4555)
* Add Memory Mushroom to Shop + escape TM selection

* consolidate learn move type params into an enum

* Rewrite lock capsule test

* Disable luck upgrades for copied SMPhases

* Mem Mushroom Cost 4x Update modifier-type.ts

* Add undefined cost check to `addModifier`

* Increase shop options row limit

* Prevent SMPhase copies from updating the seed

---------

Co-authored-by: damocleas <damocleas25@gmail.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-10-15 18:06:56 -07:00
Mumble
d01d856898
[Refactor] Default case to display challenge name (#4656)
Co-authored-by: frutescens <info@laptop>
2024-10-15 10:05:21 -04:00
MokaStitcher
676322e800
[QOL] Add input delay for skipping egg summary (#4644) 2024-10-14 10:42:59 -04:00
MokaStitcher
89d7e7ea65
[P3][UI] Fix tooltip bugs in Starter Select screen (#4641)
* [UI] Fix candy friendship tooltip bug in Starter Select

* [UI] remove tooltip when exiting starter select screen
2024-10-11 15:46:00 -04:00
Lugiad
b817253053
Merge branch 'beta' into hebrew-pr 2024-10-11 19:50:27 +02:00
MokaStitcher
4f456339f4
[UI] Remove score display in voucher menu (#4616) 2024-10-11 10:26:47 -04:00
MokaStitcher
80a784ac8d
[P3 Beta][UI] Fix loading behavior introduced with save preview (#4633)
* [ui] partially revert loading behavior introduced with save preview

* [beta][ui] fix scrolling issue in Load Game menu
2024-10-11 10:24:53 -04:00
ImperialSympathizer
6ad5ba972c
[Enhancement] Refactor Starter Species to use separate EggTier map (#4591)
* creates table for tracking species egg tiers

* creates table for tracking species egg tiers

* rename EggTier enum values

* replace clamp util function with Phaser function

---------

Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
2024-10-10 09:29:26 -07:00
Mumble
ffe941d235
[Feature][UI] Save Preview (#4410)
* Making 3 Option UI real

* idk anymore

* Revert "Making 3 Option UI real"

This reverts commit beaad44c1e.

* Let's see

* Current issues - scrolling upwards and correct cursor landing

* argh

* Fixed reactive scrolling

* Adding ME handling

* set up descriptions

* Cleaned up UI i think

* stupid alder

* Added double trainer handling + changed enum name

* Apply suggestions from code review

Thank you Moka!

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

* Arrow Visibility now depends on Session Slot hasData

* documentation

* Simplified calls to revertSessionSlot + changed function name per feedback

* Fixed scrollCursor issue.

* added comment

* Update src/ui/save-slot-select-ui-handler.ts

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

* Fixed sound played + added better conditional

* Balance Team....

* ME related changes

* Apply suggestions from code review

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

* Update src/data/mystery-encounters/mystery-encounter.ts

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

* Update src/data/mystery-encounters/mystery-encounter.ts

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

* Sending Doubles-fix

* eslint..

---------

Co-authored-by: frutescens <info@laptop>
Co-authored-by: MokaStitcher <54149968+MokaStitcher@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-10-09 15:04:13 -04:00
MokaStitcher
0ede7b057d
[P3][UI] Fix egg gacha overlay not getting cleared properly (#4600) 2024-10-08 11:10:54 -04:00
Lugiad
3c22323d01
Merge branch 'beta' into hebrew-pr 2024-10-07 18:36:06 +02:00
Acelynn Zhang
f5fa478eb8
[P1] Fix crash when starting a challenge run after revisiting challenge select screen (#4603)
Ensure EncounterPhase initializes correctly at the start of the game
after revisting the challenge selection screen.

Fixes #4520
2024-10-07 12:01:15 -04:00
ImperialSympathizer
a7157bbe9a
fix shop option cursor indexing (#4601)
Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
2024-10-06 13:51:34 -07:00
MokaStitcher
1947472f1c
[P3] Fix start button cursor not being cleared properly in starter select (#4558) 2024-10-04 16:47:12 -04:00
torranx
644c078a6c add new lint rules....again 2024-10-04 13:08:31 +08: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
Lugiad
65651f6be8
Merge branch 'beta' into hebrew-pr 2024-10-03 15:49:58 +02:00
AJ Fontaine
8a2900ad29
[Refactor] Move some relevant files, tables etc to new balance folder (#4510)
* Move biomes.ts

* Move starter costs, passives, friendship, starter-candy to starters.ts

* Change relative imports to absolute imports

* Add docstrings, passives.ts

* Constants in rates.ts for egg pity, egg tier rates, hatch waves, variant chances

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-10-02 06:20:19 -07:00
NightKev
a6bcd6eeea
[Refactor] Remove obsolete comments in egg gacha and starter select UIs (#4542) 2024-10-01 21:58:16 -04: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
MokaStitcher
fd67096a6a
[P3 Bug][UI] Fix egg summary not displaying 1st mon properly (#4507) 2024-09-29 21:48:29 -04:00
fransdhinta
4160aefd93
[Feature] Show app version on title screen (#4344)
* feat: show app version on title screen

* fix: adjust app version positions

* update app version text

---------

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-29 18:18:52 -07:00
Lugiad
dfa826d5fa
Update settings-display-ui-handler.ts 2024-09-29 20:16:17 +02:00
Lugiad
fcca584be7
Merge branch 'beta' into hebrew-pr 2024-09-27 00:49:28 +02:00
MokaStitcher
a25ccbcde6
[UI] Make Egg List and Egg Summary scrollable (#4391) 2024-09-26 01:51:49 -07:00
Lugiad
224461c40f
Merge branch 'beta' into hebrew-pr 2024-09-26 02:31:55 +02:00
MokaStitcher
03bedac283
[P3 Bug] Fix form name not always showing in starter select (#4406)
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-25 10:20:33 -04:00
Lugiad
dccd8aecca
Merge branch 'beta' into hebrew-pr 2024-09-25 13:47:14 +02:00
ImperialSympathizer
24bbb0931c change return type of isNullOrUndefined 2024-09-24 13:15:18 -04:00
ImperialSympathizer
23f006bc43
[Enhancement] Remove unnecessary loading of trainer sprites in loading scene (#4397)
* Remove unnecessary loading of trainer sprites in loading scene

* load trainer assets on demand for run history UI

---------

Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
2024-09-23 17:34:47 -04:00
Opaque02
6626df27ba
[QoL] Adding challenge arrows (#4048)
Arrows allow for dynamic placement based on language

---------

Co-authored-by: MokaStitcher <54149968+MokaStitcher@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-22 23:34:41 -07:00
Lugiad
cfef026db4
Merge branch 'beta' into hebrew-pr 2024-09-22 18:20:01 +02:00
Jannik Tappert
7046f854c1
[Feature] The Form Names in the Catching Summary are now localized (#3628)
* Form names are now localized when catching a pokemon (and probably hatching a egg since its the same dialogue)

* Update src/ui/pokemon-info-container.ts

* Update src/ui/pokemon-info-container.ts

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

* Update src/ui/pokemon-info-container.ts

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

* Update pokemon-info-container.ts

* Update pokemon-info-container.ts

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update src/locales/pt_BR/pokemon-form.json

* Update src/locales/pt_BR/pokemon-form.json

* Update src/locales/pt_BR/pokemon-form.json

* Update src/locales/pt_BR/pokemon-form.json

* Update src/locales/pt_BR/pokemon-form.json

* Update src/locales/pt_BR/pokemon-form.json

* Update pokemon-form.json

* Update pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/ko/pokemon-form.json

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

* Add missed keys, make empty-key displayed, change EN to original formName

* add missed key, add korean translation (partial)

* Korean translation, refactor code

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

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

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

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

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

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

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

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

* Apply suggestions from code review

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

* Apply suggestions from code review

* Update pokemon-form.json

* Update src/locales/pt_BR/pokemon-form.json

* Update src/locales/pt_BR/pokemon-form.json

* Update src/locales/pt_BR/pokemon-form.json

* Update src/locales/pt_BR/pokemon-form.json

* Update src/locales/pt_BR/pokemon-form.json

* Update src/locales/pt_BR/pokemon-form.json

* Update src/locales/pt_BR/pokemon-form.json

* Update src/locales/pt_BR/pokemon-form.json

* Update src/locales/pt_BR/pokemon-form.json

* Update pokemon-form.json

* Update src/locales/ja/pokemon-form.json

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

* Update src/locales/ja/pokemon-form.json

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

* Update src/locales/ja/pokemon-form.json

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

* Update src/locales/ja/pokemon-form.json

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

* Update src/locales/ja/pokemon-form.json

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

* Update src/locales/ja/pokemon-form.json

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

* Update src/locales/ja/pokemon-form.json

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

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update src/locales/it/pokemon-form.json

* Update pokemon-form.json

deleted all of the remaining "form" snippets since it'll be shown as "Form: form name" so the form snippet was useless

* Apply suggestions from code review

Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>

---------

Co-authored-by: Lugiad <adrien.grivel@hotmail.fr>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: José Ricardo <josefleury@discente.ufg.br>
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
2024-09-22 17:41:38 +02:00
gruxor
590758f616
[QoL] Show move description via info button (#4165)
* Show move desc via info button

* Update src/ui/move-info-overlay.ts

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

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-22 17:31:53 +02:00
Lugiad
ffbaa9d087
Merge branch 'beta' into hebrew-pr 2024-09-22 12:48:34 +02: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
Lugiad
c523bc52e8
Merge branch 'beta' into hebrew-pr 2024-09-20 16:26:18 +02:00