diff --git a/audio/skill/kunfen_ol_sb_jiangwei1.mp3 b/audio/skill/kunfen_ol_sb_jiangwei1.mp3 new file mode 100644 index 000000000..eba15aeca Binary files /dev/null and b/audio/skill/kunfen_ol_sb_jiangwei1.mp3 differ diff --git a/audio/skill/zhaxiang_ol_sb_jiangwei1.mp3 b/audio/skill/zhaxiang_ol_sb_jiangwei1.mp3 new file mode 100644 index 000000000..950713bdf Binary files /dev/null and b/audio/skill/zhaxiang_ol_sb_jiangwei1.mp3 differ diff --git a/character/collab/character.js b/character/collab/character.js index 9ae034df4..af46e1d9f 100644 --- a/character/collab/character.js +++ b/character/collab/character.js @@ -21,7 +21,7 @@ const characters = { sp_mushun: ["male", "qun", 4, ["moukui"]], dc_wuyi: ["male", "shu", 4, ["dcbenxi"]], quyuan: ["male", "qun", 3, ["dcqiusuo", "dclisao"]], - xin_sunquan: ["male", "wu", 4, ["dchuiwan", "dchuanli"]], + xin_sunquan: ["male", "wu", 3, ["dchuiwan", "dchuanli"], ["die_audio"]], }; export default characters; diff --git a/character/collab/skill.js b/character/collab/skill.js index b4f649ab6..14d974ae0 100644 --- a/character/collab/skill.js +++ b/character/collab/skill.js @@ -118,7 +118,7 @@ const skills = { }); if (targets.length) { const result = await player - .chooseTarget(get.prompt("dchuanli"), "令一名其他角色的所有技能失效,然后令其获得〖直谏〗和〖固政〗直到其回合结束", (card, player, target) => { + .chooseTarget(get.prompt("dchuanli"), "令一名其他角色的所有技能失效,然后令其获得〖英姿〗和〖反间〗直到其回合结束", (card, player, target) => { return get.event("targets").includes(target); }) .set("ai", target => { diff --git a/character/onlyOL/skill.js b/character/onlyOL/skill.js index f32ba82e9..724926850 100644 --- a/character/onlyOL/skill.js +++ b/character/onlyOL/skill.js @@ -383,7 +383,7 @@ const skills = { if (goon && player.isDamaged()) result = await player .chooseControl() - .set("choiceList", ["获得" + get.translation(target) + "的一张牌", "发动一次〖秘计〗"]) + .set("choiceList", ["获得" + get.translation(target) + "的一张牌", "于本回合的结束阶段发动一次〖秘计〗"]) .set("ai", () => { const player = get.event("player"), target = get.event().getTrigger().player; @@ -394,16 +394,28 @@ const skills = { if (result.index == 0) { await player.gainPlayerCard(target, "he", true); } else { - await player.useSkill("olmiji"); + player.addTempSkill("olzhenjie_effect"); + player.addMark("olzhenlie_effect", 1, false); } } }, + subSkill: { + effect: { + charlotte: true, + onremove: true, + intro: { content: "本回合的结束阶段可以发动#次〖秘计〗" }, + }, + }, }, olmiji: { audio: 2, - trigger: { player: "phaseJieshuBegin" }, + trigger: { global: "phaseJieshuBegin" }, filter(event, player) { - return player.isDamaged(); + if (player.isHealthy()) return false; + return event.player == player || player.hasMark("olzhenlie_effect"); + }, + getIndex(event, player) { + return player.countMark("olzhenlie_effect") + (event.player == player); }, async content(event, trigger, player) { let num = player.getDamagedHp(); @@ -1712,8 +1724,10 @@ const skills = { }, kunfenx: { audio: "kunfen", - audioname: ["ol_sb_jiangwei"], + audioname2: { ol_sb_jiangwei: "kunfen_ol_sb_jiangwei" }, }, + kunfen_ol_sb_jiangwei: { audio: 1 }, + zhaxiang_ol_sb_jiangwei: { audio: 1 }, //界曹彰 oljiangchi: { audio: "rejiangchi", diff --git a/character/onlyOL/translate.js b/character/onlyOL/translate.js index 6f2e8763e..f5687865c 100644 --- a/character/onlyOL/translate.js +++ b/character/onlyOL/translate.js @@ -69,7 +69,7 @@ const translates = { ol_wangyi: "OL界王异", ol_wangyi_prefix: "OL界", olzhenlie: "贞烈", - olzhenlie_info: "当你成为其他角色使用【杀】或普通锦囊牌的目标后,你可以失去1点体力并令此牌对你无效,然后你选择一项:①获得使用者的一张牌;②发动一次〖秘计〗。", + olzhenlie_info: "当你成为其他角色使用【杀】或普通锦囊牌的目标后,你可以失去1点体力并令此牌对你无效,然后你选择一项:①获得使用者的一张牌;②于本回合的结束阶段发动一次〖秘计〗。", olmiji: "秘计", olmiji_info: "结束阶段,若你已受伤,则你可以摸X张牌,然后你可以将至多X张牌任意分配给其他角色(X为你已损失的体力值)。", ol_sb_pangtong: "OL谋庞统", @@ -78,14 +78,14 @@ const translates = { olsbhongtu_info: "一名角色的阶段结束时,若你于此阶段得到过至少两张牌,你可以摸三张牌,展示三张手牌,令一名其他角色选择是否使用其中一张牌并令你随机弃置其中另一张牌。若使用牌的点数于三张牌中满足以下条件,其获得如下技能或效果直到其下一个回合的回合结束:唯一最大,其获得〖飞军〗;不为唯一最大且不为唯一最小,其获得〖潜袭〗;唯一最小,其手牌上限+2。若其未以此法使用牌,你对其与你各造成1点火焰伤害。", olsbqiwu: "栖梧", olsbqiwu_info: "当你每回合首次受到伤害时,若伤害来源为你或在你的攻击范围内,你可以弃置一张红色牌,防止此伤害。", - ol_fazheng:'OL界法正', - ol_fazheng_prefix:'OL界', - olxuanhuo:'眩惑', - olxuanhuo_info:'摸牌阶段结束时,你可以交给一名其他角色两张牌,然后其选择一项:1.对你选择的另一名其他角色使用一张【杀】,2.令你观看并获得其两张牌。', - olenyuan:'恩怨', - olenyuan1:'恩怨', - olenyuan2:'恩怨', - olenyuan_info:'①当你一次性获得一名其他角色超过一张牌后,你可以令其摸一张牌。②当你受到1点伤害后,你可以令伤害来源选择一项:1.将一张红色手牌交给你;2.失去1点体力。', + ol_fazheng: "OL界法正", + ol_fazheng_prefix: "OL界", + olxuanhuo: "眩惑", + olxuanhuo_info: "摸牌阶段结束时,你可以交给一名其他角色两张牌,然后其选择一项:1.对你选择的另一名其他角色使用一张【杀】,2.令你观看并获得其两张牌。", + olenyuan: "恩怨", + olenyuan1: "恩怨", + olenyuan2: "恩怨", + olenyuan_info: "①当你一次性获得一名其他角色超过一张牌后,你可以令其摸一张牌。②当你受到1点伤害后,你可以令伤害来源选择一项:1.将一张红色手牌交给你;2.失去1点体力。", }; export default translates; diff --git a/character/onlyOL/voices.js b/character/onlyOL/voices.js index 5d3ba39fe..dca1b6852 100644 --- a/character/onlyOL/voices.js +++ b/character/onlyOL/voices.js @@ -3,6 +3,8 @@ export default { "#olsbzhuri2": "知天命而不顺,履穷途而强为。", "#olsbranji1": "此身为薪,炬成灰亦昭大汉长明!", "#olsbranji2": "维之一腔骨血,可驱驰来北马否?", + "#kunfen_ol_sb_jiangwei1": "虽千万人,吾往矣!", + "#zhaxiang_ol_sb_jiangwei1": "亡国之将姜维,请明公驱驰。", "#ol_sb_jiangwei:die": "姜维姜维……又将何为?", "#xuanfeng_re_lingtong1": "短兵相接,让敌人丢盔弃甲!", "#xuanfeng_re_lingtong2": "攻敌不备,看他们闻风而逃!", diff --git a/character/refresh/skill.js b/character/refresh/skill.js index 48edbef81..3cc50b8d7 100644 --- a/character/refresh/skill.js +++ b/character/refresh/skill.js @@ -14582,7 +14582,7 @@ const skills = { }, zhaxiang: { audio: 2, - audioname: ["ol_sb_jiangwei"], + audioname2: { ol_sb_jiangwei: "zhaxiang_ol_sb_jiangwei" }, trigger: { player: "loseHpEnd" }, forced: true, content: function () { @@ -14641,7 +14641,7 @@ const skills = { charlotte: true, onremove: true, audio: "zhaxiang", - audioname: ["ol_sb_jiangwei"], + audioname2: { ol_sb_jiangwei: "zhaxiang_ol_sb_jiangwei" }, trigger: { player: "useCard" }, filter: function (event, player) { return event.card && event.card.name == "sha" && get.color(event.card) == "red"; diff --git a/character/sp/skill.js b/character/sp/skill.js index 26e0f2914..4f4757ef1 100644 --- a/character/sp/skill.js +++ b/character/sp/skill.js @@ -24268,7 +24268,7 @@ const skills = { }, kunfen: { audio: 2, - audioname: ["ol_sb_jiangwei"], + audioname2: { ol_sb_jiangwei: "kunfen_ol_sb_jiangwei" }, trigger: { player: "phaseJieshuBegin" }, locked: function (skill, player) { if (!player || !player.storage.kunfen) return true; diff --git a/character/sp/translate.js b/character/sp/translate.js index 2c22fb760..c3c642281 100644 --- a/character/sp/translate.js +++ b/character/sp/translate.js @@ -1190,7 +1190,7 @@ const translates = { olsilv: "思闾", olsilv_info: "锁定技,每回合每项限一次,当你获得或失去你发动〖联句〗记录的最后一次牌名的同名牌后,你展示这些牌,然后摸一张牌。", relianju: "联句", - relianju_info: "结束阶段,你可以令一名其他角色获得你本回合使用的至多两张位于弃牌堆且颜色相同的牌,称为“思闾”,然后你于其下个结束阶段获得其本回合使用的至多两张不同于此颜色的位于弃牌堆且颜色相同且颜色的牌,称为“思闾”。", + relianju_info: "结束阶段,你可以令一名其他角色获得你本回合使用的至多两张位于弃牌堆且颜色相同的牌,称为“思闾”,然后你于其下个结束阶段获得其本回合使用的至多两张的位于弃牌堆且颜色相同且颜色不同于你本次获得的牌的颜色的牌,称为“思闾”。", resilv: "思闾", resilv_info: "锁定技。①当你受到伤害后,你摸一张牌,称为“思闾”。②一名角色因弃置“思闾”牌使“思闾”牌进入弃牌堆后,其获得之。", xueji_old: "血祭", diff --git a/image/character/xin_sunquan.jpg b/image/character/xin_sunquan.jpg new file mode 100644 index 000000000..8c86a38ff Binary files /dev/null and b/image/character/xin_sunquan.jpg differ