From 96e8e7f4a60ab5d745017ecee0606e01f89e9842 Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Wed, 1 May 2024 14:20:43 +0800 Subject: [PATCH 1/4] =?UTF-8?q?combo=E6=A0=87=E7=AD=BE=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/key/skill.js | 3 +++ character/refresh.js | 6 ++++++ character/shenhua.js | 6 ++++++ character/sp.js | 8 +++++++- character/sp2.js | 3 +++ character/tw.js | 6 ++++++ character/xianding.js | 3 +++ 7 files changed, 34 insertions(+), 1 deletion(-) diff --git a/character/key/skill.js b/character/key/skill.js index b5621566f..5648c385f 100644 --- a/character/key/skill.js +++ b/character/key/skill.js @@ -9921,6 +9921,9 @@ const skills = { await trigger.player.changeGroup(player.group); await trigger.player.draw(); }, + ai: { + combo: "yuri_xingdong" + }, }, //枣恭介 nk_shekong: { diff --git a/character/refresh.js b/character/refresh.js index f14a6a2a8..9cff043b5 100755 --- a/character/refresh.js +++ b/character/refresh.js @@ -9528,6 +9528,9 @@ game.import("character", function () { player.addSkills("jixi"); player.insertPhase(); }, + ai: { + combo: "oltuntian" + }, }, rejunxing: { enable: "phaseUse", @@ -13190,6 +13193,9 @@ game.import("character", function () { event.goto(1); } }, + ai: { + combo: "rehuasheng" + }, }, reguhuo: { audio: 2, diff --git a/character/shenhua.js b/character/shenhua.js index 9e11f3a86..887474fde 100755 --- a/character/shenhua.js +++ b/character/shenhua.js @@ -4444,6 +4444,9 @@ game.import("character", function () { player.loseMaxHp(); player.addSkills("jixi"); }, + ai: { + combo: "tuntian" + }, }, jixi: { audio: 2, @@ -5346,6 +5349,9 @@ game.import("character", function () { event.goto(1); } }, + ai: { + combo: "huashen" + }, }, huoshou: { audio: "huoshou1", diff --git a/character/sp.js b/character/sp.js index ce71c4d76..f8eb3a18f 100755 --- a/character/sp.js +++ b/character/sp.js @@ -16472,6 +16472,9 @@ game.import("character", function () { player.awakenSkill("xinmoucheng"); player.changeSkills(["xinjingong"], ["xinlianji"]); }, + ai: { + combo: "xinlianji" + }, }, xinjingong: { audio: "jingong", @@ -20272,6 +20275,9 @@ game.import("character", function () { "step 3"; if (player.isMinHp()) player.recover(); }, + ai: { + combo: "refanghun" + }, }, refanghun: { mod: { @@ -24225,7 +24231,7 @@ game.import("character", function () { zhuSkill: true, locked: true, ai: { - combo: "canshi", + combo: "recanshi", }, }, canshi: { diff --git a/character/sp2.js b/character/sp2.js index ec461c793..74882642a 100644 --- a/character/sp2.js +++ b/character/sp2.js @@ -12181,6 +12181,9 @@ game.import("character", function () { player.storage.bingzhao = group; player.markSkill("bingzhao"); }, + ai: { + combo: "guju" + }, }, baijia: { audio: 2, diff --git a/character/tw.js b/character/tw.js index b1c9628d7..8c27868f9 100644 --- a/character/tw.js +++ b/character/tw.js @@ -6017,6 +6017,9 @@ game.import("character", function () { }, }, }, + ai: { + combo: "twxiongzheng" + }, }, //鲍信 twmutao: { @@ -17394,6 +17397,9 @@ game.import("character", function () { //for(var i of skills) target.addSkillLog(i); } }, + ai: { + combo: "twyujue" + }, }, twsidai: { audio: 2, diff --git a/character/xianding.js b/character/xianding.js index df0462841..f20789f1c 100644 --- a/character/xianding.js +++ b/character/xianding.js @@ -8450,6 +8450,9 @@ game.import("character", function () { player.awakenSkill("dcmoucheng"); player.changeSkills(["xinjingong"], ["dclianji"]); }, + ai: { + combo: "dclianji" + }, }, //周宣 dcwumei: { From f78ab9510a784c49a138b846b22c5b01fa70c6d5 Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Wed, 1 May 2024 14:55:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?halfneg=E6=A0=87=E7=AD=BE=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/huicui.js | 3 +++ character/jsrg.js | 1 + character/mobile.js | 4 ++++ character/sb.js | 3 +++ character/sp2.js | 1 + 5 files changed, 12 insertions(+) diff --git a/character/huicui.js b/character/huicui.js index b5023c25d..70bb922cb 100644 --- a/character/huicui.js +++ b/character/huicui.js @@ -1284,6 +1284,9 @@ game.import("character", function () { await player.draw(2); await player.loseHp(); }, + ai: { + halfneg: true + }, }, dckuizhen: { audio: 2, diff --git a/character/jsrg.js b/character/jsrg.js index c5ee62229..60cbb4a57 100644 --- a/character/jsrg.js +++ b/character/jsrg.js @@ -6102,6 +6102,7 @@ game.import("character", function () { }, }, ai: { + halfneg: true, effect: { player_use: function (card, player, target) { if (card.name == "jiu") return [1, 1]; diff --git a/character/mobile.js b/character/mobile.js index cd31a94bd..574b41aa8 100644 --- a/character/mobile.js +++ b/character/mobile.js @@ -16746,6 +16746,7 @@ game.import("character", function () { player.loseMaxHp(); }, ai: { + halfneg: true, filterDamage: true, skillTagFilter: function (player, tag, arg) { if (arg && arg.card && arg.card.name == "sha") return true; @@ -18831,6 +18832,9 @@ game.import("character", function () { "step 1"; player.draw(event.num); }, + ai: { + halfneg: true + }, }, yixiang: { audio: 2, diff --git a/character/sb.js b/character/sb.js index 5644e9ea0..629399ccc 100644 --- a/character/sb.js +++ b/character/sb.js @@ -1859,6 +1859,9 @@ game.import("character", function () { player.markAuto("sbyijue", [trigger.player]); player.markAuto("sbyijue_effect", [trigger.player]); }, + ai: { + halfneg: true + }, marktext: "绝", intro: { content: "已放$一马" }, subSkill: { diff --git a/character/sp2.js b/character/sp2.js index 74882642a..84d00450c 100644 --- a/character/sp2.js +++ b/character/sp2.js @@ -3209,6 +3209,7 @@ game.import("character", function () { player.loseMaxHp(); }, ai: { + halfneg: true, filterDamage: true, skillTagFilter: function (player, tag, arg) { if (arg && arg.card && arg.card.name == "sha") return true; From 6c7b5ea65b8cbb6b9c7553bf906dcf5062669ea6 Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Wed, 1 May 2024 15:02:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?ai=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/xianding.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/character/xianding.js b/character/xianding.js index f20789f1c..ab0da48b2 100644 --- a/character/xianding.js +++ b/character/xianding.js @@ -11499,7 +11499,11 @@ game.import("character", function () { }, check: function (card) { var player = _status.event.player; - if (!player.hasSkill("dcpingxi")) return 0; + if (!player.hasSkill("dcpingxi")) { + if (ui.selected.cards.length) return 0; + if (player.needsToDiscard()) return 12 - get.value(card); + return 2 * player.hp + 1.5 - get.value(card); + } var num = lib.skill.dcpingxi.getNum() + ui.selected.cards.length; if ( num < From e73e832a85a455de15ae17ce91cbfe57cf34ab2d Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Wed, 1 May 2024 15:15:52 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=B8=8E=E5=8D=A1?= =?UTF-8?q?=E7=89=8C=E5=90=8Cid=E7=9A=84=E5=BA=9F=E5=BC=83=E6=8A=80?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- card/gujian.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/card/gujian.js b/card/gujian.js index 234f7738a..1abf7e3b3 100644 --- a/card/gujian.js +++ b/card/gujian.js @@ -733,11 +733,6 @@ game.import("card", function () { } ui.arena.classList.remove("thrownhighlight"); game.addVideo("thrownhighlight2"); - "step 4"; - // if(cards&&cards.length){ - // player.gain(cards,'gain2'); - // target.addTempSkill('bingpotong'); - // } }, ai: { basic: { @@ -1619,7 +1614,6 @@ game.import("card", function () { player.removeSkill("dinvxuanshuang_skill"); }, }, - bingpotong: {}, heilonglinpian: { mark: true, marktext: "鳞",