xxx

card/standard.js

@@ -217,6 +217,7 @@ card.standard={
 				},
 				result:{
 					target:function(player,target){
+						// if(player==target&&player.hp<=0) return 2;
 						var nh=target.num('h');
 						var keep=false;
 						if(nh<=target.hp){
@@ -249,6 +250,7 @@ card.standard={
 										if(num>2) return 2;
 									}
 								}
+								if(num>1&&player==target) return 2;
 								return 0;
 							}
 						}

character/mountain.js

@@ -103,9 +103,10 @@ character.mountain={
 				effect:{
 					target:function(card,player,target,current){
 						if(card.name=='sha'){
-							if(player.num('h',{type:'basic'})<2) return 0;
+							if(_status.event.name=='xiangle') return;
-							var bs=player.num('h',{type:'basic'});
+							var bs=player.get('h',{type:'basic'});
 							if(bs.length<2) return 0;
+							if(player.skills.contains('jiu')||player.skills.contains('tianxianjiu')) return;
 							if(bs.length<=3&&player.num('h','sha')<=1){
 								for(var i=0;i<bs.length;i++){
 									if(bs[i].name!='sha'&&ai.get.value(bs[i])<7){

character/refresh.js

@@ -19,12 +19,13 @@ character.refresh={
 		re_luxun:['male','wu',3,['reqianxun','relianying']],
 		re_daqiao:['female','wu',3,['reguose','liuli']],
 		re_huanggai:['male','wu',4,['rekurou','zhaxiang']],
-		re_lvbu:['male','qun',5,['wushuang','linu']],
+		re_lvbu:['male','qun',5,['wushuang','liyu']],
 		re_gongsunzan:['male','qun',4,['qiaomeng','reyicong']],
 		re_huatuo:['male','qun',3,['chulao','jijiu']],
 	},
 	skill:{
-		linu:{
+		liyu:{
+			audio:2,
 			trigger:{source:'damageEnd'},
 			direct:true,
 			filter:function(event,player){
@@ -34,13 +35,13 @@ character.refresh={
 				'step 0'
 				trigger.player.chooseTarget(function(card,playerx,target){
 					return player.canUse({name:'juedou'},target)&&target!=trigger.player;
-				},'是否发动【利奴】？').ai=function(target){
+				},'是否发动【利驭】？').ai=function(target){
 					return ai.get.effect(target,{name:'juedou'},player,trigger.player)-2;
 				};
 				'step 1'
 				if(result.bool){
 					player.gainPlayerCard(trigger.player,'he',true);
-					player.logSkill('linu');
+					player.logSkill('liyu');
 					event.target=result.targets[0];
 					trigger.player.line(player,'green');
 				}
@@ -1291,8 +1292,8 @@ character.refresh={
 		fenwei:'奋威',
 		chulao:'除痨',
 		rejizhi:'集智',
-		linu:'利驭',
+		liyu:'利驭',
-		linu_info:'当你使用【杀】对一名其他角色造成伤害后，该角色可令你获得其一张牌，若如此做，则视为你对其选择的另一名角色使用一张【决斗】',
+		liyu_info:'当你使用【杀】对一名其他角色造成伤害后，该角色可令你获得其一张牌，若如此做，则视为你对其选择的另一名角色使用一张【决斗】',
 		rejizhi_info:'当你使用一张装备牌或锦囊牌时，你可以摸一张牌并展示之，若此牌是基本牌，你须弃置一张手牌',
 		xunxun_info:'摸牌阶段，你可以放弃摸牌，改为观看牌堆顶的四张牌，然后获得其中的两张牌，将其余的牌以任意顺序置于牌堆底。',
 		wangxi_info:'每当你对其他角色造成1点伤害后，或受到其他角色造成的1点伤害后，你可与该角色各摸一张牌。',

character/sp.js

@@ -49,6 +49,7 @@ character.sp={
 	},
 	skill:{
 		qirang:{
+			audio:2,
 			trigger:{player:'equipEnd'},
 			frequent:true,
 			content:function(){
@@ -68,6 +69,7 @@ character.sp={
 		yuhua:{
 			trigger:{player:'phaseDiscardBegin'},
 			forced:true,
+			audio:2,
 			filter:function(event,player){
 				return player.num('h',{type:'basic'})<player.num('h');
 			},
@@ -92,6 +94,7 @@ character.sp={
 			group:'yuhua2'
 		},
 		yuhua2:{
+			audio:false,
 			trigger:{player:'phaseDiscardEnd'},
 			forced:true,
 			filter:function(event,player){