Update starrail pipeline to properly get skill data and image data lo…

…cally (#2363)

* Use local images for starrail assets

* Remove overworld image

* Regenerate

* Fix somnia command

* Update pipeline to properly use AvatarSkillConfig and AvatarSkillTreeConfig

* Regenerate files

* Update more things

* Generate again

* Undo databank change

apps/somnia/src/commands/databank/char.ts

@@ -68,7 +68,7 @@ function skillEmbed(
   }
   const embed = baseEmbed(id, name).setDescription(clean(text))
   const thumbnail = getAssets(id)[ability]
-  if (thumbnail) embed.setThumbnail(createYattaUrl('skill', thumbnail))
+  if (thumbnail) embed.setThumbnail(createYattaUrl('skill', thumbnail[0]))
   return embed
 }
 

libs/sr/assets-data/src/executors/gen-assets-data/executor.ts

@@ -10,8 +10,10 @@ import type {
 import {
   avatarConfig,
   avatarRankConfig,
+  avatarSkillConfig,
   avatarSkillTreeConfig,
   characterIdMap,
+  DmAttackTypeMap,
   equipmentConfig,
   lightConeIdMap,
   relicDataInfo,
@@ -24,12 +26,12 @@ import type { GenAssetsDataExecutorSchema } from './schema'
 
 type CharacterIcon = {
   icon: string
-  basic: string
-  skill: string
-  ult: string
-  talent: string
-  technique: string
-  overworld: string
+  basic: string[]
+  skill: string[]
+  ult: string[]
+  talent: string[]
+  technique: string[]
+  overworld: string[]
   bonusAbility1: string
   bonusAbility2: string
   bonusAbility3: string
@@ -84,42 +86,51 @@ const runExecutor: PromiseExecutor<GenAssetsDataExecutorSchema> = async (
 
   // parse baseStat/ascension/basic data for characters.
   Object.entries(avatarConfig).forEach(([avatarId, charData]) => {
-    const { DefaultAvatarHeadIconPath } = charData
+    const { DefaultAvatarHeadIconPath, SkillList } = charData
+    const [eidolon1, eidolon2, eidolon3, eidolon4, eidolon5, eidolon6] =
+      Object.values(avatarRankConfig[avatarId]).map((config) => config.IconPath)
+
     const [
-      basic,
-      skill,
-      ult,
-      talent,
-      technique,
-      overworld,
+      _basic,
+      _skill,
+      _ult,
+      _talent,
+      _technique,
       bonusAbility1,
       bonusAbility2,
       bonusAbility3,
     ] = Object.values(avatarSkillTreeConfig[avatarId]).map(
       // Grab the first level; we just need the image names
-      (skillTree) => skillTree[0]
+      (skillTree) => skillTree[0].IconPath
     )
 
-    const [e1, e2, e3, e4, e5, e6] = Object.values(avatarRankConfig[avatarId])
-
     const assets: CharacterIcon = {
       icon: DefaultAvatarHeadIconPath,
-      basic: basic.IconPath,
-      skill: skill.IconPath,
-      ult: ult.IconPath, // TODO: Maybe switch tot
-      talent: talent.IconPath,
-      technique: technique.IconPath,
-      overworld: overworld.IconPath,
-      bonusAbility1: bonusAbility1.IconPath,
-      bonusAbility2: bonusAbility2.IconPath,
-      bonusAbility3: bonusAbility3.IconPath,
-      eidolon1: e1.IconPath,
-      eidolon2: e2.IconPath,
-      eidolon3: e3.IconPath,
-      eidolon4: e4.IconPath,
-      eidolon5: e5.IconPath,
-      eidolon6: e6.IconPath,
+      basic: [],
+      skill: [],
+      ult: [],
+      talent: [],
+      technique: [],
+      overworld: [],
+      bonusAbility1,
+      bonusAbility2,
+      bonusAbility3,
+      eidolon1,
+      eidolon2,
+      eidolon3,
+      eidolon4,
+      eidolon5,
+      eidolon6,
     }
+
+    SkillList.forEach((skillId) => {
+      // Grab the first level; we just need the image names
+      const { AttackType, SkillIcon } = avatarSkillConfig[skillId][0]
+      assets[AttackType ? DmAttackTypeMap[AttackType] : 'talent']?.push(
+        SkillIcon
+      )
+    })
+
     assetData.chars[characterIdMap[avatarId]] = assets
   })
 

libs/sr/assets/project.json

@@ -9,7 +9,7 @@
     "gen-file": {
       "executor": "@genshin-optimizer/sr/assets:gen-assets",
       "options": {
-        "fetchAssets": "none"
+        "fetchAssets": "local"
       },
       "outputs": ["{workspaceRoot}/${projectRoot}/src/gen/**/*"],
       "dependsOn": ["sr-assets-data:gen-file"]

libs/sr/assets/src/executors/gen-assets/executor.ts

@@ -35,57 +35,50 @@ export default async function runExecutor(
   console.log(options)
   if (options.fetchAssets === 'local' && fs.existsSync(DM2D_PATH)) {
     console.log('Copying files')
-    await crawlObject(
+    crawlObject(
       AssetData,
       [],
-      (s) => typeof s === 'string',
-      async (filePath: string, keys) => {
-        const fileName = keys.slice(-1)
+      (s) => typeof s === 'string' || Array.isArray(s),
+      (filePath: string | string[], keys) => {
+        const fileName = keys.slice(-1)[0]
         const folderPath = keys.slice(0, -1).join('/')
-        copyFile(
-          `${DM2D_PATH}/${filePath.toLocaleLowerCase()}`,
-          `${DEST_PROJ_PATH}/gen/${folderPath}/${fileName}.png`
-        )
+        if (typeof filePath === 'string') {
+          copyFile(
+            `${DM2D_PATH}/${filePath.toLocaleLowerCase()}`,
+            `${DEST_PROJ_PATH}/gen/${folderPath}/${fileName}.png`
+          )
+        } else {
+          filePath.forEach((fp, index) =>
+            copyFile(
+              `${DM2D_PATH}/${fp.toLocaleLowerCase()}`,
+              `${DEST_PROJ_PATH}/gen/${folderPath}/${fileName}_${index}.png`
+            )
+          )
+        }
       }
     )
   } else if (options.fetchAssets === 'yatta') {
     console.log('Fetching from yatta.top')
     await crawlObjectAsync(
       AssetData,
       [],
-      (s) => typeof s === 'string',
-      async (filePath: string, keys) => {
-        const fileName = keys.slice(-1)
+      (s) => typeof s === 'string' || Array.isArray(s),
+      async (filePath: string | string[], keys) => {
+        const fileName = keys.slice(-1)[0]
         const subFolderPath = keys.slice(0, -1).join('/')
-        const yattaFileName = filePath.split('/').at(-1) ?? ''
-        const yatta = `https://api.yatta.top/hsr/assets/UI/skill/${yattaFileName}`
         const destFolder = path.resolve(
           `${DEST_PROJ_PATH}/gen/${subFolderPath}`
         )
-        const destFile = path.resolve(`${destFolder}/${fileName}.png`)
-
         if (!fs.existsSync(destFolder)) fs.mkdirSync(destFolder)
 
-        const filestream = fs.createWriteStream(destFile)
-
-        try {
-          const yattaImage = await fetch(yatta)
-          if (yattaImage.body === null) {
-            console.log(
-              `File body null for ${yatta} to be stored in ${destFile}`
-            )
-            return
-          }
-          await finished(
-            Readable.fromWeb(yattaImage.body as ReadableStream<any>).pipe(
-              filestream
+        if (typeof filePath === 'string') {
+          await saveFromYatta(filePath, destFolder, fileName)
+        } else {
+          await Promise.all(
+            filePath.map((fp, index) =>
+              saveFromYatta(fp, destFolder, `${fileName}_${index}`)
             )
           )
-        } catch (exception) {
-          console.log(
-            `Exception when fetching ${yatta} for ${destFile}: ${exception}`
-          )
-          throw exception
         }
       }
     )
@@ -98,12 +91,50 @@ export default async function runExecutor(
   crawlObject(
     AssetData,
     [],
-    (s) => typeof s === 'string',
-    (_filePath: string, keys) => {
+    (s) => typeof s === 'string' || Array.isArray(s),
+    (filePath: string | string[], keys) => {
       const fileName = keys.slice(-1)[0]
-      layeredAssignment(indexData, keys, fileName)
+      if (typeof filePath === 'string') {
+        layeredAssignment(indexData, keys, fileName)
+      } else {
+        filePath.forEach((_, index) => {
+          const newKeys = [...keys]
+          newKeys[newKeys.length - 1] = `${
+            newKeys[newKeys.length - 1]
+          }_${index}`
+          layeredAssignment(indexData, newKeys, `${fileName}_${index}`)
+        })
+      }
     }
   )
   await generateIndexFromObj(indexData, `${DEST_PROJ_PATH}/gen`)
   return { success: true }
 }
+
+async function saveFromYatta(
+  filePath: string,
+  destFolder: string,
+  fileName: string
+) {
+  const yattaFileName = filePath.split('/').at(-1) ?? ''
+  const yatta = `https://api.yatta.top/hsr/assets/UI/skill/${yattaFileName}`
+  const destFile = path.resolve(`${destFolder}/${fileName}.png`)
+
+  const filestream = fs.createWriteStream(destFile)
+
+  try {
+    const yattaImage = await fetch(yatta)
+    if (yattaImage.body === null) {
+      console.log(`File body null for ${yatta} to be stored in ${destFile}`)
+      return
+    }
+    await finished(
+      Readable.fromWeb(yattaImage.body as ReadableStream<any>).pipe(filestream)
+    )
+  } catch (exception) {
+    console.log(
+      `Exception when fetching ${yatta} for ${destFile}: ${exception}`
+    )
+    throw exception
+  }
+}

libs/sr/assets/src/gen/chars/Acheron/index.ts

@@ -1,5 +1,5 @@
 // This is a generated index file.
-import basic from './basic.png'
+import basic_0 from './basic_0.png'
 import bonusAbility1 from './bonusAbility1.png'
 import bonusAbility2 from './bonusAbility2.png'
 import bonusAbility3 from './bonusAbility3.png'
@@ -10,14 +10,18 @@ import eidolon4 from './eidolon4.png'
 import eidolon5 from './eidolon5.png'
 import eidolon6 from './eidolon6.png'
 import icon from './icon.png'
-import overworld from './overworld.png'
-import skill from './skill.png'
-import talent from './talent.png'
-import technique from './technique.png'
-import ult from './ult.png'
+import overworld_0 from './overworld_0.png'
+import skill_0 from './skill_0.png'
+import talent_0 from './talent_0.png'
+import technique_0 from './technique_0.png'
+import ult_0 from './ult_0.png'
+import ult_1 from './ult_1.png'
+import ult_2 from './ult_2.png'
+import ult_3 from './ult_3.png'
+import ult_4 from './ult_4.png'
 
 const data = {
-  basic,
+  basic_0,
   bonusAbility1,
   bonusAbility2,
   bonusAbility3,
@@ -28,10 +32,14 @@ const data = {
   eidolon5,
   eidolon6,
   icon,
-  overworld,
-  skill,
-  talent,
-  technique,
-  ult,
+  overworld_0,
+  skill_0,
+  talent_0,
+  technique_0,
+  ult_0,
+  ult_1,
+  ult_2,
+  ult_3,
+  ult_4,
 } as const
 export default data

libs/sr/assets/src/gen/chars/Argenti/index.ts

@@ -1,5 +1,5 @@
 // This is a generated index file.
-import basic from './basic.png'
+import basic_0 from './basic_0.png'
 import bonusAbility1 from './bonusAbility1.png'
 import bonusAbility2 from './bonusAbility2.png'
 import bonusAbility3 from './bonusAbility3.png'
@@ -10,14 +10,15 @@ import eidolon4 from './eidolon4.png'
 import eidolon5 from './eidolon5.png'
 import eidolon6 from './eidolon6.png'
 import icon from './icon.png'
-import overworld from './overworld.png'
-import skill from './skill.png'
-import talent from './talent.png'
-import technique from './technique.png'
-import ult from './ult.png'
+import overworld_0 from './overworld_0.png'
+import skill_0 from './skill_0.png'
+import talent_0 from './talent_0.png'
+import technique_0 from './technique_0.png'
+import ult_0 from './ult_0.png'
+import ult_1 from './ult_1.png'
 
 const data = {
-  basic,
+  basic_0,
   bonusAbility1,
   bonusAbility2,
   bonusAbility3,
@@ -28,10 +29,11 @@ const data = {
   eidolon5,
   eidolon6,
   icon,
-  overworld,
-  skill,
-  talent,
-  technique,
-  ult,
+  overworld_0,
+  skill_0,
+  talent_0,
+  technique_0,
+  ult_0,
+  ult_1,
 } as const
 export default data