From 971b6c16b338fd7be2e898abef5f6208041567b0 Mon Sep 17 00:00:00 2001
From: mengxinzxz <2223529500@qq.com>
Date: Thu, 18 Apr 2024 20:10:14 +0800
Subject: [PATCH] =?UTF-8?q?bugfix+=E6=8A=80=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
character/clan.js | 2 +-
character/extra.js | 24 ++++++++++--------------
character/sb.js | 6 +++---
character/sp.js | 4 ++--
character/sp2.js | 2 +-
5 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/character/clan.js b/character/clan.js
index 2e209b470..c99823343 100644
--- a/character/clan.js
+++ b/character/clan.js
@@ -1162,7 +1162,7 @@ game.import("character", function () {
var num = get.cardNameLength(event.card);
return typeof num == "number" && num > 0 && player.countCards("he") > 0;
},
- async content(event, trigger, player) {
+ async cost(event, trigger, player) {
var num = get.cardNameLength(trigger.card),
str = "";
if (player.getDamagedHp() > 0)
diff --git a/character/extra.js b/character/extra.js
index 7f6c41343..1b34c9899 100755
--- a/character/extra.js
+++ b/character/extra.js
@@ -753,7 +753,6 @@ game.import("character", function () {
},
direct: true,
changeSeat: true,
- derivation: "tamo_faq",
async content(event, trigger, player) {
const toSortPlayers = game.filterPlayer((current) => !current.isZhu2());
toSortPlayers.sortBySeat(game.findPlayer2((current) => current.getSeatNum() == 1, true));
@@ -871,7 +870,7 @@ game.import("character", function () {
});
const { result } = await next;
if (!result.bool) return;
- await player.logSkill("tamo");
+ player.logSkill("tamo");
const resultList = result.moved[0].map((info) => {
return parseInt(info.split("|")[0]);
});
@@ -919,8 +918,9 @@ game.import("character", function () {
audio: 2,
trigger: { player: "phaseAfter" },
filter(event, player) {
- return game.hasPlayer((current) => {
- return current.countCards("h") + player.countCards("h") > 0 && player != current;
+ 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;
});
},
direct: true,
@@ -932,9 +932,8 @@ game.import("character", function () {
get.prompt("zhimeng"),
"与一名其他角色平分手牌",
(card, player, target) => {
- return (
- target.countCards("h") + player.countCards("h") > 0 && 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;
}
)
.set("ai", (target) => {
@@ -1184,6 +1183,7 @@ game.import("character", function () {
default:
return false;
}
+ break;
}
},
forced: true,
@@ -10833,14 +10833,10 @@ game.import("character", function () {
dingzhou_info:
"出牌阶段限一次。你可以将X张牌交给一名场上有牌的角色，然后你获得其场上的所有牌（X为其场上的牌数+1）。",
tamo: "榻谟",
- tamo_info:
- "游戏开始时，你可以重新分配除主公外所有角色的座次。",
- tamo_faq: "FAQ",
- tamo_faq_info:
- "
Q：在一号位不为主公的情况下，〖榻谟〗如何结算？A：该角色可以正常进行座次交换。若受此技能影响导致一号位角色发生了变化，则以排列后的一号位角色为起始角色开始本局游戏。",
+ tamo_info: "游戏开始时，你可以重新分配除主公外所有角色的座次。",
zhimeng: "智盟",
- zhimeng_info:
- "回合结束后，你可以与一名其他角色将各自所有手牌置于处理区，然后你随机获得这些牌中的一半（向上取整），其获得剩余的牌。",
+ zhimeng_info_identity:'回合结束后，你可以选择一名其他角色。若如此做，你与其将各自所有手牌置于处理区，然后你随机获得这些牌中的一半（向上取整），其获得剩余的牌。',
+ zhimeng_info:'回合结束后，你可以选择一名手牌数不大于Y的其他角色（Y为你的手牌数+1）。若如此做，你与其将各自所有手牌置于处理区，然后你随机获得这些牌中的一半（向上取整），其获得剩余的牌。',
shen_xuzhu: "神许褚",
shen_xuzhu_prefix: "神",
zhengqing: "争擎",
diff --git a/character/sb.js b/character/sb.js
index a294009df..519e02fdc 100644
--- a/character/sb.js
+++ b/character/sb.js
@@ -890,7 +890,7 @@ game.import("character", function () {
} = await player
.chooseTarget(
get.prompt("sbjieming"),
- `令一名角色摸三张牌，然后其可以弃置任意张牌。若其弃置的牌数不大于${get.cnNumber(
+ `令一名角色摸四张牌，然后其可以弃置任意张牌。若其弃置的牌数不大于${get.cnNumber(
num
)}张，你失去1点体力。`
)
@@ -921,7 +921,7 @@ game.import("character", function () {
if (!bool) return;
const target = targets[0];
player.logSkill("sbjieming", target);
- await target.draw(3);
+ await target.draw(4);
num = Math.max(1, player.getDamagedHp());
const {
result: { bool: bool2, cards },
@@ -8984,7 +8984,7 @@ game.import("character", function () {
"出牌阶段限一次。你可以选择两名有牌的其他角色，你与这些角色同时将任意张牌扣置于武将牌上。若你以此法扣置的牌唯一最少，则扣置牌最多的其他角色获得你扣置的牌，且这些角色获得各自扣置的牌；否则这两名角色中扣置牌较多的角色对较少的角色造成1点伤害，获得你扣置的牌，然后这些角色将各自扣置的牌置入弃牌堆（若这两名角色扣置的牌数相同，视为与你逆时针最近座次的角色扣置牌较多）。",
sbjieming: "节命",
sbjieming_info:
- "当你受到伤害后，你可以令一名角色摸三张牌，然后其可以弃置任意张牌。若其弃置的牌数不大于X，你失去1点体力（X为你已损失的体力值，至少为1）。",
+ "当你受到伤害后，你可以令一名角色摸四张牌，然后其可以弃置任意张牌。若其弃置的牌数不大于X，你失去1点体力（X为你已损失的体力值，至少为1）。",
sb_xiahoudun: "谋夏侯惇",
sb_xiahoudun_prefix: "谋",
sbganglie: "刚烈",
diff --git a/character/sp.js b/character/sp.js
index fdad5ff70..7b764bc08 100755
--- a/character/sp.js
+++ b/character/sp.js
@@ -999,7 +999,7 @@ game.import("character", function () {
list.push(
cards.reduce((sum, card) => {
const juedou = get.autoViewAs({ name: "juedou" }, [card]);
- return sum + get.effect(target, card, player, player);
+ return sum + get.effect(target, juedou, player, player);
}, 0)
);
}
@@ -1030,7 +1030,7 @@ game.import("character", function () {
})
.reduce((num, card) => {
const juedou = get.autoViewAs({ name: "juedou" }, [card]);
- return num + get.effect(player, card, source, player);
+ return num + get.effect(player, juedou, source, player);
}, 0);
};
return controls.sort(
diff --git a/character/sp2.js b/character/sp2.js
index 6caefd98f..d71e54324 100644
--- a/character/sp2.js
+++ b/character/sp2.js
@@ -2448,7 +2448,7 @@ game.import("character", function () {
} = await player.chooseButton(dialog, true).set("ai", (button) => {
const player = get.event("player"),
target = get.event().getParent().targets[0];
- return get.value(card, player) * get.value(card, target) * (1 + Math.random());
+ return get.value(button.link, player) * get.value(button.link, target) * (1 + Math.random());
});
if (bool) {
await player.gain(links, target, "giveAuto", "bySelf");