From 3d511c415b163fb7ccf5a025404340f1560ff6f8 Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Tue, 7 May 2024 10:47:57 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E3=80=90=E6=8B=BC=E5=91=BD=E3=80=91?= =?UTF-8?q?=E6=8E=92=E9=99=A4=E6=8A=95=E9=99=8D=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 155449bb7..31a7afe23 100644 --- a/character/diy/skill.js +++ b/character/diy/skill.js @@ -5178,7 +5178,7 @@ const skills = { trigger: { player: "dieBefore" }, forced: true, filter(event, player) { - return player.maxHp > 0; + return player.maxHp > 0 && event.getParent().name != "giveup"; }, content() { trigger.cancel(); From 950bcb467258c72c45319e16e61daa2d9cd4cbcd Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Tue, 7 May 2024 10:49:17 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=90=E6=81=AF?= =?UTF-8?q?=E5=85=B5=E3=80=91ai?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/huicui/skill.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/character/huicui/skill.js b/character/huicui/skill.js index c609125e3..1fc55d0a3 100644 --- a/character/huicui/skill.js +++ b/character/huicui/skill.js @@ -12437,7 +12437,7 @@ const skills = { var target = event.player; var att = get.attitude(player, target); var num2 = Math.min(5, target.hp) - target.countCards("h"); - if (num2 <= 0) return att <= 0; + if (num2 <= 0) return false; var num = target.countCards("h", function (card) { return target.hasValueTarget(card, null, true); }); From 649fc418d67f8d25f46b2bfbf22449b415c32322 Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Tue, 7 May 2024 10:58:47 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=83=A8=E5=88=86combo=E7=B1=BB=E5=8D=96?= =?UTF-8?q?=E8=A1=80=E6=8A=80=E5=A2=9E=E5=8A=A0combo=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/extra/skill.js | 1 + character/yijiang/skill.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/character/extra/skill.js b/character/extra/skill.js index 7354d3af0..fdc103f60 100644 --- a/character/extra/skill.js +++ b/character/extra/skill.js @@ -6323,6 +6323,7 @@ const skills = { combo: "sbaiyin", effect: { target(card, player, target) { + if (!target.hasSkill("sbaiyin") && !target.hasSkill("jilue") || !target.hasFriend()) return; if (player.hasSkillTag("jueqing", false, target)) return [1, -2]; if (get.tag(card, "damage")) { if (target.hp == target.maxHp) { diff --git a/character/yijiang/skill.js b/character/yijiang/skill.js index 9454cef17..8a5d9b10a 100644 --- a/character/yijiang/skill.js +++ b/character/yijiang/skill.js @@ -11661,7 +11661,7 @@ const skills = { threaten: 0.8, effect: { target: function (card, player, target) { - if (get.tag(card, "damage")) { + if (get.tag(card, "damage") && (player.hasSkill("paiyi") || player.hasSkill("zili"))) { if (player.hasSkillTag("jueqing", false, target)) return [1, -2]; if (!target.hasFriend()) return; if (target.hp >= 4) return [0.5, get.tag(card, "damage") * 2]; From 4a33dabdc4d7b660a0ea58e46ce9cb1bb9c509d5 Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Tue, 7 May 2024 11:26:13 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=85=B6=E4=BB=96ai=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/tw/skill.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/character/tw/skill.js b/character/tw/skill.js index e147f6054..886a68faf 100644 --- a/character/tw/skill.js +++ b/character/tw/skill.js @@ -14737,12 +14737,12 @@ const skills = { order: 2.9, result: { target: function (player, target) { + if (get.attitude(player, target) >= 0) return -20; var cards = ui.selected.cards.slice(0); var names = []; for (var i of cards) names.add(i.name); if (names.length < player.hp) return 0; if (player.hasUnknown() && (player.identity != "fan" || !target.isZhu)) return 0; - if (get.attitude(player, target) >= 0) return -20; return lib.card.sha.ai.result.target.apply(this, arguments); }, }, From 0abda1569d641b3ae169a9dce8ece2dc8444e7ae Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Tue, 7 May 2024 11:37:32 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=90=E7=82=99?= =?UTF-8?q?=E6=97=A5=E3=80=91=E5=8F=91=E5=8A=A8=E4=B8=8D=E8=8E=B7=E5=BE=97?= =?UTF-8?q?=E3=80=96=E5=BF=83=E6=83=94=E3=80=97=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/sp/skill.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/sp/skill.js b/character/sp/skill.js index ddab9ff60..35a158bd6 100644 --- a/character/sp/skill.js +++ b/character/sp/skill.js @@ -22183,6 +22183,7 @@ const skills = { player.awakenSkill("zhiri"); player.loseMaxHp(); player.storage.zhiri = true; + player.addSkills("xintan"); }, ai: { combo: "fentian", From 342c727731d98e08ca77c07f009c2418c62b80c1 Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Tue, 7 May 2024 11:46:15 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=90=E4=B9=89?= =?UTF-8?q?=E9=87=8A=E3=80=91ai?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/mobile/skill.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/character/mobile/skill.js b/character/mobile/skill.js index fe06ab7c8..80dc050c4 100644 --- a/character/mobile/skill.js +++ b/character/mobile/skill.js @@ -7170,10 +7170,11 @@ const skills = { }, check: function (event, player) { return ( - get.damageEffect(event.player, player, player) < 0 || - (!event.player.hasSkillTag("noe") && + get.damageEffect(event.player, player, player) <= 0 || + (get.attitude(player, event.player) <= 0 && + !event.player.hasSkillTag("noe") && event.player.hasCard(function (card) { - return get.value(card) > 6; + return get.value(card) > 9 - event.player.hp; }, "e")) ); }, From 2ce1cac7d5edd866fa0f87d91c64f2e5c40616d8 Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Tue, 7 May 2024 11:49:44 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=90=E8=97=8F?= =?UTF-8?q?=E5=BF=83=E3=80=91ai?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/sp/skill.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/character/sp/skill.js b/character/sp/skill.js index 35a158bd6..c3fec72f5 100644 --- a/character/sp/skill.js +++ b/character/sp/skill.js @@ -2828,7 +2828,7 @@ const skills = { }, checkx: function (event, player) { var target = event.source; - return get.damageEffect(player, target, target) <= 0; + return get.damageEffect(player, target, player) <= 0; }, forced: true, content: function () {