diff --git a/card/guozhan.js b/card/guozhan.js
index ec96310dc..95d5a9515 100644
--- a/card/guozhan.js
+++ b/card/guozhan.js
@@ -989,6 +989,7 @@ card.guozhan={
 			priority:10,
 			forced:true,
 			filter:function(event){
+				if(event.source&&event.source.hasSkillTag('unequip',false,event.card)) return false;
 				return event.num>0;
 			},
 			content:function(){
diff --git a/card/swd.js b/card/swd.js
index 50b8ca283..7c4a04551 100644
--- a/card/swd.js
+++ b/card/swd.js
@@ -3312,6 +3312,7 @@ card.swd={
 			forced:true,
 			priority:15,
 			filter:function(event,player){
+				if(event.source&&event.source.hasSkillTag('unequip',false,event.card)) return false;
 				return get.type(event.card,'trick')=='trick';
 			},
 			content:function(){
@@ -3322,6 +3323,7 @@ card.swd={
 				notrick:true,
 				effect:{
 					target:function(card,player,target,current){
+						if(player.hasSkillTag('unequip',false,card)) return;
 						if(get.type(card)=='trick'&&get.tag(card,'damage')){
 							return 'zeroplayertarget';
 						}
diff --git a/character/swd.js b/character/swd.js
index 2c78e346b..dcf0c1891 100644
--- a/character/swd.js
+++ b/character/swd.js
@@ -313,11 +313,14 @@ character.swd={
 			content:function(){
 				"step 0"
 				var next=player.chooseToDiscard(get.prompt('tiebi',trigger.target),{color:'black'});
+				var goon=(ai.get.attitude(player,trigger.target)>2&&
+					ai.get.damageEffect(trigger.target,trigger.player,player)<0);
 				next.ai=function(card){
-					if(ai.get.attitude(player,trigger.target)>0){
+					if(goon){
 						if(trigger.target.hp==1) return 10-ai.get.value(card);
 						return 7-ai.get.value(card);
 					}
+					return 0;
 				};
 				next.logSkill=['tiebi',trigger.target];
 				"step 1"
@@ -7696,8 +7699,7 @@ character.swd={
 				return !player.storage.duijue;
 			},
 			filterTarget:function(card,player,target){
-				if(target.identity=='zhu') return false;
-				if(get.mode()=='guozhan'&&target.isZhu) return false;
+				if(target.identity=='zhu'||get.is.jun(target)) return false;
 				return player!=target;
 			},
 			content:function(){