From 1e04bbfe933be53ed11e1eace7b752f585a00373 Mon Sep 17 00:00:00 2001
From: libccy <operawidget@163.com>
Date: Mon, 25 Sep 2017 23:56:37 +0800
Subject: [PATCH] f

---
 card/guozhan.js | 3 +++
 character/sp.js | 2 +-
 game/game.js    | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/card/guozhan.js b/card/guozhan.js
index 52afec4f2..49239ac92 100644
--- a/card/guozhan.js
+++ b/card/guozhan.js
@@ -646,6 +646,9 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				trigger:{player:'shaBegin'},
 				priority:5,
 				logTarget:'target',
+				check:function(event,player){
+					return get.attitude(player,event.target)<=0;
+				},
 				filter:function(event,player){
 					return event.target.countCards('he');
 				},
diff --git a/character/sp.js b/character/sp.js
index 0da63c998..e5ea0e9ee 100644
--- a/character/sp.js
+++ b/character/sp.js
@@ -1029,7 +1029,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
                     'step 1'
                     if(target.countCards('h','shan')){
                         player.viewHandcards(target);
-                        player.useCard({name:'sha'},target);
+                        player.useCard({name:'sha'},target,false);
                         player.storage.weikui2=target;
                         player.addTempSkill('weikui2');
                     }
diff --git a/game/game.js b/game/game.js
index 26284a9eb..bdfa8342e 100644
--- a/game/game.js
+++ b/game/game.js
@@ -19155,6 +19155,12 @@
 						if(this.node.background.innerHTML.length>1) this.node.background.classList.add('tight');
 						else this.node.background.classList.remove('tight');
 					}
+					if(!lib.card[bg].fullborder&&this.node.avatar&&this.node.framebg){
+						this.node.avatar.remove();
+						this.node.framebg.remove();
+						delete this.node.avatar;
+						delete this.node.framebg;
+					}
 					if(info.noname&&!this.classList.contains('button')){
 						this.node.name.style.display='none';
 					}