From b0b9a8fa7b5835cc1e4d2c830a49414401b55f8b Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Sun, 2 Jun 2024 21:04:30 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E5=9B=BD=E6=88=98=E5=90=9B=E4=B8=BB?= =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E5=8F=B0=E8=AF=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mode/guozhan.js | 151 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 108 insertions(+), 43 deletions(-) diff --git a/mode/guozhan.js b/mode/guozhan.js index d42c79879..ebd46bb67 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -826,9 +826,9 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { gz_sp_dongzhuo: ["male", "qun", 4, ["hengzheng", "fakebaoling"]], gz_zhangren: ["male", "qun", 4, ["chuanxin", "fengshi"]], - gz_jun_liubei: ["male", "shu", 4, ["zhangwu", "jizhao", "shouyue", "wuhujiangdaqi"]], - gz_jun_zhangjiao: ["male", "qun", 4, ["wuxin", "hongfa", "wendao", "huangjintianbingfu"]], - gz_jun_sunquan: ["male", "wu", 4, ["jiahe", "lianzi", "jubao", "yuanjiangfenghuotu"]], + gz_jun_liubei: ["male", "shu", 4, ["zhangwu", "jizhao", "shouyue"]], + gz_jun_zhangjiao: ["male", "qun", 4, ["wuxin", "hongfa", "wendao"]], + gz_jun_sunquan: ["male", "wu", 4, ["jiahe", "lianzi", "jubao"]], gz_liqueguosi: ["male", "qun", 4, ["gzxiongsuan"]], gz_zuoci: ["male", "qun", 3, ["fakeyigui", "fakejihun"], ["gzskin"]], @@ -864,7 +864,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { gz_lukang: ["male", "wu", 4, ["fakejueyan", "fakekeshou"], ["gzskin"]], gz_yuanshu: ["male", "qun", 4, ["gzweidi", "gzyongsi"], ["gzskin"]], gz_zhangxiu: ["male", "qun", 4, ["gzfudi", "gzcongjian"], ["gzskin"]], - gz_jun_caocao: ["male", "wei", 4, ["jianan", "huibian", "gzzongyu", "wuziliangjiangdao"], []], + gz_jun_caocao: ["male", "wei", 4, ["jianan", "huibian", "gzzongyu"], []], gz_jin_zhangchunhua: ["female", "jin", 3, ["gzhuishi", "fakeqingleng"]], gz_jin_simayi: ["male", "jin", 3, ["fakequanbian", "smyyingshi", "fakezhouting"]], @@ -925,6 +925,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { //官盗2023 fakexiaoguo: { audio: "xiaoguo", + audioname2: { gz_jun_caocao: "jianan_xiaoguo" }, trigger: { global: "phaseZhunbeiBegin" }, filter(event, player) { return ( @@ -15639,19 +15640,21 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { }, }, jianan: { - audio: 2, + audio: true, unique: true, forceunique: true, - group: "wuziliangjiangdao", - derivation: "wuziliangjiangdao", + derivation: ["wuziliangjiangdao", "new_retuxi", "qiaobian", "fakexiaoguo", "gzjieyue", "new_duanliang"], lordSkill: true, - global: "g_jianan", + global: ["wuziliangjiangdao", "g_jianan"], + init(player) { + player.markSkill("wuziliangjiangdao"); + }, }, g_jianan: { trigger: { player: ["phaseZhunbeiBegin", "phaseBefore", "dieBegin"], }, - audio: "jianan", + audio: "wuziliangjiangdao", forceaudio: true, filter: function (event, player, name) { if (name != "phaseZhunbeiBegin") return get.is.jun(player) && player.identity == "wei"; @@ -15779,6 +15782,11 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { jianan_eff: { ai: { nomingzhi: true }, }, + jianan_tuxi: { audio: true }, + jianan_qiaobian: { audio: true }, + jianan_xiaoguo: { audio: true }, + jianan_jieyue: { audio: true }, + jianan_duanliang: { audio: true }, huibian: { enable: "phaseUse", audio: 2, @@ -15823,9 +15831,11 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { }, gzzongyu: { audio: 2, + derivation: "liulongcanjia", unique: true, forceunique: true, - group: ["gzzongyu_others", "gzzongyu_player"], + group: "gzzongyu_others", + global: "gzzongyu_player", ai: { threaten: 1.2, }, @@ -15873,9 +15883,11 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { }, player: { audio: "gzzongyu", + forceaudio: true, trigger: { player: "equipAfter" }, forced: true, filter: function (event, player) { + if (!player.skills.includes("gzzongyu")) return false; if (!["equip3", "equip4"].includes(get.subtype(event.card))) return false; for (var i = 0; i < ui.discardPile.childElementCount; i++) { if (ui.discardPile.childNodes[i].name == "liulongcanjia") return true; @@ -15913,6 +15925,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { }, }, wuziliangjiangdao: { + audio: 2, nopop: true, unique: true, forceunique: true, @@ -16317,6 +16330,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { }, }, audio: ["jieyue", 2], + audioname2: { gz_jun_caocao: "jianan_jieyue" }, }, jianglue: { @@ -16857,6 +16871,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { }, locked: false, audio: "duanliang1", + audioname2: { gz_jun_caocao: "jianan_duanliang" }, enable: "chooseToUse", filterCard: function (card) { if (get.type(card) != "basic" && get.type(card) != "equip") return false; @@ -18828,6 +18843,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { enable: "phaseUse", usable: 1, audio: 2, + derivation: "gzzhiheng", filterCard: true, check: function (card) { if (get.type(card) == "equip") return 0; @@ -18899,6 +18915,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { }, trigger: { player: "phaseJieshuBegin" }, audio: 2, + derivation: "dinglanyemingzhu", forced: true, unique: true, filter: function (event, player) { @@ -18935,14 +18952,20 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { }, }, jiahe: { + audio: true, unique: true, forceunique: true, lordSkill: true, - locked: false, - audio: 2, - derivation: "yuanjiangfenghuotu", mark: true, - global: ["jiahe_put", "jiahe_skill"], + derivation: ["yuanjiangfenghuotu", "jiahe_reyingzi", "jiahe_haoshi", "jiahe_shelie", "jiahe_duoshi"], + global: ["yuanjiangfenghuotu", "jiahe_damage", "jiahe_put", "jiahe_skill"], + init(player) { + player.markSkill("yuanjiangfenghuotu"); + }, + }, + jiahe_damage: { + audio: ["yuanjiangfenghuotu3.mp3", "yuanjiangfenghuotu4.mp3"], + forceaudio: true, ai: { threaten: 2, }, @@ -18971,7 +18994,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { }, jiahe_put: { enable: "phaseUse", - audio: 2, + audio: ["yuanjiangfenghuotu", 2], forceaudio: true, filter: function (event, player) { var zhu = get.zhu(player, "jiahe"); @@ -19130,9 +19153,10 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { inherit: "shelie", }, jiahe_duoshi: { - inherit: "duoshi", + inherit: "fakeduoshi", }, yuanjiangfenghuotu: { + audio: 4, unique: true, forceunique: true, nopop: true, @@ -19150,7 +19174,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) { dialog.addSmall(content); } dialog.addText( - '