From 918b20a4e62a516b1619de3c280eda3d250b7f0e Mon Sep 17 00:00:00 2001 From: Spmario233 Date: Sun, 5 May 2024 18:03:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=8F=E9=9F=A9=E9=9F=B6=20bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/clan/skill.js | 76 +++++++++++++++++---------------------- character/collab/skill.js | 4 +-- character/huicui/skill.js | 8 +++-- 3 files changed, 39 insertions(+), 49 deletions(-) diff --git a/character/clan/skill.js b/character/clan/skill.js index fd4329b75..778eb456c 100644 --- a/character/clan/skill.js +++ b/character/clan/skill.js @@ -2355,72 +2355,60 @@ const skills = { filter(event, player) { return game.hasPlayer(current => player.canCompare(current)); }, - direct: true, + async cost(event, trigger, player){ + event.result = await player.chooseTarget(get.prompt("clanliuju"), "与一名其他角色拼点，输的角色可以使用任意张拼点牌中的非基本牌", (card, player, target) => { + return player.canCompare(target); + }).set("ai", target => { + var player = _status.event.player; + var ts = target.getCards("h").sort((a, b) => get.number(a) - get.number(b)); + if (get.attitude(player, target) < 0) { + var hs = player.getCards("h").sort((a, b) => get.number(a) - get.number(b)); + if (!hs.length || !ts.length) return 0; + if (get.type(hs[0], null, false) == "basic" && get.value(hs[0]) > 6) return 0; + if (get.number(hs[0]) < get.number(ts[0]) || get.type(hs[0], null, false) == "basic") return 1; + return Math.random() - 0.7; + } + return get.type(ts[0]) != "basic"; + }).forResult(); + }, content() { "step 0"; - player - .chooseTarget(get.prompt("clanliuju"), "与一名其他角色拼点，输的角色可以使用任意张拼点牌中的非基本牌", (card, player, target) => { - return player.canCompare(target); - }) - .set("ai", target => { - var player = _status.event.player; - var ts = target.getCards("h").sort((a, b) => get.number(a) - get.number(b)); - if (get.attitude(player, target) < 0) { - var hs = player.getCards("h").sort((a, b) => get.number(a) - get.number(b)); - if (!hs.length || !ts.length) return 0; - if (get.type(hs[0], null, false) == "basic" && get.value(hs[0]) > 6) return 0; - if (get.number(hs[0]) < get.number(ts[0]) || get.type(hs[0], null, false) == "basic") return 1; - return Math.random() - 0.7; - } - return get.type(ts[0]) != "basic"; - }); + var target = targets[0]; + event.target = target; + player.chooseToCompare(target).set("small", true); "step 1"; - if (result.bool) { - var target = result.targets[0]; - event.target = target; - player.logSkill("clanliuju", target); - player.chooseToCompare(target).set("small", true); - } else event.finish(); - "step 2"; if (!result.tie) { var loser = result.bool ? target : player; var cards = []; game.getGlobalHistory("cardMove", evt => { - if (evt.getParent(2) == event) - cards.addArray( - evt.cards.filter(i => { - return get.position(i, true) == "d" && get.type(i, null, false) != "basic"; - }) - ); + if (evt.getParent(2).name === "chooseToCompare" && evt.getParent(3) === event) cards.addArray(evt.cards.filter(i => { + return get.position(i, true) == "d" && get.type(i, null, false) != "basic"; + })); }); event.loser = loser; event.distance = [get.distance(player, target), get.distance(target, player)]; if (cards.length) event.cards = cards; else event.finish(); } else event.finish(); - "step 3"; + "step 2"; var cardsx = cards.filter(i => get.position(i, true) == "d" && event.loser.hasUseTarget(i)); if (!cardsx.length) event.goto(6); - else - event.loser - .chooseButton(["留驹：是否使用其中的一张牌？", cardsx]) - .set("filterButton", button => { - return _status.event.player.hasUseTarget(button.link); - }) - .set("ai", button => { - return _status.event.player.getUseValue(button.link) + 0.1; - }); - "step 4"; + else event.loser.chooseButton(["留驹：是否使用其中的一张牌？", cardsx]).set("filterButton", button => { + return _status.event.player.hasUseTarget(button.link); + }).set("ai", button => { + return _status.event.player.getUseValue(button.link) + 0.1; + }); + "step 3"; if (result.bool) { var card = result.links[0]; event.cards.remove(card); event.loser.$gain2(card, false); game.delayx(); event.loser.chooseUseTarget(true, card, false); - } else event.goto(6); - "step 5"; + } else event.goto(5); + "step 4"; if (cards.filter(i => get.position(i, true) == "d" && event.loser.hasUseTarget(i)).length) event.goto(3); - "step 6"; + "step 5"; if (get.distance(player, target) != event.distance[0] || get.distance(target, player) != event.distance[1]) { player.restoreSkill("clanxumin"); game.log(player, "重置了", "#g【恤民】"); diff --git a/character/collab/skill.js b/character/collab/skill.js index a883c5797..0d54eba03 100644 --- a/character/collab/skill.js +++ b/character/collab/skill.js @@ -20,9 +20,7 @@ const skills = { const map = lib.skill.dcbenxi.getMap(), list = Object.keys(map); if (list.length > 0) { - const skill = list.randomGet(), - voiceMap = game.parseSkillTextMap(skill, map[skill]); - console.log(voiceMap); + const skill = list.randomGet(), voiceMap = game.parseSkillTextMap(skill, map[skill]); player.storage.dcbenxi_pending = skill; findaudio: for (let data of voiceMap) { if(!data.text) continue; diff --git a/character/huicui/skill.js b/character/huicui/skill.js index 2bbbd4f66..6b46a1c7d 100644 --- a/character/huicui/skill.js +++ b/character/huicui/skill.js @@ -2793,8 +2793,12 @@ const skills = { trigger: { player: ["gainAfter", "loseAsyncAfter"] }, forced: true, filter: (event, player) => { - if (event.getParent("phaseDraw", true)) return false; - const evt = player.getHistory("gain", i => !i.getParent("phaseDraw", true))[0]; + const phaseDraw = event.getParent("phaseDraw"); + if (phaseDraw && phaseDraw.player === player) return false; + const evt = player.getHistory("gain").find(i => { + const phaseDraw = i.getParent("phaseDraw"); + return (!phaseDraw || phaseDraw.player !== player); + }); if (!evt) return false; if (event.name == "gain") { if (evt != event || event.getlx === false) return false;