diff --git a/character/extra.js b/character/extra.js
index e6069fdc9..75b99b253 100755
--- a/character/extra.js
+++ b/character/extra.js
@@ -4813,7 +4813,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							return 10*Math.sqrt(Math.max(0.01,get.threaten(target)))/(3.5-draw)+dis/(2*game.countPlayer());
 						}
 						else{
-							if(target.isTurnedOver()) return -att-draw;
+							if(target.isTurnedOver()) return att-draw;
 							if(draw>=5) return -1;
 							if(current&&target.getSeatNum()<=current.getSeatNum()) return -att+draw/3;
 							return (4.25-draw)*10*Math.sqrt(Math.max(0.01,get.threaten(target)))+2*game.countPlayer()/dis;
diff --git a/character/jsrg.js b/character/jsrg.js
index 6f4592ad8..0034a5456 100644
--- a/character/jsrg.js
+++ b/character/jsrg.js
@@ -711,6 +711,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					},'hs');
 				},
 				groupSkill:true,
+				locked:false,
 				viewAs:{
 					name:'sha',
 					storage:{jsrgxianzhu:true},
diff --git a/character/shenhua.js b/character/shenhua.js
index a41844a16..3f08d8c85 100755
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -4700,7 +4700,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							return 10*Math.sqrt(Math.max(0.01,get.threaten(target)))/(3.5-draw)+dis/(2*game.countPlayer());
 						}
 						else{
-							if(target.isTurnedOver()) return -att-draw;
+							if(target.isTurnedOver()) return att-draw;
 							if(draw>=5) return -1;
 							if(current&&target.getSeatNum()<=current.getSeatNum()) return -att+draw/3;
 							return (4.25-draw)*10*Math.sqrt(Math.max(0.01,get.threaten(target)))+2*game.countPlayer()/dis;
diff --git a/character/yijiang.js b/character/yijiang.js
index 76404d57f..3609436eb 100755
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -490,6 +490,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					event.guessedNum=guessedNum;
 					game.delay();
 					'step 2'
+					var type=get.type2(trigger.card,trigger.player);
 					var count=trigger.player.countCards('h',card=>get.type2(card)==type);
 					var guessedNum=event.guessedNum;
 					if(count==guessedNum){
diff --git a/game/game.js b/game/game.js
index e13eb5c2a..db277d254 100644
--- a/game/game.js
+++ b/game/game.js
@@ -28952,29 +28952,37 @@
 					if(Array.isArray(card)){
 						if(card[2]=='huosha'){
 							card[2]='sha';
-							card[3]=['fire'];
+							card[3]='fire';
 						}
 						else if(card[2]=='leisha'){
 							card[2]='sha';
-							card[3]=['thunder'];
+							card[3]='thunder';
 						}
 						// else if(card[2]=='kamisha'){
 						// 	card[2]='sha';
-						// 	card[3]=['kami'];
+						// 	card[3]='kami';
 						// }
 						// else if(card[2]=='icesha'){
 						// 	card[2]='sha';
-						// 	card[3]=['ice'];
+						// 	card[3]='ice';
 						// }
 						else if(card[2]=='cisha'){
 							card[2]='sha';
-							card[3]=['stab'];
+							card[3]='stab';
 						}
 						else if(card[2].length>3){
 							let prefix=card[2].slice(0,card[2].lastIndexOf('sha'));
-							if(prefix.length+3==card[2].length){
+							if(lib.nature.has(prefix)){
+								if(prefix.length+3==card[2].length){
+									card[2]='sha';
+									card[3]=prefix;
+								}
+							}
+							if(card[2].indexOf('sha_')==0){
+								let suffix=card[2].slice(4);
+								let natureList=suffix.split('_');
 								card[2]='sha';
-								card[3]=[prefix];
+								card[3]=get.nature(natureList);
 							}
 						}
 					}