From 0d2f551fade2a143186494d94f55f8ebaed8cdba Mon Sep 17 00:00:00 2001
From: mengxinzxz <139629761+mengxinzxz@users.noreply.github.com>
Date: Fri, 25 Aug 2023 15:27:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B9=90=E7=B6=9D=E3=80=90=E7=A0=B4=E9=94=90?=
 =?UTF-8?q?=E3=80=91bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复乐綝【破锐】无法选择角色且未限制弃置牌的类型的bug
---
 character/huicui.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/character/huicui.js b/character/huicui.js
index 217bb55ea..0445aaea1 100644
--- a/character/huicui.js
+++ b/character/huicui.js
@@ -613,7 +613,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					return game.hasPlayer(current=>{
 						if(current==player||current==event.player) return false;
 						return current.hasHistory('lose',function(evt){
-							return evt.cards.length>0;
+							return evt.cards2.length>0;
 						});
 					})&&(_status.connectMode||player.hasCard({type:'basic'},'h'));
 				},
@@ -624,17 +624,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						prompt:get.prompt('dcporui'),
 						//prompt2:'弃置一张基本牌并选择一名本回合失去过牌的非当前回合的其他角色，你视为对其依次使用'+get.cnNumber(Math.max(0,player.hp)+1)+'张【杀】',
 						prompt2:get.skillInfoTranslation('dcporui',player),
-						filterCard:lib.filter.cardDiscardable,
-						selectCard:1,
+						filterCard:function(card,player){
+							return get.type2(card)=='basic'&&lib.filter.cardDiscardable(card,player,'dcporui');
+						},
 						position:'he',
-						list:game.filterPlayer(current=>{
-							if(current==player||current==trigger.player) return false;
-							return current.hasHistory('lose',function(evt){
-								return evt.cards.length>0;
-							});
-						}),
 						filterTarget:function(card,player,target){
-							return _status.event.list.map(i=>i[0]).contains(target);
+							return _status.event.list.contains(target);
 						},
 						ai1:function(card){
 							return 7-get.value(card);
@@ -644,7 +639,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 								return i[0]==target;
 							})[1];
 						}
-					});
+					}).set('list',game.filterPlayer(current=>{
+						if(current==player||current==trigger.player) return false;
+						return current.hasHistory('lose',function(evt){
+							return evt.cards2.length>0;
+						});
+					}));
 					'step 1'
 					if(result.bool){
 						var target=result.targets[0],cards=result.cards;