From 707aca8959c8c27456dc527b4b0217ae1c61de39 Mon Sep 17 00:00:00 2001 From: copcap Date: Sat, 20 Apr 2024 00:01:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A5=9E=E5=8D=8E=E4=BD=97bugfix=EF=BC=9B?= =?UTF-8?q?=E7=A5=9E=E9=B2=81=E8=82=83=E6=A6=BB=E8=B0=9F=E5=92=8C=E6=99=BA?= =?UTF-8?q?=E7=9B=9F=E5=86=8D=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/extra.js | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/character/extra.js b/character/extra.js index 6746813d8..c70a11367 100755 --- a/character/extra.js +++ b/character/extra.js @@ -126,7 +126,7 @@ game.import("character", function () { if (!skill || skill === "jingyu") return false; let info = get.info(skill); while (true) { - if (!info || info.charlotte) return false; + if (!info || info.charlotte || info.equipSkill) return false; if (info && !info.sourceSkill) break; skill = info.sourceSkill; info = get.info(skill); @@ -235,13 +235,13 @@ game.import("character", function () { if (["global", "equip"].includes(event.type)) return false; const skill = event.sourceSkill || event.skill; const info = get.info(skill); - return info && !info.charlotte; + return info && !info.charlotte && !info.equipSkill; }, forced: true, onremove: true, charlotte: true, async content(event, trigger, player) { - player.loseHp(player.countMark("lvxin_recover")); + player.recover(player.countMark("lvxin_recover")); player.removeSkill("lvxin_recover"); }, intro: { @@ -256,7 +256,7 @@ game.import("character", function () { if (["global", "equip"].includes(event.type)) return false; const skill = event.sourceSkill || event.skill; const info = get.info(skill); - return info && !info.charlotte; + return info && !info.charlotte && !info.equipSkill; }, forced: true, onremove: true, @@ -746,9 +746,9 @@ game.import("character", function () { filter(event, player) { return ( (event.name != "phase" || game.phaseNumber == 0) && - game.countPlayer(current => { - if (get.mode() != "doudizhu") return !current.isZhu2(); - return current.getSeatNum() != 3; + game.countPlayer((current) => { + if (get.mode() === "doudizhu") return current.getSeatNum() !== 3; + return !current.isZhu2(); }) > 1 ); }, @@ -757,8 +757,8 @@ game.import("character", function () { derivation: "tamo_faq", async content(event, trigger, player) { const toSortPlayers = game.filterPlayer((current) => { - if (get.mode() != "doudizhu") return !current.isZhu2(); - return current.getSeatNum() != 3; + if (get.mode() === "doudizhu") return current.getSeatNum() !== 3; + return !current.isZhu2(); }); toSortPlayers.sortBySeat(game.findPlayer2((current) => current.getSeatNum() == 1, true)); const next = player.chooseToMove("榻谟：是否分配" + @@ -900,7 +900,12 @@ game.import("character", function () { game.swapSeat(list[0], list[1], false); } }, toSwapList); - if (trigger.name === "phase" && !trigger.player.isZhu2() && trigger.player !== toSortPlayers[0] && !trigger._finished) { + if ( + trigger.name === "phase" && + !trigger.player.isZhu2() && + trigger.player !== toSortPlayers[0] && + !trigger._finished + ) { trigger.finish(); trigger._triggered = 5; const evt = toSortPlayers[0].insertPhase(); @@ -911,10 +916,7 @@ game.import("character", function () { } //跳过新回合的phaseBefore evt.pushHandler("onPhase", (event, option) => { - if ( - event.step === 0 && - option.state === "begin" - ) { + if (event.step === 0 && option.state === "begin") { event.step = 1; } }); @@ -929,7 +931,8 @@ game.import("character", function () { filter(event, player) { return game.hasPlayer(target => { if (target == player || target.countCards('h') + player.countCards('h') == 0) return false; - return get.mode() == 'identity' || target.countCards('h') <= player.countCards('h') + 1; + // return get.mode() == 'identity' || target.countCards('h') <= player.countCards('h') + 1; + return true; }); }, direct: true, @@ -942,7 +945,8 @@ game.import("character", function () { "与一名其他角色平分手牌", (card, player, target) => { if (target == player || target.countCards('h') + player.countCards('h') == 0) return false; - return get.mode() == 'identity' || target.countCards('h') <= player.countCards('h') + 1; + // return get.mode() == 'identity' || target.countCards('h') <= player.countCards('h') + 1; + return true; } ) .set("ai", (target) => { @@ -10841,17 +10845,13 @@ game.import("character", function () { dingzhou_info: "出牌阶段限一次。你可以将X张牌交给一名场上有牌的角色，然后你获得其场上的所有牌（X为其场上的牌数）。", tamo: "榻谟", - tamo_info: - "游戏开始时，你可以重新分配除主公外所有角色的座次。", - tamo_info_doudizhu: - "游戏开始时，你可以重新分配除三号位外所有角色的座次。", + tamo_info_doudizhu: "游戏开始时，你可以重新分配除三号位角色外所有角色的座次。", + tamo_info: "游戏开始时，你可以重新分配除主公外所有角色的座次。", tamo_faq: "FAQ", tamo_faq_info: "
  • Q：在一号位不为主公的情况下，〖榻谟〗如何结算？
  • A：该角色可以正常进行座次交换。若受此技能影响导致一号位角色发生了变化，则以排列后的一号位角色为起始角色开始本局游戏。
    • ", zhimeng: "智盟", zhimeng_info: - "回合结束后，你可以选择一名手牌数不大于Y的其他角色（Y为你的手牌数+1）。若如此做，你与其将各自所有手牌置于处理区，然后你随机获得这些牌中的一半（向上取整），其获得剩余的牌。", - zhimeng_info_identity: "回合结束后，你可以选择一名其他角色。若如此做，你与其将各自所有手牌置于处理区，然后你随机获得这些牌中的一半（向上取整），其获得剩余的牌。", shen_xuzhu: "神许褚", shen_xuzhu_prefix: "神",