feat(editor2): remove skills from operators.json and rename equips to modules

Author: guansss

scripts/shared.ts

@@ -1,5 +1,5 @@
 import { access } from 'fs/promises'
-import { compact, last, uniq, uniqBy } from 'lodash-es'
+import { uniq, uniqBy } from 'lodash-es'
 import fetch from 'node-fetch'
 import { pinyin } from 'pinyin'
 import simplebig from 'simplebig'
@@ -147,29 +147,11 @@ export async function getOperators() {
           })
         }
       }
-      const equips = equipsByOperatorId[id]
+      const modules = equipsByOperatorId[id]
         ?.sort((a, b) => a.charEquipOrder - b.charEquipOrder)
         .map(({ typeName1, typeName2 }) => {
           return typeName1 === 'ORIGINAL' ? '' : typeName2
         })
-      const skills = ['TOKEN'].includes(op.profession)
-        ? [] // 召唤物无需选择技能，所以不需要技能信息
-        : compact(
-            (op.skills as any[]).map(
-              ({ skillId }: { skillId: string | null }) => {
-                if (!skillId) return null
-                // 技能的每级都有一个 name，直接取等级最高的那个，以防鹰角背刺
-                const name = last<{ name: string }>(
-                  skillTable[skillId].levels,
-                )?.name
-                if (!name) {
-                  console.error(`Invalid skill: ${op.name} - ${skillId}`)
-                  return null
-                }
-                return name
-              },
-            ),
-          )
       return [
         {
           id: id,
@@ -182,8 +164,7 @@ export async function getOperators() {
               ? 0
               : Number(op.rarity?.split('TIER_').join('') || 0),
           alt_name: op.appellation,
-          skills,
-          equips,
+          modules,
         },
       ]
     }),

src/components/editor/operator/EditorOperator.tsx

