poi-plugin-gimmick-tracker 0.2.1 → 0.2.2

package/index.js

@@ -79,25 +79,36 @@ var AIR_ALIAS = {
 };
 var AIR_STATE_TO_TEXT = { 1: "\u7A7A\u786E", 2: "\u7A7A\u4F18", 3: "\u7A7A\u5747", 4: "\u7A7A\u52A3" };
 var CHINESE_DIGIT = { \u4E00: 1, \u4E24: 2, \u4E8C: 2, \u4E09: 3, \u56DB: 4, \u4E94: 5, \u516D: 6, \u4E03: 7, \u516B: 8, \u4E5D: 9, \u5341: 10 };
-var NODE = "([A-Za-z]{1,2}\\d{0,2})";
-var DIAN = "[\u70B9\u70B9\u9EDE]?";
-var CNT = "(\\d+|[\u4E00\u4E24\u4E8C\u4E09\u56DB\u4E94\u516D\u4E03\u516B\u4E5D\u5341])";
-var CNT_UNIT = "[\u6B21\u56DE\u51F8]?";
-var RANKC = "(SS|S|A|B|C|D|E)";
-var AIR = "(\u7A7A\u786E|\u7A7A\u512A|\u7A7A\u4F18|\u7A7A\u5747|\u7A7A\u52A3|\u5236\u7A7A\u786E\u4FDD|\u5236\u7A7A\u78BA\u4FDD|\u5236\u7A7A\u6743\u786E\u4FDD|\u5236\u7A7A\u6B0A\u78BA\u4FDD|\u822A\u7A7A\u512A\u52E2|\u822A\u7A7A\u4F18\u52BF)";
 var WIN = "[\u80DC\u52DD]?";
 var KILL = "[\u51FB\u64CA]\u7834";
 var REACH = "\u5230[\u8FBE\u9054]";
