Combo only UI redesign

libs/common/util/src/lib/array.ts

@@ -75,3 +75,17 @@ export function handleMultiSelect<T>(allKeys: T[]) {
     return [...new Set(toggleArr(arr, v))]
   }
 }
+
+/**
+ * Shorten or pad an array to a certain length, with a default value.
+ * @param array
+ * @param length
+ * @param value
+ */
+export function pruneOrPadArray<T>(array: T[], length: number, value: T) {
+  if (array.length > length) {
+    array.splice(-1, length)
+  } else {
+    array.splice(-1, 0, ...new Array(length - array.length).fill(value))
+  }
+}

libs/common/util/src/lib/object.ts

@@ -153,7 +153,7 @@ export const getObjectKeysRecursive = (obj: unknown): string[] =>
 
 export function deepFreeze<T>(obj: T, layers = 5): T {
   if (layers === 0) return obj
-  if (typeof obj === 'object')
+  if (obj && typeof obj === 'object')
     Object.values(Object.freeze(obj)).forEach((o) => deepFreeze(o, layers--))
   return obj
 }

libs/sr/consts/src/relic.ts

@@ -125,26 +125,25 @@ export const relicSubstatRollData: Record<
   5: { low: 3, high: 4, numUpgrades: 5 },
 } as const
 
-export const relicSlotToMainStatKeys: Record<RelicSlotKey, RelicMainStatKey[]> =
-  {
-    head: ['hp'],
-    hands: ['atk'],
-    body: ['hp_', 'atk_', 'def_', 'eff_', 'heal_', 'crit_', 'crit_dmg_'],
-    feet: ['hp_', 'atk_', 'def_', 'spd'],
-    sphere: [
-      'hp_',
-      'atk_',
-      'def_',
-      'physical_dmg_',
-      'fire_dmg_',
-      'ice_dmg_',
-      'wind_dmg_',
-      'lightning_dmg_',
-      'quantum_dmg_',
-      'imaginary_dmg_',
-    ],
-    rope: ['hp_', 'atk_', 'def_', 'brEffect_', 'enerRegen_'],
-  }
+export const relicSlotToMainStatKeys = {
+  head: ['hp'],
+  hands: ['atk'],
+  body: ['hp_', 'atk_', 'def_', 'eff_', 'heal_', 'crit_', 'crit_dmg_'],
+  feet: ['hp_', 'atk_', 'def_', 'spd'],
+  sphere: [
+    'hp_',
+    'atk_',
+    'def_',
+    'physical_dmg_',
+    'fire_dmg_',
+    'ice_dmg_',
+    'wind_dmg_',
+    'lightning_dmg_',
+    'quantum_dmg_',
+    'imaginary_dmg_',
+  ],
+  rope: ['hp_', 'atk_', 'def_', 'brEffect_', 'enerRegen_'],
+} as const
 
 export const allRelicMainSubStatKeys = Array.from(
   new Set([...allRelicSubStatKeys, ...allRelicMainStatKeys] as const)

libs/sr/db/src/Database/DataManagers/OptConfigDataManager.ts

@@ -5,11 +5,7 @@ import {
   objKeyMap,
   validateArr,
 } from '@genshin-optimizer/common/util'
-import type {
-  CharacterKey,
-  RelicMainStatKey,
-  RelicSlotKey,
-} from '@genshin-optimizer/sr/consts'
+import type { CharacterKey, RelicSlotKey } from '@genshin-optimizer/sr/consts'
 import {
   allCharacterKeys,
   allRelicSetKeys,
@@ -53,18 +49,17 @@ export interface OptConfig {
   relicSetExclusion: RelicSetExclusion
   statFilters: StatFilters
   mainStatKeys: {
-    body: RelicMainStatKey[]
-    feet: RelicMainStatKey[]
-    sphere: RelicMainStatKey[]
-    rope: RelicMainStatKey[]
+    body: (typeof relicSlotToMainStatKeys)['body'][number][]
+    feet: (typeof relicSlotToMainStatKeys)['feet'][number][]
+    sphere: (typeof relicSlotToMainStatKeys)['sphere'][number][]
+    rope: (typeof relicSlotToMainStatKeys)['rope'][number][]
     head?: never
     hands?: never
   }
   excludedLocations: CharacterKey[]
   allowLocationsState: AllowLocationsState
   relicExclusion: string[]
   useExcludedRelics: boolean
-  optimizationTarget?: Tag
   mainStatAssumptionLevel: number
   allowPartial: boolean
   maxBuildsToShow: number
@@ -96,7 +91,6 @@ export class OptConfigDataManager extends DataManager<
       useExcludedRelics,
       statFilters,
       mainStatKeys,
-      optimizationTarget,
       mainStatAssumptionLevel,
       excludedLocations,
       allowLocationsState,
@@ -139,8 +133,6 @@ export class OptConfigDataManager extends DataManager<
       })
     }
 
-    if (optimizationTarget && !validateTag(optimizationTarget))
-      optimizationTarget = undefined
     if (
       typeof mainStatAssumptionLevel !== 'number' ||
       mainStatAssumptionLevel < 0 ||
@@ -210,7 +202,6 @@ export class OptConfigDataManager extends DataManager<
       useExcludedRelics,
       statFilters,
       mainStatKeys,
-      optimizationTarget,
       mainStatAssumptionLevel,
       excludedLocations,
       allowLocationsState,
@@ -269,7 +260,6 @@ const initialBuildSettings: OptConfig = deepFreeze({
     sphere: relicSlotToMainStatKeys.sphere,
     rope: relicSlotToMainStatKeys.rope,
   },
-  optimizationTarget: undefined,
   mainStatAssumptionLevel: 0,
   excludedLocations: [],
   allowLocationsState: 'unequippedOnly',