@@ -32,7 +32,6 @@ const createArbitraryOperator = (name: string): OperatorInfo => ({
   name_en: '',
   prof: '',
   rarity: 0,
-  skills: [],
 })
 
 export const EditorOperatorName = <T extends FieldValues>({

src/components/editor/operator/sheet/sheetOperator/SheetOperatorFilterProvider.tsx

@@ -115,7 +115,6 @@ const generateCustomizedOperInfo = (name: string): OperatorInfo => ({
   alias: 'customized-operator',
   rarity: 0,
   alt_name: 'custormized operator named' + name,
-  skills: [],
 })
 
 const useOperatorFiltered = (

src/components/editor2/operator/OperatorItem.tsx

@@ -21,9 +21,9 @@ import {
   OPERATORS,
   adjustOperatorLevel,
   alternativeOperatorSkillUsages,
-  defaultSkills,
   getDefaultRequirements,
   getEliteIconUrl,
+  getSkillCount,
   getSkillUsageAltTitle,
   withDefaultRequirements,
 } from '../../../models/operator'
@@ -66,12 +66,12 @@ export const OperatorItem: FC<OperatorItemProps> = memo(
     const edit = useEdit()
     const setFavOperators = useSetAtom(editorFavOperatorsAtom)
     const info = OPERATORS.find(({ name }) => name === operator.name)
-    const skills = info ? info.skills : defaultSkills
+    const skillCount = info ? getSkillCount(info) : 3
     const requirements = withDefaultRequirements(
       operator.requirements,
       info?.rarity,
     )
-    const detailedSkills = skills.map((_, index) => ({
+    const detailedSkills = Array.from({ length: skillCount }, (_, index) => ({
       available: index <= requirements.elite,
       defaultLevel: getDefaultRequirements(info?.rarity).skillLevel,
     }))
@@ -313,6 +313,7 @@ export const OperatorItem: FC<OperatorItemProps> = memo(
               const skillLevel = selected
                 ? requirements.skillLevel
                 : defaultLevel
+              const maxLevel = requirements.elite === 2 ? 10 : 7
               return (
                 <li
                   key={index}
@@ -350,20 +351,19 @@ export const OperatorItem: FC<OperatorItemProps> = memo(
                         })
                       }
                     }}
-                    onValueChange={(value) => {
+                    onValueChange={(_, valueStr) => {
                       edit(() => {
                         // 拿到新输入的一位数字（比如原来是 5，输入 2，变成 52，这里会拿到 2）
-                        const acceptedValue =
-                          value >= 10
-                            ? +String(value).replace(
-                                String(requirements.skillLevel),
-                                '',
-                              )
-                            : value
-                        let newLevel = clamp(acceptedValue, 0, 9)
+                        let newLevel =
+                          valueStr.length > 1
+                            ? +String(valueStr).replace(String(skillLevel), '')
+                            : Number(valueStr)
+
                         if (newLevel === 0) {
                           newLevel = 10
                         }
+                        newLevel = clamp(newLevel, 1, maxLevel)
+
                         onChange?.({
                           ...operator,
                           requirements: {
@@ -372,7 +372,7 @@ export const OperatorItem: FC<OperatorItemProps> = memo(
                           },
                         })
                         return {
-                          action: 'set-operator-level',
+                          action: 'set-operator-skillLevel',
                           desc: i18n.actions.editor2.set_operator_skill_level,
                           squashBy: operator.id,
                         }
@@ -388,12 +388,12 @@ export const OperatorItem: FC<OperatorItemProps> = memo(
                             skillLevel: clamp(
                               requirements.skillLevel + (e.deltaY > 0 ? -1 : 1),
                               1,
-                              10,
+                              maxLevel,
                             ),
                           },
                         })
                         return {
-                          action: 'set-operator-level',
+                          action: 'set-operator-skillLevel',
                           desc: i18n.actions.editor2.set_operator_skill_level,
                           squashBy: operator.id,
                         }
@@ -412,11 +412,11 @@ export const OperatorItem: FC<OperatorItemProps> = memo(
                 </li>
               )
             })}
-          {controlsEnabled && info?.equips && (
+          {controlsEnabled && info?.modules && (
             <Select
               className="row-start-4"
               filterable={false}
-              items={info.equips}
+              items={info.modules}
               itemRenderer={(
                 item,
                 { index, handleClick, handleFocus, modifiers },
@@ -440,7 +440,7 @@ export const OperatorItem: FC<OperatorItemProps> = memo(
                     ...operator,
                     requirements: {
                       ...operator.requirements,
-                      module: info.equips.indexOf(item),
+                      module: info.modules.indexOf(item),
                     },
                   })
                   return {
@@ -467,7 +467,7 @@ export const OperatorItem: FC<OperatorItemProps> = memo(
                     : '!bg-gray-300 dark:!bg-gray-600 opacity-15 dark:opacity-25 hover:opacity-30 dark:hover:opacity-50',
                 )}
               >
-                {info.equips[requirements.module]}
+                {info.modules[requirements.module]}
               </Button>
             </Select>
           )}

src/components/editor2/operator/OperatorSelect.tsx

@@ -22,7 +22,6 @@ const createArbitraryOperator = (name: string): OperatorInfo => ({
   subProf: '',
   prof: '',
   rarity: 0,
-  skills: [],
 })
 
 const operatorNamesAtom = selectAtom(

src/components/viewer/OperationViewer.tsx

@@ -53,8 +53,8 @@ import { createCustomLevel, findLevelByStageName } from '../../models/level'
 import { Level } from '../../models/operation'
 import {
   OPERATORS,
-  defaultSkills,
   getEliteIconUrl,
+  getSkillCount,
   useLocalizedOperatorName,
   withDefaultRequirements,
 } from '../../models/operator'
@@ -341,11 +341,13 @@ const OperatorCard: FC<{
   const t = useTranslation()
   const displayName = useLocalizedOperatorName(operator.name)
   const info = OPERATORS.find((o) => o.name === operator.name)
-  const skills = info ? info.skills : defaultSkills
   const { level, elite, skillLevel, module } = withDefaultRequirements(
     operator.requirements,
     info?.rarity,
   )
+  const skillCount = info
+    ? Math.max(getSkillCount(info), operator.skill ?? 1)
+    : 3
 
   return (
     <div className="relative flex items-start">
@@ -357,12 +359,12 @@ const OperatorCard: FC<{
             className="w-20 h-20"
             fallback={displayName}
           />
-          {info?.equips && module !== 0 && (
+          {info?.modules && module !== 0 && (
             <div
               title={t.components.editor2.label.opers.requirements.module}
               className="absolute -bottom-1 right-1 font-serif font-bold text-lg text-white [text-shadow:0_0_3px_#a855f7,0_0_5px_#a855f7]"
             >
-              {info.equips[module]}
+              {info.modules[module]}
             </div>
           )}
         </div>
@@ -393,7 +395,7 @@ const OperatorCard: FC<{
       )}
 
       <ul className="flex flex-col gap-1 ml-1">
-        {skills.map((_, index) => {
+        {Array.from({ length: skillCount }, (_, index) => {
           const skillNumber = index + 1
           const selected = operator.skill === skillNumber
           return (