From 3a46dbde5b279987b19b1c92425c0da006622bea Mon Sep 17 00:00:00 2001
From: Spmario233 <Spmario233@163.com>
Date: Sun, 3 Mar 2024 16:39:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=BB=E8=8D=B7=E3=80=90=E6=91=86=E5=B0=BE?=
 =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 character/diy.js | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/character/diy.js b/character/diy.js
index 030c252e3..3efeaaff6 100755
--- a/character/diy.js
+++ b/character/diy.js
@@ -9511,7 +9511,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					if(event.type=='wuxie'||!player.countCards('hse',{suit:'diamond'})) return false;
 					for(var i=0;i<lib.inpile.length;i++){
 						var name=lib.inpile[i];
-						if(name!='du'&&name!='shan'&&get.type(name)=='basic'&&event.filterCard(get.autoViewAs({name:name},'unsure'),player,event)) return true;
+						if(name!='du'&&get.type(name)=='basic'&&event.filterCard(get.autoViewAs({name:name},'unsure'),player,event)) return true;
 					}
 					return false;
 				},
@@ -9520,7 +9520,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						var list=[];
 						for(var i=0;i<lib.inpile.length;i++){
 							var name=lib.inpile[i];
-							if(name=='du'||name=='shan') continue;
+							if(name=='du') continue;
 							if(name=='sha'){
 								list.push(['基本','','sha']);
 								for(var j of lib.inpile_nature) list.push(['基本','',name,j]);
@@ -9532,7 +9532,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						return ui.create.dialog('摆尾',[list,'vcard'],'hidden');
 					},
 					filter(button,player){
-						return _status.event.getParent().filterCard({name:button.link[2]},player,_status.event.getParent());
+						return _status.event.getParent().filterCard(get.autoViewAs({name:button.link[2]},'unsure'),player,_status.event.getParent());
 					},
 					check(button){
 						if(_status.event.getParent().type=='phase'){
@@ -9585,27 +9585,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						return tag=='fireAttack'||player.countCards('he',{suit:'diamond'})>0;
 					},
 				},
-				group:['inari_baiwei_shan','inari_baiwei_draw'],
-			},
-			inari_baiwei_shan:{
-				prompt:'将一张♦牌当做闪使用或打出',
-				enable:['chooseToRespond','chooseToUse'],
-				viewAs:{name:'shan'},
-				selectCard:1,
-				filterCard:{suit:'diamond'},
-				popname:true,
-				check(card){
-					return 1/Math.max(0.1,get.value(card));
-				},
-				position:'hse',
-				ai:{
-					order:10,
-					result:{player:1},
-					respondShan:true,
-					skillTagFilter(player){
-						return player.countCards('hse',{suit:'diamond'})>0;
-					},
-				},
+				group:['inari_baiwei_draw'],
 			},
 			inari_baiwei_draw:{
 				trigger:{player:['useCardAfter','respondAfter']},