diff --git a/character/jsrg/skill.js b/character/jsrg/skill.js index 86da960b3..36a85cd8e 100644 --- a/character/jsrg/skill.js +++ b/character/jsrg/skill.js @@ -3340,29 +3340,16 @@ const skills = { charlotte: true, direct: true, check: function (event, player) { - return ( - player - .getCards("h") - .map(i => get.value(i)) - .reduce((p, c) => p + c, 0) < - event.player - .getCards("h") - .map(i => get.value(i)) - .reduce((p, c) => p + c, 0) + - 4 * Math.random() - ); + return (player.getCards("h").map(i => get.value(i)).reduce((p, c) => p + c, 0) < event.player.getCards("h").map(i => get.value(i)).reduce((p, c) => p + c, 0) + 4 * Math.random()); }, content: function () { "step 0"; + player.unmarkAuto("jsrgguiji_swapback", [trigger.player]); if (trigger.name == "phaseUse") { - player - .chooseBool(get.prompt("jsrgguiji_swapback", trigger.player), "与其交换手牌。") - .set("ai", () => { - return get.event("bool"); - }) - .set("bool", lib.skill.jsrgguiji_swapback.check(trigger, player) > 0); + player.chooseBool(get.prompt("jsrgguiji_swapback", trigger.player), "与其交换手牌。").set("ai", () => { + return get.event("bool"); + }).set("bool", lib.skill.jsrgguiji_swapback.check(trigger, player) > 0); } else { - player.unmarkAuto("jsrgguiji_swapback", [trigger.player]); event.finish(); } "step 1"; @@ -3370,7 +3357,6 @@ const skills = { player.logSkill("jsrgguiji_swapback", trigger.player); player.swapHandcards(trigger.player); } - player.unmarkAuto("jsrgguiji_swapback", [trigger.player]); }, intro: { content: "$的下个出牌阶段结束时,你可以与其交换手牌", diff --git a/character/tw/character.js b/character/tw/character.js index a5d41a217..5d6e9cd83 100644 --- a/character/tw/character.js +++ b/character/tw/character.js @@ -66,7 +66,7 @@ const characters = { tw_daxiaoqiao: ["female", "wu", 3, ["twxingwu", "twpingting"], ["tempname:daxiaoqiao"]], tw_furong: ["male", "shu", 4, ["twxuewei", "twliechi"]], tw_yl_luzhi: ["male", "qun", 3, ["twmingren", "twzhenliang"]], - tw_liuzhang: ["male", "qun", 3, ["jutu", "twyaohu", "rehuaibi"]], + tw_liuzhang: ["male", "qun", 3, ["jutu", "twyaohu", "rehuaibi"], ["zhu"]], tw_zongyu: ["male", "shu", 3, ["twzhibian", "twyuyan"]], tw_zhouchu: ["male", "wu", 4, ["twguoyi", "twchuhai"]], tw_qiaogong: ["male", "wu", 3, ["twyizhu", "twluanchou"]],