koishi-plugin-wcl-lili 1.3.1 → 1.3.2

package/lib/index.js

@@ -2325,9 +2325,14 @@ function normHeroEn(s) {
   return s.toLowerCase().replace(/[^a-z0-9]/g, "");
 }
 var _HERO_NORM_IDX = Object.entries(HERO_EN_CN).map(([en, zh]) => ({ ne: normHeroEn(en), zh }));
+var HERO_ZH_ALIAS = {
+  // 常见同音/形近变体（用户输入 → 表内标准译名）
+  \u8428\u83B1\u8335: "\u8428\u83B1\u56E0"
+};
 function matchHeroToken(t) {
   const s = (t || "").trim();
   if (!s) return null;
+  if (HERO_ZH_ALIAS[s]) return HERO_ZH_ALIAS[s];
   for (const zh of Object.values(HERO_EN_CN)) if (zh === s) return zh;
   const nq = normHeroEn(s);
   if (nq.length < 3) return null;
@@ -2341,12 +2346,39 @@ function parseTrinketContext(t) {
   return null;
 }
 var TRINKET_DEFAULT_HERO = {
-  "evoker.devastation": "Scalecommander"
-  // 湮灭：鳞长为主流
+  "death_knight.blood": "San'layn",
+  "death_knight.unholy": "Rider",
+  "demon_hunter.devourer": "Void-Scarred",
+  "demon_hunter.havoc": "Fel-Scarred",
+  "demon_hunter.vengeance": "Annihilator",
+  "druid.balance": "Elune's Chosen",
+  "druid.feral": "Druid of the Claw",
+  "druid.guardian": "Druid of the Claw",
+  "evoker.augmentation": "Chronowarden",
+  "evoker.devastation": "Flameshaper",
+  "mage.arcane": "Spellslinger",
+  "mage.fire": "Sunfury",
+  "mage.frost": "Spellslinger",
+  "paladin.retribution": "Herald of the Sun",
+  "priest.shadow": "Voidweaver",
+  "rogue.assassination": "Deathstalker",
+  "shaman.elemental": "Farseer",
+  "shaman.enhancement": "Stormbringer",
+  "warlock.affliction": "Soul Harvester",
+  "warlock.demonology": "Soulharvester",
+  "warlock.destruction": "Hellcaller"
 };
 function profileHeroEn(name2) {
   return (name2 || "").replace(/^(?:SimulationCraft|Liquid Generated)\s*-\s*(?:M\+\s*)?/i, "").trim();
 }
+var TRINKET_GEN_ALIAS = {
+  liquid: "liquid",
+  \u6DB2\u4F53: "liquid",
+  \u674E\u9035: "liquid",
+  \u674E\u594E: "liquid",
+  simc: "simc",
+  simulationcraft: "simc"
+};
 function profileHeroZh(name2) {
   const en = profileHeroEn(name2);
   if (!en || /^default$/i.test(en)) return "";
@@ -2659,13 +2691,16 @@ function selectLiquidBars(data, cls, spec, simStyle, opts) {
   const mplus = !!opts?.mplus;
   const specData = data?.[titleKey(cls)]?.[titleKey(spec)];
   if (!specData || !specData.profiles?.length) return { error: "no-profile", available: [], profile: "", heroZh: "", mplus };
-  const ctxProfiles = specData.profiles.filter((p) => /M\+/.test(p.name) === mplus);
-  if (!ctxProfiles.length) return { error: "no-profile", available: [], profile: "", heroZh: "", mplus };
+  let ctxProfiles = specData.profiles.filter((p) => /M\+/.test(p.name) === mplus);
+  const genRe = opts?.gen === "simc" ? /^SimulationCraft/i : opts?.gen === "liquid" ? /^Liquid Generated/i : null;
+  if (genRe) ctxProfiles = ctxProfiles.filter((p) => genRe.test(p.name));
+  if (!ctxProfiles.length) return { error: genRe ? "gen-not-found" : "no-profile", available: [], profile: "", heroZh: "", mplus };
   const pool = ctxProfiles;
-  const availableZh = [...new Set(specData.profiles.map((p) => profileHeroZh(p.name)).filter(Boolean))];
+  const availableZh = [...new Set(ctxProfiles.map((p) => profileHeroZh(p.name)).filter(Boolean))];
   let profile = null;
   if (opts?.heroZh) {
-    const wantEn = Object.entries(HERO_EN_CN).find(([, zh]) => zh === opts.heroZh)?.[0] || opts.heroZh;
+    const wantZh = HERO_ZH_ALIAS[opts.heroZh] || opts.heroZh;
+    const wantEn = Object.entries(HERO_EN_CN).find(([, zh]) => zh === wantZh)?.[0] || wantZh;
     const nq = normHeroEn(wantEn);
     if (!nq) return { error: "hero-not-found", available: availableZh, profile: "", heroZh: opts.heroZh, mplus };
     profile = pool.find((p) => {
@@ -2985,6 +3020,7 @@ function renderTrinketLiquidHtml(opts) {
               <div class="la_wow_sim_profile__settings">
                 <div class="tl_select"><label class="tl_select__label">\u6D41\u6D3E</label><div class="tl_select__selector"><span class="select_trigger"><span class="select_trigger__label">${e(sel.heroZh || "\u9ED8\u8BA4")} \xB7 ${sel.mplus ? "\u5927\u79D8\u5883" : "\u56E2\u672C"}</span>${chevron}</span></div></div>
                 <div class="tl_select" style="flex:0 0 96px"><label class="tl_select__label">\u76EE\u6807\u6570</label><div class="tl_select__selector"><span class="select_trigger"><span class="select_trigger__label">${e(targetCn)}</span>${chevron}</span></div></div>
+                ${opts.genZh ? `<div class="tl_select" style="flex:0 0 96px"><label class="tl_select__label">\u4EE3\u6B21</label><div class="tl_select__selector"><span class="select_trigger"><span class="select_trigger__label">${e(opts.genZh)}</span>${chevron}</span></div></div>` : ""}
               </div>
               <div class="la_wow_sim_profile__simcraft_data"><p>SimulationCraft \u6A21\u62DF \xB7 Liquid \u516C\u4F1A</p><p>\u6570\u636E\u6E90 liquidarmory.com Trinket Tracker</p></div>
             </div>
@@ -4441,7 +4477,7 @@ ${raid}`;
       return `\u274C \u751F\u6210\u56E2\u672C\u5F3A\u5EA6\u56FE\u5931\u8D25\uFF1A${e.message || "\u672A\u77E5\u9519\u8BEF"}`;
     }
   });
-  ctx.command("wcl.\u9970\u54C1 <spec:text>", "\u67E5\u8BE2\u4E13\u7CBE BIS \u9970\u54C1\u5F3A\u5EA6\u699C\uFF08\u8F93\u51FA\u5411=liquidarmory \u590D\u523B\u6837\u5F0F\uFF0C\u6CBB\u7597\u5411=questionablyepic \u6570\u636E\uFF0C\u5168\u4E2D\u6587\uFF09").example("wcl.\u9970\u54C1 \u9C9C\u8840 5 \u2014 \u9C9C\u8840 DK 5 \u76EE\u6807\u573A\u666F\uFF0C\u5168\u90E8\u9970\u54C1").example("wcl.\u9970\u54C1 \u6CD5\u5E08-\u51B0\u971C 1 \u2014 \u6CD5\u5E08\u51B0\u971C\u5355\u76EE\u6807").example("wcl.\u9970\u54C1 \u566C\u706D 3 15 \u2014 \u566C\u706D 3 \u76EE\u6807\uFF0C\u53EA\u770B\u524D 15 \u540D").example("wcl.\u9970\u54C1 \u6E6E\u706D \u5851\u7130\u8005 5 \u2014 \u6E6E\u706D\u5524\u9B54\u5E08\u5851\u7130\u8005\u6D41\u6D3E 5 \u76EE\u6807\uFF08\u9ED8\u8BA4\u9CDE\u957F\uFF09").example("wcl.\u9970\u54C1 \u5FB7\u9C81\u4F0A-\u6062\u590D \u2014 \u6062\u590D\u5FB7\u6CBB\u7597\u9970\u54C1\u699C\uFF08\u9ED8\u8BA4\u5927\u79D8\u5883\uFF0C\u52A0\u300C\u56E2\u672C\u300D\u5207\u6362\uFF09").usage("\u683C\u5F0F\uFF1Awcl.\u9970\u54C1 \u4E13\u7CBE [\u82F1\u96C4\u5929\u8D4B] [\u56E2\u672C/\u5927\u79D8\u5883] [\u6570\u5B57]\uFF0C\u5404\u540E\u7F00\u4F4D\u7F6E\u4E0D\u9650\u3002\n\u4E13\u7CBE\u652F\u6301\u4E2D\u6587\uFF08\u9C9C\u8840/\u51B0\u971C/\u566C\u706D \u7B49\uFF09\u3002\u91CD\u540D\u4E13\u7CBE\uFF08\u51B0\u971C=DK/\u6CD5\u5E08\u3001\u6062\u590D=\u5FB7/\u8428\u3001\u795E\u5723=\u9A91/\u7267\u3001\u9632\u62A4=\u9A91/\u6218\uFF09\u8BF7\u7528\u300C\u804C\u4E1A-\u4E13\u7CBE\u300D\uFF0C\u5982\u300C\u6CD5\u5E08-\u51B0\u971C\u300D\u3002\n\u82F1\u96C4\u5929\u8D4B\uFF1A\u8F93\u51FA\u5411\u4E13\u7CBE\u53EF\u6307\u5B9A\u6D41\u6D3E\uFF08\u5982 \u6E6E\u706D\u2192\u9CDE\u957F/\u5851\u7130\u8005\uFF0C\u90AA\u6076\u2192\u5929\u542F\u9A91\u58EB/\u6B7B\u4EA1\u4F7F\u8005 \u7B49\uFF0C\u652F\u6301\u4E2D\u6587\u6216\u82F1\u6587\uFF09\uFF0C\u9ED8\u8BA4\u53D6\u4E3B\u6D41\u6D41\u6D3E\u3002\n\u76EE\u6807\u6570\u4EC5\u652F\u6301 1 / 3 / 5\uFF0C\u9ED8\u8BA4 1\uFF1B\u6570\u5B57\u81EA\u52A8\u8BC6\u522B\uFF081/3/5=\u76EE\u6807\u6570\uFF0C\u5176\u4ED6=\u6700\u591A N \u6761\uFF09\uFF0C\u4F4D\u7F6E\u4E0D\u9650\u3002\n\u60C5\u5883\uFF1A\u9ED8\u8BA4\u67E5\u8BE2\u5927\u79D8\u5883\uFF0C\u53EF\u7528\u300C\u56E2\u672C/\u5927\u79D8\u5883\u300D\u5207\u6362\uFF1B\u65E0\u5927\u79D8\u5883\u6570\u636E\u7684\u4E13\u7CBE\u81EA\u52A8\u56DE\u9000\u56E2\u672C\uFF08\u4F1A\u63D0\u793A\uFF09\u3002\n\u6CBB\u7597\u4E13\u7CBE\uFF08\u6062\u590D\u5FB7/\u6062\u590D\u8428/\u795E\u5723\u9A91/\u795E\u5723\u7267/\u6212\u5F8B\u7267/\u7EC7\u96FE/\u62A4\u5B58\u8005\uFF09\uFF1A\u6570\u636E\u6E90 QE Live \u6CBB\u7597\u6A21\u62DF\uFF08HPS\uFF09\uFF0C\u540C\u6837\u9ED8\u8BA4\u5927\u79D8\u5883\u3002\n\u6570\u636E\u6E90\uFF1Aliquidarmory.com Trinket Tracker\uFF081:1 \u590D\u523B\u539F\u7AD9\u4E09\u8272\u6761\u7EB9\u6837\u5F0F\uFF09\u3002").action(wrapOutput(config, async (argv, specRaw) => {
+  ctx.command("wcl.\u9970\u54C1 <spec:text>", "\u67E5\u8BE2\u4E13\u7CBE BIS \u9970\u54C1\u5F3A\u5EA6\u699C\uFF08\u8F93\u51FA\u5411=liquidarmory \u590D\u523B\u6837\u5F0F\uFF0C\u6CBB\u7597\u5411=questionablyepic \u6570\u636E\uFF0C\u5168\u4E2D\u6587\uFF09").example("wcl.\u9970\u54C1 \u9C9C\u8840 5 \u2014 \u9C9C\u8840 DK 5 \u76EE\u6807\u573A\u666F\uFF0C\u5168\u90E8\u9970\u54C1").example("wcl.\u9970\u54C1 \u6CD5\u5E08-\u51B0\u971C 1 \u2014 \u6CD5\u5E08\u51B0\u971C\u5355\u76EE\u6807").example("wcl.\u9970\u54C1 \u566C\u706D 3 15 \u2014 \u566C\u706D 3 \u76EE\u6807\uFF0C\u53EA\u770B\u524D 15 \u540D").example("wcl.\u9970\u54C1 \u6E6E\u706D \u5851\u7130\u8005 5 \u2014 \u6E6E\u706D\u5524\u9B54\u5E08\u5851\u7130\u8005\u6D41\u6D3E 5 \u76EE\u6807\uFF08\u9ED8\u8BA4\u9CDE\u957F\uFF09").example("wcl.\u9970\u54C1 \u5FB7\u9C81\u4F0A-\u6062\u590D \u2014 \u6062\u590D\u5FB7\u6CBB\u7597\u9970\u54C1\u699C\uFF08\u9ED8\u8BA4\u5927\u79D8\u5883\uFF0C\u52A0\u300C\u56E2\u672C\u300D\u5207\u6362\uFF09").example("wcl.\u9970\u54C1 \u9C9C\u8840 simc \u2014 \u9C9C\u8840 DK \u56E2\u672C SimC \u4EE3\u6A21\u62DF\uFF08\u4E0D\u6307\u5B9A\u4EE3\u6B21 = \u4E0E\u7F51\u7AD9\u9ED8\u8BA4\u4E00\u81F4\uFF09").usage("\u683C\u5F0F\uFF1Awcl.\u9970\u54C1 \u4E13\u7CBE [\u82F1\u96C4\u5929\u8D4B] [\u56E2\u672C/\u5927\u79D8\u5883] [\u4EE3\u6B21] [\u6570\u5B57]\uFF0C\u5404\u540E\u7F00\u4F4D\u7F6E\u4E0D\u9650\u3002\n\u4E13\u7CBE\u652F\u6301\u4E2D\u6587\uFF08\u9C9C\u8840/\u51B0\u971C/\u566C\u706D \u7B49\uFF09\u3002\u91CD\u540D\u4E13\u7CBE\uFF08\u51B0\u971C=DK/\u6CD5\u5E08\u3001\u6062\u590D=\u5FB7/\u8428\u3001\u795E\u5723=\u9A91/\u7267\u3001\u9632\u62A4=\u9A91/\u6218\uFF09\u8BF7\u7528\u300C\u804C\u4E1A-\u4E13\u7CBE\u300D\uFF0C\u5982\u300C\u6CD5\u5E08-\u51B0\u971C\u300D\u3002\n\u82F1\u96C4\u5929\u8D4B\uFF1A\u8F93\u51FA\u5411\u4E13\u7CBE\u53EF\u6307\u5B9A\u6D41\u6D3E\uFF08\u5982 \u6E6E\u706D\u2192\u9CDE\u957F/\u5851\u7130\u8005\uFF0C\u90AA\u6076\u2192\u5929\u542F\u9A91\u58EB/\u6B7B\u4EA1\u4F7F\u8005 \u7B49\uFF0C\u652F\u6301\u4E2D\u6587\u6216\u82F1\u6587\uFF09\uFF0C\u9ED8\u8BA4\u53D6\u4E3B\u6D41\u6D41\u6D3E\u3002\n\u76EE\u6807\u6570\u4EC5\u652F\u6301 1 / 3 / 5\uFF0C\u9ED8\u8BA4 1\uFF1B\u6570\u5B57\u81EA\u52A8\u8BC6\u522B\uFF081/3/5=\u76EE\u6807\u6570\uFF0C\u5176\u4ED6=\u6700\u591A N \u6761\uFF09\uFF0C\u4F4D\u7F6E\u4E0D\u9650\u3002\n\u60C5\u5883\uFF1A\u9ED8\u8BA4\u67E5\u8BE2\u5927\u79D8\u5883\uFF0C\u53EF\u7528\u300C\u56E2\u672C/\u5927\u79D8\u5883\u300D\u5207\u6362\uFF1B\u65E0\u5927\u79D8\u5883\u6570\u636E\u7684\u4E13\u7CBE\u81EA\u52A8\u56DE\u9000\u56E2\u672C\uFF08\u4F1A\u63D0\u793A\uFF09\u3002\n\u4EE3\u6B21\uFF1Aliquidarmory \u6709 SimulationCraft / Liquid Generated \u4E24\u4EE3\u6A21\u62DF\uFF0C\u53EF\u7528 simc/simulationcraft \u6216 liquid/\u6DB2\u4F53/\u674E\u9035/\u674E\u594E \u6307\u5B9A\uFF0C\u4E0D\u6307\u5B9A\u65F6\u53D6\u6570\u636E\u987A\u5E8F\u9996\u4E2A\uFF08\u4E0E\u7F51\u7AD9\u9ED8\u8BA4\u4E00\u81F4\uFF09\u3002\n\u6CBB\u7597\u4E13\u7CBE\uFF08\u6062\u590D\u5FB7/\u6062\u590D\u8428/\u795E\u5723\u9A91/\u795E\u5723\u7267/\u6212\u5F8B\u7267/\u7EC7\u96FE/\u62A4\u5B58\u8005\uFF09\uFF1A\u6570\u636E\u6E90 QE Live \u6CBB\u7597\u6A21\u62DF\uFF08HPS\uFF09\uFF0C\u540C\u6837\u9ED8\u8BA4\u5927\u79D8\u5883\u3002\n\u6570\u636E\u6E90\uFF1Aliquidarmory.com Trinket Tracker\uFF081:1 \u590D\u523B\u539F\u7AD9\u4E09\u8272\u6761\u7EB9\u6837\u5F0F\uFF09\u3002").action(wrapOutput(config, async (argv, specRaw) => {
     const session = argv?.session;
     const guard = await checkQueryQuota(ctx, session, config.queryQuota);
     if (guard) return guard;
@@ -4462,8 +4498,14 @@ ${raid}`;
     }
     let heroZh = null;
     let context = null;
+    let gen = null;
     const leftover = [];
     for (const t of words) {
+      const g = TRINKET_GEN_ALIAS[t.toLowerCase()];
+      if (g) {
+        gen = g;
+        continue;
+      }
       const c = parseTrinketContext(t);
       if (c) {
         context = c;
@@ -4520,14 +4562,18 @@ ${raid}`;
       if (!r) {
         return "\u274C \u62C9\u53D6 liquidarmory.com Trinket Tracker \u6570\u636E\u5931\u8D25\uFF08\u7F51\u7EDC\u5F02\u5E38\u6216\u9875\u9762\u7ED3\u6784\u53D8\u5316\uFF09\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5\u3002";
       }
-      let sel = selectLiquidBars(r.data, hit.cls, hit.spec, simStyle, { heroZh, mplus: context !== "raid" });
+      let sel = selectLiquidBars(r.data, hit.cls, hit.spec, simStyle, { heroZh, mplus: context !== "raid", gen });
       let fallbackNote = "";
-      if ("error" in sel && !context && sel.error === "no-profile") {
-        sel = selectLiquidBars(r.data, hit.cls, hit.spec, simStyle, { heroZh, mplus: false });
+      if ("error" in sel && !context && (sel.error === "no-profile" || sel.error === "gen-not-found")) {
+        sel = selectLiquidBars(r.data, hit.cls, hit.spec, simStyle, { heroZh, mplus: false, gen });
         if (!("error" in sel)) fallbackNote = "\u2139\uFE0F \u8BE5\u4E13\u7CBE\u6682\u65E0\u5927\u79D8\u5883\u6A21\u62DF\u6570\u636E\uFF0C\u4EE5\u4E0B\u4E3A\u56E2\u672C\u6570\u636E\u3002";
       }
       if ("error" in sel) {
         const zhSpec = specNameMap[specSlugToEn[hit.spec]] || hit.spec;
+        if (sel.error === "gen-not-found") {
+          const genName = gen === "simc" ? "SimulationCraft" : "Liquid Generated";
+          return `\u274C ${CLASS_CN[hit.cls] || hit.cls}${zhSpec}\u6CA1\u6709\u300C${genName}\u300D\u4EE3\u6B21\u7684${sel.mplus ? "\u5927\u79D8\u5883" : "\u56E2\u672C"}\u6A21\u62DF\u6570\u636E\u3002\u53EF\u53BB\u6389\u4EE3\u6B21\u8BCD\u91CD\u8BD5\uFF0C\u6216\u6362 ${gen === "simc" ? "Liquid\uFF08\u6DB2\u4F53\uFF09" : "SimC"} \u4EE3\u6B21\u3002`;
+        }
         if (sel.error === "hero-not-found") {
           const avail = sel.available.length ? sel.available.join("\u3001") : "\u65E0";
           return `\u274C ${CLASS_CN[hit.cls] || hit.cls}${zhSpec}\u6CA1\u6709\u300C${sel.heroZh}\u300D\u6D41\u6D3E\u6570\u636E\u3002\u53EF\u7528\u6D41\u6D3E\uFF1A${avail}`;
@@ -4537,14 +4583,14 @@ ${raid}`;
       }
       if (fallbackNote && session) await session.send(fallbackNote);
       const updated = new Date(r.ts * 1e3).toISOString().slice(0, 10);
-      const pngKey = `l|${hit.cls}|${hit.spec}|${sel.heroZh || ""}|${sel.mplus ? 1 : 0}|${tgt}|${topN}|${config.theme}`;
+      const pngKey = `l|${hit.cls}|${hit.spec}|${gen || ""}|${sel.heroZh || ""}|${sel.mplus ? 1 : 0}|${tgt}|${topN}|${config.theme}`;
       const cachedBuf = await trinketPngGet(pngKey);
       if (cachedBuf) {
         await sendImageMaybeFold(config, session, cachedBuf);
         return;
       }
       const icons = await trinketIconMap(sel.bars.map((b) => b.iconId));
-      const html = renderTrinketLiquidHtml({ cls: hit.cls, spec: hit.spec, sel, topN, simStyle, updated, theme: config.theme, icons });
+      const html = renderTrinketLiquidHtml({ cls: hit.cls, spec: hit.spec, sel, topN, simStyle, updated, theme: config.theme, genZh: gen === "simc" ? "SimC" : gen === "liquid" ? "Liquid" : void 0, icons });
       const buf = await renderPng(html, ctx, 480);
       if (!buf) return "\u274C \u56FE\u7247\u751F\u6210\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5\u3002";
       await trinketPngSet(pngKey, buf);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-wcl-lili",
   "description": "Warcraft Logs 角色战绩查询 · 团本/大秘境/分数线/角色信息",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [