Disable egg gacha in rewards #3304
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
flx-sta
added
(Legacy) Bug
flx-sta
reviewed
Aug 2, 2024
flx-sta
reviewed
Aug 2, 2024
flx-sta
reviewed
Aug 2, 2024
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
…mes/pokerogue into disable-egg-gacha-in-rewards
flx-sta
approved these changes
Aug 2, 2024
7 tasks
frutescens
pushed a commit
to frutescens/pokerogue
that referenced
this pull request
Aug 2, 2024
This reverts commit 3a87c86.
f-fsantos
pushed a commit
that referenced
this pull request
Aug 23, 2024
* 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 3a87c86. * 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 5c6fcf6, reversing changes made to 751bf4a. * Revert "Revert "Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue into runHistoryNew"" This reverts commit f6c3580. * 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>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What are the changes?
Only allowing Egg Gacha and Egg List to be used in Command and Title screens.
Why am I doing these changes?
Stopping the most common capture and save without skipping wave glitch.
What did change?
Add a filter on the menu that only makes it render if the player is in Command mode or Title mode.
Screenshots/Videos
How to test the changes?
Checklist
betaas my base branchnpm run test)