From 79be76e569680e3f46a79245981707b9c06622a6 Mon Sep 17 00:00:00 2001 From: Spmario233 Date: Sat, 13 Jan 2024 00:41:41 +0800 Subject: [PATCH] =?UTF-8?q?=E2=80=9C=E8=93=84=E8=B0=8B=E2=80=9D=E7=89=8C?= =?UTF-8?q?=EF=BC=8C=E5=88=A4=E5=AE=9A=E5=8C=BA=E6=9C=BA=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- card/standard.js | 2 +- character/jsrg.js | 20 +++++++ noname/get/index.js | 9 +++- noname/library/element/content.js | 82 ++++++++++++++++++++++++++--- noname/library/element/gameEvent.js | 5 ++ noname/library/element/player.js | 6 ++- noname/ui/index.js | 6 +++ 7 files changed, 117 insertions(+), 13 deletions(-) diff --git a/card/standard.js b/card/standard.js index a81404548..850299e31 100644 --- a/card/standard.js +++ b/card/standard.js @@ -1926,7 +1926,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ content:function(){ var trigger=event.getParent(2)._trigger; if(trigger.name=='phaseJudge'){ - trigger.untrigger(); + trigger.untrigger('currentOnly'); trigger.cancelled=true; } else{ diff --git a/character/jsrg.js b/character/jsrg.js index 847230b93..9adfcd317 100644 --- a/character/jsrg.js +++ b/character/jsrg.js @@ -66,6 +66,23 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, perfectPair:{}, card:{ + xumou_jsrg:{ + type:'delay', + allowDuplicate:true, + blankCard:true, + effect:function(){ + 'step 0' + var card=event.cards[0]; + player.chooseUseTarget(card,`蓄谋:是否使用${get.translation(card)}？`,`请选择要使用的目标。若不使用此牌，则判定区内的所有“蓄谋”牌都将被置入弃牌堆。`); + 'step 1' + if(!result.bool){ + var cards=player.getCards('j',card=>{ + return (card.viewAs||card.name)=='xumou_jsrg'; + }); + if(cards.length>0) player.loseToDiscardpile(cards); + } + }, + }, ying:{ audio:true, fullskin:true, @@ -6311,6 +6328,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){ jsrg_fanjiangzhangda_prefix:'转', jsrgfushan:'负山', jsrgfushan_info:'出牌阶段开始时，所有其他角色可以依次交给你一张牌并令你此阶段使用【杀】的次数上限+1。此阶段结束时，若你使用【杀】的次数未达到上限且此阶段以此法交给你牌的角色均存活，你失去2点体力，否则你将手牌摸至体力上限。', + + xumou_jsrg:'蓄谋', + xumou_jsrg_info:'“蓄谋”牌可在判定区内重复存在。判定阶段开始时，你选择一项：⒈使用此牌对应的实体牌，然后本阶段不能再使用此牌名的牌；⒉将所有的“蓄谋”牌置入弃牌堆。', jiangshanrugu_qi:'江山如故·起', jiangshanrugu_cheng:'江山如故·承', diff --git a/noname/get/index.js b/noname/get/index.js index 332b78f66..955765fc9 100644 --- a/noname/get/index.js +++ b/noname/get/index.js @@ -1653,7 +1653,7 @@ export class Get extends Uninstantable { } } } - if (obj instanceof lib.element.Button) return 'button'; + if (obj instanceof lib.element.Button || obj instanceof HTMLDivElement && obj.classList.contains('button') ) return 'button'; if (obj instanceof lib.element.Card) return 'card'; if (obj instanceof lib.element.Player) return 'player'; if (obj instanceof lib.element.Dialog) return 'dialog'; @@ -3319,7 +3319,12 @@ export class Get extends Uninstantable { } if (get.position(node) == 'j' && node.viewAs && node.viewAs != name) { uiintro.add(get.translation(node.viewAs)); - uiintro.add('
（' + get.translation(get.translation(node)) + '）
'); + var cardInfo = lib.card[node.viewAs], showCardIntro=true; + if (cardInfo.blankCard) { + var cardOwner = get.owner(node); + if (cardOwner && !cardOwner.isUnderControl(true)) showCardIntro = false; + } + if (showCardIntro) uiintro.add('
（' + get.translation(get.translation(node)) + '）
'); // uiintro.add(get.translation(node.viewAs)+'
（'+get.translation(node)+'）
'); uiintro.nosub = true; name = node.viewAs; diff --git a/noname/library/element/content.js b/noname/library/element/content.js index ffc85cfe0..ec360fa13 100644 --- a/noname/library/element/content.js +++ b/noname/library/element/content.js @@ -2646,8 +2646,9 @@ export const Content = { event.cards = player.getCards('j'); if (!event.cards.length) event.finish(); "step 1"; - if (cards.length && player.getCards('j').includes(cards[0])) { + if (cards.length) { event.card = cards.shift(); + var cardName = event.card.viewAs || event.card.name, cardInfo=lib.card[cardName]; if (event.card.classList.contains('removing')) { event.card.remove(); delete event.card; @@ -2657,21 +2658,26 @@ export const Content = { event.finish(); return; } + else if (cardInfo.noEffect || !player.getCards('j').includes(event.card)) { + event.redo(); + } else { player.lose(event.card, 'visible', ui.ordering); player.$phaseJudge(event.card); event.cancelled = false; event.trigger('phaseJudge'); - var name = event.card.viewAs || event.card.name; - player.popup(name, 'thunder'); - if (!lib.card[name].effect) { + player.popup(cardName, 'thunder'); + if (!cardInfo.effect) { game.delay(); event.redo(); } - else if (!lib.card[name].judge) { + else if (!cardInfo.judge) { game.delay(); event.nojudge = true; } + else{ + event.nojudge = false; + } } } else event.finish(); @@ -5193,7 +5199,27 @@ export const Content = { var title = event.dialog.add('
判定区
'); title.style.margin = '0px'; title.style.padding = '0px'; - event.dialog.add(js); + var shown = js.filter(card => { + var name = (card.viewAs || card.name), info = lib.card[name]; + if (!info || !info.blankCard) return true; + return false; + }); + if (shown.length < js.length) { + var hidden = js.filter(card => !shown.includes(card)); + var buttons = ui.create.div('.buttons', event.dialog.content); + event.dialog.buttons = event.dialog.buttons.concat(ui.create.buttons(shown, 'card', buttons)); + event.dialog.buttons = event.dialog.buttons.concat(ui.create.buttons(hidden, 'blank', buttons)); + if (event.dialog.forcebutton !== false) event.dialog.forcebutton = true; + if (event.dialog.buttons.length > 3) { + event.dialog.classList.remove('forcebutton-auto'); + } + else if (!event.dialog.noforcebutton) { + event.dialog.classList.add('forcebutton-auto'); + } + } + else{ + event.dialog.add(js); + } directh = false; } } @@ -5348,7 +5374,27 @@ export const Content = { var title = event.dialog.add('
判定区
'); title.style.margin = '0px'; title.style.padding = '0px'; - event.dialog.add(js); + var shown = js.filter(card => { + var name = (card.viewAs || card.name), info = lib.card[name]; + if (!info || !info.blankCard) return true; + return false; + }); + if (shown.length < js.length) { + var hidden = js.filter(card => !shown.includes(card)); + var buttons = ui.create.div('.buttons', event.dialog.content); + event.dialog.buttons = event.dialog.buttons.concat(ui.create.buttons(shown, 'card', buttons)); + event.dialog.buttons = event.dialog.buttons.concat(ui.create.buttons(hidden, 'blank', buttons)); + if (event.dialog.forcebutton !== false) event.dialog.forcebutton = true; + if (event.dialog.buttons.length > 3) { + event.dialog.classList.remove('forcebutton-auto'); + } + else if (!event.dialog.noforcebutton) { + event.dialog.classList.add('forcebutton-auto'); + } + } + else{ + event.dialog.add(js); + } directh = false; } } @@ -5528,7 +5574,27 @@ export const Content = { var title = event.dialog.add('
判定区
'); title.style.margin = '0px'; title.style.padding = '0px'; - event.dialog.add(js); + var shown = js.filter(card => { + var name = (card.viewAs || card.name), info = lib.card[name]; + if (!info || !info.blankCard) return true; + return false; + }); + if (shown.length < js.length) { + var hidden = js.filter(card => !shown.includes(card)); + var buttons = ui.create.div('.buttons', event.dialog.content); + event.dialog.buttons = event.dialog.buttons.concat(ui.create.buttons(shown, 'card', buttons)); + event.dialog.buttons = event.dialog.buttons.concat(ui.create.buttons(hidden, 'blank', buttons)); + if (event.dialog.forcebutton !== false) event.dialog.forcebutton = true; + if (event.dialog.buttons.length > 3) { + event.dialog.classList.remove('forcebutton-auto'); + } + else if (!event.dialog.noforcebutton) { + event.dialog.classList.add('forcebutton-auto'); + } + } + else{ + event.dialog.add(js); + } directh = false; } } diff --git a/noname/library/element/gameEvent.js b/noname/library/element/gameEvent.js index 248a77e79..d1ff882ac 100644 --- a/noname/library/element/gameEvent.js +++ b/noname/library/element/gameEvent.js @@ -749,6 +749,11 @@ export class GameEvent { // const doing=evt.doingList.find(doing=>doing.player==player); // if(doing) doing.todoList=[]; } + else if (all==='currentOnly'){ + if (evt && evt.doingList) { + evt.doingList.forEach(doing => doing.todoList = []); + } + } return this; } /** diff --git a/noname/library/element/player.js b/noname/library/element/player.js index 6c1c0b604..139e8d356 100644 --- a/noname/library/element/player.js +++ b/noname/library/element/player.js @@ -5646,7 +5646,7 @@ export class Player extends HTMLDivElement { } canAddJudge(card) { if (this.isDisabledJudge()) return false; - var name; + let name; if (typeof card == 'string') { name = card; } @@ -5654,7 +5654,9 @@ export class Player extends HTMLDivElement { name = card.viewAs || card.name; } if (!name) return false; - if (this.hasJudge(name)) return false; + const cardInfo = lib.card[name]; + if(!cardInfo) return false; + if (!cardInfo.allowDuplicate && this.hasJudge(name)) return false; if (this.isOut()) return false; var mod = game.checkMod(card, this, this, 'unchanged', 'targetEnabled', this); if (mod != 'unchanged') return mod; diff --git a/noname/ui/index.js b/noname/ui/index.js index 16d72c58b..294f6660c 100644 --- a/noname/ui/index.js +++ b/noname/ui/index.js @@ -9621,6 +9621,12 @@ class Create extends Uninstantable { blank: (item, type, position, noclick, node) => { node = ui.create.div('.button.card', position); node.link = item; + if (get.position(item) == 'j' && item.viewAs && lib.config.cardtempname != 'off') { + node.classList.add('infoflip'); + node.classList.add('infohidden') + ui.create.cardTempName(item, node).style.setProperty('display','block','important') + + } return node; }, /**