character to map

chadluo · Oct 6, 2024 · b4e1646 · b4e1646
1 parent 292c9be
commit b4e1646
Show file tree

Hide file tree

Showing 4 changed files with 197 additions and 99 deletions.
diff --git a/src/base.ts b/src/base.ts
@@ -7,7 +7,7 @@ import {
   formatName,
   weekdays,
 } from "./i18n";
-import { characters } from "./models/characters";
+import { type CharacterId, characters } from "./models/characters";
 import { type Domain, bosses, domains, enemies } from "./models/enemies";
 import { type Material, materials } from "./models/materials";
 import { weapons } from "./models/weapons";
@@ -59,7 +59,7 @@ export function renderQTableContent(
 ): string {
   switch (type) {
     case TYPE_CHARACTER: {
-      const character = characters.find((c) => c.id === id);
+      const character = characters[id as CharacterId];
       return character == null
         ? ""
         : renderQTableRows(
@@ -221,7 +221,10 @@ function byEnemy(enemy: string): Map<Material, OfMaterial[]> {
         }
         map.set(m, [
           ...(map.get(m) ?? []),
-          ...filterForMaterial([...characters, ...weapons], material),
+          ...filterForMaterial(
+            [...Object.values(characters), ...weapons],
+            material
+          ),
         ]);
         return map;
       }, new Map<Material, OfMaterial[]>());
@@ -239,7 +242,9 @@ export function byDomain(
     map.set(
       m,
       filterForMaterial(
-        domain?.type === TYPE_WEAPON_DOMAIN ? weapons : characters,
+        domain?.type === TYPE_WEAPON_DOMAIN
+          ? weapons
+          : Object.values(characters),
         material
       )
     );

diff --git a/src/components/characters_table.ts b/src/components/characters_table.ts
@@ -1,14 +1,17 @@
 import { TYPE_CHARACTER, renderLink } from "../base";
 import { hasBookmarks } from "../bookmarks";
-import { DELIMITER, formatName, type I18nObject } from "../i18n";
-import { characters, type Character } from "../models/characters";
+import { DELIMITER, type I18nObject, formatName } from "../i18n";
+import { type Character, characters } from "../models/characters";
 
 const title: I18nObject = { en: "Characters", "zh-CN": "角色" };
 
 export class CharactersTable extends HTMLElement {
   constructor() {
     super();
-    const byRarity = Map.groupBy(characters, ({ rarity }) => rarity);
+    const byRarity = Map.groupBy(
+      Object.values(characters),
+      ({ rarity }) => rarity
+    );
     const rarities = Array.from(byRarity.keys()).sort().reverse();
     this.innerHTML = `<details class="section" ${hasBookmarks() ? "" : "open"}>
         <summary>🦸 ${formatName(title)}</summary>