From 5016691166e78742d9b8aa48a9426fcf707c7f16 Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Sun, 5 May 2024 20:33:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BD=E6=88=98=E3=80=90?= =?UTF-8?q?=E6=9C=9B=E5=BD=92=E3=80=91=EF=BC=8C=E5=90=8C=E6=97=B6=E6=94=B9?= =?UTF-8?q?async=E5=86=99=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/huicui/skill.js | 70 +++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/character/huicui/skill.js b/character/huicui/skill.js index 2ecb9d3f6..840ee7514 100644 --- a/character/huicui/skill.js +++ b/character/huicui/skill.js @@ -12371,53 +12371,53 @@ const skills = { player: "damageEnd", source: "damageSource", }, - direct: true, filter: function (event, player) { - if (!player.hasSkill("wanggui") || player.hasSkill("wanggui2")) return false; + if (player.isUnseen()) return false; if (!player.isUnseen(2)) return true; - return !player.isUnseen() && [player.name1, player.name2].some(name => { - return get.character(name, 3).includes("wanggui"); - }); + return ( + !player.isUnseen(0) && get.character(player.name1, 3).includes("wanggui") || + !player.isUnseen(1) && get.character(player.name2, 3).includes("wanggui") + ); }, + usable: 1, preHidden: true, - content: function () { - "step 0"; - player.addTempSkill("wanggui2"); - var bool = player.isUnseen(2); - if (bool) { - player - .chooseTarget("望归:是否对一名势力不同的角色造成1点伤害?", function (card, player, target) { + async cost(event, trigger, player) { + if (player.isUnseen(2)) event.result = await player + .chooseTarget( + get.prompt("wanggui"), + "望归:是否对与你势力不同的一名角色造成1点伤害?", + (card, player, target) => { return target.isEnemyOf(player); - }) - .set("ai", function (target) { - var player = _status.event.player; - return get.damageEffect(target, player, player); - }) - .setHiddenSkill("wanggui"); - } else event.goto(2); - "step 1"; - if (result.bool) { - var target = result.targets[0]; - player.logSkill("wanggui", target); - target.damage(); + } + ) + .set("ai", (target) => { + let player = _status.event.player; + return get.damageEffect(target, player, player); + }) + .setHiddenSkill("wanggui") + .forResult(); + else event.result = await player + .chooseBool("望归:是否令与你势力相同的角色各摸一张牌?") + .setHiddenSkill("wanggui") + .set("logSkill", ["wanggui", game.filterPlayer(current => { + return current.isFriendOf(player); + })]) + .forResult(); + }, + async content(event, trigger, player) { + if (player.isUnseen(2)) { + const target = event.targets[0]; + target.damage("nocard"); } - event.finish(); - "step 2"; - player.chooseBool("望归:是否令所有与自己势力相同的角色各摸一张牌?").setHiddenSkill("wanggui"); - "step 3"; - if (result.bool) { - var targets = game.filterPlayer(function (current) { + else { + const targets = game.filterPlayer(current => { return current.isFriendOf(player); }); targets.sortBySeat(); - player.logSkill("wanggui", targets); game.asyncDraw(targets); - } else event.finish(); - "step 4"; - game.delayx(); + } }, }, - wanggui2: {}, xibing: { audio: 2, trigger: { global: "useCardToPlayered" },