From 4c0faea3b0c205d23fcd143a7a4e71ccc531346d Mon Sep 17 00:00:00 2001
From: 157 <3619242020@qq.com>
Date: Wed, 3 Apr 2024 22:49:52 +0800
Subject: [PATCH] =?UTF-8?q?bugfix=EF=BC=8C=E5=87=BA=E9=97=AAai=E5=BE=AE?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 card/standard.js     | 14 ++++++++------
 character/shenhua.js |  2 --
 character/sp.js      |  2 --
 character/yijiang.js |  2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/card/standard.js b/card/standard.js
index 1c0d54644..1aea5bef8 100644
--- a/card/standard.js
+++ b/card/standard.js
@@ -157,11 +157,10 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 							if(target.hasSkillTag('useShan',null,event)) return true;
 							if(target.isLinked()&&game.hasNature(event.card)&&get.attitude(target,player._trueMe||player)>0) return false;
 							if(event.baseDamage+event.extraDamage<=0&&!game.hasNature(event.card,'ice')) return false;
-							if(target.hasSkillTag('freeShan',false,event,true)) return true;
-							if(event.shanRequired>1&&target.mayHaveShan(target,'use',null,'count')<event.shanRequired-(event.shanIgnored||0)) return false;
 							if(event.baseDamage+event.extraDamage>=target.hp+
 								((player.hasSkillTag('jueqing',false,target)||target.hasSkill('gangzhi'))?target.hujia:0)) return true;
 							if(!game.hasNature(event.card,'ice')&&get.damageEffect(target,player,target,get.nature(event.card))>=0) return false;
+							if(event.shanRequired>1&&target.mayHaveShan(target,'use',null,'count')<event.shanRequired-(event.shanIgnored||0)) return false;
 							return true;
 						})());
 						//next.autochoose=lib.filter.autoRespondShan;
@@ -2911,14 +2910,19 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				},
 				audio:true,
 				check:function(event,player){
-					if(event&&(event.ai||event.ai1)){
-						var ai=event.ai||event.ai1;
+					if(!event) return true;
+					if(event.ai){
+						var ai=event.ai;
 						var tmp=_status.event;
 						_status.event=event;
 						var result=ai({name:'shan'},_status.event.player,event);
 						_status.event=tmp;
 						return result>0;
 					}
+					let evt=event.getParent();
+					if(player.hasSkillTag('noShan',null,evt)) return false;
+					if(!evt||!evt.card||!evt.player||player.hasSkillTag('useShan',null,evt)) return true;
+					if(evt.card&&evt.player&&player.isLinked()&&game.hasNature(evt.card)&&get.attitude(player,evt.player._trueMe||evt.player)>0) return false;
 					return true;
 				},
 				content:function(){
@@ -2943,8 +2947,6 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						if(!arg||!arg.player) return true;
 						if(arg.player.hasSkillTag('unequip',false,{
 							target:player
-						})||arg.player.hasSkillTag('unequip_ai',false,{
-							target:player
 						})) return false;
 						return true;
 					},
diff --git a/character/shenhua.js b/character/shenhua.js
index 2bf40c7f0..f6ff37797 100755
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -5441,8 +5441,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						if(!arg||!arg.player) return true;
 						if(arg.player.hasSkillTag('unequip',false,{
 							target:player
-						})||arg.player.hasSkillTag('unequip_ai',false,{
-							target:player
 						})) return false;
 						return true;
 					},
diff --git a/character/sp.js b/character/sp.js
index 3d0db4bec..ae468a554 100755
--- a/character/sp.js
+++ b/character/sp.js
@@ -20128,8 +20128,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						if(!arg||!arg.player) return true;
 						if(arg.player.hasSkillTag('unequip',false,{
 							target:player
-						})||arg.player.hasSkillTag('unequip_ai',false,{
-							target:player
 						})) return false;
 						return true;
 					},
diff --git a/character/yijiang.js b/character/yijiang.js
index 7845bd880..1d1c20aea 100755
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -2295,7 +2295,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							return get.distance(player,current)>1;
 						})) return false;
 						if(tag=='directHit_ai') return arg.card.name=='sha';
-						if(arg.card.name!='sha'&&arg.card.name!='chuqibuyi') return false;
+						if(!arg||!arg.card||arg.card.name!='sha'&&arg.card.name!='chuqibuyi') return false;
 						var card=arg.target.getEquip(2);
 						if(card&&card.name.indexOf('bagua')!=-1) return true;
 						if(player._xinbenxi_ai) return false;