koishi-plugin-xxck-1 0.2.26 → 0.2.28

package/lib/index.js

@@ -1928,10 +1928,12 @@ async function doBattleAgree(ctx, session) {
       return {
         cardId: "test",
         name: "测试卡",
-        element: "physic",
-        hp: 400,
-        maxHp: 400,
-        atk: 300,
+        element: "fire",
+        hp: 700,
+        // 血量上调
+        maxHp: 700,
+        atk: 180,
+        // 攻击下调
         def: 200,
         spd: 80,
         critRate: 0.1,
@@ -1940,7 +1942,7 @@ async function doBattleAgree(ctx, session) {
         dmgIncrease: 0,
         dmgReduce: 0,
         skillCost: 999,
-        energy: 2,
+        energy: 0,
         isAlive: true,
         hasActed: false,
         buffs: [],
@@ -1972,7 +1974,7 @@ async function doBattleAgree(ctx, session) {
       dmgIncrease: b.dmg_increase,
       dmgReduce: b.dmg_reduce,
       skillCost: b.skill_cost,
-      energy: 2,
+      energy: 0,
       isAlive: true,
       hasActed: false,
       buffs: [],
@@ -2014,14 +2016,27 @@ async function doBattleAgree(ctx, session) {
   const isEnd = /* @__PURE__ */ __name(() => !teamA.some((c) => c.isAlive) || !teamB.some((c) => c.isAlive), "isEnd");
   async function act(card) {
     card.hasActed = true;
+    const isTeamA = teamA.includes(card);
+    const targetQQ = isTeamA ? p1 : p2;
+    const sideGroup = session.guildId;
+    let nick = targetQQ;
+    if (sideGroup) {
+      const member = await ctx.database.get("gacha_group_member", {
+        group_id: sideGroup,
+        qq: targetQQ
+      });
+      if (member.length) {
+        nick = member[0].group_nickname || targetQQ;
+      }
+    }
     const tip = card.energy >= card.skillCost ? "【技能就绪】" : "【普攻】";
     await session.send(build_msg(
       session,
-      `⚔️【${card.name}】行动｜血量：${card.hp}/${card.maxHp}｜能量：${card.energy}/5｜速度：${card.spd} ${tip}`
+      `⚔️【${nick}】的 ${card.name}｜血量：${card.hp}/${card.maxHp}｜能量：${card.energy}/5｜速度：${card.spd} ${tip}`
     ));
     await sleep(500);
-    const team = teamA.includes(card) ? teamA : teamB;
-    const enemy = teamA.includes(card) ? teamB : teamA;
+    const team = isTeamA ? teamA : teamB;
+    const enemy = isTeamA ? teamB : teamA;
     const skill = skillBook[card.cardId];
     if (skill?.wugui) await skill.wugui(card, team, enemy, session);
     if (skill && card.energy >= card.skillCost) {
@@ -2031,6 +2046,16 @@ async function doBattleAgree(ctx, session) {
     }
     await sleep(500);
     card.energy = Math.min(5, card.energy + 1);
+    if (!card.isAlive) {
+      await session.send(build_msg(
+        session,
+        `💀【${nick}】的 ${card.name} 已阵亡！`
+      ));
+      if (skill?.onDeath) {
+        skill.onDeath(card, team);
+      }
+      await sleep(500);
+    }
   }
   __name(act, "act");
   let turn = 0;
@@ -2038,6 +2063,8 @@ async function doBattleAgree(ctx, session) {
     turn++;
     teamA.forEach((c) => c.hasActed = false);
     teamB.forEach((c) => c.hasActed = false);
+    teamA.filter((c) => c.isAlive).forEach((c) => c.energy = Math.min(5, c.energy + 2));
+    teamB.filter((c) => c.isAlive).forEach((c) => c.energy = Math.min(5, c.energy + 2));
     await session.send(`=== 第 ${turn} 回合 ==`);
     while (true) {
       const q = rebuildQueue();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-xxck-1",
   "description": "自用（？）抽卡系统|完整指令说明见readme|建议使用skia-canvas|指令与本地化已经基本完成",
-  "version": "0.2.26",
+  "version": "0.2.28",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [