Merge branch 'master' into tc-opt

.github/workflows/beta-release.yml → .github/workflows/beta-go-release.yml

@@ -1,4 +1,4 @@
-name: New Beta Release
+name: New Beta GO Release
 
 on:
   push:

.github/workflows/beta-sro-release.yml

@@ -0,0 +1,23 @@
+name: New Beta SRO Release
+
+on:
+  push:
+    branches:
+      - master
+
+# Only allow the most recent run of beta release to complete, if multiple are queued.
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  call-deploy-frontend:
+    uses: ./.github/workflows/deploy-frontend.yml
+    with:
+      frontend_name: 'sr-frontend'
+      repo_full_name: ${{ github.repository }}
+      ref: ${{ github.ref }}
+      deployment_name: 'beta'
+      pr_repo: ${{ vars.PR_REPO }}
+      show_dev_components: true
+    secrets: inherit

.github/workflows/ci.yml

@@ -16,6 +16,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           persist-credentials: false
+          submodules: true
       - uses: actions/setup-node@v3
         with:
           node-version: 18
@@ -34,6 +35,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           persist-credentials: false
+          submodules: true
       - uses: actions/setup-node@v3
         with:
           node-version: 18
@@ -52,6 +54,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           persist-credentials: false
+          submodules: true
       - uses: actions/setup-node@v3
         with:
           node-version: 18

.github/workflows/deploy-frontend.yml

@@ -61,6 +61,7 @@ jobs:
         with:
           repository: ${{ inputs.repo_full_name }}
           ref: ${{ inputs.ref }}
+          submodules: true
       - uses: actions/setup-node@v3
         with:
           node-version: 18

.github/workflows/new-release.yml

@@ -14,6 +14,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          submodules: true
       - uses: actions/setup-node@v3
         with:
           node-version: 18

.gitignore

@@ -60,3 +60,6 @@ Thumbs.db
 
 # Next.js
 .next
+
+# nx
+.nx/cache

.gitmodules

@@ -0,0 +1,8 @@
+[submodule "libs/dm/GenshinData"]
+	path = libs/dm/GenshinData
+	url = https://gitlab.com/Dimbreath/AnimeGameData.git
+	shallow = true
+[submodule "libs/sr-dm/StarRailData"]
+	path = libs/sr-dm/StarRailData
+	url = https://github.com/Dimbreath/StarRailData.git
+	shallow = true

.nxignore

@@ -1,2 +1,4 @@
+libs/sr-dm/StarRailData
 !libs/dm/GenshinData.hash
+libs/dm/GenshinData
 !libs/sr-dm/StarRailData.hash

.prettierignore

@@ -5,6 +5,7 @@
 /.yarn
 
 /libs/dm/GenshinData
+/libs/sr-dm/StarRailData
 *_gen.json
 
 /libs/gi-stats/Data
@@ -13,3 +14,6 @@
 # generated from backend
 apps/gi-backend/src/app/graphql_gen.ts
 apps/gi-backend/src/app/schema_gen.graphql
+
+# nx
+/.nx/cache

apps/frontend/src/app/Components/Artifact/ArtifactTooltip.tsx

@@ -1,17 +1,16 @@
-import {
-  artDisplayValue,
-  getMainStatDisplayStr,
-} from '@genshin-optimizer/gi-util'
+import type { RollColorKey } from '@genshin-optimizer/gi-ui'
+import { IconStatDisplay } from '@genshin-optimizer/gi-ui'
+import { getMainStatDisplayStr } from '@genshin-optimizer/gi-util'
 import { iconInlineProps } from '@genshin-optimizer/svgicons'
-import { clamp, unit } from '@genshin-optimizer/util'
+import { clamp } from '@genshin-optimizer/util'
 import { Box, Skeleton, Typography } from '@mui/material'
 import { Suspense } from 'react'
 import { useTranslation } from 'react-i18next'
 import { getArtSheet } from '../../Data/Artifacts'
 import Artifact from '../../Data/Artifacts/Artifact'
 import KeyMap from '../../KeyMap'
 import StatIcon from '../../KeyMap/StatIcon'
-import type { ICachedArtifact, ICachedSubstat } from '../../Types/artifact'
+import type { ICachedArtifact } from '../../Types/artifact'
 import BootstrapTooltip from '../BootstrapTooltip'
 import LocationName from '../Character/LocationName'
 import SqBadge from '../SqBadge'
