@sjtdev/koishi-plugin-dota2tracker 1.0.3 → 1.1.0

package/lib/index.js

@@ -40,6 +40,14 @@ module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
 
 // src/utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  CONFIGS: () => CONFIGS,
+  ImageType: () => ImageType,
+  getFormattedMatchData: () => getFormattedMatchData,
+  getImageUrl: () => getImageUrl,
+  query: () => query
+});
 var import_axios = __toESM(require("axios"));
 var import_fs = __toESM(require("fs"));
 var dotaconstants = __toESM(require("dotaconstants"));
@@ -53,10 +61,19 @@ async function query(query_str) {
   });
 }
 __name(query, "query");
+var ImageType = /* @__PURE__ */ ((ImageType2) => {
+  ImageType2["Icons"] = "icons";
+  ImageType2["Heroes"] = "heroes";
+  ImageType2["HeroIcons"] = "heroes/icons";
+  ImageType2["Items"] = "items";
+  ImageType2["Abilities"] = "abilities";
+  ImageType2["Local"] = "local";
+  return ImageType2;
+})(ImageType || {});
 function getImageUrl(image, type = "local" /* Local */) {
   if (type === "local" /* Local */) {
     try {
-      const imageData = import_fs.default.readFileSync(`./node_modules/@sjtdev/koishi-plugin-dota2tracker/images/${image}.png`);
+      const imageData = import_fs.default.readFileSync(`./node_modules/@sjtdev/koishi-plugin-dota2tracker/template/images/${image}.png`);
       const base64Data = imageData.toString("base64");
       return `data:image/png;base64,${base64Data}`;
     } catch (error) {
@@ -68,8 +85,9 @@ function getImageUrl(image, type = "local" /* Local */) {
 }
 __name(getImageUrl, "getImageUrl");
 function getFormattedMatchData(match) {
-  match.radiantKillsCount = match.radiantKills ? match.radiantKills.reduce((acc, cva) => acc + cva, 0) : 0;
-  match.direKillsCount = match.direKills ? match.direKills.reduce((acc, cva) => acc + cva, 0) : 0;
+  ["radiant", "dire"].forEach((team) => {
+    match[team] = { killsCount: match[team + "Kills"]?.reduce((acc, cva) => acc + cva, 0) ?? 0, damageReceived: 0, heroDamage: 0, networth: 0, experience: 0 };
+  });
   match.party = {};
   let party_index = 0;
   const party_mark = ["I", "II", "III", "IV"];
@@ -97,8 +115,20 @@ function getFormattedMatchData(match) {
   laneResult.mid = processLaneOutcome(match.midLaneOutcome);
   laneResult.bottom = processLaneOutcome(match.bottomLaneOutcome);
   match.players.forEach((player) => {
-    player.killContribution = (player.kills + player.assists) / (player.isRadiant ? match.radiantKillsCount : match.direKillsCount);
-    player.deathContribution = player.deaths / (player.isRadiant ? match.direKillsCount : match.radiantKillsCount);
+    player.team = player.isRadiant ? "radiant" : "dire";
+    player.rank = {
+      medal: parseInt(player.steamAccount.seasonRank?.toString().split("")[0] ?? 0),
+      star: parseInt(player.steamAccount.seasonRank?.toString().split("")[1] ?? 0),
+      leaderboard: player.steamAccount.seasonLeaderboardRank,
+      inTop100: player.steamAccount.seasonLeaderboardRank ? player.steamAccount.seasonLeaderboardRank <= 10 ? "8c" : player.steamAccount.seasonLeaderboardRank <= 100 ? "8b" : void 0 : void 0
+    };
+    player.killContribution = (player.kills + player.assists) / match[player.team].killsCount;
+    player.deathContribution = player.deaths / match[player.team === "radiant" ? "dire" : player.team].killsCount;
+    player.damageReceived = player.stats?.heroDamageReport?.receivedTotal.physicalDamage + player.stats?.heroDamageReport?.receivedTotal.magicalDamage + player.stats?.heroDamageReport?.receivedTotal.pureDamage;
+    match[player.team].heroDamage = (match[player.team].heroDamage ?? 0) + player.heroDamage;
+    match[player.team].damageReceived = (match[player.team].damageReceived ?? 0) + player.damageReceived;
+    match[player.team].networth += player.networth;
+    match[player.team].experience += Math.floor(player.experiencePerMinute / 60 * match.durationSeconds);
     player.titles = [];
     player.mvpScore = // 计算MVP分数
     player.kills * 5 + player.assists * 3 + player.stats.heroDamageReport.dealtTotal.stunDuration / 100 * 0.1 + (player.stats.heroDamageReport.dealtTotal.slowDuration + player.stats.heroDamageReport.dealtTotal.disableDuration) / 100 * 0.05 + player.heroDamage * 1e-3 + player.towerDamage * 0.01 + player.heroHealing * 2e-3 + player.imp * 0.25;
@@ -117,13 +147,13 @@ function getFormattedMatchData(match) {
     player.stats.matchPlayerBuffEvent.splice(0, player.stats.matchPlayerBuffEvent.length, ...Object.values(maxStackCountsByAbilityOrItem));
     switch (player.lane) {
       case "SAFE_LANE":
-        player.laneResult = laneResult[player.isRadiant ? "bottom" : "top"][player.isRadiant ? "radiant" : "dire"];
+        player.laneResult = laneResult[player.isRadiant ? "bottom" : "top"][player.team];
         break;
       case "OFF_LANE":
-        player.laneResult = laneResult[!player.isRadiant ? "bottom" : "top"][player.isRadiant ? "radiant" : "dire"];
+        player.laneResult = laneResult[!player.isRadiant ? "bottom" : "top"][player.team];
         break;
       default:
-        player.laneResult = laneResult.mid[player.isRadiant ? "radiant" : "dire"];
+        player.laneResult = laneResult.mid[player.team];
         break;
     }
     let items_timelist = {};
@@ -272,8 +302,8 @@ function getFormattedMatchData(match) {
     (max, player) => player.stats.heroDamageReport.receivedTotal.physicalDamage + player.stats.heroDamageReport.receivedTotal.magicalDamage + player.stats.heroDamageReport.receivedTotal.pureDamage > max.stats.heroDamageReport.receivedTotal.physicalDamage + max.stats.heroDamageReport.receivedTotal.magicalDamage + max.stats.heroDamageReport.receivedTotal.pureDamage ? player : max
   ).titles.push({ name: "耐", color: "#84A1C7" });
   match.players.reduce((lowest, player) => {
-    const currentContribution = (player.kills + player.assists) / (player.isRadiant ? match.radiantKillsCount : match.direKillsCount);
-    const lowestContribution = (lowest.kills + lowest.assists) / (lowest.isRadiant ? match.radiantKillsCount : match.direKillsCount);
+    const currentContribution = (player.kills + player.assists) / match[player.team].KillsCount;
+    const lowestContribution = (lowest.kills + lowest.assists) / match[lowest.team].KillsCount;
     if (currentContribution < lowestContribution) {
       return player;
     } else if (currentContribution === lowestContribution) {
@@ -658,6 +688,24 @@ var import_moment = __toESM(require("moment"));
 var dotaconstants3 = __toESM(require("dotaconstants"));
 
 // src/dotaconstants_add.json
+var dotaconstants_add_exports = {};
+__export(dotaconstants_add_exports, {
+  HEROES_CHINESE: () => HEROES_CHINESE,
+  LOSE_NEGATIVE: () => LOSE_NEGATIVE,
+  LOSE_POSITIVE: () => LOSE_POSITIVE,
+  WIN_NEGATIVE: () => WIN_NEGATIVE,
+  WIN_POSITIVE: () => WIN_POSITIVE,
+  behavior: () => behavior,
+  default: () => dotaconstants_add_default,
+  gameMode: () => gameMode,
+  lobbyTypes: () => lobbyTypes,
+  position: () => position,
+  primary_attrs: () => primary_attrs,
+  rank: () => rank,
+  region: () => region,
+  roles: () => roles,
+  target_team: () => target_team
+});
 var gameMode = {
   NONE: "",
   ALL_PICK: "全英雄选择",
@@ -732,6 +780,17 @@ var position = {
   "4": "采灵芝",
   "5": "工具人"
 };
+var rank = {
+  "0": "未知",
+  "1": "先锋",
+  "2": "卫士",
+  "3": "中军",
+  "4": "统帅",
+  "5": "传奇",
+  "6": "万古流芳",
+  "7": "超凡入圣",
+  "8": "冠绝一世"
+};
 var roles = { CARRY: "核心", ESCAPE: "逃生", NUKER: "爆发", INITIATOR: "先手", DURABLE: "耐久", DISABLER: "控制", JUNGLER: "打野", SUPPORT: "辅助", PUSHER: "推进" };
 var primary_attrs = { all: "hero_universal", str: "hero_strength", agi: "hero_agility", int: "hero_intelligence" };
 var behavior = {
@@ -877,14 +936,33 @@ var WIN_NEGATIVE = ["侥幸赢得了比赛", "走狗屎运赢得了比赛", "躺
 var WIN_POSITIVE = ["带领团队走向了胜利", "暴打对面后赢得了胜利", " CARRY全场赢得了胜利", "把对面当猪宰了, 赢得了胜利", "又赢了, 这游戏就是这么枯燥, 且乏味", "直接进行一个比赛的赢"];
 var LOSE_NEGATIVE = ["被人按在地上摩擦, 输掉了这场比赛", "悲惨地输掉了比赛", "头都被打歪了, 心态爆炸地输掉了比赛", "捕鱼被鱼吃了, 输掉了比赛", "打的是个几把", "直接进行一个比赛的输"];
 var LOSE_POSITIVE = ["无力回天输掉了比赛", "尽力了, 但还是输了比赛", "背靠世界树, 虽败犹荣", "带不动队友, 输了比赛", "又输了, 很难受, 宁愿输的是我"];
+var dotaconstants_add_default = {
+  gameMode,
+  lobbyTypes,
+  region,
+  position,
+  rank,
+  roles,
+  primary_attrs,
+  behavior,
+  target_team,
+  HEROES_CHINESE,
+  WIN_NEGATIVE,
+  WIN_POSITIVE,
+  LOSE_NEGATIVE,
+  LOSE_POSITIVE
+};
 
 // src/index.ts
 var import_koishi2 = require("koishi");
+var ejs = __toESM(require("ejs"));
+var import_path = __toESM(require("path"));
 var name = "dota2tracker";
 var usage = "DOTA2Bot插件-提供自动追踪群友的最新对局的功能（需群友绑定），以及一系列查询功能。";
 var inject = ["database", "puppeteer", "cron"];
 var Config = import_koishi.Schema.object({
-  STRATZ_API_TOKEN: import_koishi.Schema.string().required().description("※必须。stratz.com的API TOKEN，可在 https://stratz.com/api 获取")
+  STRATZ_API_TOKEN: import_koishi.Schema.string().required().description("※必须。stratz.com的API TOKEN，可在 https://stratz.com/api 获取"),
+  template_match: import_koishi.Schema.union([...readDirectoryFilesSync(`./node_modules/@sjtdev/koishi-plugin-${name}/template/match`)]).default("match_1").description("生成比赛图片使用的模板，见 https://github.com/sjtdev/koishi-plugin-dota2tracker/wiki 有模板展示。")
 });
 var pendingMatches = [];
 var random = new import_koishi2.Random(() => Math.random());
@@ -977,39 +1055,45 @@ async function apply(ctx, config) {
       session.send("开发中，未来此功能会重写。\n" + queryRes.map((item) => `${item.nickName ?? ""}，ID：${item.userId}，SteamID：${item.steamId}`).join("\n"));
     }
   });
-  ctx.command("查询比赛 <match_id>", "查询比赛ID").usage("查询指定比赛ID的比赛数据，生成图片发布。").example("-查询比赛 1234567890").action(async ({ session }, match_id) => {
-    if (!match_id) {
-      session.send("请输入比赛ID。");
-      return;
-    }
-    if (!/^\d{10}$/.test(match_id)) {
-      session.send("比赛ID无效。");
-      return;
-    }
-    session.send("正在搜索对局详情，请稍后...");
+  async function queryAndDisplayMatch(session, matchId) {
     try {
       let match;
-      let queryLocal = await ctx.database.get("dt_previous_query_results", match_id, ["data"]);
+      let queryLocal = await ctx.database.get("dt_previous_query_results", matchId, ["data"]);
       if (queryLocal.length > 0) {
         match = queryLocal[0].data;
         ctx.database.set("dt_previous_query_results", match.id, { queryTime: /* @__PURE__ */ new Date() });
       } else {
-        let queryRes = await query(MATCH_INFO(match_id));
+        let queryRes = await query(MATCH_INFO(matchId));
         if (queryRes.status == 200) {
           match = getFormattedMatchData(queryRes.data.data.match);
         }
       }
-      if (match.parsedDateTime) {
-        session.send(await ctx.puppeteer.render(genMatchImageHTML(match)));
+      if (match && match.parsedDateTime) {
+        session.send(await ctx.puppeteer.render(newGenMatchImageHTML(match, config.template_match)));
         ctx.database.upsert("dt_previous_query_results", (row) => [{ matchId: match.id, data: match, queryTime: /* @__PURE__ */ new Date() }]);
       } else {
-        pendingMatches.push({ matchId: match_id, platform: session.event.platform, guildId: session.event.guild.id });
+        pendingMatches.push({ matchId, platform: session.event.platform, guildId: session.event.guild.id });
         session.send("比赛尚未解析，将在解析完成后发布。");
       }
     } catch (error) {
       console.error(error);
       session.send("获取比赛信息失败。");
+      ctx.database.remove("dt_previous_query_results", { matchId: parseInt(matchId) });
+    }
+  }
+  __name(queryAndDisplayMatch, "queryAndDisplayMatch");
+  ctx.command("查询比赛 <match_id>", "查询比赛ID").usage("查询指定比赛ID的比赛数据，生成图片发布。").example("-查询比赛 1234567890").action(async ({ session }, match_id) => {
+    if (!match_id) {
+      session.send("请输入比赛ID。");
+      return;
     }
+    JSON.stringify;
+    if (!/^\d{10}$/.test(match_id)) {
+      session.send("比赛ID无效。");
+      return;
+    }
+    session.send("正在搜索对局详情，请稍后...");
+    queryAndDisplayMatch(session, match_id);
   });
   ctx.command("查询最近比赛 [input_data]", "查询玩家的最近比赛").usage("查询指定玩家的最近一场比赛的比赛数据，生成图片发布。\n参数可输入该玩家的SteamID或已在本群绑定玩家的别名，无参数时尝试查询调用指令玩家的SteamID").example("-查询最近比赛 123456789").example("-查询最近比赛 张三").action(async ({ session }, input_data) => {
     if (session.guild) {
@@ -1035,28 +1119,7 @@ async function apply(ctx, config) {
         session.send("获取玩家最近比赛失败。");
         return;
       }
-      try {
-        let match;
-        let queryLocal = await ctx.database.get("dt_previous_query_results", lastMatchId, ["data"]);
-        if (queryLocal.length > 0) {
-          match = queryLocal[0].data;
-        } else {
-          let queryRes = await query(MATCH_INFO(lastMatchId));
-          if (queryRes.status == 200) {
-            match = getFormattedMatchData(queryRes.data.data.match);
-          }
-        }
-        if (match.parsedDateTime) {
-          session.send(await ctx.puppeteer.render(genMatchImageHTML(match)));
-          ctx.database.upsert("dt_previous_query_results", (row) => [{ matchId: match.id, data: match, queryTime: /* @__PURE__ */ new Date() }]);
-        } else {
-          pendingMatches.push({ matchId: lastMatchId, platform: session.event.platform, guildId: session.event.guild.id });
-          session.send("比赛尚未解析，将在解析完成后发布。");
-        }
-      } catch (error) {
-        console.error(error);
-        session.send("获取比赛信息失败。");
-      }
+      queryAndDisplayMatch(session, lastMatchId);
     }
   });
   ctx.command("查询玩家 <input_data>", "查询玩家信息").usage("查询指定玩家的个人信息与最近战绩，生成图片发布。\n参数可输入该玩家的SteamID或已在本群绑定玩家的别名，无参数时尝试查询调用指令玩家的SteamID").example("-查询玩家 123456789").example("-查询玩家 张三").action(async ({ session }, input_data) => {
@@ -1292,7 +1355,7 @@ async function apply(ctx, config) {
             const commingMatches = scanningMatches.filter((item) => item.matchId == match.id);
             const realCommingMatches = commingMatches.filter((commingMatch, index, self) => index === self.findIndex((t) => t.guildId === commingMatch.guildId && t.platform === commingMatch.platform));
             let broadMatchMessage = "";
-            const img = await ctx.puppeteer.render(genMatchImageHTML(match));
+            const img = await ctx.puppeteer.render(newGenMatchImageHTML(match, config.template_match));
             for (let comming of realCommingMatches) {
               let commingSubscribedPlayers = subscribedPlayersInGuild.filter((item) => item.platform == comming.platform && item.guildId == comming.guildId);
               let idsToFind = commingSubscribedPlayers.map((item) => item.steamId);
@@ -1311,7 +1374,7 @@ async function apply(ctx, config) {
                     broadPlayerMessage += random.pick(LOSE_NEGATIVE);
                 }
                 broadPlayerMessage += `。
-KDA：${((player.kills + player.assists) / Math.max(1, player.deaths)).toFixed(2)} [${player.kills}/${player.deaths}/${player.assists}]，GPM/XPM：${player.goldPerMinute}/${player.experiencePerMinute}，补刀数：${player.numLastHits}/${player.numDenies}，伤害/塔伤：${player.heroDamage}/${player.towerDamage}，参战/参葬率：${(player.killContribution * 100).toFixed(2)}%/${(player.deathContribution * 100).toFixed(2)}%`;
+KDA：${((player.kills + player.assists) / (player.deaths || 1)).toFixed(2)} [${player.kills}/${player.deaths}/${player.assists}]，GPM/XPM：${player.goldPerMinute}/${player.experiencePerMinute}，补刀数：${player.numLastHits}/${player.numDenies}，伤害/塔伤：${player.heroDamage}/${player.towerDamage}，参战/参葬率：${(player.killContribution * 100).toFixed(2)}%/${(player.deathContribution * 100).toFixed(2)}%`;
                 broadMatchMessage += broadPlayerMessage + "\n";
               }
               await ctx.broadcast([`${comming.platform}:${comming.guildId}`], broadMatchMessage + img);
@@ -1322,6 +1385,7 @@ KDA：${((player.kills + player.assists) / Math.max(1, player.deaths)).toFixed(2
             ctx.logger.info("比赛 %d 尚未解析完成，继续等待。", match.id);
         } catch (error) {
           console.error(error);
+          ctx.database.remove("dt_previous_query_results", { matchId: pendingMatch.matchId });
         }
       }
     });
@@ -1330,268 +1394,30 @@ KDA：${((player.kills + player.assists) / Math.max(1, player.deaths)).toFixed(2
   });
 }
 __name(apply, "apply");
-function genMatchImageHTML(match) {
-  let $ = cheerio.load(import_fs2.default.readFileSync(`./node_modules/@sjtdev/koishi-plugin-${name}/template/match.html`, "utf-8"));
-  let kcndcStyle = {
-    kc: function(num) {
-      let red = (255 - num * 255 / 100).toFixed(2);
-      return `rgb(255,${red},${red})`;
-    },
-    dc: function(num) {
-      let gray = ((50 - Math.min(num, 50)) * (255 / 50)).toFixed(2);
-      return `rgb(${gray},${gray},${gray})`;
-    }
-  };
-  const laneSVG = {
-    stomp: `<svg viewBox="0 0 24 24" class="hitagi__sc-1apuy4g-0 hmhZOG"><path d="M8.05731 22.3674L9.60454 22.8002L11.5974 21.6551L12.043 20.0773L13.5902 20.51L15.583 19.3649L16.0287 17.7871L17.5759 18.2199L19.5687 17.0748L20.0143 15.4969L21.5615 15.9297L23.5544 14.7846L24 13.2068L23.4492 12.2014L7.50651 21.3621L8.05731 22.3674ZM12.1328 3.50265L11.0312 1.49196C10.8798 1.21549 10.5316 1.11811 10.2576 1.27556L0.29345 7.00098C0.0194354 7.15843 -0.0808273 7.51346 0.0706444 7.78993L1.44766 10.3033L11.91 4.29159C12.184 4.13414 12.2843 3.77912 12.1328 3.50265ZM18.3935 8.4063L14.1658 9.60458L12.4221 10.6065C12.2851 10.6853 12.111 10.6366 12.0353 10.4983L11.7599 9.99565C11.6842 9.85742 11.7343 9.6799 11.8713 9.60118L13.615 8.59924L13.0642 7.59389L11.3205 8.59584C11.1835 8.67456 11.0094 8.62587 10.9337 8.48765L10.6583 7.98497C10.5826 7.84673 10.6327 7.66922 10.7697 7.5905L12.5134 6.58855L11.9626 5.58321L1.99846 11.3086L6.9557 20.3567L22.8984 11.196L22.2615 10.0336C21.5024 8.64813 19.9073 7.97847 18.3935 8.4063Z"></path></svg>`,
-    victory: `<svg viewBox="0 0 512 512"><path d="M198.844 64.75c-.985 0-1.974.03-2.97.094-15.915 1.015-32.046 11.534-37.78 26.937-34.072 91.532-51.085 128.865-61.5 222.876 14.633 13.49 31.63 26.45 50.25 38.125l66.406-196.467 17.688 5.968L163.28 362.5c19.51 10.877 40.43 20.234 62 27.28l75.407-201.53 17.5 6.53-74.937 200.282c19.454 5.096 39.205 8.2 58.78 8.875L381.345 225.5l17.094 7.594-75.875 170.656c21.82-1.237 43.205-5.768 63.437-14.28 43.317-53.844 72.633-109.784 84.5-172.69 5.092-26.992-14.762-53.124-54.22-54.81l-6.155-.282-2.188-5.75c-8.45-22.388-19.75-30.093-31.5-32.47-11.75-2.376-25.267 1.535-35.468 7.376l-13.064 7.47-.906-15c-.99-16.396-10.343-29.597-24.313-35.626-13.97-6.03-33.064-5.232-54.812 9.906l-10.438 7.25-3.812-12.125c-6.517-20.766-20.007-27.985-34.78-27.97zM103.28 188.344C71.143 233.448 47.728 299.56 51.407 359.656c27.54 21.84 54.61 33.693 80.063 35.438 14.155.97 27.94-1.085 41.405-6.438-35.445-17.235-67.36-39.533-92.594-63.53l-3.343-3.157.5-4.595c5.794-54.638 13.946-91.5 25.844-129.03z"/></svg>`,
-    fail: `<svg viewBox="0 0 36 36"><path fill="#ff6961" d="M36 32a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V4a4 4 0 0 1 4-4h28a4 4 0 0 1 4 4v28z"></path><circle fill="#FFF" cx="27" cy="7" r="3"></circle><path fill="#FFF" d="M13.06 13.06l2.367-2.366l3.859 1.158l-2.635 2.847a10.018 10.018 0 0 1 4.392 3.379l5.017-5.017a1.5 1.5 0 0 0-.63-2.497l-9.999-3a1.495 1.495 0 0 0-1.492.376l-3 3a1.5 1.5 0 1 0 2.121 2.12zm16.065 4.949a1.496 1.496 0 0 0-1.262-.503l-6.786.617a9.966 9.966 0 0 1 1.464 2.879l3.548-.322l-1.554 6.995a1.499 1.499 0 1 0 2.928.65l2-9a1.5 1.5 0 0 0-.338-1.316zM13 16a8 8 0 1 0 0 16a8 8 0 0 0 0-16zm0 14a6 6 0 1 1 .002-12.002A6 6 0 0 1 13 30z"></path></svg>`,
-    stomped: `<svg viewBox="-1 0 19 19"><path d="M16.417 9.579A7.917 7.917 0 1 1 8.5 1.662a7.917 7.917 0 0 1 7.917 7.917zm-2.458 2.96a.396.396 0 0 0-.396-.397h-.667a1.527 1.527 0 0 0-1.249-1.114.777.777 0 0 0 .014-.145V9.378a.794.794 0 0 0-.792-.792H8.201a2.984 2.984 0 0 0-1.682-.516l-.11.002V7.42h2.997a.396.396 0 1 0 0-.792H6.41v-1.3a.396.396 0 0 0-.396-.397H4.891a.396.396 0 0 0 0 .792h.727V8.21a2.997 2.997 0 1 0 3.836 3.466h.71a1.526 1.526 0 1 0 2.732 1.26h.667a.396.396 0 0 0 .396-.397zM8.078 9.507a2.205 2.205 0 1 1-1.559-.646 2.19 2.19 0 0 1 1.559.646zm4.078 3.03a.734.734 0 1 1-.733-.734.735.735 0 0 1 .733.733z"/></svg>`,
-    tie: `<svg fill="#fff" viewBox="0 0 512.001 512.001"><g><g><path d="M120.988,239.868c-4.496,10.625-5.122,20.183-5.157,20.811c-0.267,4.607,3.243,8.547,7.849,8.829 c4.618,0.29,8.574-3.228,8.873-7.833c0.265-4.771,2.339-13.092,5.884-19.44C137.421,242.113,141.397,242.649,120.988,239.868z"/></g></g><g><g><path d="M391.178,255.418c-0.211,8.054-2.458,17.62-6.74,28.398c-1.708,4.299,0.393,9.168,4.692,10.875 c4.293,1.708,9.167-0.39,10.875-4.692c5.103-12.842,7.74-24.392,7.943-34.581H391.178z"/></g></g><g><g><path d="M164.769,210.51c1.046,3.339,1.397,6.953,0.893,10.65c-0.293,2.146-0.857,4.188-1.648,6.1c0,0,51.266,3.416,198.065,3.949 c-0.086-6.331,2.19-12.199,6.244-16.732C217.627,214.046,164.769,210.51,164.769,210.51z"/></g></g><g><g><circle cx="37.179" cy="128.669" r="29.491"/></g></g><g><g><path d="M510.146,391.511l-37.916-66.985c14.35-49.173,20.678-68.137,20.678-68.137l8.949-67.014 c1.502-10.977-6.248-21.075-17.235-22.468l-18.183-2.305c-10.984-1.393-20.996,6.445-22.293,17.431l-1.884,15.955l28.718-21.317 l-37.91,42.278h-46.432c-6.571,0-11.898,5.328-11.898,11.898c0,6.57,5.328,11.898,11.898,11.898h51.744 c3.381,0,6.601-1.438,8.859-3.956l41.456-46.234l-32.023,54.694c-5.28,9.018-14.374,8.169-18.293,8.167c-1.959,0-3.31,0-5.295,0 c-0.399,0.898,3.152-7.399-24.44,57.181c-0.548,1.284-0.907,2.642-1.06,4.031l-8.934,80.338 c-0.939,8.447,5.667,15.857,14.208,15.857c7.179,0,13.361-5.401,14.172-12.701l8.702-78.244l21.512-50.353l-14.121,50.463 c-1.158,3.756-0.718,7.823,1.218,11.243l40.949,72.345c3.885,6.864,12.596,9.276,19.459,5.392 C511.615,407.085,514.03,398.373,510.146,391.511z"/></g></g><g><g><circle cx="464.865" cy="128.702" r="29.491"/></g></g><g><g><path d="M142.923,206.051l-59.556-8.118l-39.135-18.451l13.626,2.292c-1.422-10.945-11.411-18.577-22.254-17.202l-18.182,2.305 C6.43,168.271-1.315,178.374,0.186,189.345l9.12,68.689l21.865,70.857l5.829,70.795c0.646,7.848,7.527,13.705,15.401,13.057 c7.859-0.647,13.705-7.542,13.058-15.401l-5.956-72.345c-0.084-1.031-0.281-2.05-0.585-3.039l-14.123-50.463l21.514,50.353 l8.702,78.244c0.873,7.86,7.96,13.486,15.768,12.612c7.838-0.871,13.483-7.931,12.612-15.768l-8.934-80.338 c-0.154-1.388-0.511-2.747-1.06-4.032l-27.336-61.43l-2.945-24.951l-29.029-25.179l40.79,19.231 c1.097,0.517,2.266,0.862,3.468,1.027l61.369,8.365c6.521,0.887,12.509-3.68,13.396-10.183 C153.994,212.936,149.435,206.939,142.923,206.051z"/></g></g></svg>`
+function newGenMatchImageHTML(match, template = "match_1") {
+  const templatePath = import_path.default.join(`./node_modules/@sjtdev/koishi-plugin-${name}/template/match`, template + ".ejs");
+  const data = {
+    match,
+    utils: utils_exports,
+    ImageType,
+    d2a: dotaconstants_add_exports,
+    dotaconstants: dotaconstants3,
+    moment: import_moment.default,
+    sec2time,
+    formatNumber
   };
-  let matchInfo_html = `
-    <img src="${getImageUrl("flag_radiant")}" alt="" class="flag radiant${match.didRadiantWin ? " won" : ""}" style="order: 1" />
-    <img src="${getImageUrl("flag_dire")}" alt="" class="flag dire${match.didRadiantWin ? "" : " won"}" style="order: 3" />
-    <p class="won${match.didRadiantWin ? " radiant" : ""}">获胜</p>
-    <div class="details" style="order: 2">
-        <p>比赛编号：<span class="match_id">${match.id}</span></p>
-        <p>模式：<span class="mode">${lobbyTypes[match.lobbyType] || match.lobbyType}/${gameMode[match.gameMode] || match.gameMode}</span></p>
-        <p>服务器：<span class="server">${region[match.regionId]}</span></p>
-        <p>起始时间：<span class="start_time">${(0, import_moment.default)(new Date(match.startDateTime * 1e3)).format("YYYY-MM-DD HH:mm:ss").slice(2)}</span></p>
-        <img src="${getImageUrl("star_" + match.rank?.toString().split("")[1])}" alt="" class="star">
-        <img src="${getImageUrl("medal_" + match.rank?.toString().split("")[0])}" alt="" class="rank">
-        <p>结束时间：<span class="end_time">${(0, import_moment.default)(new Date(match.endDateTime * 1e3)).format("YYYY-MM-DD HH:mm:ss").slice(2)}</span></p>
-        <div class="score">
-            <p class="score radiant">${match.radiantKillsCount}</p>
-            <p class="time">${sec2time(match.durationSeconds)}</p>
-            <p class="score dire">${match.direKillsCount}</p>
-        </div>
-    </div>
-    `;
-  $(".match_info").html(matchInfo_html);
-  let players_html = { radiant: "", dire: "" };
-  match.players.forEach((player) => {
-    players_html[player.isRadiant ? "radiant" : "dire"] += sanitizeHTML`
-    <div class="player${player.hero.id == 80 ? " bear" : ""}${player.leaverStatus != "NONE" && player.leaverStatus != "DISCONNECTED" ? " giveup" : ""}" style="order:${player.position?.slice(-1)}">
-        <div class="hero">
-            <div class="player_avatar">
-                <img alt="" src="${getImageUrl(player.hero.shortName, "heroes" /* Heroes */)}" />
-                <p class="party_line${player.partyId != null ? " party_" + match.party[player.partyId] : ""}"></p>
-                <p class="party_mark${player.partyId != null ? " party_" + match.party[player.partyId] : ""}"></p>
-                <p class="position p${Math.floor(player.order / 4) + 1}">${player.isRandom ? "随机" : `第<span>${player.order ? player.order + 1 : "-"}</span>手`}<br/>${position[player.position?.slice(-1)]}</p>
-                <p class="level">${player.level}</p>
-            </div>
-            <div class="player_info">
-                <summary class="player_name">${player.steamAccount.name}</summary>
-                <summary class="player_performance">
-                    <span class="kda">${player.kills}/${player.deaths}/${player.assists}</span>&nbsp;&nbsp;
-                    <span class="kc" style="color:${kcndcStyle.kc(player.killContribution * 100)}">${Math.floor(player.killContribution * 100)}%</span>&nbsp;&nbsp;
-                    <span class="dc" style="color:${kcndcStyle.dc(player.deathContribution * 100)}">${Math.floor(player.deathContribution * 100)}%</span></summary>
-                <summary class="player_net"><span class="networth">${player.networth}</span>&emsp;<span class="score">${(player.heroDamage / player.networth)?.toFixed(2)}</span></summary>
-            </div>
-            <div class="player_lane ${player.laneResult}">
-                ${laneSVG[player.laneResult]}
-            </div>
-            <div class="player_rank">
-            ${player.steamAccount.seasonRank ? `
-                <div class="rank">
-                    <img class="medal" src="${getImageUrl(
-      "medal_" + (player.steamAccount.seasonLeaderboardRank ? player.steamAccount.seasonLeaderboardRank <= 100 ? player.steamAccount.seasonLeaderboardRank <= 10 ? "8c" : "8b" : player.steamAccount.seasonRank.toString().split("")[0] : player.steamAccount.seasonRank.toString().split("")[0])
-    )}" alt="" />
-                    ${!player.steamAccount.seasonLeaderboardRank ? `
-                    <img class="star" src="${getImageUrl("star_" + player.steamAccount.seasonRank.toString().split("")[1])}" alt="" />` : `
-                    <p>${player.steamAccount.seasonLeaderboardRank}</p>`}
-                </div>` : `
-                <div class="norank">
-                    <img class="medal" src="${getImageUrl("medal_0")}" alt="" />
-                </div>`}
-                <div class="dotaPlusLevel"${!player.dotaPlus ? ` style="display:none"` : ""}>
-                    <img src="${getImageUrl("hero_badge_" + (player.dotaPlus ? Math.ceil((player.dotaPlus?.level + 1) / 6) : 1))}" alt="" class="badge">
-                    <p class="level">${player.dotaPlus?.level}</p>
-                </div>
-            </div>
-        </div>
-        <div class="titles">
-            ${player.titles.map((item) => `<span style="color: ${item.color};">${item.name}</span>`).join("&nbsp;")}
-        </div>
-        ${player.hero.id != 80 ? `
-        <div class="items">
-            <div class="items_normal">
-            ${player.items.map(
-      (item) => item ? `
-                <div class="item${item.isRecipe ? " recipe" : ""}">
-                    <img src="${getImageUrl(item.name, "items" /* Items */)}" alt="" />
-                    <p class="time">${sec2time(item.time)}</p>
-                </div>` : `
-                <div class="item" style="visibility:hidden"}">
-                    <img src="${getImageUrl("blink", "items" /* Items */)}" alt="" />
-                    <p class="time">--:--</p>
-                </div>`
-    ).join("")}
-            </div>
-            <div class="items_backpack">
-            ${player.backpacks.map(
-      (item) => item ? `
-                <div class="item back${item.isRecipe ? " recipe" : ""}">
-                    <img src="${getImageUrl(item.name, "items" /* Items */)}" alt="" />
-                    <p class="time">${sec2time(item.time)}</p>
-                </div>` : `
-                <div class="item back" style="visibility:hidden"}">
-                    <img src="${getImageUrl("blink", "items" /* Items */)}" alt="" />
-                    <p class="time">--:--</p>
-                </div>`
-    ).join("")}
-            </div>
-            <div class="item neutral" style="background-image: url(${getImageUrl(dotaconstants3.item_ids[player.neutral0Id], "items" /* Items */)})"></div>
-        </div>
-        <div class="buffs">
-            <section>
-                ${player.stats?.matchPlayerBuffEvent?.map(
-      (buff) => `
-                <div class="buff">
-                    <img src="${getImageUrl(dotaconstants3[buff.abilityId ? "ability_ids" : "item_ids"][buff.abilityId ?? buff.itemId], buff.abilityId ? "abilities" /* Abilities */ : "items" /* Items */)}" alt="" />
-                    <p>${buff.stackCount ?? ""}</p>
-                </div>`
-    ).join("")}
-            </section>
-            <section>
-                <div class="support_item"${player.supportItemsCount[30] > 0 ? "" : ' style="display:none"'}>
-                    <img src="${getImageUrl("gem", "items" /* Items */)}" alt="" />
-                    <p>${player.supportItemsCount[30]}</p>
-                </div>
-                <div class="support_item"${player.supportItemsCount[40] > 0 ? "" : ' style="display:none"'}>
-                    <img src="${getImageUrl("dust", "items" /* Items */)}" alt="" />
-                    <p>${player.supportItemsCount[40]}</p>
-                </div>
-                <div class="support_item"${player.supportItemsCount[42] > 0 ? "" : ' style="display:none"'}>
-                    <img src="${getImageUrl("ward_observer", "items" /* Items */)}" alt="" />
-                    <p>${player.supportItemsCount[42]}</p>
-                </div>
-                <div class="support_item"${player.supportItemsCount[43] > 0 ? "" : ' style="display:none"'}>
-                    <img src="${getImageUrl("ward_sentry", "items" /* Items */)}" alt="" />
-                    <p>${player.supportItemsCount[43]}</p>
-                </div>
-                <div class="support_item"${player.supportItemsCount[188] > 0 ? "" : ' style="display:none"'}>
-                    <img src="${getImageUrl("smoke_of_deceit", "items" /* Items */)}" alt="" />
-                    <p>${player.supportItemsCount[188]}</p>
-                </div>
-            </section>
-        </div>` : `
-        <div class="items_buffs master">
-            <div class="items master">
-                ${player.items.map(
-      (item) => item ? `
-                <div class="item${item.isRecipe ? " recipe" : ""}">
-                    <img src="${getImageUrl(item.name, "items" /* Items */)}" alt="" />
-                    <p class="time">${sec2time(item.time)}</p>
-                </div>` : `
-                <div class="item" style="visibility:hidden"}">
-                    <img src="${getImageUrl("blink", "items" /* Items */)}" alt="" />>
-                    <p class="time">--:--</p>
-                </div>`
-    ).join("")}
-                ${player.backpacks.map(
-      (item) => item ? `
-                <div class="item back${item.isRecipe ? " recipe" : ""}">
-                    <img src="${getImageUrl(item.name, "items" /* Items */)}" alt="" />
-                    <p class="time">${sec2time(item.time)}</p>
-                </div>` : `
-                <div class="item back" style="visibility:hidden"}">
-                    <img src="${getImageUrl("blink", "items" /* Items */)}" alt="" />
-                    <p class="time">--:--</p>
-                </div>`
-    ).join("")}
-                <div class="item neutral">
-                    <img src="${getImageUrl(dotaconstants3.item_ids[player.neutral0Id], "items" /* Items */)}" alt="" />
-                </div>
-            </div>
-            <div class="buffs master">
-                ${player.stats?.matchPlayerBuffEvent?.map(
-      (buff) => `
-                <div class="buff">
-                    <img src="${getImageUrl(dotaconstants3[buff.abilityId ? "ability_ids" : "item_ids"][buff.abilityId ?? buff.itemId], buff.abilityId ? "abilities" /* Abilities */ : "items" /* Items */)}" alt="" />
-                    <p>${buff.stackCount ?? ""}</p>
-                </div>`
-    ).join("")}
-            </div>
-        </div>
-        <div class="items_buffs slave">
-            <div class="items slave">
-                ${player.unitItems.map(
-      (item) => item ? `
-                <div class="item${item.isRecipe ? " recipe" : ""}">
-                    <img src="${getImageUrl(item.name, "items" /* Items */)}" alt="" />
-                    <p class="time">${sec2time(item.time)}</p>
-                </div>` : `
-                <div class="item" style="visibility:hidden"}">
-                    <img src="${getImageUrl("blink", "items" /* Items */)}" alt="" />>
-                    <p class="time">--:--</p>
-                </div>`
-    ).join("")}
-                ${player.unitBackpacks.map(
-      (item) => item ? `
-                <div class="item back${item.isRecipe ? " recipe" : ""}">
-                    <img src="${getImageUrl(item.name, "items" /* Items */)}" alt="" />
-                    <p class="time">${sec2time(item.time)}</p>
-                </div>` : `
-                <div class="item back" style="visibility:hidden"}">
-                    <img src="${getImageUrl("blink", "items" /* Items */)}" alt="" />
-                    <p class="time">--:--</p>
-                </div>`
-    ).join("")}
-                <div class="item neutral">
-                    <img src="${getImageUrl(dotaconstants3.item_ids[player.additionalUnit.neutral0Id], "items" /* Items */)}" alt="" />
-                </div>
-            </div>
-            <div class="buffs_supportItems slave">
-                <div class="buffs">
-                    <!-- 无有效API获取熊灵buff -->
-                </div>
-                <div class="support_items">
-                    <div class="support_item"${player.supportItemsCount[30] > 0 ? "" : ' style="display:none"'}>
-                        <img src="${getImageUrl("gem", "items" /* Items */)}" alt="" />
-                        <p>${player.supportItemsCount[30]}</p>
-                    </div>
-                    <div class="support_item"${player.supportItemsCount[40] > 0 ? "" : ' style="display:none"'}>
-                        <img src="${getImageUrl("dust", "items" /* Items */)}" alt="" />
-                        <p>${player.supportItemsCount[40]}</p>
-                    </div>
-                    <div class="support_item"${player.supportItemsCount[42] > 0 ? "" : ' style="display:none"'}>
-                        <img src="${getImageUrl("ward_observer", "items" /* Items */)}" alt="" />
-                        <p>${player.supportItemsCount[42]}</p>
-                    </div>
-                    <div class="support_item"${player.supportItemsCount[43] > 0 ? "" : ' style="display:none"'}>
-                        <img src="${getImageUrl("ward_sentry", "items" /* Items */)}" alt="" />
-                        <p>${player.supportItemsCount[43]}</p>
-                    </div>
-                    <div class="support_item"${player.supportItemsCount[188] > 0 ? "" : ' style="display:none"'}>
-                        <img src="${getImageUrl("smoke_of_deceit", "items" /* Items */)}" alt="" />
-                        <p>${player.supportItemsCount[188]}</p>
-                    </div>
-                </div>
-            </div>
-        </div>`}
-        <div class="details">
-            <section>英雄伤害：<span class="hero_damage">${player.heroDamage}</span></section>
-            <section>建筑伤害：<span class="building_damage">${player.towerDamage}</span></section>
-            <section>受到伤害(减免后)：<span class="tak">${player.stats?.heroDamageReport?.receivedTotal.physicalDamage + player.stats?.heroDamageReport?.receivedTotal.magicalDamage + player.stats?.heroDamageReport?.receivedTotal.pureDamage}</span></section>
-            <section>补刀：<span class="lh">${player.numLastHits}</span>/<span class="dn">${player.numDenies}</span></section>
-            <section>GPM/XPM：<span class="gpm">${player.goldPerMinute}</span>/<span class="xpm">${player.experiencePerMinute}</span></section>
-            <section>治疗量：<span class="heal">${player.heroHealing}</span></section>
-            <section>控制时间：<span class="building_damage">${(player.stats?.heroDamageReport?.dealtTotal.stunDuration / 100).toFixed(2)}/${(player.stats?.heroDamageReport?.dealtTotal.slowDuration / 100).toFixed(2)}/${(player.stats?.heroDamageReport?.dealtTotal.disableDuration / 100).toFixed(2)}</span>s</section>
-        </div>
-    </div>`;
+  let result = "";
+  ejs.renderFile(templatePath, data, (err, html) => {
+    if (err)
+      throw err;
+    else
+      result = html;
   });
-  $(".radiant_players").html(players_html.radiant);
-  $(".dire_players").html(players_html.dire);
-  $(".ban_list").html(
-    match.pickBans.filter((hero) => !hero.isPick).map((hero) => `<div class="ban_hero"><img src="${getImageUrl(/^npc_dota_hero_(?<name>.+)$/.exec(dotaconstants3.heroes[hero.bannedHeroId].name)[1], "heroes" /* Heroes */)}" alt="" /></div>`).join("")
-  );
   if (process.env.NODE_ENV === "development")
-    import_fs2.default.writeFileSync("./node_modules/@sjtdev/koishi-plugin-dota2tracker/temp.html", $.html());
-  return $.html();
+    import_fs2.default.writeFileSync("./node_modules/@sjtdev/koishi-plugin-dota2tracker/temp.html", result);
+  return result;
 }
-__name(genMatchImageHTML, "genMatchImageHTML");
+__name(newGenMatchImageHTML, "newGenMatchImageHTML");
 function genHeroHTML(hero) {
   let $ = cheerio.load(import_fs2.default.readFileSync(`./node_modules/@sjtdev/koishi-plugin-${name}/template/hero.html`, "utf-8"));
   let html = `
@@ -1832,18 +1658,13 @@ function genPlayerHTML(player) {
     (outcomeCounts.victory + outcomeCounts.stomp + outcomeCounts.tie / 2) / (outcomeCounts.victory + outcomeCounts.stomp + outcomeCounts.tie + outcomeCounts.fail + outcomeCounts.stomped)
   )};">${((outcomeCounts.victory + outcomeCounts.stomp) / (outcomeCounts.victory + outcomeCounts.stomp + outcomeCounts.fail + outcomeCounts.stomped) * 100).toFixed(2)}%</span></span></p>
     </div>
-    ${player.steamAccount.seasonRank ? `
     <div class="rank">
         <img class="medal" src="${getImageUrl(
-    "medal_" + (player.steamAccount.seasonLeaderboardRank ? player.steamAccount.seasonLeaderboardRank <= 100 ? player.steamAccount.seasonLeaderboardRank <= 10 ? "8c" : "8b" : player.steamAccount.seasonRank.toString().split("")[0] : player.steamAccount.seasonRank.toString().split("")[0])
+    "medal_" + ((player.steamAccount.seasonLeaderboardRank ? player.steamAccount.seasonLeaderboardRank <= 100 ? player.steamAccount.seasonLeaderboardRank <= 10 ? "8c" : "8b" : player.steamAccount.seasonRank?.toString().split("")[0] : player.steamAccount.seasonRank?.toString().split("")[0]) ?? "0")
   )}" alt="" />
-        ${!player.steamAccount.seasonLeaderboardRank ? `
-        <img class="star" src="${getImageUrl("star_" + player.steamAccount.seasonRank.toString().split("")[1])}" alt="" />` : `
-        <p>${player.steamAccount.seasonLeaderboardRank}</p>`}
-    </div>` : `
-    <div class="rank">
-        <img class="medal" src="${getImageUrl("medal_0")}" alt="" />
-    </div>`}`;
+        <img class="star" src="${getImageUrl("star_" + (player.steamAccount.seasonRank?.toString().split("")[1] ?? "0"))}" alt="" />
+        <p>${player.steamAccount.seasonLeaderboardRank ?? ""}</p>    
+    </div>`;
   const heroesCountPixels = 800 - ($(".tip:not(.row):not(.win_count):not(.lose_count)").length + 1) * 40;
   const highestCountsTotal = {
     winCount: Math.max(...player.heroesPerformanceTop10.map((hero) => hero.winCount)),
@@ -1955,13 +1776,21 @@ function winRateColor(value) {
   return `#${toHex(red)}${toHex(green)}${toHex(blue)}`;
 }
 __name(winRateColor, "winRateColor");
-function sanitizeHTML(strings, ...values) {
-  return strings.reduce((result, string, i) => {
-    let value = values[i] ?? "--";
-    return result + string + (i < values.length ? value : "");
-  }, "");
+function formatNumber(num) {
+  return num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+}
+__name(formatNumber, "formatNumber");
+function readDirectoryFilesSync(directoryPath) {
+  try {
+    const files = import_fs2.default.readdirSync(directoryPath);
+    const fileNames = files.map((file) => import_path.default.basename(file, import_path.default.extname(file)));
+    return fileNames;
+  } catch (error) {
+    console.error("Error reading directory:", error);
+    return [];
+  }
 }
-__name(sanitizeHTML, "sanitizeHTML");
+__name(readDirectoryFilesSync, "readDirectoryFilesSync");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Config,