From 561ab378fa996065e4a24dc607623eee4370bc0f Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Mon, 6 May 2024 19:42:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=AD=A6=E5=B0=86?= =?UTF-8?q?=E7=89=8C=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/diy/skill.js | 11 ++++++++--- character/gujian.js | 2 +- character/hearth.js | 4 ++-- character/huicui/skill.js | 1 + character/key/skill.js | 4 ++++ character/sp/skill.js | 5 +---- character/tw/skill.js | 1 - character/xianjian.js | 2 +- character/yxs.js | 12 ++++++++++-- 9 files changed, 28 insertions(+), 14 deletions(-) diff --git a/character/diy/skill.js b/character/diy/skill.js index 87d5432e7..197411c03 100644 --- a/character/diy/skill.js +++ b/character/diy/skill.js @@ -5396,13 +5396,13 @@ const skills = { unique: true, forceunique: true, init(player) { - if (player.storage.nscongjun_show) return false; + if (player.storage.nscongjun_show || ![player.name1, player.name2].includes("ns_huamulan")) return false; var change = function (target) { if (target == player) { var list; if (_status.connectMode) { list = get.charactersOL(function (i) { - return lib.character[i][0] != "male"; + return lib.character[i][0] == "male"; }); } else { list = get.gainableCharacters(function (info) { @@ -5427,7 +5427,12 @@ const skills = { show: { trigger: { global: "useCard" }, filter(event, player) { - return player.getEnemies().includes(event.player) && event.card.name == "wuxie" && event.getRand() < 0.1; + return ( + player.storage.nscongjun_show && + event.card.name == "wuxie" && + event.getRand() < 0.1 && + player.getEnemies().includes(event.player) + ); }, direct: true, skillAnimation: true, diff --git a/character/gujian.js b/character/gujian.js index 4585eab0c..32cb44d1d 100644 --- a/character/gujian.js +++ b/character/gujian.js @@ -630,7 +630,7 @@ game.import("character", function () { player.turnOver(false); "step 3"; player.draw(4); - player.reinit("gjqt_xieyi", "gjqt_chuqi"); + player.reinit(get.character(player.name2, 3).includes("humeng") ? player.name2 : player.name1, "gjqt_chuqi"); player.hp = player.maxHp; "step 4"; if (event.yanjia) { diff --git a/character/hearth.js b/character/hearth.js index 5563603d3..027c7363a 100644 --- a/character/hearth.js +++ b/character/hearth.js @@ -2382,7 +2382,7 @@ game.import("character", function () { trigger: { player: "phaseBefore" }, unique: true, skillAnimation: true, - forceunique: true, + //forceunique: true, filter() { return game.roundNumber >= 3; }, @@ -2407,7 +2407,7 @@ game.import("character", function () { }; player.awakenSkill("szbianshen"); "step 1"; - player.reinit("hs_shizugui", result.links[0]); + player.reinit(get.character(player.name2, 3).includes("szbianshen") ? player.name2 : player.name1, result.links[0]); player.hp = player.maxHp; player.update(); }, diff --git a/character/huicui/skill.js b/character/huicui/skill.js index 00851c450..c530210d0 100644 --- a/character/huicui/skill.js +++ b/character/huicui/skill.js @@ -12431,6 +12431,7 @@ const skills = { if (evt.player != event.player) return false; return true; }, + usable: 1, logTarget: "player", check: function (event, player) { var target = event.player; diff --git a/character/key/skill.js b/character/key/skill.js index db16495e4..0bdcaa800 100644 --- a/character/key/skill.js +++ b/character/key/skill.js @@ -7569,6 +7569,7 @@ const skills = { trigger: { player: "phaseZhunbeiBegin" }, limited: true, unique: true, + forceunique: true, charlotte: true, skillAnimation: true, animationColor: "water", @@ -7576,6 +7577,7 @@ const skills = { return player.isDamaged(); }, check(event, player) { + if (![player.name1, player.name2].includes("key_mio")) return false; return player.hp <= 1 || player.getDamagedHp() > 1; }, content() { @@ -7644,12 +7646,14 @@ const skills = { limited: true, charlotte: true, unique: true, + forceunique: true, skillAnimation: true, animationColor: "water", filter(event, player) { return player.isDamaged(); }, check(event, player) { + if (![player.name1, player.name2].includes("key_midori")) return false; return player.hp <= 1 || player.getDamagedHp() > 1; }, content() { diff --git a/character/sp/skill.js b/character/sp/skill.js index 3d2c10dad..7984f5756 100644 --- a/character/sp/skill.js +++ b/character/sp/skill.js @@ -19319,7 +19319,6 @@ const skills = { limited: true, skillAnimation: true, animationColor: "orange", - forceunique: true, filter: function (event, player) { return player.storage.fanghun2 > 0; }, @@ -19377,7 +19376,7 @@ const skills = { player.awakenSkill("fuhan"); "step 1"; event.num = Math.min(event.num, 8); - player.reinitCharacter("zhaoxiang", result.links[0]); + player.reinitCharacter(get.character(player.name2, 3).includes("fuhan") ? player.name2 : player.name1, result.links[0]); "step 2"; var num = event.num - player.maxHp; if (num > 0) player.gainMaxHp(num); @@ -19395,7 +19394,6 @@ const skills = { limited: true, skillAnimation: true, animationColor: "orange", - forceunique: true, filter: function (event, player) { return player.countMark("fanghun") > 0; }, @@ -24477,7 +24475,6 @@ const skills = { audio: 2, unique: true, juexingji: true, - forceunique: true, derivation: "xiaoji", trigger: { player: "phaseZhunbeiBegin" }, filter: function (event, player) { diff --git a/character/tw/skill.js b/character/tw/skill.js index 666efdc6d..3b9b4e02c 100644 --- a/character/tw/skill.js +++ b/character/tw/skill.js @@ -15585,7 +15585,6 @@ const skills = { limited: true, skillAnimation: true, animationColor: "orange", - forceunique: true, filter: function (event, player) { return player.countMark("fanghun") > 0; }, diff --git a/character/xianjian.js b/character/xianjian.js index 8803c1eae..f039adbb7 100644 --- a/character/xianjian.js +++ b/character/xianjian.js @@ -2811,7 +2811,7 @@ game.import("character", function () { unique: true, forceunique: true, filter: function () { - return Math.random() < 0.5; + return Math.random() < 0.5 && [player.name1, player.name2].includes("pal_longkui"); }, derivation: ["diesha", "guijiang"], content: function () { diff --git a/character/yxs.js b/character/yxs.js index f08f705b5..65860cbd9 100644 --- a/character/yxs.js +++ b/character/yxs.js @@ -816,7 +816,11 @@ game.import("character", function () { forceunique: true, enable: "phaseUse", filter: function (event, player) { - return !player.hasSkill("tongyu_guiyin") && !player.getStat("damage"); + return ( + !player.hasSkill("tongyu_guiyin") && + !player.getStat("damage") && + [player.name1, player.name2].includes("yxs_luobinhan") + ); }, derivation: ["lzhangyi", "jimin", "tongyu"], content: function () { @@ -848,7 +852,11 @@ game.import("character", function () { forceunique: true, enable: "phaseUse", filter: function (event, player) { - return player.countCards("he") > 0 && !player.hasSkill("tongyu_guiyin"); + return ( + player.countCards("he") > 0 && + !player.hasSkill("tongyu_guiyin") && + [player.name1, player.name2].includes("yxs_luobinhan") + ); }, filterCard: true, position: "he", From a7c2624cf1371e734902a293ccf1bb2e76c88602 Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Mon, 6 May 2024 20:06:38 +0800 Subject: [PATCH 2/4] bugfix --- mode/guozhan.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mode/guozhan.js b/mode/guozhan.js index 31eb42ca4..74fc8ba03 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -2714,7 +2714,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { inherit: "zhiwei", filter: function (event, player, name) { if (!game.hasPlayer(current => current != player)) return false; - return event.name == "showCharacter" && event.toShow(name => { + return event.name == "showCharacter" && event.toShow.some(name => { return get.character(name, 3).includes("fakezhiwei"); }); }, @@ -6455,7 +6455,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { }) ) return false; - return event.toShow.some((name) => lib.character[name][3].includes("gzjinyu")); + return event.toShow.some((name) => get.character(name, 3).includes("gzjinyu")); }, logTarget: function (event, player) { return game From 348fbf11ad6d85c5d50a9d48f5b6113905a951e6 Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Mon, 6 May 2024 21:37:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=8D=E6=B4=BB?= =?UTF-8?q?=E7=B1=BB=E8=A7=92=E8=89=B2=E6=B2=A1=E6=B3=95=E6=8A=95=E9=99=8D?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- noname/ui/create/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noname/ui/create/index.js b/noname/ui/create/index.js index b481146ff..7e32bc08e 100644 --- a/noname/ui/create/index.js +++ b/noname/ui/create/index.js @@ -1042,7 +1042,7 @@ export class Create { .setContent(function () { game.log(player, "投降"); player.popup("投降"); - player.die("nosource").includeOut = true; + player.die("nosource").set("_triggered", null).includeOut = true; }).player = player; } if (_status.paused && _status.imchoosing && !_status.auto) { From 3d576e3784df46efeaf29058353daa226f04a015 Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Mon, 6 May 2024 21:43:40 +0800 Subject: [PATCH 4/4] revert sth. --- character/diy/skill.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/character/diy/skill.js b/character/diy/skill.js index 197411c03..155449bb7 100644 --- a/character/diy/skill.js +++ b/character/diy/skill.js @@ -5402,7 +5402,7 @@ const skills = { var list; if (_status.connectMode) { list = get.charactersOL(function (i) { - return lib.character[i][0] == "male"; + return lib.character[i][0] != "male"; }); } else { list = get.gainableCharacters(function (info) {