From 0806372288b65d166841e64b4716f60695ca1955 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Wed, 1 May 2024 14:25:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=98=B5=E6=B3=95=E6=8A=80=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=A2=AB=E5=B0=81=E5=8D=B0=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mode/guozhan.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mode/guozhan.js b/mode/guozhan.js index 5ef523cb5..eab091f4e 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -11089,7 +11089,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { trigger: { player: "phaseJieshuBegin" }, zhenfa: "siege", direct: true, - locked: true, + locked: false, filter: function (event, player) { return ( game.countPlayer() > 4 && @@ -20604,6 +20604,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { return player.siege(event.target) && event.player.siege(event.target); }, forced: true, + locked: false, forceaudio: true, logTarget: "target", content: function () { From ae7ae7e82532a2077dc5dd8b784ca59ddbb4f426 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Wed, 1 May 2024 14:39:53 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=9B=BD=E6=88=98?= =?UTF-8?q?=E6=8A=80=E8=83=BD=E6=97=A0=E6=B3=95=E8=A2=AB=E5=B0=81=E5=8D=B0?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mode/guozhan.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mode/guozhan.js b/mode/guozhan.js index eab091f4e..7dc0554b0 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -2075,6 +2075,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { ); }, forced: true, + locked: false, async content(event, trigger, player) { if (trigger.name == "phaseZhunbei") { const num = player.getStorage("fakeshilu").length; @@ -2225,6 +2226,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { return !goon && groups.includes(event.source.identity); }, forced: true, + locked: false, logTarget(event, player) { return event.source == player ? event.player : event.source; }, @@ -4766,6 +4768,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { ); }, forced: true, + locked: false, popup: false, preHidden: ["xijue_tuxi", "fakexijue_xiaoguo"], content() { @@ -6502,6 +6505,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { gzrehuaiyi: { audio: "gzhuaiyi", enable: "phaseUse", + locked: false, filter: function (event, player) { return player.countCards("h") > 0; }, @@ -10025,6 +10029,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { }, trigger: { player: "phaseDrawBegin2" }, forced: true, + locked: false, filter: (event, player) => !event.numFixed && player.isMaxHandcard(), preHidden: true, content: function () { From 47471f94cd081678abf33e25c3dc1b03ad3d5233 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Wed, 1 May 2024 15:09:46 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=8C=91=E6=88=98=E6=AD=A6=E5=B0=86?= =?UTF-8?q?=E6=8A=80=E8=83=BD=E6=97=A0=E6=B3=95=E8=A2=AB=E5=B0=81=E5=8D=B0?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mode/boss.js | 1 + 1 file changed, 1 insertion(+) diff --git a/mode/boss.js b/mode/boss.js index 673a86cd2..942cdfada 100644 --- a/mode/boss.js +++ b/mode/boss.js @@ -9154,6 +9154,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { fanghua: { trigger: { player: "phaseJieshuBegin" }, forced: true, + locked: false, unique: true, filter: function () { return game.hasPlayer(function (current) { From 6c15f404439803d9d53da7f1c4b85b05b29423c2 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Wed, 1 May 2024 15:10:20 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=89=91=E9=98=81=E6=AD=A6=E5=B0=86?= =?UTF-8?q?=E6=8A=80=E8=83=BD=E6=97=A0=E6=B3=95=E8=A2=AB=E5=B0=81=E5=8D=B0?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mode/versus.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mode/versus.js b/mode/versus.js index 2ee231b97..4ee4a9154 100644 --- a/mode/versus.js +++ b/mode/versus.js @@ -6239,6 +6239,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { boss_xiaorui: { trigger: { global: "damageSource" }, forced: true, + locked: false, logTarget: "source", filter: function (event, player) { var target = event.source; @@ -6288,6 +6289,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { boss_fengjian: { trigger: { source: "damageSource" }, forced: true, + locked: false, filter: function (event, player) { return event.player.isAlive(); }, @@ -6774,6 +6776,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { return num >= 0; }, forced: true, + locked: false, content: function () { "step 0"; var targets = game.filterPlayer(function (current) { From 750d827a465ed0e59a01df7c5a269ad2ea4915fd Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Wed, 1 May 2024 17:19:45 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=8B=B1=E9=9B=84=E6=9D=80=E6=AD=A6?= =?UTF-8?q?=E5=B0=86=E6=8A=80=E8=83=BD=E6=97=A0=E6=B3=95=E8=A2=AB=E5=B0=81?= =?UTF-8?q?=E5=8D=B0=E4=BF=AE=E5=A4=8D=E3=80=81=E9=94=81=E5=AE=9A=E6=8A=80?= =?UTF-8?q?=E8=83=BD=E8=A2=AB=E5=B0=81=E5=8D=B0=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/yxs.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/character/yxs.js b/character/yxs.js index 5ea6c043b..7542be518 100644 --- a/character/yxs.js +++ b/character/yxs.js @@ -917,6 +917,7 @@ game.import("character", function () { }, }, kuangchan: { + locked: true, ai: { neg: true, }, @@ -2500,7 +2501,7 @@ game.import("character", function () { }, }, nvquan: { - locked: true, + locked: false, group: ["nvquan1", "nvquan2", "nvquan3"], }, nvquan1: {