diff --git a/card/extra.js b/card/extra.js index 57bcce1dd8..21b54b8130 100644 --- a/card/extra.js +++ b/card/extra.js @@ -338,7 +338,17 @@ game.import("card", function () { recastable: true, ai: { wuxie: (target, card, player, viewer, status) => { - if (status * get.attitude(viewer, player._trueMe || player) > 0 || target.hasSkillTag("nodamage") || target.hasSkillTag("nofire") || target.hasSkillTag("nothunder") || get.attitude(viewer, player) > 0 || (1 + target.countCards("hs")) * _status.event.getRand() > 1.57) return 0; + if ( + status * get.attitude(viewer, player._trueMe || player) > 0 || + target.hasSkillTag("nodamage") || + target.hasSkillTag("nofire") || + target.hasSkillTag("nothunder") + ) return 0; + if ( + get.damageEffect(target, player, viewer, "thunder") >= 0 || + get.damageEffect(target, player, viewer, "fire") >= 0 + ) return 0; + if (target.hp + target.hujia > 2 && target.mayHaveShan(viewer, "use")) return 0; }, basic: { order: 7.3, diff --git a/card/guozhan.js b/card/guozhan.js index 36e3b48783..596ba027af 100644 --- a/card/guozhan.js +++ b/card/guozhan.js @@ -722,6 +722,18 @@ game.import("card", function () { order: 7.5, value: 4, useful: 2, + wuxie: (target, card, player, viewer, status) => { + if ( + target.hasSkillTag("nodamage") || + target.hasSkillTag("nofire") || + target.hasSkillTag("nothunder") + ) return 0; + if ( + get.damageEffect(target, player, viewer, "thunder") >= 0 || + get.damageEffect(target, player, viewer, "fire") >= 0 + ) return 0; + if (target.hp + target.hujia > 2 && target.mayHaveShan(viewer, "use")) return 0; + }, result: { target: function (player, target) { if (get.mode() == "versus") { diff --git a/card/xianxia.js b/card/xianxia.js index ae02250992..2a192d3b92 100644 --- a/card/xianxia.js +++ b/card/xianxia.js @@ -269,6 +269,7 @@ game.import("card", function () { }, ty_feilongduofeng: { fullskin: true, + cardimage: "feilongduofeng", type: "equip", subtype: "equip1", distance: { attackFrom: -1 }, diff --git a/character/offline/skill.js b/character/offline/skill.js index fc7b4c6912..1828656e8a 100644 --- a/character/offline/skill.js +++ b/character/offline/skill.js @@ -1822,8 +1822,7 @@ const skills = { enable: "phaseUse", usable: 1, async content(event, trigger, player) { - let cards = get.cards(3); - await game.cardsGotoOrdering(cards); + let cards = get.cards(3, true); await player.showCards(cards, get.translation(player) + "发动了【冲虚】"); const { result: { @@ -2177,8 +2176,7 @@ const skills = { return 5 - get.value(card); }, async content(event, trigger, player) { - let cards = get.cards(event.cards.length); - await game.cardsGotoOrdering(cards); + let cards = get.cards(event.cards.length, true); await player.showCards(cards, get.translation(player) + "发动了【爵制】"); const { result: { diff --git a/game/asset.js b/game/asset.js index 8ce15902c6..b827a3da98 100644 --- a/game/asset.js +++ b/game/asset.js @@ -7479,6 +7479,7 @@ "image/card/jinchan.png", "image/card/jingfanma.png", "image/card/jingleishan.png", + "image/card/jingxiangshengshi.png", "image/card/jinhe.png", "image/card/jinlianzhu.png", "image/card/jintuiziru.png", @@ -7516,6 +7517,7 @@ "image/card/luyugeng.png", "image/card/ly_piliche.png", "image/card/mapodoufu.png", + "image/card/mengchong.png", "image/card/mianju.png", "image/card/mianlijinzhen.png", "image/card/miki_binoculars.png", @@ -7571,6 +7573,7 @@ "image/card/qinglong.png", "image/card/qinglonglingzhu.png", "image/card/qinglongzhigui.png", + "image/card/qingmingjian.png", "image/card/qingtuan.png", "image/card/qixingbaodao.png", "image/card/qizhengxiangsheng.png", @@ -7596,6 +7599,7 @@ "image/card/shan.png", "image/card/shandian.png", "image/card/shandianjian.png", + "image/card/shangfangbaojian.png", "image/card/shatang.png", "image/card/shencaojie.png", "image/card/shenenshu.png", @@ -7618,6 +7622,7 @@ "image/card/shunshou.png", "image/card/sifeizhenmian.png", "image/card/sizhaojian.png", + "image/card/suibozhuliu.png", "image/card/suijiyingbian.png", "image/card/suolianjia.png", "image/card/taigongyinfu.png", @@ -7666,6 +7671,7 @@ "image/card/xiaolicangdao.png", "image/card/xiayuncailing.png", "image/card/xietianzi.png", + "image/card/xingbian.png", "image/card/xinge.png", "image/card/xingjiegoutong.png", "image/card/xingjunyan.png", @@ -11460,6 +11466,7 @@ "extension/十周年UI/image/card/lx_huoshaolianying.webp", "extension/十周年UI/image/card/ly_piliche.webp", "extension/十周年UI/image/card/meiyingqiang.webp", + "extension/十周年UI/image/card/mengchong.webp", "extension/十周年UI/image/card/mianju.webp", "extension/十周年UI/image/card/minguangkai.webp", "extension/十周年UI/image/card/monkey.webp", @@ -11480,6 +11487,7 @@ "extension/十周年UI/image/card/qimenbagua.webp", "extension/十周年UI/image/card/qinggang.webp", "extension/十周年UI/image/card/qinglong.webp", + "extension/十周年UI/image/card/qingmingjian.webp", "extension/十周年UI/image/card/qixingbaodao.webp", "extension/十周年UI/image/card/qizhengxiangsheng.webp", "extension/十周年UI/image/card/renwang.webp", @@ -11497,6 +11505,7 @@ "extension/十周年UI/image/card/sha.webp", "extension/十周年UI/image/card/shan.webp", "extension/十周年UI/image/card/shandian.webp", + "extension/十周年UI/image/card/shangfangbaojian.webp", "extension/十周年UI/image/card/shanrangzhaoshu.webp", "extension/十周年UI/image/card/sha_fire.webp", "extension/十周年UI/image/card/sha_ice.webp", @@ -11512,6 +11521,7 @@ "extension/十周年UI/image/card/shuiyanqijuny.webp", "extension/十周年UI/image/card/shunshou.webp", "extension/十周年UI/image/card/sizhaojian.webp", + "extension/十周年UI/image/card/suibozhuliu.webp", "extension/十周年UI/image/card/suijiyingbian.webp", "extension/十周年UI/image/card/suolianjia.webp", "extension/十周年UI/image/card/taigongyinfu.webp", @@ -11529,6 +11539,7 @@ "extension/十周年UI/image/card/toushiche.webp", "extension/十周年UI/image/card/tuixinzhifu.webp", "extension/十周年UI/image/card/tunliang.webp", + "extension/十周年UI/image/card/ty_feilongduofeng.webp", "extension/十周年UI/image/card/wangmeizhike.webp", "extension/十周年UI/image/card/wanjian.webp", "extension/十周年UI/image/card/wolong_card.webp", @@ -11543,6 +11554,7 @@ "extension/十周年UI/image/card/wy_meirenji.webp", "extension/十周年UI/image/card/wy_xiaolicangdao.webp", "extension/十周年UI/image/card/xietianzi.webp", + "extension/十周年UI/image/card/xingbian.webp", "extension/十周年UI/image/card/xinge.webp", "extension/十周年UI/image/card/xingtianpojunfu.webp", "extension/十周年UI/image/card/xionghuangjiu.webp", diff --git a/image/card/jingxiangshengshi.png b/image/card/jingxiangshengshi.png new file mode 100644 index 0000000000..41887a2427 Binary files /dev/null and b/image/card/jingxiangshengshi.png differ diff --git a/image/card/mengchong.png b/image/card/mengchong.png new file mode 100644 index 0000000000..0e80ea7304 Binary files /dev/null and b/image/card/mengchong.png differ diff --git a/image/card/qingmingjian.png b/image/card/qingmingjian.png new file mode 100644 index 0000000000..e6b098c11e Binary files /dev/null and b/image/card/qingmingjian.png differ diff --git a/image/card/shangfangbaojian.png b/image/card/shangfangbaojian.png new file mode 100644 index 0000000000..7ac5a35269 Binary files /dev/null and b/image/card/shangfangbaojian.png differ diff --git a/image/card/suibozhuliu.png b/image/card/suibozhuliu.png new file mode 100644 index 0000000000..b707c1c7aa Binary files /dev/null and b/image/card/suibozhuliu.png differ diff --git a/image/card/xingbian.png b/image/card/xingbian.png new file mode 100644 index 0000000000..82b5fbbf41 Binary files /dev/null and b/image/card/xingbian.png differ diff --git a/mode/guozhan.js b/mode/guozhan.js index 83b9e18d15..1d7ffc0b44 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -7005,17 +7005,16 @@ export default () => { }, usable: 1, preHidden: true, - content: function () { - var cards = get.cards(4); - game.cardsGotoOrdering(cards); - player.showCards(cards, get.translation(player) + "发动了【诱言】"); + async content(event, trigger, player) { + let cards = get.cards(4, true); + await player.showCards(cards, get.translation(player) + "发动了【诱言】"); var evt = trigger.getl(player); var list = []; for (var i of evt.cards2) { list.add(get.suit(i, player)); } cards = cards.filter(card => !list.includes(get.suit(card, false))); - if (cards.length) player.gain(cards, "gain2"); + if (cards.length) await player.gain(cards, "gain2"); }, ai: { effect: { @@ -8349,47 +8348,6 @@ export default () => { }, subSkill: { blocker: { charlotte: true } }, }, - gzxiongzhi: { - audio: "xiongzhi", - enable: "phaseUse", - limited: true, - skillAnimation: true, - animationColor: "thunder", - content: function () { - "step 0"; - player.awakenSkill("gzxiongzhi"); - event.cards = game.cardsGotoOrdering(get.cards(player.maxHp)).cards.slice(0); - "step 1"; - var card = cards.shift(); - event.card = card; - player.showCards(card); - if (!player.hasUseTarget(card)) { - if (cards.length > 0) event.redo(); - else event.finish(); - } - "step 2"; - var next = player.chooseUseTarget(card, true); - if (get.info(card).updateUsable == "phaseUse") next.addCount = false; - "step 3"; - if (result.bool && cards.length > 0) event.goto(1); - }, - ai: { - order: 1, - result: { - player: function (player) { - if (!player.hasSkill("smyyingshi")) return 1; - var cards = []; - for (var i = 0; i < player.maxHp; i++) { - var card = ui.cardPile.childNodes[i]; - if (card) { - if (!player.hasValueTarget(card)) return 0; - } else break; - } - return 1; - }, - }, - }, - }, //十周年羊祜 gzdeshao: { audio: "dcdeshao", @@ -21138,8 +21096,6 @@ export default () => { gzhongyuan_info: "①出牌阶段限一次。你可以令一张没有「合纵」标签的卡牌视为拥有「合纵」标签直到本回合结束。②当你即将因合纵效果摸牌时，你可放弃摸牌，并令一名己方角色摸等量的牌。", gzmingzhe: "明哲", gzmingzhe_info: "你的回合外，当你使用或打出红色手牌，或失去装备区内的红色装备牌时，你可摸一张牌。", - gzxiongzhi: "雄志", - gzxiongzhi_info: "限定技。出牌阶段，你可依次展示牌堆顶的X张牌并使用之（X为你的体力上限）。", gzquanbian: "权变", gzquanbian_info: "当你于出牌阶段内使用/打出手牌时，若此牌有花色且你本回合内未使用/打出过该花色的其他手牌，则你可以观看牌堆顶X张牌，选择获得其中的一张并展示之。若你本回合使用过与得到的牌花色相同的牌，则你本回合内不能再发动〖权变〗。", gzhuishi: "慧识",