diff --git a/character/xianding/character.js b/character/xianding/character.js index e89921651..c45ebd0cb 100644 --- a/character/xianding/character.js +++ b/character/xianding/character.js @@ -1,4 +1,5 @@ const characters = { + dc_sb_zhangxiu: ["male", "qun", 4, ["dcsbfuxi", "dcsbhaoyi"]], dc_sb_guanping: ["male", "shu", 4, ["dcsbwuwei"]], dc_sb_caoang: ["male", "wei", 4, ["dcsbfengmin", "dcsbzhiwang", "dcsbjueying"]], dc_caoshuang: ["male", "wei", 4, ["dcjianzhuan", "dcfanshi"]], diff --git a/character/xianding/characterReplace.js b/character/xianding/characterReplace.js index 6f3ece9de..f03e5d3c3 100644 --- a/character/xianding/characterReplace.js +++ b/character/xianding/characterReplace.js @@ -14,7 +14,8 @@ const characterReplaces = { caomao: ["caomao", "mb_caomao"], sp_zhenji: ["sp_zhenji", "jsrg_zhenji"], zhugejin: ["zhugejin", "dc_sb_zhugejin"], - caoang: ["dc_sb_caoang", "caoang"], + caoang: ["caoang", "dc_sb_caoang"], + zhangxiu: ["zhangxiu", "dc_sb_zhangxiu"], }; export default characterReplaces; diff --git a/character/xianding/skill.js b/character/xianding/skill.js index 7a6eec614..4ae39c393 100644 --- a/character/xianding/skill.js +++ b/character/xianding/skill.js @@ -3,6 +3,161 @@ import cards from "../sp2/card.js"; /** @type { importCharacterConfig['skill'] } */ const skills = { + //张绣 + dcsbfuxi: { + audio: 2, + trigger: { global: "phaseUseBegin" }, + filter(event, player) { + const target = event.player; + if (!player.countCards("he") && !target.countCards("he") && !player.canUse(new lib.element.VCard({ name: "sha" }), target, false)) return false; + return event.player != player && event.player.isMaxHandcard(); + }, + async cost(event, trigger, player) { + const target = trigger.player, + str = get.translation(target); + let result; + if (!player.countCards("he")) { + result = await player + .chooseBool(get.prompt("dcsbfuxi", target), "弃置" + str + "的一张牌，然后视为对其使用一张【杀】") + .set("choice", get.effect(target, { name: "guohe_copy2" }, player, player) + get.effect(target, new lib.element.VCard({ name: "sha" }), player, player) > 0) + .forResult(); + result.index = 1; + } else if (!target.countCards("he") && !player.canUse(new lib.element.VCard({ name: "sha" }), target, false)) { + result = await player + .chooseBool(get.prompt("dcsbfuxi", target), "交给" + str + "一张牌，然后摸两张牌") + .set("choice", get.attitude(player, target) > 0 || player.hasCard(card => card.name == "du", "h")) + .forResult(); + result.index = 0; + } else { + result = await player + .chooseControl("给牌", "出杀", "cancel2") + .set("choiceList", ["交给" + str + "一张牌，然后摸两张牌", "弃置" + str + "的一张牌，然后视为对其使用一张【杀】"]) + .set("ai", () => { + const player = get.event("player"), + target = get.event("target"); + const num = get.effect(target, { name: "guohe_copy2" }, player, player) + get.effect(target, new lib.element.VCard({ name: "sha" }), player, player); + if (num <= 0 && get.attitude(player, target) < 0) return "cancel2"; + return get.attitude(player, target) >= 0 ? 0 : 1; + }) + .set("target", target) + .forResult(); + result.bool = result.control != "cancel2"; + } + if (result.bool) { + result.targets = [target]; + result.cost_data = result.index; + } + event.result = result; + }, + async content(event, trigger, player) { + const target = trigger.player; + if (event.cost_data == 0) { + await player.chooseToGive(target, "he", true); + await player.draw(2); + } else { + await player.discardPlayerCard(target, "he", true); + const sha = new lib.element.VCard({ name: "sha" }); + if (player.canUse(sha, target, false)) { + await player.useCard(sha, target, false); + } + } + }, + }, + dcsbhaoyi: { + audio: 2, + trigger: { player: "phaseJieshuBegin" }, + filter(event, player) { + return lib.skill.dcsbhaoyi.getCards().length; + }, + frequent: true, + prompt(event, player) { + return get.prompt("dcsbhaoyi") + "（可获得" + get.translation(lib.skill.dcsbhaoyi.getCards()) + "）"; + }, + async content(event, trigger, player) { + let cardx = lib.skill.dcsbhaoyi.getCards(); + await player.gain(cardx, "gain2"); + cardx = cardx.filter(i => get.owner(i) == player && get.position(i) == "h"); + if (!cardx.length) return; + if (_status.connectMode) game.broadcastAll(() => (_status.noclearcountdown = true)); + let given_map = []; + while (player.hasCard(card => cardx.includes(card) && !card.hasGaintag("olsujian_given"), "h")) { + const { + result: { bool, cards, targets }, + } = await player + .chooseCardTarget({ + filterCard(card, player) { + return get.event("cards").includes(card) && !card.hasGaintag("olsujian_given"); + }, + selectCard: [1, Infinity], + position: "h", + filterTarget: lib.filter.notMe, + prompt: "豪意：请选择要分配的卡牌和目标", + ai1(card) { + return !ui.selected.cards.length && card.name == "du" ? 1 : 0; + }, + ai2(target) { + const player = get.event("player"); + const card = ui.selected.cards[0]; + if (card) return get.value(card, target) * get.attitude(player, target); + return 0; + }, + }) + .set("cards", cardx); + if (bool) { + const target = targets[0]; + if (given_map.some(i => i[0] == target)) { + given_map[given_map.indexOf(given_map.find(i => i[0] == target))][1].addArray(cards); + } else given_map.push([target, cards]); + player.addGaintag(cards, "olsujian_given"); + } else break; + } + if (_status.connectMode) { + game.broadcastAll(() => { + delete _status.noclearcountdown; + game.stopCountChoose(); + }); + } + if (given_map.length) { + await game + .loseAsync({ + gain_list: given_map, + player: player, + cards: given_map.slice().map(list => list[1]), + giver: player, + animate: "giveAuto", + }) + .setContent("gaincardMultiple"); + } + }, + getCards() { + let cards = [], + targets = game.players.slice().concat(game.dead.slice()); + for (const target of targets) { + const history = target.getHistory("lose", evt => evt.position == ui.discardPile); + if (history.length) { + for (const evt of history) cards.addArray(evt.cards2.filterInD("d")); + } + } + const historyx = game.getGlobalHistory("cardMove", evt => evt.name == "cardsDiscard"); + if (historyx.length) { + for (const evtx of historyx) cards.addArray(evtx.cards.filterInD("d")); + } + for (const target of targets) { + const history = target.getHistory( + "useCard", + evt => + (evt.cards || []).length && + target.getHistory("sourceDamage", evtx => { + return evtx.card && evtx.card == evt.card; + }).length + ); + if (history.length) { + for (const evt of history) cards.removeArray(evt.cards.filterInD("d")); + } + } + return cards.filter(card => get.tag(card, "damage")); + }, + }, //关平 dcsbwuwei: { audio: 2, diff --git a/character/xianding/sort.js b/character/xianding/sort.js index 5c353c6fc..4c2e75e09 100644 --- a/character/xianding/sort.js +++ b/character/xianding/sort.js @@ -16,7 +16,7 @@ const characterSort = { sp2_mouding: ["dc_sb_jiaxu", "dc_sb_lusu", "dc_sb_zhouyu", "dc_sb_simayi"], sp2_zhonghu: ["dc_jiangji", "dc_wangling", "dc_simashi", "dc_caoshuang"], sp2_zijing: ["dc_sb_zhugejin"], - sp2_waitingforsort: ["dc_sb_caoang", "dc_sb_guanping"], + sp2_waitingforsort: ["dc_sb_caoang", "dc_sb_guanping", "dc_sb_zhangxiu"], }; const characterSortTranslate = { diff --git a/character/xianding/translate.js b/character/xianding/translate.js index 5b016aaca..63700755b 100644 --- a/character/xianding/translate.js +++ b/character/xianding/translate.js @@ -627,6 +627,12 @@ const translates = { dc_sb_guanping_prefix: "新杀谋", dcsbwuwei: "武威", dcsbwuwei_info: "出牌阶段限一次，你可以将一种颜色的所有手牌当作无距离和次数限制的【杀】使用，然后你选择执行以下X项（X为转化为此【杀】的牌的类别数）：①摸一张牌；②令目标角色本回合非锁定技失效；③令本回合〖武威〗可发动次数+1。然后若你执行了所有项，则此【杀】造成的伤害+1。", + dc_sb_zhangxiu: "新杀谋张绣", + dc_sb_zhangxiu_prefix: "新杀谋", + dcsbfuxi: "附袭", + dcsbfuxi_info: "其他角色的出牌阶段开始时，若其手牌数为全场最多，则你可以选择一项：①交给其一张牌，然后摸两张牌；②弃置其一张牌，然后视为对其使用一张【杀】。", + dcsbhaoyi: "豪意", + dcsbhaoyi_info: "结束阶段，你可以获得本回合进入弃牌堆的所有未造成过伤害的伤害牌，然后你可以将这些牌任意分配给其他角色。", }; export default translates;