-
-
Notifications
You must be signed in to change notification settings - Fork 10
feat: Mega Dimension DLC support #122
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
15d74e3
feat: mega dimension megas
Mygod 1b1e81b
feat: mega z
Mygod 694c5e6
fix: dup mega
Mygod fa5128e
fix: misc issues
Mygod f8ae692
fix: missing files
Mygod 575e83d
chore: reduce code dup
Mygod b31a843
fix: more dup
Mygod 6414a86
Merge main into megadim
Mygod 32e1be8
refactor: make temp evo utils safer
Mygod 355cc4b
fix: test dup code
Mygod File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| import type { TempEvolutions } from '../typings/dataTypes' | ||
|
|
||
| export type TempEvoId = TempEvolutions['tempEvoId'] | ||
|
|
||
| /** | ||
| * Returns a stable, type-sensitive key for a temp evolution ID. | ||
| * This keeps `1` and `'1'` distinct. | ||
| */ | ||
| export const tempEvoIdKey = (tempEvoId: TempEvoId): string => | ||
| `${typeof tempEvoId}:${tempEvoId}` | ||
|
|
||
| /** | ||
| * Sort comparator for temp evolution IDs: | ||
| * - Numbers sort before strings | ||
| * - Numbers sort numerically (ascending) | ||
| * - Strings sort lexicographically (localeCompare) | ||
| */ | ||
| export const compareTempEvoId = (a: TempEvoId, b: TempEvoId): number => { | ||
| const aIsNumber = typeof a === 'number' | ||
| const bIsNumber = typeof b === 'number' | ||
|
|
||
| if (aIsNumber && bIsNumber) return a - b | ||
| if (aIsNumber) return -1 | ||
| if (bIsNumber) return 1 | ||
| return a.toString().localeCompare(b.toString()) | ||
| } | ||
|
|
||
| /** | ||
| * Returns a new array sorted by `tempEvoId` without mutating the input array. | ||
| */ | ||
| export const sortTempEvolutions = ( | ||
| tempEvolutions: TempEvolutions[], | ||
| ): TempEvolutions[] => | ||
| [...tempEvolutions].sort((a, b) => compareTempEvoId(a.tempEvoId, b.tempEvoId)) | ||
|
|
||
| /** | ||
| * Deduplicates temp evolutions by `tempEvoId` (type-sensitive) and returns them sorted. | ||
| * Defaults to preferring the last entry when duplicates exist. | ||
| */ | ||
| export const dedupeTempEvolutions = ( | ||
| tempEvolutions: (TempEvolutions | undefined | null)[], | ||
| options: { prefer?: 'first' | 'last' } = {}, | ||
| ): TempEvolutions[] => { | ||
| const prefer = options.prefer ?? 'last' | ||
| const deduped = new Map<string, TempEvolutions>() | ||
|
|
||
| for (const tempEvo of tempEvolutions) { | ||
| if (!tempEvo) continue | ||
| const key = tempEvoIdKey(tempEvo.tempEvoId) | ||
|
|
||
| if (prefer === 'first') { | ||
| if (!deduped.has(key)) deduped.set(key, tempEvo) | ||
| continue | ||
| } | ||
|
|
||
| deduped.set(key, tempEvo) | ||
| } | ||
|
|
||
| return sortTempEvolutions(Array.from(deduped.values())) | ||
| } | ||
|
|
||
| /** | ||
| * Merges estimated + actual temp evolutions, preferring actual values for duplicates. | ||
| */ | ||
| export const mergeTempEvolutions = ( | ||
| estimated: (TempEvolutions | undefined | null)[] | undefined, | ||
| actual: (TempEvolutions | undefined | null)[] | undefined, | ||
| ): TempEvolutions[] => { | ||
| const estimatedList = Array.isArray(estimated) ? estimated : [] | ||
| const actualList = Array.isArray(actual) ? actual : [] | ||
|
|
||
| return dedupeTempEvolutions([...estimatedList, ...actualList], { prefer: 'last' }) | ||
| } | ||
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.