-var FORMS = [
-  { kind: "base-air-defense", re: new RegExp(`(\u5B88\u5BB6|\u57FA\u5730\u9632\u7A7A\u6218|\u57FA\u5730\u9632\u7A7A|\u5BB6\u91CC|\u9632\u7A7A|\u57FA\u5730)${AIR}${CNT}${CNT_UNIT}`, "i") },
-  { kind: "reach-after", re: new RegExp(`${REACH}${NODE}${DIAN}${CNT}${CNT_UNIT}`, "i") },
-  { kind: "node-arrival", re: new RegExp(`${NODE}${DIAN}${REACH}${CNT}${CNT_UNIT}`, "i") },
-  { kind: "kill", re: new RegExp(`${NODE}${DIAN}${KILL}${CNT}${CNT_UNIT}`, "i") },
-  { kind: "victory-rank", re: new RegExp(`${NODE}${DIAN}${RANKC}${WIN}${CNT}${CNT_UNIT}`, "i") },
-  { kind: "count-first", re: new RegExp(`${NODE}${DIAN}${CNT}${CNT_UNIT}${RANKC}${WIN}`, "i") },
-  { kind: "node-air-state", re: new RegExp(`${NODE}${DIAN}${AIR}${CNT}${CNT_UNIT}`, "i") }
+var RANKC = "(?<rank>SS|S|A|B|C|D|E)";
+var AIR = "(?<air>\u7A7A\u786E|\u7A7A\u512A|\u7A7A\u4F18|\u7A7A\u5747|\u7A7A\u52A3|\u5236\u7A7A\u786E\u4FDD|\u5236\u7A7A\u78BA\u4FDD|\u5236\u7A7A\u6743\u786E\u4FDD|\u5236\u7A7A\u6B0A\u78BA\u4FDD|\u822A\u7A7A\u512A\u52E2|\u822A\u7A7A\u4F18\u52BF)";
+var CNT = "(?<cnt>\\d+|[\u4E00\u4E24\u4E8C\u4E09\u56DB\u4E94\u516D\u4E03\u516B\u4E5D\u5341])?";
+var CNT_UNIT = "[\u6B21\u56DE\u51F8]?";
+var NODE_DIAN = "(?<node>[A-Za-z]{1,2}\\d{0,2})[\u70B9\u70B9\u9EDE]";
+var NODE_BARE = "(?<node>(?:[A-Za-z]{1,2}\\d{1,2})|(?:[A-Za-z](?!\\d)))";
+var BASE = "(?<base>\u5B88\u5BB6|\u57FA\u5730\u9632\u7A7A\u6218|\u57FA\u5730\u9632\u7A7A|\u5BB6\u91CC|\u9632\u7A7A|\u57FA\u5730)";
+var DECORATION = /(boss|王点|王點|門神|门神|斬殺|斩杀|斬殺線|斩杀线|第\d+[次回凸]?|第[一两二三四五六七八九十]+[次回凸]?|第)/gi;
+var NOISE = /[^A-Za-z0-9〇㐀-䶿一-鿿]/g;
+var FORM_TEMPLATES = [
+  { kind: "base-air-defense", build: () => new RegExp(`${BASE}${AIR}${CNT}${CNT_UNIT}`, "i"), usesNode: false },
+  { kind: "reach-after", build: (node) => new RegExp(`${REACH}${node}${CNT}${CNT_UNIT}`, "i"), usesNode: true },
+  { kind: "node-arrival", build: (node) => new RegExp(`${node}${REACH}${CNT}${CNT_UNIT}`, "i"), usesNode: true },
+  { kind: "kill", build: (node) => new RegExp(`${node}${KILL}${CNT}${CNT_UNIT}`, "i"), usesNode: true },
+  { kind: "victory-rank", build: (node) => new RegExp(`${node}${RANKC}${WIN}${CNT}${CNT_UNIT}`, "i"), usesNode: true },
+  { kind: "count-first", build: (node) => new RegExp(`${node}${CNT}${CNT_UNIT}${RANKC}${WIN}`, "i"), usesNode: true },
+  { kind: "node-air-state", build: (node) => new RegExp(`${node}${AIR}${CNT}${CNT_UNIT}`, "i"), usesNode: true }
 ];
-var DECORATION = /(boss|王点|王點|門神|门神|斬殺|斩杀|斬殺線|斩杀线)/gi;
+var FORMS = [];
+for (const template of FORM_TEMPLATES) {
+  if (!template.usesNode) {
+    FORMS.push({ kind: template.kind, re: template.build(null), countGroup: 3 });
+    continue;
+  }
+  FORMS.push({ kind: template.kind, re: template.build(NODE_DIAN), countGroup: 2, nodeGroup: 1 });
+  FORMS.push({ kind: template.kind, re: template.build(NODE_BARE), countGroup: 2, nodeGroup: 1 });
+}
 function normalizeNodeLabel(value) {
   return String(value ?? "").trim().toUpperCase();
 }
@@ -112,15 +123,20 @@ function toHalfWidth(text) {
   return out;
 }
 function chineseCountToNumber(count) {
+  if (count == null || count === "") return 1;
   return CHINESE_DIGIT[count] ?? Number(count);
 }
 function stripAnnotation(text) {
   const notes = [];
-  const cleaned = String(text ?? "").replace(/[（(【〔「]([^（）()【】〔〕「」]*)[）)】〕」]/g, (_m, inner) => {
-    const note = String(inner ?? "").trim();
-    if (note !== "") notes.push(note);
-    return "";
-  });
+  const cleaned = String(text ?? "").replace(
+    /[（(【〔「]([^（）()【】〔〕「」]*)[）)】〕」]/g,
+    (_m, inner) => {
+      const value = String(inner ?? "").trim();
+      if (/^[A-Za-z]{1,2}\d{0,2}[点点點]?$/.test(value)) return value;
+      if (value !== "") notes.push(value);
+      return "";
+    }
+  );
   return { cleaned: cleaned.trim(), notes };
 }
 function airStateOf(word) {
@@ -128,10 +144,9 @@ function airStateOf(word) {
 }
 function parseSegmentBody(segment) {
   const { cleaned, notes } = stripAnnotation(segment);
-  let text = toHalfWidth(cleaned).replace(DECORATION, "").replace(/[×✕*＊]/g, "").replace(/\s+/g, "");
+  let text = toHalfWidth(cleaned).replace(DECORATION, "").replace(NOISE, "");
   if (text === "") return { matches: null, notes };
   const bossSeen = /boss/i.test(segment) || /boss/i.test(text);
-  text = text.replace(/([一两二三四五六七八九十])(?=[次回凸]|$)/g, (m) => String(CHINESE_DIGIT[m]));
   const matches = [];
   let rest = text;
   let guard = 0;
@@ -145,94 +160,59 @@ function parseSegmentBody(segment) {
       }
     }
     if (matched == null && bossSeen) {
-      const bare = new RegExp(`^${NODE}${DIAN}${CNT}${CNT_UNIT}`, "i").exec(rest);
-      if (bare != null) {
+      const bare = /^([A-Za-z]{1,2})(\d+)?([一两二三四五六七八九十]|\d+)?[次回凸]?/.exec(rest);
+      if (bare != null && bare[1] != null && (bare[2] != null || bare[3] != null)) {
+        const letters = bare[1];
+        const digits = bare[2] ?? "";
+        const countWord = bare[3] ?? "";
+        const restAfter = rest.slice(bare[0].length);
+        const digitsAreCount = digits !== "" && /^[次回凸]/.test(restAfter);
+        const nodeLabel2 = normalizeNodeLabel(digitsAreCount || digits === "" ? letters : letters + digits);
+        const count2 = digitsAreCount ? Number(digits) : chineseCountToNumber(countWord);
         matches.push({
           ok: true,
           condition: {
             kind: "victory-rank",
-            nodeLabel: normalizeNodeLabel(bare[1]),
+            nodeLabel: nodeLabel2,
             requiredRank: "A",
-            requiredCount: chineseCountToNumber(bare[2]),
+            requiredCount: count2,
             notes: [...notes, "boss\u2192\u6309\u51FB\u7834(A\u80DC)\u8BA1"]
           }
         });
-        rest = rest.slice(bare[0].length);
+        rest = restAfter;
         continue;
       }
       break;
     }
     if (matched == null) break;
     const { form, m } = matched;
-    const count = chineseCountToNumber(form.kind === "count-first" ? m[2] : m[m.length - 1]);
-    if (!Number.isInteger(count) || count <= 0) return { matches: [{ ok: false, reason: "\u6B21\u6570\u5FC5\u987B\u662F\u6B63\u6574\u6570" }], notes };
+    const count = chineseCountToNumber(m.groups?.cnt);
+    if (!Number.isInteger(count) || count <= 0) {
+      return { matches: [{ ok: false, reason: "\u6B21\u6570\u5FC5\u987B\u662F\u6B63\u6574\u6570" }], notes };
+    }
+    const common = { requiredCount: count, notes };
+    const nodeLabel = normalizeNodeLabel(m.groups?.node);
     if (form.kind === "base-air-defense") {
-      const airState = airStateOf(m[2]);
-      if (airState == null) return { matches: [{ ok: false, reason: `\u672A\u77E5\u5236\u7A7A\u8BCD\u300C${m[2]}\u300D` }], notes };
-      matches.push({
-        ok: true,
-        condition: { kind: "base-air-defense", requiredAirState: airState, requiredCount: count, notes }
-      });
+      const airState = airStateOf(m.groups.air);
+      if (airState == null) return { matches: [{ ok: false, reason: `\u672A\u77E5\u5236\u7A7A\u8BCD\u300C${m.groups.air}\u300D` }], notes };
+      matches.push({ ok: true, condition: { kind: "base-air-defense", requiredAirState: airState, ...common } });
     } else if (form.kind === "node-arrival" || form.kind === "reach-after") {
-      matches.push({
-        ok: true,
-        condition: {
-          kind: "node-arrival",
-          nodeLabel: normalizeNodeLabel(m[1]),
-          requiredCount: count,
-          notes
-        }
-      });
+      matches.push({ ok: true, condition: { kind: "node-arrival", nodeLabel, ...common } });
     } else if (form.kind === "kill") {
       matches.push({
         ok: true,
-        condition: {
-          kind: "victory-rank",
-          nodeLabel: normalizeNodeLabel(m[1]),
-          requiredRank: "A",
-          requiredCount: count,
-          notes: [...notes, "\u51FB\u7834\u2192\u6309A\u80DC\u8BA1"]
-        }
-      });
-    } else if (form.kind === "victory-rank") {
-      matches.push({
-        ok: true,
-        condition: {
-          kind: "victory-rank",
-          nodeLabel: normalizeNodeLabel(m[1]),
-          requiredRank: m[2].toUpperCase(),
-          requiredCount: count,
-          notes
-        }
-      });
-    } else if (form.kind === "count-first") {
-      matches.push({
-        ok: true,
-        condition: {
-          kind: "victory-rank",
-          nodeLabel: normalizeNodeLabel(m[1]),
-          requiredRank: m[3].toUpperCase(),
-          requiredCount: count,
-          notes
-        }
+        condition: { kind: "victory-rank", nodeLabel, requiredRank: "A", ...common, notes: [...notes, "\u51FB\u7834\u2192\u6309A\u80DC\u8BA1"] }
       });
+    } else if (form.kind === "victory-rank" || form.kind === "count-first") {
+      matches.push({ ok: true, condition: { kind: "victory-rank", nodeLabel, requiredRank: m.groups.rank.toUpperCase(), ...common } });
     } else {
-      const airState = airStateOf(m[2]);
-      if (airState == null) return { matches: [{ ok: false, reason: `\u672A\u77E5\u5236\u7A7A\u8BCD\u300C${m[2]}\u300D` }], notes };
-      matches.push({
-        ok: true,
-        condition: {
-          kind: "node-air-state",
-          nodeLabel: normalizeNodeLabel(m[1]),
-          requiredAirState: airState,
-          requiredCount: count,
-          notes
-        }
-      });
+      const airState = airStateOf(m.groups.air);
+      if (airState == null) return { matches: [{ ok: false, reason: `\u672A\u77E5\u5236\u7A7A\u8BCD\u300C${m.groups.air}\u300D` }], notes };
+      matches.push({ ok: true, condition: { kind: "node-air-state", nodeLabel, requiredAirState: airState, ...common } });
     }
     rest = rest.slice(m.index + m[0].length);
   }
-  return { matches, notes, bossSeen };
+  return { matches, notes };
 }
 var BUCKET_HEADER = /^(解谜|解密|谜题|削甲|装甲|debuff|gimmick)[:：]/;
 var BUCKET_WORDS = { \u89E3\u8C1C: "gimmick", \u89E3\u5BC6: "gimmick", \u8C1C\u9898: "gimmick", gimmick: "gimmick", \u524A\u7532: "debuff", \u88C5\u7532: "debuff", debuff: "debuff" };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-gimmick-tracker",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "解密·削甲进度：自动对账活动海域解密/削甲条件进度（轮次账本，阶段自动旋转，无人工确认卡）",
   "main": "index.js",
   "files": [