more superimposition handling

frzyc · Nov 27, 2024 · 1bc85ce · 1bc85ce
1 parent 024d8be
commit 1bc85ce
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/libs/sr/formula-ui/src/lightCone/sheets/PastSelfInMirror.tsx b/libs/sr/formula-ui/src/lightCone/sheets/PastSelfInMirror.tsx
@@ -42,7 +42,7 @@ const sheet: UISheetElement = {
           {
             title: 'Duration',
             fieldValue: (
-              <SuperImposeWrapper>
+              <SuperImposeWrapper lcKey={key}>
                 {(superimpose) => dm.duration[superimpose]}
               </SuperImposeWrapper>
             ),
@@ -61,7 +61,7 @@ const sheet: UISheetElement = {
         {
           title: 'Energy regen at start of each wave',
           fieldValue: (
-            <SuperImposeWrapper>
+            <SuperImposeWrapper lcKey={key}>
               {(superimpose) => dm.enerRegn[superimpose]}
             </SuperImposeWrapper>
           ),

diff --git a/libs/sr/formula-ui/src/lightCone/util.tsx b/libs/sr/formula-ui/src/lightCone/util.tsx
@@ -1,13 +1,22 @@
+import type { LightConeKey } from '@genshin-optimizer/sr/consts'
 import { own } from '@genshin-optimizer/sr/formula'
 import { useSrCalcContext } from '@genshin-optimizer/sr/ui'
 import type { ReactNode } from 'react'
 
 export function SuperImposeWrapper({
+  lcKey,
   children,
 }: {
+  lcKey: LightConeKey
   children: (superimpose: number) => ReactNode
 }) {
   const calc = useSrCalcContext()
-  const superimpose = calc?.compute(own.lightCone.superimpose).val ?? 1
+  let superimpose = 1
+  if (calc) {
+    const hasLightCone = !!calc.compute(own.common.count.sheet(lcKey)).val
+    if (hasLightCone)
+      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
@@ -42,8 +42,5 @@ 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
diff --git a/libs/sr/formula/src/data/util/tag.ts b/libs/sr/formula/src/data/util/tag.ts
@@ -114,7 +114,7 @@ export const ownTag = {
     ...objKeyMap(bonusAbilities, () => isoSum),
     ...objKeyMap(statBoosts, () => isoSum),
   },
-  lightCone: { lvl: iso, ascension: iso, superimpose: iso },
+  lightCone: { lvl: iso, ascension: iso, superimpose: isoSum },
   common: {
     count: isoSum,
     path: iso,