From 151b058ff26d0b3482a129893c875d5a29f976fb Mon Sep 17 00:00:00 2001
From: Spmario233 <Spmario233@163.com>
Date: Tue, 3 Oct 2023 21:03:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=AD=94=E8=9E=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 character/mobile.js  |  2 +-
 character/shenhua.js | 14 ++++++--------
 character/yijiang.js |  2 +-
 game/game.js         | 10 +++++-----
 mode/identity.js     |  9 ++++++---
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/character/mobile.js b/character/mobile.js
index e84260180..addf138d0 100644
--- a/character/mobile.js
+++ b/character/mobile.js
@@ -10725,7 +10725,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					});
 					'step 1'
 					if(!result.bool) player.draw();
-					else player.chooseUseTarget({name:result.links[0][2],isCard:true,nature:result.links[0][3]});
+					else player.chooseUseTarget({name:result.links[0][2],isCard:true,nature:result.links[0][3]},true);
 				},
 			},
 			zhiyi:{
diff --git a/character/shenhua.js b/character/shenhua.js
index d495796f0..66406bbbc 100755
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -4259,15 +4259,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						lib.skill.pingjian.initList();
 					}
 					_status.characterlist.randomSort();
-					var bool=false;
 					for(var i=0;i<_status.characterlist.length;i++){
-						var name=_status.characterlist[i];
-						if(name.indexOf('zuoci')!=-1||name.indexOf('key')==0||lib.skill.rehuashen.banned.contains(name)||player.storage.huashen.owned[name]) continue;
-						var skills=lib.character[name][3];
-						for(var j=0;j<skills.length;j++){
-							var info=lib.skill[skills[j]];
-							if(info.charlotte||(info.unique&&!info.gainable)||info.juexingji||info.limited||info.zhuSkill||info.hiddenSkill||info.dutySkill) skills.splice(j--,1);
-						}
+						let name=_status.characterlist[i];
+						if(name.indexOf('zuoci')!=-1||name.indexOf('key_')==0||name.indexOf('sp_key_')==0||lib.skill.rehuashen.banned.includes(name)||player.storage.huashen.owned[name]) continue;
+						let skills=lib.character[name][3].filter(skill=>{
+							const categories=get.skillCategoriesOf(skill);
+							return !categories.some(type=>lib.skill.rehuashen.bannedType.includes(type));
+						})
 						if(skills.length){
 							player.storage.huashen.owned[name]=skills;
 							_status.characterlist.remove(name);
diff --git a/character/yijiang.js b/character/yijiang.js
index f15ea53cc..f0623bd4c 100755
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -302,7 +302,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							else playerx.chooseButton([
 								`请选择要视为对${get.translation(player)}使用的牌`,
 								[names,'vcard'],
-							]).set('ai',(button)=>{
+							],true).set('ai',(button)=>{
 								return button.link[0][2]==_status.event.choice;
 							}).set('choice',function(){
 								var list=names.map(name=>{
diff --git a/game/game.js b/game/game.js
index 4b3bc8b21..5e7bb4239 100644
--- a/game/game.js
+++ b/game/game.js
@@ -16292,7 +16292,11 @@
 						}
 					}
 					if(event.isMine()){
-						if(event.direct&&num==selectButton[0]||event.forceDirect){
+						if(event.hsskill&&!event.forced&&_status.prehidden_skills.contains(event.hsskill)){
+							ui.click.cancel();
+							return;
+						}
+						else if(event.direct&&num==selectButton[0]||event.forceDirect){
 							var buttons=buttonsx.slice(0,num);
 							event.result={
 								bool:true,
@@ -16305,10 +16309,6 @@
 							game.check();
 							game.pause();
 						}
-						if(event.hsskill&&!event.forced&&_status.prehidden_skills.contains(event.hsskill)){
-							ui.click.cancel();
-							return;
-						}
 					}
 					else if(event.isOnline()){
 						if(event.direct&&num==1||event.forceDirect){
diff --git a/mode/identity.js b/mode/identity.js
index a3a2d35fb..5dac34c85 100644
--- a/mode/identity.js
+++ b/mode/identity.js
@@ -2399,9 +2399,12 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 						var effect=0,c,shown;
 						var info=get.info(card);
 						if(info.ai&&info.ai.expose){
-							if(_status.event.name=='_wuxie'){
-								if(_status.event.source&&_status.event.source.ai.shown){
-									this.ai.shown+=0.2;
+							if(_status.event.name=='_wuxie'&&card.name=='wuxie'){
+								const infomap=_status.event._info_map;
+								if(infomap){
+									if(this!=infomap.target&&infomap.player&&infomap.player.ai.shown){
+										this.ai.shown+=0.2;
+									}
 								}
 							}
 							else{