ZO add advanced Set Filters (#2654)

* ZO add advanced Set Filters

* minor styling

* fixes

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

@@ -247,3 +247,26 @@ export function objFindValue<K extends string, V extends string>(
 ): K | undefined {
   return Object.keys(obj).find((k) => obj[k as K] === value) as K | undefined
 }
+
+/**
+ * Returns a new object that is the sum of `a` and `b`
+ */
+export function objSum(
+  a: Record<string, number>,
+  b: Record<string, number>
+): Record<string, number> {
+  const sum = { ...a }
+  for (const k in b) sum[k] = (sum[k] ?? 0) + b[k]
+  return sum
+}
+
+/**
+ * Apply obj `add` to the `base` object
+ */
+export function objSumInPlace(
+  base: Record<string, number>,
+  add: Record<string, number>
+): Record<string, number> {
+  for (const k in add) base[k] = (base[k] ?? 0) + add[k]
+  return base
+}

libs/zzz/db/src/Database/DataManagers/CharacterDataManager.ts

@@ -3,11 +3,13 @@ import { clamp, objFilter, validateArr } from '@genshin-optimizer/common/util'
 import type {
   CharacterKey,
   DiscMainStatKey,
+  DiscSetKey,
   FormulaKey,
   WengineKey,
 } from '@genshin-optimizer/zzz/consts'
 import {
   allCharacterKeys,
+  allDiscSetKeys,
   allFormulaKeys,
   allWengineKeys,
   discSlotToMainStatKeys,
@@ -32,6 +34,8 @@ export type CharacterData = {
   slot6: DiscMainStatKey[]
   levelLow: number
   levelHigh: number
+  setFilter2: DiscSetKey[]
+  setFilter4: DiscSetKey[]
 }
 
 function initialCharacterData(key: CharacterKey): CharacterData {
@@ -53,6 +57,8 @@ function initialCharacterData(key: CharacterKey): CharacterData {
     slot6: [...discSlotToMainStatKeys['6']],
     levelLow: 15,
     levelHigh: 15,
+    setFilter2: [],
+    setFilter4: [],
   }
 }
 export class CharacterDataManager extends DataManager<
@@ -81,6 +87,8 @@ export class CharacterDataManager extends DataManager<
       slot6,
       levelLow,
       levelHigh,
+      setFilter2,
+      setFilter4,
     } = obj as CharacterData
 
     if (!allCharacterKeys.includes(characterKey)) return undefined // non-recoverable
@@ -122,6 +130,10 @@ export class CharacterDataManager extends DataManager<
 
     if (typeof levelHigh !== 'number') levelHigh = 15
     levelHigh = clamp(levelHigh, 0, 15)
+
+    setFilter2 = validateArr(setFilter2, allDiscSetKeys, [])
+    setFilter4 = validateArr(setFilter4, allDiscSetKeys, [])
+
     const char: CharacterData = {
       key: characterKey,
       level,
@@ -137,6 +149,8 @@ export class CharacterDataManager extends DataManager<
       slot6,
       levelLow,
       levelHigh,
+      setFilter2,
+      setFilter4,
     }
     return char
   }

libs/zzz/page-optimize/src/BuildsDisplay.tsx

@@ -4,7 +4,7 @@ import type { LocationKey } from '@genshin-optimizer/zzz/consts'
 import type { Stats } from '@genshin-optimizer/zzz/db'
 import { useDatabaseContext, useDisc } from '@genshin-optimizer/zzz/db-ui'
 import type { BuildResult } from '@genshin-optimizer/zzz/solver'
-import { convertDiscToStats, getSum } from '@genshin-optimizer/zzz/solver'
+import { applyCalc, convertDiscToStats } from '@genshin-optimizer/zzz/solver'
 import { DiscCard } from '@genshin-optimizer/zzz/ui'
 import { Box, Button, CardContent, Stack, Typography } from '@mui/material'
 import { useCallback, useMemo } from 'react'
@@ -48,7 +48,7 @@ function Build({
   const { database } = useDatabaseContext()
   const sum = useMemo(
     () =>
-      getSum(
+      applyCalc(
         baseStats,
         Object.values(build.discIds)
           .map((d) => database.discs.get(d))

libs/zzz/page-optimize/src/CharacterContext.ts

@@ -0,0 +1,10 @@
+import type { CharacterData } from '@genshin-optimizer/zzz/db'
+import { createContext, useContext } from 'react'
+
+export const CharacterContext = createContext(
+  undefined as CharacterData | undefined
+)
+
+export function useCharacterContext() {
+  return useContext(CharacterContext)
+}

libs/zzz/page-optimize/src/LevelFilter.tsx

@@ -18,7 +18,8 @@ export const LevelFilter = memo(function LevelFilter({
     <CardThemed bgt="light">
       <CardContent sx={{ display: 'flex', gap: 1 }}>
         <Typography sx={{ fontWeight: 'bold' }}>
-          Artifact Level Filter
+          Disc Level Filter
+          {/* TODO: Translate */}
           {/* {t('levelFilter')} */}
         </Typography>
       </CardContent>