feat: 🎸 update move list on evoluton chain

HuskyHsu · Oct 31, 2023 · 2a9d0f7 · 2a9d0f7
1 parent 986e5f5
commit 2a9d0f7
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 14 deletions.
diff --git a/public/data/base_list_201.json b/public/data/base_list_201.json
diff --git a/public/data/pm/184.json b/public/data/pm/184.json
diff --git a/public/data/pm/275.json b/public/data/pm/275.json
diff --git a/public/data/pm/289.json b/public/data/pm/289.json
diff --git a/public/data/pm/395.json b/public/data/pm/395.json
diff --git a/public/data/pm/604.json b/public/data/pm/604.json
diff --git a/public/data/pm/666.json b/public/data/pm/666.json
diff --git a/public/data/pm/979.json b/public/data/pm/979.json
diff --git a/src/pages/Pokemon/components/Moves.tsx b/src/pages/Pokemon/components/Moves.tsx
@@ -40,7 +40,7 @@ const columns = [
           ? LevelMap[row.level.toString() as keyof typeof LevelMap]
           : `Lv${row.level.toString().padStart(2, '0')}`;
 
-      return `${row.pm.nameZh}${row.pm.altForm ? '(' + row.pm.altForm + ')' : ''}-${level}`;
+      return `${row.pm.nameZh}${row.pm.altForm ? '(' + row.pm.altForm + ')' : ''}: ${level}`;
     },
     meta: 'w-2/12',
   },
@@ -211,7 +211,9 @@ export function Moves({ pm }: Props) {
         </li>
         {allMoves
           .map((move) => {
-            const key = `${move.pid}-${'level' in move ? move.level : move.TMPid}`;
+            const key = `${move.pid}-${
+              'level' in move ? ('pm' in move ? move.pm.link : move.level) : move.TMPid
+            }`;
             const lilist = [
               <li
                 className="flex cursor-pointer border-b-[1px] py-1"

diff --git a/src/types/Pokemon.ts b/src/types/Pokemon.ts
@@ -70,6 +70,8 @@ type LevelingUp = Move & { level: number };
 
 type EggMove = Move & { level: number };
 
+type beforeEvolveMove = Move & { level: number; pm: SubPokemon };
+
 type TM = Move & {
   TMPid: number;
   leaguePoint: number;
@@ -80,15 +82,13 @@ type TM = Move & {
   }[];
 };
 
-type beforeEvolveMove = Move & { level: number; pm: SubPokemon };
-
-export type PMMove = LevelingUp | EggMove | TM | beforeEvolveMove;
+export type PMMove = LevelingUp | EggMove | beforeEvolveMove | TM;
 
 type MoveInfo = {
   levelingUps: LevelingUp[];
   eggMoves: EggMove[];
-  TMs: TM[];
   beforeEvolve: beforeEvolveMove[];
+  TMs: TM[];
 };
 
 export enum MoveCategoryEnum {