skill

character/sp.js

@@ -1290,11 +1290,11 @@ character.sp={
 			threaten:1.2
 		},
 		tongji:{
-			global:'tongji2',
+			global:'tongji_disable',
 			unique:true,
 			gainnable:true,
-		},
+			subSkill:{
-		tongji2:{
+				disable:{
 					mod:{
 						targetEnabled:function(card,player,target){
 							if(player.skills.contains('tongji')) return;
@@ -1311,6 +1311,8 @@ character.sp={
 							}
 						}
 					}
+				}
+			}
 		},
 		wangzun:{
 			audio:2,
@@ -2905,7 +2907,7 @@ character.sp={
 			audio:2,
 			trigger:{player:'shaBefore'},
 			filter:function(event,player){
-				if(event.skill!='longdan1') return false;
+				if(event.skill!='longdan_sha') return false;
 				return event.target.num('h')>0;
 			},
 			content:function(){
@@ -2918,7 +2920,7 @@ character.sp={
 			audio:2,
 			trigger:{player:'respond'},
 			filter:function(event,player){
-				if(event.skill!='longdan2'&&event.skill!='longdan1') return false;
+				if(event.skill!='longdan_shan'&&event.skill!='longdan_sha') return false;
 				return event.source&&event.source.num('h')>0;
 			},
 			content:function(){

character/standard.js

@@ -405,10 +405,16 @@ character.standard={
 				return get.color(card)=='black';
 			},
 			viewAs:{name:'shan'},
+			viewAsFilter:function(player){
+				if(!player.num('h',{color:'black'})) return false;
+			},
 			prompt:'将一张黑色牌当闪打出',
 			check:function(){return 1},
 			ai:{
 				respondShan:true,
+				skillTagFilter:function(player){
+					if(!player.num('h',{color:'black'})) return false;
+				},
 				result:{
 					target:function(card,player,target,current){
 						if(get.tag(card,'respondShan')&&current<0) return 0.6
@@ -651,6 +657,9 @@ character.standard={
 			prompt:'将一张红色牌当杀使用或打出',
 			check:function(card){return 4-ai.get.value(card)},
 			ai:{
+				skillTagFilter:function(player){
+					if(!player.num('he',{color:'red'})) return false;
+				},
 				respondSha:true,
 			}
 		},
@@ -806,16 +815,10 @@ character.standard={
 			},
 			content:function(){}
 		},
-		test:{
-			subSkills:{
-				t1:{},
-				t2:{}
-			}
-		},
 		longdan:{
-			group:['longdan1','longdan2']
+			group:['longdan_sha','longdan_shan'],
-		},
+			subSkill:{
-		longdan1:{
+				sha:{
 					audio:2,
 					enable:['chooseToUse','chooseToRespond'],
 					filterCard:{name:'shan'},
@@ -840,7 +843,7 @@ character.standard={
 						value:-1
 					}
 				},
-		longdan2:{
+				shan:{
 					audio:2,
 					enable:['chooseToRespond'],
 					filterCard:{name:'sha'},
@@ -861,6 +864,8 @@ character.standard={
 						useful:-1,
 						value:-1
 					}
+				}
+			}
 		},
 		mashu:{
 			mod:{

character/wind.js

@@ -13,7 +13,6 @@ character.wind={
 		// yuji:['male','qun',3,['guhuo']],
 	},
 	skill:{
-
 		diyleiji:{
 			audio:2,
 			trigger:{player:'respond'},

game/game.js

@@ -11684,9 +11684,9 @@
 						lib.translate[i+'_info']=lib.translate[lib.skill[i].inherit+'_info'];
 					}
 				}
-				if(lib.skill[i].subSkills){
+				if(lib.skill[i].subSkill){
-					for(var j in lib.skill[i].subSkills){
+					for(var j in lib.skill[i].subSkill){
-						lib.skill[i+'_'+j]=lib.skill[i].subSkills[j];
+						lib.skill[i+'_'+j]=lib.skill[i].subSkill[j];
 						lib.translate[i+'_'+j]=lib.translate[i];
 					}
 				}
@@ -20029,6 +20029,21 @@
 				window.lib=lib;
 				window._status=_status;
 			},
+			u:function(){
+				var card={name:'sha'},source=game.me.next;
+				for(var i=0;i<arguments.length;i++){
+					if(get.itemtype(arguments[i])=='player'){
+						source=arguments[i];
+					}
+					else if(typeof arguments[i]=='object'){
+						card=arguments[i];
+					}
+					else if(typeof arguments[i]=='string'){
+						card={name:arguments[i]}
+					}
+				}
+				source.useCard(card,game.me);
+			},
 			rank:function(){
 		        var list=lib.rank.s.concat(lib.rank.ap).concat(lib.rank.a).concat(lib.rank.am).
 		            concat(lib.rank.bp).concat(lib.rank.b).concat(lib.rank.bm).concat(lib.rank.c).concat(lib.rank.d);