diff --git a/character/extra/card.js b/character/extra/card.js index 7095708fdf..d30e3d4d91 100644 --- a/character/extra/card.js +++ b/character/extra/card.js @@ -1,6 +1,98 @@ import { lib, game, ui, get, ai, _status } from "../../noname.js"; const cards = { + //26神黄月英的升级装备 + zc26_zhuge: { + fullskin: true, + type: "equip", + subtype: "equip1", + derivation: "zc26_shen_huangyueying", + skills: ["zc26_zhuge_skill"], + ai: { + order() { + return get.order({ name: "sha" }) + 0.1; + }, + equipValue(card, player) { + if (player._zhuge_temp) { + return 1; + } + player._zhuge_temp = true; + var result = (function () { + if ( + !game.hasPlayer(function (current) { + return get.distance(player, current) <= 1 && player.canUse("sha", current) && get.effect(current, { name: "sha" }, player, player) > 0; + }) + ) { + return 1.5; + } + if (player.hasSha() && _status.currentPhase === player) { + if ((player.getEquip("zhuge") && player.countUsed("sha")) || player.getCardUsable("sha") === 0) { + return 10.5; + } + } + var num = player.countCards("h", "sha"); + if (num > 1) { + return 6.5 + num; + } + return 3.5 + num; + })(); + delete player._zhuge_temp; + return result; + }, + basic: { + equipValue: 6, + }, + tag: { + valueswap: 1.5, + }, + }, + }, + zc26_bagua: { + fullskin: true, + type: "equip", + subtype: "equip2", + derivation: "zc26_shen_huangyueying", + skills: ["zc26_bagua_skill"], + ai: { + basic: { + equipValue: 8, + }, + }, + }, + zc26_lingling: { + name: "zc26_lingling", + fullskin: true, + type: "equip", + subtype: "equip4", + derivation: "zc26_shen_huangyueying", + skills: ["zc26_lingling_skill"], + distance: { globalFrom: -2 }, + ai: { + value(card, player) { + if ( + !game.hasPlayer(function (current) { + return get.damageEffect(current, player, player, "thunder") > 0; + }) + ) { + return 0; + } + return 8; + }, + equipValue(card, player) { + if ( + !game.hasPlayer(function (current) { + return get.damageEffect(current, player, player, "thunder") > 0; + }) + ) { + return 0; + } + return 8; + }, + basic: { + equipValue: 2, + }, + }, + }, //神肘不疑的五灵卡牌 wuqinxi_hu: { fullskin: true, diff --git a/character/extra/character.js b/character/extra/character.js index c55afb9e08..22ddd9ceec 100644 --- a/character/extra/character.js +++ b/character/extra/character.js @@ -1,4 +1,11 @@ const characters = { + zc26_shen_huangyueying: { + sex: "female", + group: "shen", + hp: 3, + skills: ["zc26_cangqiao", "zc26_shenxie", "zc26_huaxiu"], + groupInGuozhan: "shu", + }, mark_shen_machao: { sex: "male", group: "shen", diff --git a/character/extra/characterTitle.js b/character/extra/characterTitle.js index 33e094ef50..40207aa26a 100644 --- a/character/extra/characterTitle.js +++ b/character/extra/characterTitle.js @@ -62,4 +62,5 @@ export default { ty_shen_liubei: "龙兴海内", ty_shen_guanyu: "佑子伐吴", ty_shen_zhangfei: "傲睨山河", + zc26_shen_huangyueying: "卧龙的点睛人", }; diff --git a/character/extra/skill.js b/character/extra/skill.js index 6603785549..6015103ac8 100644 --- a/character/extra/skill.js +++ b/character/extra/skill.js @@ -2,6 +2,647 @@ import { lib, game, ui, get, ai, _status } from "../../noname.js"; /** @type { importCharacterConfig['skill'] } */ const skills = { + //26珍藏神黄月英 + zc26_cangqiao: { + trigger: { + player: "useCard", + global: "roundStart", + }, + filter(event, player) { + if (event.name == "useCard") { + if (!["zheji", "nvzhuang", "numa"].includes(event.card.name)) { + return false; + } + return player.countCards("h") < player.getHandcardLimit(); + } + return true; + }, + async cost(event, trigger, player) { + event.result = await player.chooseBool(get.prompt(event.skill), () => true).forResult(); + }, + async content(event, trigger, player) { + if (trigger.name == "useCard") { + await player.drawTo(player.getHandcardLimit()); + } else { + if (!_status.zc26_cangqiao) { + game.broadcastAll(function () { + _status.zc26_cangqiao = [ + { name: "zheji", number: 13, suit: "club" }, + { name: "nvzhuang", number: 9, suit: "heart" }, + { name: "numa", number: 13, suit: "club" }, + ]; + for (let info of _status.zc26_cangqiao) { + if (!lib.inpile.includes(info.name)) { + lib.inpile.add(info.name); + } + } + }); + } + let list = ["zheji", "nvzhuang", "numa"], + cards = []; + for (let name of list) { + let card = get.discardPile(name); + if (card) { + cards.add(card); + } else { + let info = _status.zc26_cangqiao.find(i => i.name == name); + if (info) { + game.broadcastAll(function (info) { + _status.zc26_cangqiao.remove(info); + }, info); + card = game.createCard2(name, info.suit, info.number); + cards.add(card); + } + } + } + if (cards.length) { + await player.gain(cards, "draw2"); + } + } + }, + }, + zc26_shenxie: { + usable: 1, + trigger: { global: "useCardAfter" }, + filter(event, player) { + if (!event.targets.includes(player) || event.targets.length != 1) { + return false; + } else if (get.color(event.card) != "black") { + return false; + } + const storage = player.getStorage( + "zc26_shenxie", + lib.inpile.filter(name => get.type(name) == "delay") + ); + if (!storage.some(name => player.hasUseTarget(name))) { + return false; + } + return game.hasPlayer(current => { + return current.countCards("ej", { type: "equip" }); + }); + }, + async cost(event, trigger, player) { + const storage = player.getStorage( + event.skill, + lib.inpile.filter(name => get.type(name) == "delay") + ); + const choice = storage + .map(name => [name, player.getUseValue(get.autoViewAs({ name, isCard: false }, "unsure"))]) + .reduce( + (max, info) => { + if (max[1] < info[1]) { + return info; + } + return max; + }, + [null, 0] + )[0]; + const { result } = await await player + .chooseTarget(get.prompt2(event.skill), (_, player, target) => target.countCards("ej", { type: "equip" })) + .set("ai", target => { + const { player, choice } = get.event(), + es = target.getCards("ej", { type: "equip" }); + if (!choice) { + return 0; + } + if (get.attitude(player, target) > 0) { + return 10 - Math.min(...es.map(card => get.equipValue(card))); + } + return Math.max(...es.map(card => get.equipValue(card))); + }) + .set("choice", choice); + event.result = { + bool: result?.bool, + targets: result?.targets, + cost_data: choice, + }; + }, + async content(event, trigger, player) { + const { + targets: [target], + cost_data: choice, + } = event; + const { result } = await player + .choosePlayerCard(target, `###神械###将${get.translation(target)}场上的一张牌当作延时锦囊牌使用`, "ej", true) + .set("filterButton", ({ link }) => get.type(link) == "equip") + .set("ai", ({ link }) => { + const { player, target } = get.event(); + if (get.attitude(player, target) > 0) { + return 10 - get.equipValue(link); + } + return get.equipValue(link); + }); + if (result?.bool && result.cards?.length) { + const storage = player.getStorage( + "zc26_shenxie", + lib.inpile.filter(name => get.type(name) == "delay") + ); + const links = await player + .chooseVCardButton(true, "神械：请选择要使用的延时锦囊牌", storage.slice()) + .set("ai", ({ link: [_, __, name] }) => { + const { player, choice } = get.event(); + if (choice) { + return name == choice; + } + return player.getUseValue(name); + }) + .set("choice", choice) + .forResultLinks(); + if (links?.length) { + const name = links[0][2]; + storage.remove(name); + if (!storage.length) { + storage.addArray(lib.inpile.filter(name => get.type(name) == "delay")); + } + player.setStorage(event.name, storage, true); + await player.chooseUseTarget({ name, storage: { equipEnable: true }, isCard: false }, result.cards, true); + } + } + }, + }, + zc26_huaxiu: { + usable: 1, + enable: "phaseUse", + onChooseToUse(event) { + if (game.online) { + return; + } + event.set( + "zc26_huaxiu", + ["zheji", "nvzhuang", "numa"].filter(i => i in lib.card) + ); + }, + filter(event, player) { + return event.zc26_huaxiu?.length; + }, + async content(event, trigger, player) { + const list = event.getParent(2).zc26_huaxiu.map(name => [get.type(name), "", name]); + const { result } = await player.chooseButton(true, ["化朽", "选择要升级的装备", [list, "vcard"]]).set("ai", button => { + const player = get.player(), + name = button.link[2]; + const num = game.countPlayer(current => { + const hs = current.countVCards("h", card => name == card.name), + es = current.countVCards("e", card => name == card.name), + js = current.countVCards("j", card => get.type(card) == "delay" && card.storage.equipEnable && name == get.name(card, false)); + return get.sgnAttitude(player, current) * (es + js + current == player ? hs : 0); + }); + return num; + }); + if (result?.bool && result.links?.length) { + const name = result.links[0][2], + map = { + zheji: "zc26_zhuge", + nvzhuang: "zc26_bagua", + numa: "zc26_lingling", + }; + game.log(player, "将", `#y${get.translation({ name })}`, "升级为", `#y${get.translation({ name: map[name] })}`); + player.addTempSkill("zc26_huaxiu_restore", { player: "phaseBegin" }); + game.broadcastAll( + function (name, player, map) { + if (!_status.zc26_huaxiu_origin) { + _status.zc26_huaxiu_origin = {}; + for (let name of ["zheji", "nvzhuang", "numa"]) { + _status.zc26_huaxiu_origin[name] = { info: lib.card[name], translate: lib.translate[name], translate2: lib.translate[`${name}_info`] }; + } + } + lib.card[name] = lib.card[map[name]]; + lib.translate[name] = lib.translate[map[name]]; + lib.translate[`${name}_info`] = lib.translate[`${map[name]}_info`]; + _status.zc26_huaxiu ??= {}; + _status.zc26_huaxiu[name] ??= []; + _status.zc26_huaxiu[name].push(player); + }, + name, + player, + map + ); + function check(name, target) { + if (target.hasVCard({ name }, "e")) { + return true; + } + return target.hasVCard(card => { + if (!card.storage?.equipEnable) { + return false; + } + return card.cards.some(cardx => cardx.name == name); + }, "j"); + } + const removeSkill = get.skillsFromEquips([{ name }]), + addSkill = get.skillsFromEquips([{ name: map[name] }]); + for (let current of game.players) { + current.removeSkill(removeSkill); + if (check(name, current)) { + current.addSkill(addSkill); + } + } + } + }, + subSkill: { + restore: { + charlotte: true, + onremove(player, skill) { + get.info(skill).contentx.apply(this, [null, null, player]); + }, + trigger: { player: "phaseBegin" }, + filter(event, player) { + for (let name of ["zheji", "nvzhuang", "numa"]) { + if (_status.zc26_huaxiu?.[name]?.includes(player)) { + return true; + } + } + return false; + }, + forced: true, + popup: false, + async content(event, trigger, player) { + get.info(event.name).contentx.apply(this, arguments); + }, + contentx(event, trigger, player) { + game.broadcastAll(function (player) { + for (let name of ["zheji", "nvzhuang", "numa"]) { + if (_status.zc26_huaxiu?.[name]?.includes(player)) { + _status.zc26_huaxiu[name].remove(player); + } + } + }, player); + function check(name, target) { + if (target.hasVCard({ name }, "e")) { + return true; + } + return target.hasVCard(card => { + if (!card.storage?.equipEnable) { + return false; + } + return card.cards.some(cardx => cardx.name == name); + }, "j"); + } + const map = { + zheji: "zc26_zhuge", + nvzhuang: "zc26_bagua", + numa: "zc26_lingling", + }; + for (let name of ["zheji", "nvzhuang", "numa"]) { + if (name in _status.zc26_huaxiu && !_status.zc26_huaxiu[name].length) { + game.log(`#y${get.translation({ name })}`, "的效果还原了"); + lib.card[name] = _status.zc26_huaxiu_origin[name].info; + lib.translate[name] = _status.zc26_huaxiu_origin[name].translate; + lib.translate[`${name}_info`] = _status.zc26_huaxiu_origin[name].translate2; + const addSkill = get.skillsFromEquips([{ name }]), + removeSkill = get.skillsFromEquips([{ name: map[name] }]); + for (let current of game.players) { + let keepSkills = Object.values(current.additionalSkills).flat(), + removeSkill2 = removeSkill.slice().removeArray(keepSkills); + if (removeSkill2.length) { + current.removeSkill(removeSkill2); + } + if (check(name, current)) { + current.addSkill(addSkill); + } + } + } + } + }, + }, + }, + }, + zc26_zhuge_skill: { + equipSkill: true, + firstDo: true, + locked: true, + audio: "zhuge_skill", + mod: { + cardUsable(card, player, num) { + let cards = player.getCards("e", card => get.name(card) == "zc26_zhuge"); + if (card.name === "sha") { + if (!cards.length || player.hasSkill("zc26_zhuge_skill", null, false) || cards.some(card => card !== _status.zc26_zhuge_temp && !ui.selected.cards.includes(card))) { + if (get.is.versus() || get.is.changban()) { + return num + 3; + } + return Infinity; + } + } + }, + cardEnabled2(card, player) { + if (!_status.event.addCount_extra || player.hasSkill("zc26_zhuge_skill", null, false)) { + return; + } + let cards = player.getCards("e", card => get.name(card) == "zc26_zhuge"); + if (card && cards.includes(card)) { + try { + let cardz = get.card(); + } catch (e) { + return; + } + if (!cardz || cardz.name !== "sha") { + return; + } + _status.zc26_zhuge_temp = card; + let bool = lib.filter.cardUsable(get.autoViewAs(cardz, ui.selected.cards.concat([card])), player); + delete _status.zc26_zhuge_temp; + if (!bool) { + return false; + } + } + }, + }, + trigger: { player: ["useCard1", "useCardToPlayered"] }, + filter(event, player, triggername) { + if (event.card.name != "sha") { + return false; + } + if (event.name == "useCard") { + return !event.audioed && player.countUsed("sha", true) > 1 && event.getParent().type === "phase"; + } + return game.dead.length && event.target.countCards("h"); + }, + async cost(event, trigger, player) { + if (trigger.name == "useCard") { + event.result = { bool: true }; + } else { + event.result = await player + .chooseTarget(`###${get.prompt(event.skill)}###令任意名死亡角色依次观看${get.translation(trigger.target)}手牌并可以重铸其中一张牌`, [1, game.dead.length]) + .set("filterTarget", (_, player, target) => target.isDead()) + .set("ai", target => get.attitude(get.player(), target) > 0) + .set("deadTarget", true) + .forResult(); + } + }, + async content(event, trigger, player) { + if (trigger.name == "useCard") { + trigger.audioed = true; + } else { + event.targets.sortBySeat(_status.currentPhase); + for (const current of event.targets) { + if (!current.isDead()) { + continue; + } + await current.viewHandcards(trigger.target); + const cards = trigger.target.getCards("h", card => lib.filter.cardRecastable(card, player, player)); + if (!cards.length) { + return; + } + const { result } = await current + .chooseCardButton(`请选择重铸${trigger.target}的一张手牌`, cards) + .set("ai", ({ link }) => { + const { player, target } = get.event(); + if (get.attitude(player, target) > 0) { + return 20 - get.value(link); + } + return get.value(link); + }) + .set("target", trigger.target) + .set("forceDie", true); + if (result?.bool && result.links?.length) { + await trigger.target.recast(result.links); + } + } + } + }, + }, + zc26_bagua_skill: { + equipSkill: true, + audio: "bagua_skill", + trigger: { player: ["chooseToRespondBegin", "chooseToUseBegin"] }, + filter(event, player) { + if (event.responded) { + return false; + } + if (event.zc26_bagua_skill) { + return false; + } + if (!event.filterCard || !event.filterCard(get.autoViewAs({ name: "shan" }, []), player, event)) { + return false; + } + if (event.name === "chooseToRespond" && !lib.filter.cardRespondable(get.autoViewAs({ name: "shan" }, []), player, event)) { + return false; + } + if (player.hasSkillTag("unequip2")) { + return false; + } + let evt = event.getParent(); + if ( + evt.player && + evt.player.hasSkillTag("unequip", false, { + name: evt.card ? evt.card.name : null, + target: player, + card: evt.card, + }) + ) { + return false; + } + return true; + }, + check(event, player) { + if (!event) { + return true; + } + if (event.ai) { + let ai = event.ai; + let tmp = _status.event; + _status.event = event; + let result = ai({ name: "shan" }, _status.event.player, event); + _status.event = tmp; + return result > 0; + } + const type = event.name === "chooseToRespond" ? "respond" : "use"; + let evt = event.getParent(); + if (player.hasSkillTag("noShan", null, type)) { + return false; + } + if (!evt || !evt.card || !evt.player || player.hasSkillTag("useShan", null, type)) { + return true; + } + if (evt.card && evt.player && player.isLinked() && game.hasNature(evt.card) && get.attitude(player, evt.player._trueMe || evt.player) > 0) { + return false; + } + return true; + }, + async content(event, trigger, player) { + trigger.zc26_bagua_skill = true; + if (game.dead.length) { + const targets = await player + .chooseTarget(`###${get.prompt(event.name)}###令一名死亡角色卜算3`) + .set("filterTarget", (_, player, target) => target.isDead()) + .set("ai", target => get.attitude(get.player(), target) > 0) + .set("deadTarget", true) + .forResultTargets(); + if (targets?.length) { + player.line(targets[0]); + game.log(player, "令", targets[0], "卜算3"); + await targets[0].chooseToGuanxing(3).set("forceDie", true); + } + } + const { result } = await player.judge("zc26_bagua", card => (get.color(card) === "red" ? 1.5 : -0.5)).set("judge2", result => result.bool); + if (result.bool > 0) { + trigger.untrigger(); + trigger.set("responded", true); + trigger.result = { bool: true, card: get.autoViewAs({ name: "shan", isCard: true }, []), cards: [] }; + } + }, + ai: { + respondShan: true, + freeShan: true, + skillTagFilter(player, tag, arg) { + if (tag !== "respondShan" && tag !== "freeShan") { + return; + } + if (player.hasSkillTag("unequip2")) { + return false; + } + if (!arg || !arg.player) { + return true; + } + if ( + arg.player.hasSkillTag("unequip", false, { + target: player, + }) + ) { + return false; + } + return true; + }, + effect: { + target(card, player, target, effect) { + if (target.hasSkillTag("unequip2")) { + return; + } + if ( + player.hasSkillTag("unequip", false, { + name: card ? card.name : null, + target: target, + card: card, + }) || + player.hasSkillTag("unequip_ai", false, { + name: card ? card.name : null, + target: target, + card: card, + }) + ) { + return; + } + if (get.tag(card, "respondShan")) { + return 0.5; + } + }, + }, + }, + }, + zc26_lingling_skill: { + equipSkill: true, + trigger: { + player: "phaseZhunbeiBegin", + global: "roundEnd", + }, + getIndex(event, player) { + if (event.name == "phaseZhunbei") { + return 1; + } + const es = player.getCards("e", card => get.info(card)?.name == "zc26_lingling"), + js = player.getCards("j", card => { + if (get.type(card) != "delay") { + false; + } + const vcard = card[card.cardSymbol]; + if (!vcard || !vcard.storage?.equipEnable) { + return false; + } + return vcard.cards.some(cardx => get.info(cardx)?.name == "zc26_lingling"); + }); + return es.concat(js); + }, + filter(event, player, triggername, card) { + if (event.name == "phaseZhunbei") { + return true; + } + if (!game.dead.length) { + return false; + } + return !event.next[event.next.length - 1]?.zc26_lingling?.includes(card); + }, + forced: true, + async content(event, trigger, player) { + if (trigger.name == "phaseZhunbei") { + const targets = await player + .chooseTarget(`軨軨：选择一名角色对其造成1点雷电伤害`, true) + .set("ai", target => get.damageEffect(target, get.player(), get.player(), "thunder")) + .forResultTargets(); + if (targets?.length) { + await targets[0].damage(player, "thunder"); + } + } else { + trigger.next[trigger.next.length - 1].zc26_lingling ??= []; + trigger.next[trigger.next.length - 1].zc26_lingling.add(event.indexedData); + const targets = game.dead.slice(); + const map = await game.chooseAnyOL(targets, get.info(event.name).chooseControl, [player, event.indexedData]).forResult(); + for (const target of targets) { + let source = game.findPlayer(current => current.hasCards(card => card == event.indexedData, "ej")), + aim; + const control = map.get(target).control; + if (control == "上家") { + aim = source?.previous; + } else if (control == "下家") { + aim = source?.next; + } + if (!source || !aim) { + return; + } + await target + .moveCard(true, source, aim, card => { + const cardx = get.event("card"); + if (get.itemtype(card) == "card") { + return card == cardx; + } + return card == cardx[cardx.cardSymbol]; + }) + .set("card", event.indexedData) + .set("forceDie", true) + .setContent(async function (event, trigger, player) { + if (player.canMoveCard(null, event.nojudge, event.sourceTargets, event.aimTargets, event.filter, event.canReplace ? "canReplace" : "noReplace")) { + const source = event.sourceTargets[0], + aim = event.aimTargets[0]; + let position = "j"; + event.result = { + bool: true, + links: [event.card], + card: event.card, + }; + if (source.getCards("e").includes(event.card)) { + position = "e"; + if (!event.card.cards?.length) { + source.removeVirtualEquip(event.card); + } + await aim.equip(event.card); + } else { + if (!event.card.cards?.length) { + source.removeVirtualJudge(event.card); + } + await aim.addJudge(event.card, event.card?.cards); + } + if (event.card.cards?.length) { + source.$give(event.card.cards, aim, false); + } + game.log(source, "的", event.card, "被移动给了", aim); + event.result.position = position; + await game.delay(); + } + }); + } + } + }, + chooseControl(player, source, card, eventId) { + return player + .chooseControl(["上家", "下家"]) + .set("prompt", "軨軨：秘密选择一个方向") + .set("prompt2", `令${get.translation(source)}的${get.translation(card)}移动至其上家或下家`) + .set("ai", () => { + //哪管死后洪水滔天 + let controls = get.event().controls.slice(); + return get.event().getRand() < 0.5 ? controls[0] : controls[1]; + }) + .set("id", eventId) + .set("_global_waiting", true); + }, + }, //线下标记神马 mark_shouli: { audio: "shouli", @@ -132,7 +773,7 @@ const skills = { : { bool: true, links: list, - }; + }; if (!result?.bool) { return; } @@ -410,7 +1051,7 @@ const skills = { }, ai: { combo: "mark_shouli", - } + }, }, //渭南神马超 wn_qiangshu: { @@ -1913,7 +2554,7 @@ const skills = { ["7", "3"], ["7", "6"], ["7", "8"], - ] + ] : [ ["7", "1"], //["8", "3"], @@ -1922,7 +2563,7 @@ const skills = { ["9", "13"], ["6", "3"], ["6", "6"], - ]; + ]; let list = []; for (let i = 0; i < position.length; i++) { const num_px = document.createElement("div"); @@ -9929,7 +10570,7 @@ const skills = { ? event.numFixed : !game.hasPlayer(function (current) { return current.hasEnabledSlot(); - }) + }) ) { return false; } diff --git a/character/extra/sort.js b/character/extra/sort.js index 289699e877..37936104ca 100644 --- a/character/extra/sort.js +++ b/character/extra/sort.js @@ -12,7 +12,7 @@ const characterSort = { extra_mobileren: ["shen_huatuo", "shen_lusu"], extra_tw: ["tw_shen_guanyu", "tw_shen_lvmeng"], extra_mb: ["xin_simayi"], - extra_offline: ["shen_jiaxu", "shen_diaochan", "boss_zhaoyun", "le_shen_jiaxu", "ps_shen_machao", "mark_shen_machao"], + extra_offline: ["shen_jiaxu", "shen_diaochan", "boss_zhaoyun", "le_shen_jiaxu", "ps_shen_machao", "mark_shen_machao", "zc26_shen_huangyueying"], extra_taoyuan: ["ty_shen_zhangfei", "ty_shen_guanyu", "ty_shen_liubei"], extra_hanmo: ["hm_shen_yl_luzhi", "hm_shen_huangfusong", "hm_shen_zhangjiao", "hm_shen_zhangbao", "hm_shen_zhangliang", "hm_shen_zhujun"], extra_changan: ["ca_shen_wangyun", "ca_shen_caocao", "ca_shen_lijueguosi", "zombie_jiaxu", "zombie_zombie"], diff --git a/character/extra/translate.js b/character/extra/translate.js index a06cd37cdb..9874f535f5 100644 --- a/character/extra/translate.js +++ b/character/extra/translate.js @@ -532,6 +532,26 @@ const translates = { }, mark_hengwu: "横骛", mark_hengwu_info: "锁定技，有“骏”/“骊”的角色获得“骏”/“骊”后，你摸X张牌（X为其拥有的“骏”/“骊”数）。", + zc26_shen_huangyueying: "26神黄月英", + zc26_shen_huangyueying_prefix: "26|神", + zc26_cangqiao: "藏巧", + zc26_cangqiao_info: "每轮开始时，你可以获得游戏外或弃牌堆中的【折戟】、【女装】、【驽马】各至多一张；你使用上述牌时可以将手牌摸至体力上限。", + zc26_shenxie: "神械", + zc26_shenxie_info: "每回合限一次，以你为唯一目标的黑色牌结算后，你可以将场上一张装备牌当未以此法使用过的延时锦囊牌使用（均使用过后重置）；此类锦囊牌在判定区内同时又被转化的装备牌的效果。", + zc26_huaxiu: "化朽", + zc26_huaxiu_info: "出牌阶段限一次，你可以将一种“藏巧”装备牌效果修改为下述对应顺序的牌直到下回合开始：【魂·诸葛连弩】、【魂·八卦阵】、【軨軨】。", + zc26_zhuge: "魂·诸葛连弩", + zc26_zhuge_info: "你使用【杀】无次数限制且指定目标后，你可以令任意名死亡角色依次观看目标手牌并可以重铸其中一张牌。", + zc26_zhuge_skill: "魂·诸葛连弩", + zc26_zhuge_skill_info: "你使用【杀】无次数限制且指定目标后，你可以令任意名死亡角色依次观看目标手牌并可以重铸其中一张牌。", + zc26_bagua: "魂·八卦阵", + zc26_bagua_info: "当你需要使用或打出【闪】时，你可以进行一次判定，若结果为红色，视为使用或打出之；判定前你可以令一名死亡角色卜算3。", + zc26_bagua_skill: "魂·八卦阵", + zc26_bagua_skill_info: "当你需要使用或打出【闪】时，你可以进行一次判定，若结果为红色，视为使用或打出之；判定前你可以令一名死亡角色卜算3。", + zc26_lingling: "軨軨", + zc26_lingling_info: "准备阶段，你须对一名角色造成1点雷电伤害；每轮结束时，所有死亡角色同时秘密选择上家或下家，然后按顺序（死亡由前到后）依次移动此牌至选择的角色对应区域内。", + zc26_lingling_skill: "軨軨", + zc26_lingling_skill_info: "准备阶段，你须对一名角色造成1点雷电伤害；每轮结束时，所有死亡角色同时秘密选择上家或下家，然后按顺序（死亡由前到后）依次移动此牌至选择的角色对应区域内。", }; export default translates; diff --git a/character/rank.js b/character/rank.js index d185f103b1..93559a0350 100644 --- a/character/rank.js +++ b/character/rank.js @@ -86,6 +86,7 @@ window.noname_character_rank = { "eu_yuejin", ], a: [ + "zc26_shen_huangyueying", "scl_jiaxu", "xuwen", "mark_shen_machao", @@ -2157,6 +2158,7 @@ window.noname_character_rank = { ], rarity: { legend: [ + "zc26_shen_huangyueying", "scl_jiaxu", "x_yao_yuanshu", "zj_liuyuan", diff --git a/noname/get/index.js b/noname/get/index.js index 240572f005..1d2474411d 100644 --- a/noname/get/index.js +++ b/noname/get/index.js @@ -5677,6 +5677,9 @@ else if (entry[1] !== void 0) stringifying[key] = JSON.stringify(entry[1]);*/ if (lib.translate[name + "_append"]) { uiintro.add('
' + lib.translate[name + "_append"] + "
"); } + if (Vcard?.storage?.equipEnable) { + uiintro.add('
— 装备牌仍然生效 —
'); + } if (uiintro.isNotCard) { if (Vcard?.cards?.length) { uiintro.add('
—— 对应实体牌 ——
'); diff --git a/noname/library/element/content.js b/noname/library/element/content.js index c139a9aa44..b876c50aa1 100644 --- a/noname/library/element/content.js +++ b/noname/library/element/content.js @@ -13126,6 +13126,8 @@ player.removeVirtualEquip(card); const cards = get.cards(event.num); await game.cardsGotoOrdering(cards); const next = player.chooseToMove(); + next.set("forceDie", event.forceDie); + next.set("includeOut", event.includeOut); next.set("list", [["牌堆顶", cards], ["牌堆底"]]); next.set("prompt", event.prompt || "点击或拖动将牌移动到牌堆顶或牌堆底"); next.processAI = diff --git a/noname/library/element/player.js b/noname/library/element/player.js index ed59a10f3f..d3a832f2f5 100644 --- a/noname/library/element/player.js +++ b/noname/library/element/player.js @@ -10456,6 +10456,22 @@ export class Player extends HTMLDivElement { if (cards && cards.includes(VCard)) { cards.remove(VCard); } + if (VCard.storage.equipEnable && VCard.cards?.some(card => get.type(card) == "equip")) { + const es = player.getVCards("e"); + const equips = VCard.cards.filter(card => { + if (get.type(card) == "equip") { + return false; + } + return !es.some(cardx => cardx.name == card.name); + }); + if (equips.length) { + let keepSkills = Object.values(player.additionalSkills).flat(), + skills = get.skillsFromEquips(equips).removeArray(keepSkills); + if (skills.length) { + player.removeSkill(skills); + } + } + } } removeVirtualEquip(VCard) { const player = this; @@ -13952,6 +13968,16 @@ export class Player extends HTMLDivElement { } player.$addVirtualJudge(card, cards); //game.addVideo("addVirtualJudge", ???); + if (cardx.storage.equipEnable && (cardx.cards || cards).some(card => get.type(card) == "equip")) { + const equips = (cardx.cards || cards).filter(card => get.type(card) == "equip"); + if (equips.length) { + let skills = get.skillsFromEquips(equips).filter(skill => !player.hasSkill(skill, "e")); + if (skills.length) { + player.addSkill(skills); + } + } + game.addGlobalSkill("equipEnableSkill"); + } } $addVirtualJudge(VCard, cards) { if (game.online) { diff --git a/noname/library/index.js b/noname/library/index.js index 335f31d6ed..9ceffbf265 100644 --- a/noname/library/index.js +++ b/noname/library/index.js @@ -14598,6 +14598,20 @@ export class Library { nature: "firemm", }, ], + [ + "26", + { + getSpan: () => { + const span = document.createElement("span"), + style = span.style; + style.writingMode = style.webkitWritingMode = "horizontal-tb"; + style.fontFamily = "MotoyaLMaru"; + style.transform = "scaleY(0.85)"; + span.textContent = "26"; + return span.outerHTML; + }, + }, + ], ]); groupnature = { shen: "shen", diff --git a/noname/library/skill.js b/noname/library/skill.js index 254afddf28..280672202f 100644 --- a/noname/library/skill.js +++ b/noname/library/skill.js @@ -5,6 +5,80 @@ import { _status, game, get, lib, ui } from "../../noname.js"; * @type {Record} */ export default { + equipEnable: { + chalotte: true, + mod: { + globalFrom(from, to, distance) { + let num = from + .getVCards("j", vcard => { + if (get.type(vcard) != "delay") { + false; + } else if (!vcard.storage?.equipEnable) { + return false; + } + return vcard.cards.some(card => get.type(card) == "equip"); + }) + .map(vcard => { + const sum = vcard.cards?.reduce((sum, card) => { + if (get.type(card) != "equip") { + return sum; + } + let globalFrom = get.info(card)?.distance?.globalFrom || 0; + return sum + globalFrom; + }, 0); + return sum || 0; + }) + .reduce((a, b) => a + b, 0); + return distance + num; + }, + globalTo(from, to, distance) { + let num = to + .getVCards("j", vcard => { + if (get.type(vcard) != "delay") { + false; + } else if (!vcard.storage?.equipEnable) { + return false; + } + return vcard.cards.some(card => get.type(card) == "equip"); + }) + .map(vcard => { + const sum = vcard.cards?.reduce((sum, card) => { + if (get.type(card) != "equip") { + return sum; + } + let globalTo = get.info(card)?.distance?.globalTo || 0; + return sum + globalTo; + }, 0); + return sum || 0; + }) + .reduce((a, b) => a + b, 0); + return distance + num; + }, + attackRangeBase(player) { + let num = player + .getVCards("j", vcard => { + if (get.type(vcard) != "delay") { + false; + } else if (!vcard.storage?.equipEnable) { + return false; + } + return vcard.cards.some(card => get.type(card) == "equip"); + }) + .map(vcard => { + const num = vcard.cards?.reduce((sum, card) => { + if (get.type(card) != "equip") { + return sum; + } + let attackFrom = get.info(card)?.distance?.attackFrom || 0; + return sum + attackFrom; + }, 0); + return num || 0; + }) + .reduce((a, b) => a + b, 0); + return Math.max(player.getEquipRange(player.getCards("e")), 1 - num); + }, + }, + }, stratagem_fury: { marktext: "🔥", intro: { @@ -94,12 +168,7 @@ export default { } const storage = player.storage, zhibi = storage.zhibi; - return ( - ((zhibi && !zhibi.includes(current)) || - get.effect(current, card, player, player) >= 2 - Math.max(0, (storage.stratagem_fury || 0) - 1)) && - current.mayHaveShan(player, "use") && - player.hasSkill("jiu") - ); + return ((zhibi && !zhibi.includes(current)) || get.effect(current, card, player, player) >= 2 - Math.max(0, (storage.stratagem_fury || 0) - 1)) && current.mayHaveShan(player, "use") && player.hasSkill("jiu"); }) ) { return 1; @@ -117,10 +186,7 @@ export default { if (_status.event.type == "dying") { return get.attitude(player, _status.event.dying) > 3 ? 1 : 0; } - return (_status.event.getParent().shanRequired || 1) > 1 && - get.damageEffect(player, _status.event.getParent().player || player, player) < 0 - ? 1 - : 0; + return (_status.event.getParent().shanRequired || 1) > 1 && get.damageEffect(player, _status.event.getParent().player || player, player) < 0 ? 1 : 0; }, position: "hs", filterCard: (card, player, event) => { @@ -212,11 +278,7 @@ export default { } const storage = player.storage, zhibi = storage.zhibi; - return ( - ((zhibi && !zhibi.includes(current)) || - get.effect(current, card, player, player) >= 2 - Math.max(0, (storage.stratagem_fury || 0) - 1)) && - current.mayHaveShan(player, "use") - ); + return ((zhibi && !zhibi.includes(current)) || get.effect(current, card, player, player) >= 2 - Math.max(0, (storage.stratagem_fury || 0) - 1)) && current.mayHaveShan(player, "use"); }) ) { return get.order(card, player) + 0.5; @@ -333,10 +395,7 @@ export default { } else { value = card[j]; } - if ( - (typeof cardFilter[j] == "string" && value != cardFilter[j]) || - (Array.isArray(cardFilter[j]) && !cardFilter[j].includes(value)) - ) { + if ((typeof cardFilter[j] == "string" && value != cardFilter[j]) || (Array.isArray(cardFilter[j]) && !cardFilter[j].includes(value))) { return false; } } @@ -539,10 +598,7 @@ export default { } else { value = card[j]; } - if ( - (typeof cardFilter[j] == "string" && value != cardFilter[j]) || - (Array.isArray(cardFilter[j]) && !cardFilter[j].includes(value)) - ) { + if ((typeof cardFilter[j] == "string" && value != cardFilter[j]) || (Array.isArray(cardFilter[j]) && !cardFilter[j].includes(value))) { return false; } } @@ -860,11 +916,7 @@ export default { } var storage = player.getStorage("cooperation"); for (var info of storage) { - if ( - info.type == "use" && - (event.player == player || event.player == info.target) && - (!info.used || !info.used.includes(suit)) - ) { + if (info.type == "use" && (event.player == player || event.player == info.target) && (!info.used || !info.used.includes(suit))) { return true; } } @@ -1107,12 +1159,7 @@ export default { var val = 0; if ( player.hasCard(function (cardx) { - return ( - get.suit(cardx) == suitx && - card != cardx && - (!card.cards || !card.cards.includes(cardx)) && - player.hasValueTarget(cardx) - ); + return get.suit(cardx) == suitx && card != cardx && (!card.cards || !card.cards.includes(cardx)) && player.hasValueTarget(cardx); }, "hs") ) { val = [2, 0.1]; @@ -1318,11 +1365,7 @@ export default { if (card.name == "tao") { const evt = get.event(), viewAs = name => get.autoViewAs({ name: name, cards: [card] }, [card]); - if ( - typeof evt.filterCard == "function" && - evt.filterCard(viewAs("shan"), player, evt) && - !evt.filterCard(viewAs("sha"), player, evt) - ) { + if (typeof evt.filterCard == "function" && evt.filterCard(viewAs("shan"), player, evt) && !evt.filterCard(viewAs("sha"), player, evt)) { return "shan"; } return "sha"; @@ -1337,20 +1380,11 @@ export default { firstDo: true, priority: Infinity, filter(event, player) { - if ( - !event.card || - !event.cards || - !["sha", "shan"].includes(event.card.name) || - event.card === event.cards[0] || - event.cards.length != 1 || - event.cards[0].name != "tao" - ) { + if (!event.card || !event.cards || !["sha", "shan"].includes(event.card.name) || event.card === event.cards[0] || event.cards.length != 1 || event.cards[0].name != "tao") { return false; } const evt = event.getParent(); - return ( - typeof evt.filterCard == "function" && evt.filterCard({ name: "shan" }, player, evt) && evt.filterCard({ name: "sha" }, player, evt) - ); + return typeof evt.filterCard == "function" && evt.filterCard({ name: "shan" }, player, evt) && evt.filterCard({ name: "sha" }, player, evt); }, async content(event, trigger, player) { const control = await player @@ -1425,26 +1459,7 @@ export default { autoswap: { firstDo: true, trigger: { - player: [ - "chooseToUseBegin", - "chooseToRespondBegin", - "chooseToDiscardBegin", - "chooseToCompareBegin", - "chooseButtonBegin", - "chooseCardBegin", - "chooseTargetBegin", - "chooseCardTargetBegin", - "chooseControlBegin", - "chooseBoolBegin", - "choosePlayerCardBegin", - "discardPlayerCardBegin", - "gainPlayerCardBegin", - "chooseToMoveBegin", - "chooseToPlayBeatmapBegin", - "chooseToGiveBegin", - "chooseToGuanxingBegin", - "chooseButtonTargetBegin", - ], + player: ["chooseToUseBegin", "chooseToRespondBegin", "chooseToDiscardBegin", "chooseToCompareBegin", "chooseButtonBegin", "chooseCardBegin", "chooseTargetBegin", "chooseCardTargetBegin", "chooseControlBegin", "chooseBoolBegin", "choosePlayerCardBegin", "discardPlayerCardBegin", "gainPlayerCardBegin", "chooseToMoveBegin", "chooseToPlayBeatmapBegin", "chooseToGiveBegin", "chooseToGuanxingBegin", "chooseButtonTargetBegin"], }, forced: true, priority: 100,