Merge branch 'PR-Branch' of https://github.com/PZ157/noname into PR-Branch

This commit is contained in:
157 2024-04-27 18:17:09 +08:00
commit 2924a570e2
4 changed files with 880 additions and 2162 deletions

View File

@ -1219,26 +1219,21 @@ game.import("character", function () {
.forResult();
},
popup: false,
content() {
player.link(true);
if (player.getDamagedHp() > 0) player.draw(player.getDamagedHp());
*content(event, map) {
const player = map.player;
yield player.link(true);
if (player.getDamagedHp() > 0) {
yield player.draw(player.getDamagedHp());
}
if (
game.getGlobalHistory("everything", evt => {
return evt.name == "dying";
}).length
) {
player.tempBanSkill("clanxieshu");
}
},
ai: { threaten: 3 },
group: "clanxieshu_ban",
subSkill: {
ban: {
audio: "clanxieshu",
trigger: { global: "dyingAfter" },
filter(event, player) {
return !player.isTempBanned("clanxieshu");
},
forced: true,
locked: false,
content() {
player.tempBanSkill("clanxieshu");
},
},
},
},
//族王浑
clanfuxun: {
@ -2264,13 +2259,10 @@ game.import("character", function () {
("step 6");
var current = targets.shift();
current
.chooseToUse(
function (card, player, event) {
if (get.name(card) != "sha") return false;
return lib.filter.filterCard.apply(this, arguments);
},
"联诛:是否对" + get.translation(event.targetx) + "使用一张杀?"
)
.chooseToUse(function (card, player, event) {
if (get.name(card) != "sha") return false;
return lib.filter.filterCard.apply(this, arguments);
}, "联诛:是否对" + get.translation(event.targetx) + "使用一张杀?")
.set("targetRequired", true)
.set("complexSelect", true)
.set("filterTarget", function (card, player, target) {
@ -3794,7 +3786,7 @@ game.import("character", function () {
clanyuzhi: "迂志",
clanyuzhi_info: "锁定技。新的一轮开始时你依次执行以下项①你弃置上一轮因〖迂志〗展示的手牌然后若你上一轮使用的牌数或你上上轮因〖迂志〗摸的牌数小于你上轮因〖迂志〗摸的牌数你受到1点雷属性伤害或失去〖保族〗。②你展示一张手牌然后摸X张牌X为此牌牌名字数。",
clanxieshu: "挟术",
clanxieshu_info: "当你因牌造成或受到伤害后你可以横置武将牌并弃置Y张牌然后摸你已损失体力值张牌Y为此牌牌名字数②一名角色的濒死状态结算完毕后,你令〖挟术〗于本回合失效。",
clanxieshu_info: "当你因牌造成或受到伤害后你可以横置武将牌并弃置Y张牌然后摸你已损失体力值张牌Y为此牌牌名字数若本回合有角色进入过濒死状态,则〖挟术〗于本回合失效。",
clan_zhongyu: "族钟毓",
clanjiejian: "捷谏",
clanjiejian_info: "当你于一回合使用第X张牌指定第一个目标后若此牌不为装备牌则你可以令一名目标角色摸X张牌。X为此牌牌名字数",

File diff suppressed because it is too large Load Diff

View File

@ -645,6 +645,7 @@ export class Get {
return "暂无武将介绍";
}
bordergroup(info, raw) {
if(typeof info == 'string') info = get.character(info);
if(info.groupBorder) return info.groupBorder;
return raw ? "" : info.group || "";
}

View File

@ -2843,10 +2843,20 @@ export class Click {
}
if (targetprompt) {
if (Array.isArray(targetprompt)) {
targetprompt =
targetprompt[
Math.min(targetprompt.length - 1, ui.selected.targets.indexOf(this))
];
const targets = ui.selected.targets.slice();
let index = ui.selected.targets.indexOf(this);
for (let i = 0; i < targetprompt.length; i++) {
const target = targets.find(
(cur) => cur.node.prompt && cur.node.prompt.innerText === targetprompt[i]
);
if (target) {
targets.remove(target);
} else {
index = i;
break;
}
}
targetprompt = targetprompt[Math.min(targetprompt.length - 1, index)];
} else if (typeof targetprompt == "function") {
targetprompt = targetprompt(this);
}
@ -3706,7 +3716,7 @@ export class Click {
showSkillNamePinyin == "showCodeIdentifier"
? derivation
: lib.translate[`${derivation}_rt`] ||
get.pinyin(derivationName).join(" ");
get.pinyin(derivationName).join(" ");
ruby.appendChild(rt);
const rightParenthesisRP = document.createElement("rp");
rightParenthesisRP.textContent = "";