diff --git a/libs/sr/formula-ui/src/lightCone/util.tsx b/libs/sr/formula-ui/src/lightCone/util.tsx index 7f33e822ac..afcd3d2f6c 100644 --- a/libs/sr/formula-ui/src/lightCone/util.tsx +++ b/libs/sr/formula-ui/src/lightCone/util.tsx @@ -1,3 +1,5 @@ +import { own } from '@genshin-optimizer/sr/formula' +import { useSrCalcContext } from '@genshin-optimizer/sr/ui' import type { ReactNode } from 'react' export function SuperImposeWrapper({ @@ -5,9 +7,7 @@ export function SuperImposeWrapper({ }: { children: (superimpose: number) => ReactNode }) { - // const calc = useSrCalcContext() - - // TODO: FIXME: a character without a lightcone will cause an error - const superimpose = 1 // calc?.compute(own.lightCone.superimpose).val ?? 1 + const calc = useSrCalcContext() + const superimpose = calc?.compute(own.lightCone.superimpose).val ?? 1 return children(superimpose) } diff --git a/libs/sr/formula/src/data/common/index.ts b/libs/sr/formula/src/data/common/index.ts index f7ab9f32f1..e78aa28fad 100644 --- a/libs/sr/formula/src/data/common/index.ts +++ b/libs/sr/formula/src/data/common/index.ts @@ -42,5 +42,8 @@ const data: TagMapNodeEntries = [ // Default conditionals to 0 reader.with('qt', 'cond').add(0), + + // Default superimposition to 1 + reader.withTag(own.lightCone.superimpose.tag).add(1), ] export default data