@@ -70,18 +69,15 @@ function ArtifactData({ art }: { art: ICachedArtifact }) {
       </Typography>
       <Box py={1}>
         {substats.map(
-          (stat: ICachedSubstat) =>
-            !!stat.value && (
-              <Typography
-                key={stat.key}
-                color={`roll${clamp(stat.rolls.length, 1, 6)}.main`}
-              >
-                <StatIcon statKey={stat.key} iconProps={iconInlineProps} />{' '}
-                {tk(stat.key)}{' '}
-                <strong>{`+${artDisplayValue(stat.value, unit(stat.key))}${unit(
-                  stat.key
-                )}`}</strong>
-              </Typography>
+          ({ value, key, rolls }) =>
+            !!(value && key) && (
+              <IconStatDisplay
+                key={key}
+                statKey={key}
+                value={value}
+                color={`roll${clamp(rolls.length, 1, 6)}` as RollColorKey} //TODO: stat.rolls.length instead of 1
+                prefix="+"
+              />
             )
         )}
       </Box>

apps/frontend/src/app/Data/Artifacts/SongOfDaysPast/index.tsx

@@ -34,11 +34,15 @@ const burst_dmgInc = { ...healing_dmgInc }
 export const data: Data = dataObjForArtifactSheet(key, {
   premod: {
     heal_: set2,
-    normal_dmgInc,
-    charged_dmgInc,
-    plunging_dmgInc,
-    skill_dmgInc,
-    burst_dmgInc,
+  },
+  teamBuff: {
+    premod: {
+      normal_dmgInc,
+      charged_dmgInc,
+      plunging_dmgInc,
+      skill_dmgInc,
+      burst_dmgInc,
+    },
   },
 })
 
@@ -54,6 +58,7 @@ const sheet: IArtifactSheet = {
           value: condHealing,
           path: condHealingPath,
           name: trm('condName'),
+          teamBuff: true,
           states: objKeyMap(healingArr, (heal) => ({
             name: `${heal}`,
             fields: [

apps/frontend/src/app/Data/Characters/HuTao/index.tsx

@@ -175,6 +175,7 @@ const dmgFormulas = {
   ),
   skill: {
     dmg: dmgNode('atk', dm.skill.dmg, 'skill'),
+    atk,
   },
   burst: {
     dmg: dmgNode('atk', dm.burst.dmg, 'burst'),

apps/frontend/src/app/Formula/api.tsx

@@ -6,12 +6,13 @@ import type {
   SubstatKey,
 } from '@genshin-optimizer/consts'
 import { allElementWithPhyKeys } from '@genshin-optimizer/consts'
-import { getMainStatDisplayValue } from '@genshin-optimizer/gi-util'
+import { getMainStatValue } from '@genshin-optimizer/gi-util'
 import {
   crawlObject,
   layeredAssignment,
   objKeyMap,
   objPathValue,
+  toDecimal,
 } from '@genshin-optimizer/util'
 import type { ICachedArtifact } from '../Types/artifact'
 import type { ICachedCharacter } from '../Types/character'
@@ -66,24 +67,24 @@ function dataObjForArtifact(
   art: ICachedArtifact,
   mainStatAssumptionLevel = 0
 ): Data {
-  const mainStatVal = getMainStatDisplayValue(
+  const mainStatVal = getMainStatValue(
     art.mainStatKey,
     art.rarity,
     Math.max(Math.min(mainStatAssumptionLevel, art.rarity * 4), art.level)
   )
   const stats: [ArtifactSetKey | MainStatKey | SubstatKey, number][] = []
   stats.push([art.mainStatKey, mainStatVal])
   art.substats.forEach(
-    ({ key, accurateValue }) => key && stats.push([key, accurateValue])
+    ({ key, accurateValue }) =>
+      key && stats.push([key, toDecimal(accurateValue, key)])
   )
   return {
     art: {
       ...Object.fromEntries(
-        stats.map(([key, value]) =>
-          key.endsWith('_')
-            ? [key, percent(value / 100)]
-            : [key, constant(value)]
-        )
+        stats.map(([key, value]) => [
+          key,
+          key.endsWith('_') ? percent(value) : constant(value),
+        ])
       ),
       [art.slotKey]: {
         id: constant(art.id),
@@ -428,15 +429,15 @@ function compareInternal(data1: any | undefined, data2: any | undefined): any {
   }
 }
 
-export type { NodeDisplay, UIData }
 export {
+  compareDisplayUIData,
+  compareTeamBuffUIData,
+  computeUIData,
   dataObjForArtifact,
   dataObjForCharacter,
   dataObjForWeapon,
-  mergeData,
-  computeUIData,
   inferInfoMut,
+  mergeData,
   uiDataForTeam,
-  compareTeamBuffUIData,
-  compareDisplayUIData,
 }
+export type { NodeDisplay, UIData }

apps/frontend/src/app/PageArtifact/ArtifactEditor.tsx

@@ -145,7 +145,7 @@ export default function ArtifactEditor({
   disableSlot = false,
 }: ArtifactEditorProps) {
   const queueRef = useRef(
-    new ScanningQueue(textsFromImage, process.env.NODE_ENV === 'development')
+    new ScanningQueue(textsFromImage, shouldShowDevComponents)
   )
   const queue = queueRef.current
   const { t } = useTranslation('artifact')

apps/frontend/src/app/PageCharacter/CharacterDisplay/Tabs/TabTalent.tsx

@@ -10,6 +10,7 @@ import {
   useTheme,
 } from '@mui/material'
 import { useCallback, useContext, useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
 import CardDark from '../../../Components/Card/CardDark'
 import CardLight from '../../../Components/Card/CardLight'
 import ConditionalWrapper from '../../../Components/ConditionalWrapper'
@@ -33,22 +34,23 @@ const talentSpacing = {
 }
 
 export default function CharacterTalentPane() {
+  const { t } = useTranslation('sheet_gen')
   const { character, characterSheet } = useContext(CharacterContext)
   const { data } = useContext(DataContext)
   const characterDispatch = useCharacterReducer(character.key)
   const skillBurstList = [
-    ['auto', 'Normal/Charged Attack'],
-    ['skill', 'Elemental Skill'],
-    ['burst', 'Elemental Burst'],
+    ['auto', t('talents.auto')],
+    ['skill', t('talents.skill')],
+    ['burst', t('talents.burst')],
   ] as [TalentSheetElementKey, string][]
   const passivesList: [
     tKey: TalentSheetElementKey,
     tText: string,
     asc: number
   ][] = [
-    ['passive1', 'Unlocked at Ascension 1', 1],
-    ['passive2', 'Unlocked at Ascension 4', 4],
-    ['passive3', 'Unlocked by Default', 0],
+    ['passive1', t('unlockPassive1'), 1],
+    ['passive2', t('unlockPassive2'), 4],
+    ['passive3', t('unlockPassive3'), 0],
   ]
   const ascension = data.get(input.asc).value
   const constellation = data.get(input.constellation).value
@@ -60,20 +62,20 @@ export default function CharacterTalentPane() {
       range(1, maxConstellationCount).map((i) => (
         <SkillDisplayCard
           talentKey={`constellation${i}` as TalentSheetElementKey}
-          subtitle={`Constellation Lv. ${i}`}
+          subtitle={t('constellationLvl', { level: i })}
           onClickTitle={() =>
             characterDispatch({
               constellation: i === constellation ? i - 1 : i,
             })
           }
         />
       )),
-    [constellation, characterDispatch]
+    [t, constellation, characterDispatch]
   )
   const constellationHeader = (
     <DropdownButton
       fullWidth
-      title={`Constellation Lv. ${constellation}`}
+      title={t('constellationLvl', { level: constellation })}
       color="primary"
       sx={{ borderRadius: 0 }}
     >
@@ -88,7 +90,7 @@ export default function CharacterTalentPane() {
             })
           }
         >
-          Constellation Lv. {i}
+          {t(`constellationLvl`, { level: i })}
         </MenuItem>
       ))}
     </DropdownButton>
@@ -126,7 +128,7 @@ export default function CharacterTalentPane() {
             <Grid item {...talentSpacing}>
               <SkillDisplayCard
                 talentKey="sprint"
-                subtitle="Alternative Sprint"
+                subtitle={t('talents.altSprint')}
               />
             </Grid>
           )}
@@ -210,6 +212,7 @@ function SkillDisplayCard({
   subtitle,
   onClickTitle,
 }: SkillDisplayCardProps) {
+  const { t } = useTranslation('sheet_gen')
   const {
     character: { talent },
     characterSheet,
@@ -242,7 +245,7 @@ function SkillDisplayCard({
     header = (
       <DropdownButton
         fullWidth
-        title={`Talent Lv. ${level}`}
+        title={t('talentLvl', { level: level })}
         color={levelBoost ? 'info' : 'primary'}
         sx={{ borderRadius: 0 }}
       >
@@ -253,7 +256,7 @@ function SkillDisplayCard({
             disabled={talent[talentKey] === i}
             onClick={() => setTalentLevel(talentKey, i)}
           >
-            Talent Lv. {i + levelBoost}
+            {t('talentLvl', { level: i + levelBoost })}
           </MenuItem>
         ))}
       </DropdownButton>