From 31e6d4553b69415615f4031856a46d7e736cad60 Mon Sep 17 00:00:00 2001 From: Spmario233 Date: Sun, 10 Sep 2023 21:59:41 +0800 Subject: [PATCH] putBack for get.cards and get.bottomCards --- game/game.js | 14 ++++++++++++-- mode/boss.js | 24 ++++++++++++++++++++---- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/game/game.js b/game/game.js index 2fc34a00f..c86ead9e0 100644 --- a/game/game.js +++ b/game/game.js @@ -54306,7 +54306,7 @@ return false; }, }, - bottomCards:function(num){ + bottomCards:function(num,putBack){ if(_status.waitingForCards){ ui.create.cards.apply(ui.create,_status.waitingForCards); delete _status.waitingForCards; @@ -54363,6 +54363,11 @@ cardx.original='c'; list.push(cardx); } + if(putBack){ + for(let i=list.length-1;i>=0;i--){ + ui.cardPile.appendChild(list[i]); + } + } game.updateRoundNumber(); if(card) return list[0]; return list; @@ -55798,7 +55803,7 @@ } return card.nature; }, - cards:function(num){ + cards:function(num,putBack){ if(_status.waitingForCards){ ui.create.cards.apply(ui.create,_status.waitingForCards); delete _status.waitingForCards; @@ -55855,6 +55860,11 @@ cardx.original='c'; list.push(cardx); } + if(putBack){ + for(let i=list.length-1;i>=0;i--){ + ui.cardPile.insertBefore(list[i],ui.cardPile.firstChild); + } + } game.updateRoundNumber(); if(card) return list[0]; return list; diff --git a/mode/boss.js b/mode/boss.js index 90cb1d27b..afd2a9af6 100644 --- a/mode/boss.js +++ b/mode/boss.js @@ -3117,10 +3117,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ return distance+1; }, }, - init:function(player){ - player.$disableEquip('equip3'); - player.$disableEquip('equip4'); - }, enable:"phaseUse", position:'h', filter:function (event,player){ @@ -3151,6 +3147,26 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ player:1, }, }, + group:'boss_diting_init', + subSkill:{ + trigger:{ + global:'gameStart', + player:'enterGame', + }, + forced:true, + filter:function(event,player){ + return player.hasEnabledSlot(3)||player.hasEnabledSlot(4); + }, + content:function(){ + var disables=[]; + for(var i=3;i<=4;i++){ + for(var j=0;j0) player.disableEquip(disables); + }, + }, }, /* "boss_sdyl_level":{