Update sr-formula and add March7th sheet

apps/sr-frontend/src/app/App.tsx

@@ -1,4 +1,8 @@
-import { CharacterProvider, DatabaseProvider } from '@genshin-optimizer/sr-ui'
+import {
+  CalcProvider,
+  CharacterProvider,
+  DatabaseProvider,
+} from '@genshin-optimizer/sr-ui'
 import {
   CssBaseline,
   Stack,
@@ -17,12 +21,14 @@ export default function App() {
       <ThemeProvider theme={theme}>
         <DatabaseProvider>
           <CharacterProvider>
-            <CssBaseline />
-            <Stack gap={1} pt={1}>
-              <CharacterSelector />
-              <Character />
-              <Database />
-            </Stack>
+            <CalcProvider>
+              <CssBaseline />
+              <Stack gap={1} pt={1}>
+                <CharacterSelector />
+                <Character />
+                <Database />
+              </Stack>
+            </CalcProvider>
           </CharacterProvider>
         </DatabaseProvider>
       </ThemeProvider>

apps/sr-frontend/src/app/Character.tsx

@@ -1,38 +1,32 @@
-import { reread } from '@genshin-optimizer/pando'
 import type { AscensionKey } from '@genshin-optimizer/sr-consts'
+import { convert, selfTag } from '@genshin-optimizer/sr-formula'
 import {
-  self,
-  selfBuff,
-  srCalculatorWithEntries,
-} from '@genshin-optimizer/sr-formula'
-import {
-  CharacterContext,
+  useCalcContext,
   useCharacter,
+  useCharacterContext,
   useCharacterReducer,
 } from '@genshin-optimizer/sr-ui'
 import { CardThemed } from '@genshin-optimizer/ui-common'
-import { Box, CardContent, Stack, TextField, Typography } from '@mui/material'
-import { Container } from '@mui/system'
-import { useContext, useMemo } from 'react'
+import { ExpandMore } from '@mui/icons-material'
+import {
+  Accordion,
+  AccordionDetails,
+  AccordionSummary,
+  Box,
+  CardContent,
+  Container,
+  Stack,
+  TextField,
+  Typography,
+} from '@mui/material'
 
 export default function Character() {
-  const { characterKey } = useContext(CharacterContext)
+  const { characterKey } = useCharacterContext()
   const character = useCharacter(characterKey)
   const charReducer = useCharacterReducer(characterKey)
 
-  const calc = useMemo(
-    () =>
-      character &&
-      srCalculatorWithEntries([
-        selfBuff.char.lvl.add(character.level),
-        selfBuff.char.ascension.add(character?.ascension),
-        {
-          tag: { src: 'char' },
-          value: reread({ src: characterKey }),
-        },
-      ]),
-    [character, characterKey]
-  )
+  const { calc } = useCalcContext()
+  const member0 = convert(selfTag, { member: 'member0', et: 'self' })
 
   return (
     <Container>
@@ -45,34 +39,71 @@ export default function Character() {
               label="Level"
               variant="outlined"
               inputProps={{ min: 1, max: 90 }}
-              value={character?.level}
+              value={character?.level || 0}
               onChange={(e) => charReducer({ level: parseInt(e.target.value) })}
             />
             <TextField
               type="number"
               label="Ascension"
               variant="outlined"
               inputProps={{ min: 0, max: 6 }}
-              value={character?.ascension}
+              value={character?.ascension || 0}
               onChange={(e) =>
                 charReducer({
                   ascension: parseInt(e.target.value) as AscensionKey,
                 })
               }
             />
-            {(
-              [
-                ['ATK', 'atk'],
-                ['DEF', 'def'],
-                ['HP', 'hp'],
-                ['SPD', 'spd'],
-              ] as const
-            ).map(([txt, skey]) => (
-              <Typography key={skey}>
-                {txt}: {calc?.compute(self.stat[skey].src('char')).val}
-              </Typography>
-            ))}
+            <Accordion>
+              <AccordionSummary expandIcon={<ExpandMore />}>
+                Basic stats for all chars
+              </AccordionSummary>
+              <AccordionDetails>
+                {(
+                  [
+                    ['ATK', 'atk'],
+                    ['DEF', 'def'],
+                    ['HP', 'hp'],
+                    ['SPD', 'spd'],
+                  ] as const
+                ).map(([txt, skey]) => (
+                  <Typography key={skey}>
+                    {txt}: {calc?.compute(member0.final[skey]).val}
+                  </Typography>
+                ))}
+              </AccordionDetails>
+            </Accordion>
           </Stack>
+          <Accordion>
+            <AccordionSummary expandIcon={<ExpandMore />}>
+              All target values, if sheet is created
+            </AccordionSummary>
+            <AccordionDetails>
+              <Stack>
+                {calc?.listFormulas(member0.listing.formulas).map((read) => {
+                  const computed = calc.compute(read)
+                  const name = read.tag.name || read.tag.q
+                  return (
+                    <Box>
+                      <Typography key={name}>
+                        {name}: {computed.val}
+                      </Typography>
+                      <Accordion>
+                        <AccordionSummary expandIcon={<ExpandMore />}>
+                          meta for {name}
+                        </AccordionSummary>
+                        <AccordionDetails>
+                          <Typography component="pre">
+                            {JSON.stringify(computed.meta, undefined, 2)}
+                          </Typography>{' '}
+                        </AccordionDetails>
+                      </Accordion>
+                    </Box>
+                  )
+                })}
+              </Stack>
+            </AccordionDetails>
+          </Accordion>
         </CardContent>
       </CardThemed>
     </Container>

apps/sr-frontend/src/app/CharacterSelector.tsx

@@ -1,13 +1,12 @@
 import {
   CharacterAutocomplete,
-  CharacterContext,
+  useCharacterContext,
 } from '@genshin-optimizer/sr-ui'
 import { CardThemed } from '@genshin-optimizer/ui-common'
 import { CardContent, Container } from '@mui/material'
-import { useContext } from 'react'
 
 export default function CharacterSelector() {
-  const { characterKey, setCharacterKey } = useContext(CharacterContext)
+  const { characterKey, setCharacterKey } = useCharacterContext()
 
   return (
     <Container>

apps/sr-frontend/src/app/Database.tsx

@@ -1,6 +1,6 @@
 import { SandboxStorage } from '@genshin-optimizer/database'
-import { DatabaseContext } from '@genshin-optimizer/sr-ui'
 import { SroDatabase } from '@genshin-optimizer/sr-db'
+import { useDatabaseContext } from '@genshin-optimizer/sr-ui'
 import { CardThemed, DropdownButton } from '@genshin-optimizer/ui-common'
 import { range } from '@genshin-optimizer/util'
 import {
@@ -12,14 +12,10 @@ import {
   Typography,
 } from '@mui/material'
 import type { ChangeEvent } from 'react'
-import { useCallback, useContext, useEffect, useMemo, useState } from 'react'
+import { useCallback, useEffect, useMemo, useState } from 'react'
 
 export default function Database() {
-  const {
-    database: mainDB,
-    databases,
-    setDatabase,
-  } = useContext(DatabaseContext)
+  const { database: mainDB, databases, setDatabase } = useDatabaseContext()
   const [index, setIndex] = useState(0)
   const database = databases[index]
   const current = database === mainDB

apps/sr-frontend/tsconfig.app.json

@@ -2,7 +2,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
-    "types": ["node", "vite/client"]
+    "types": ["node", "vite/client", "object-overrides"]
   },
   "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts"],
   "include": ["src/**/*.ts", "src/**/*.tsx"]

libs/pando/tsconfig.lib.json

@@ -2,7 +2,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
-    "types": ["node", "vite/client"]
+    "types": ["node"]
   },
   "include": ["src/**/*.ts"],
   "exclude": ["**/*.spec.ts", "vitest.config.ts"]

libs/sr-consts/src/character.ts

@@ -31,18 +31,18 @@ export const nonTrailblazerCharacterKeys = [
 export type NonTrailblazerCharacterKey =
   (typeof nonTrailblazerCharacterKeys)[number]
 
-export const damageType = [
+export const allTypeKeys = [
   'Physical',
   'Quantum',
-  'Thunder',
+  'Lightning',
   'Ice',
   'Wind',
   'Fire',
   'Imaginary',
 ] as const
-export type DamageTypeKey = (typeof damageType)[number]
+export type TypeKey = (typeof allTypeKeys)[number]
 
-export const path = [
+export const allPathKeys = [
   'Erudition',
   'Preservation',
   'Abundance',
@@ -51,7 +51,7 @@ export const path = [
   'Harmony',
   'TheHunt',
 ] as const
-export type PathKey = (typeof path)[number]
+export type PathKey = (typeof allPathKeys)[number]
 
 export const allTrailblazerGenderedKeys = [
   'TrailblazerPhysicalM',
@@ -88,6 +88,18 @@ export type BonusAbilityKey = (typeof allBonusAbilityKeys)[number]
 export const allStatBoostKeys = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] as const
 export type StatBoostKey = (typeof allStatBoostKeys)[number]
 
+export const allEidolonKeys = [1, 2, 3, 4, 5, 6] as const
+export type EidolonKey = (typeof allEidolonKeys)[number]
+
+export const allAbilityKeys = [
+  'basic',
+  'skill',
+  'ult',
+  'talent',
+  'technique',
+] as const
+export type AbilityKey = (typeof allAbilityKeys)[number]
+
 export function charKeyToCharLocKey(
   charKey: CharacterKey
 ): CharacterLocationKey {

libs/sr-consts/src/common.ts

@@ -11,7 +11,6 @@ export const allStatKeys = [
   'def_',
   'crit_',
   'crit_dmg_',
-  'taunt',
   'brEff_',
   'eff_',
   'eff_res_',
@@ -27,5 +26,16 @@ export const allStatKeys = [
 ] as const
 export type StatKey = (typeof allStatKeys)[number]
 
+export const allTypeDmgKeys = [
+  'physical_dmg_',
+  'fire_dmg_',
+  'ice_dmg_',
+  'wind_dmg_',
+  'lightning_dmg_',
+  'quantum_dmg_',
+  'imaginary_dmg_',
+] as const
+export type TypeDmgKey = (typeof allTypeDmgKeys)[number]
+
 export const allAscensionKeys = [0, 1, 2, 3, 4, 5, 6] as const
 export type AscensionKey = (typeof allAscensionKeys)[number]

libs/sr-dm/src/dm/character/AvatarConfig.ts

@@ -1,10 +1,10 @@
 import { dumpFile, nameToKey } from '@genshin-optimizer/pipeline'
-import type { DamageTypeKey } from '@genshin-optimizer/sr-consts'
+import type { TypeKey } from '@genshin-optimizer/sr-consts'
 import { objFilterKeys } from '@genshin-optimizer/util'
+import { TextMapEN } from '../../TextMapUtil'
 import { PROJROOT_PATH } from '../../consts'
 import type { AvatarBaseTypeKey, AvatarId } from '../../mapping'
 import { characterIdMap } from '../../mapping'
-import { TextMapEN } from '../../TextMapUtil'
 import { readDMJSON } from '../../util'
 import type { HashId, MaterialValue, Value } from '../common'
 
@@ -16,7 +16,7 @@ export type AvatarConfig = {
   AvatarVOTag: string
   Rarity: AvatarRarity
   JsonPath: string
-  DamageType: DamageTypeKey
+  DamageType: TypeKey
   SPNeed: Value
   ExpGroup: number
   MaxPromotion: number

libs/sr-dm/src/dm/character/AvatarRankConfig.ts

@@ -0,0 +1,45 @@
+import { dumpFile } from '@genshin-optimizer/pipeline'
+import { PROJROOT_PATH } from '../../consts'
+import { readDMJSON } from '../../util'
+import type { HashId, MaterialValue, Value } from '../common'
+import { avatarConfig } from './AvatarConfig'
+
+// Eidolon information
+export type AvatarRankConfig = {
+  RankID: number // Internal Eidolon ID
+  Rank: number // Eidolon #1-6
+  Trigger: HashId
+  Name: string
+  Desc: string
+  IconPath: string
+  SkillAddLevelList: SkillAddLevelList // Info for Eidolon 3/5
+  RankAbility: string[] // I dunno
+  UnlockCost: MaterialValue
+  Param: Value[] // Scalings, if any
+}
+// { <skillId>: <# of levels increased> }
+type SkillAddLevelList = Partial<Record<string, number>>
+
+const avatarRankConfigSrc = JSON.parse(
+  readDMJSON('ExcelOutput/AvatarRankConfig.json')
+) as Record<string, AvatarRankConfig>
+
+// Convert to { charId: { eidolon#: config } } mapping
+const avatarRankConfig = Object.fromEntries(
+  Object.entries(avatarConfig).map(([avatarId, avatarConfig]) => [
+    avatarId, // Map charId
+    // to { eidolon#: config }
+    Object.fromEntries(
+      avatarConfig.RankIDList.map((rankId) => [
+        avatarRankConfigSrc[rankId].Rank, // Map Eidolon #1-6
+        avatarRankConfigSrc[rankId], // to Config
+      ])
+    ),
+  ])
+)
+
+dumpFile(
+  `${PROJROOT_PATH}/src/dm/character/AvatarRankConfig_charMapped_gen.json`,
+  avatarRankConfig
+)
+export { avatarRankConfig }

libs/sr-dm/src/dm/character/AvatarSkillConfig.ts

@@ -1,4 +1,5 @@
 import { dumpFile } from '@genshin-optimizer/pipeline'
+import type { AbilityKey } from '@genshin-optimizer/sr-consts'
 import { objMap } from '@genshin-optimizer/util'
 import { PROJROOT_PATH } from '../../consts'
 import { readDMJSON } from '../../util'
@@ -42,6 +43,13 @@ export type AvatarSkillConfig = {
 }
 
 export type AttackType = 'Normal' | 'BPSkill' | 'Ultra' | 'MazeNormal' | 'Maze'
+export const DmAttackTypeMap: Record<AttackType, AbilityKey> = {
+  Normal: 'basic',
+  BPSkill: 'skill',
+  Ultra: 'ult',
+  MazeNormal: 'talent',
+  Maze: 'technique',
+}
 
 export type SkillEffect =
   | 'SingleAttack'