From 1bd1dd4633da00865bf1838c6115e3db2fffeebc Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Sun, 2 Jun 2024 23:58:51 +0800 Subject: [PATCH 2/8] =?UTF-8?q?jiahe=5Fduoshi=E8=AF=AD=E9=9F=B3=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mode/guozhan.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mode/guozhan.js b/mode/guozhan.js index ebd46bb67..c0f625bd5 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -1023,10 +1023,12 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { }, fakeduoshi: { audio: "duoshi", + audioname2: { gz_jun_sunquan: "jiahe_duoshi" }, global: "fakeduoshi_global", subSkill: { global: { audio: "duoshi", + audioname2: { gz_jun_sunquan: "jiahe_duoshi" }, forceaudio: true, enable: "chooseToUse", filter(event, player) { @@ -19144,15 +19146,19 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { }, }, jiahe_reyingzi: { + audio: 2, inherit: "reyingzi", }, jiahe_haoshi: { + audio: 2, inherit: "haoshi", }, jiahe_shelie: { + audio: 2, inherit: "shelie", }, jiahe_duoshi: { + audio: 2, inherit: "fakeduoshi", }, yuanjiangfenghuotu: { From a78d546eee74eac055780f086bb74f3fc6c46d54 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Mon, 3 Jun 2024 00:03:49 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E7=BE=A4=E7=A5=9D=E8=9E=8D=E5=89=8D?= =?UTF-8?q?=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/huicui/translate.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/huicui/translate.js b/character/huicui/translate.js index 0b9d2133f..15b18c890 100644 --- a/character/huicui/translate.js +++ b/character/huicui/translate.js @@ -553,6 +553,7 @@ const translates = { dcchengyan: "乘烟", dcchengyan_info: "当你于出牌阶段使用【杀】或普通锦囊牌指定其他角色为目标后，你可以亮出牌堆顶的一张牌，若此牌为【杀】或可指定目标的普通锦囊牌，你将此牌对其的结算方式改为此牌牌名的结算方式；若此牌不为【杀】和普通锦囊牌，你获得此牌并将此牌标记为“笛”。", dc_sp_zhurong: "群祝融", + dc_sp_zhurong_prefix: "群", dcmanhou: "蛮后", dcmanhou_info: "出牌阶段限一次，你可以摸任意张牌并依次执行以下等量项（至多为4） ：1：失去〖探乱〗;2：弃置一张手牌; 3：失去1点体力; 4：弃置一张牌并获得〖探乱〗。", dctanluan: "探乱", From c46761c285e80dfcfbac576f12ae535e16fb2990 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Mon, 3 Jun 2024 21:26:06 +0800 Subject: [PATCH 4/8] Update boss.js --- mode/boss.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mode/boss.js b/mode/boss.js index a999e09f5..1e5903923 100644 --- a/mode/boss.js +++ b/mode/boss.js @@ -7158,7 +7158,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { content: function (storage, player) { var str = "扣减" + (7 - player.storage.xiangxing_count) + "点体力后失去下一枚星；"; str += - "防上禳星伤害条件：" + + "防止禳星伤害条件：" + lib.translate["xiangxing" + player.storage.xiangxing + "_info"]; return str; }, From 09a77df9d7bc10ae98fc96f092512eb481dc3469 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Mon, 3 Jun 2024 22:02:34 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E9=82=A3=E4=B8=AA=E7=94=B7=E4=BA=BA?= =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E4=BF=AE=E5=A4=8D=E3=80=81=E9=98=B5=E4=BA=A1?= =?UTF-8?q?=E5=8F=B0=E8=AF=8D=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mode/boss.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mode/boss.js b/mode/boss.js index 1e5903923..8989ccfbd 100644 --- a/mode/boss.js +++ b/mode/boss.js @@ -9641,6 +9641,8 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { }, }, }, + reyingzi_sunce: { audio: 2 }, + yinghun_sunce: { audio: 2 }, boss_jiang: { audio: "jiang", trigger: { @@ -9691,6 +9693,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { group: ["boss_jiang_use"], subSkill: { use: { + audio: "jiang", trigger: { global: ["useCard"], }, @@ -10581,6 +10584,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { "#wansha_boss_lvbu31": "蝼蚁，怎容偷生？", "#wansha_boss_lvbu32": "沉沦吧，在这无边的恐惧！", "#boss_lvbu3:die": "你们的项上人头，我改日再取！", + "#boss_sunce:die": "内事不决问张昭，外事不决问周瑜……", }, get: { rawAttitude: function (from, to) { From 6a7093ed18b8383c18b4b6177c2a8cf7c2f58b53 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Mon, 3 Jun 2024 22:03:31 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E9=82=A3=E4=B8=AA=E7=94=B7=E4=BA=BA?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=AF=AD=E9=9F=B3=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/refresh/skill.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/character/refresh/skill.js b/character/refresh/skill.js index 659bd744f..f899ae212 100644 --- a/character/refresh/skill.js +++ b/character/refresh/skill.js @@ -13857,7 +13857,8 @@ const skills = { audioname2: { re_sunyi: "reyingzi_re_sunyi", heqi: "reyingzi_heqi", - re_heqi: "reyingzi_heqi" + re_heqi: "reyingzi_heqi", + boss_sunce: "reyingzi_sunce" }, trigger: { player: "phaseDrawBegin2" }, forced: true, From cd48827e47f878357e1c2a27baf88c38479ee4e9 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Mon, 3 Jun 2024 22:03:52 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E9=82=A3=E4=B8=AA=E7=94=B7=E4=BA=BA?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=AF=AD=E9=9F=B3=E4=BF=AE=E5=A4=8D1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/shenhua/skill.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/shenhua/skill.js b/character/shenhua/skill.js index b4416e983..8ad7dabec 100644 --- a/character/shenhua/skill.js +++ b/character/shenhua/skill.js @@ -4983,6 +4983,7 @@ const skills = { audioname2: { re_sunyi: "gzyinghun_re_sunyi", tw_ol_sunjian: "yinghun_ol_sunjian", + boss_sunce: "yinghun_sunce" }, mod: { aiOrder(player, card, num) { From ee57f4d08c1fddece4212e942ef1408988ff423a Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Mon, 3 Jun 2024 22:56:34 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E7=BE=A4=E7=A5=9D=E8=9E=8D=E5=89=8D?= =?UTF-8?q?=E7=BC=80=E6=94=B9=E6=96=B0=E6=9D=80SP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/huicui/translate.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/character/huicui/translate.js b/character/huicui/translate.js index 15b18c890..70ddd18ec 100644 --- a/character/huicui/translate.js +++ b/character/huicui/translate.js @@ -552,8 +552,8 @@ const translates = { dcxidi_info: "锁定技。①游戏开始时，你将所有手牌标记为“笛”。②你的“笛”牌不计入手牌上限。③准备阶段，若你的手牌中有“笛”，则你观看牌堆顶X张牌，然后将这些牌以任意顺序置于牌堆顶和牌堆底（X为你手牌中的“笛”数，且X至多为5）。", dcchengyan: "乘烟", dcchengyan_info: "当你于出牌阶段使用【杀】或普通锦囊牌指定其他角色为目标后，你可以亮出牌堆顶的一张牌，若此牌为【杀】或可指定目标的普通锦囊牌，你将此牌对其的结算方式改为此牌牌名的结算方式；若此牌不为【杀】和普通锦囊牌，你获得此牌并将此牌标记为“笛”。", - dc_sp_zhurong: "群祝融", - dc_sp_zhurong_prefix: "群", + dc_sp_zhurong: "新杀SP祝融", + dc_sp_zhurong_prefix: "新杀SP", dcmanhou: "蛮后", dcmanhou_info: "出牌阶段限一次，你可以摸任意张牌并依次执行以下等量项（至多为4） ：1：失去〖探乱〗;2：弃置一张手牌; 3：失去1点体力; 4：弃置一张牌并获得〖探乱〗。", dctanluan: "探乱",