f1

card/gujian.js

@@ -816,7 +816,7 @@ card.gujian={
                         case 2:target.recover();break;
                         case 3:target.changeHujia();break;
                         case 4:target.addTempSkill('qianxing',{player:'phaseBegin'});break;
-                        case 5:target.discard(target,get('j'));break;
+                        case 5:target.discard(target.get('j'));break;
                         case 6:{
                             if(target.isLinked()) target.link();
                             if(target.isTurnedOver()) target.turnOver();

card/sp.js

@@ -253,7 +253,7 @@ card.sp={
 				if(card.name=='du') return 20;
 				var player=_status.event.player;
 				var nh=player.num('h');
-				if(nh<=player.hp){
+				if(!player.needsToDiscard()){
 					if(nh<3) return 0;
 					if(nh==3) return 5-ai.get.value(card);
 					return 7-ai.get.value(card);

card/swd.js

@@ -2898,8 +2898,8 @@ card.swd={
 				return !player.hasSkill('xuanyuan')&&player.hp<=2
 			},
 			content:function(){
-				var e1=player.get('e','1');
+				var e1=player.getEquip('xuanyuanjian');
-				if(e1&&e1.name.indexOf('xuanyuanjian')==0){
+				if(e1){
 					player.discard(e1);
 				}
 			},

character/diy.js

@@ -83,7 +83,7 @@ character.diy={
 			content:function(){
 				"step 0"
 				player.chooseTarget(get.prompt('jianbi'),
-					[1,1+player.maxHp-player.hp],function(card,player,target){
+					[1,Math.max(1,player.maxHp-player.hp)],function(card,player,target){
 					return _status.event.getTrigger().targets.contains(target);
 				}).set('ai',function(target){
 					var trigger=_status.event.getTrigger();
@@ -1296,7 +1296,7 @@ character.diy={
 		liangce:'粮策',
 		liangce_info:'①出牌阶段限一次，你可以将一张基本牌当【五谷丰登】使用。②当因执行【五谷丰登】的效果而亮出的牌因效果执行完毕而置入弃牌堆后，你可以选择一名角色，令该角色获取之',
 		jianbi:'坚壁',
-		jianbi_info:'当你成为锦囊牌的目标时，若此牌的目标包括其他角色，你可以令此牌对一至X+1个目标无效（X为你已损失的体力值）',
+		jianbi_info:'当你成为锦囊牌的目标时，若此牌的目标包括其他角色，你可以令此牌对1至X个目标无效（X为你已损失的体力值且至少为1）',
 		juntun:'军屯',
 		juntun_info:'出牌阶段，你可以重铸装备牌',
 		choudu:'筹度',

character/sp.js

@@ -6053,7 +6053,7 @@ character.sp={
 		aocai2:{
 			enable:'chooseToUse',
 			filter:function(event,player){
-				return _status.currentPhase!==player&&event.type!='wuxie'&&event.getParent().name!='_chenhuodajie';
+				return _status.currentPhase!==player&&event.type!='wuxie'&&event.type!='trickuse';
 			},
 			onChooseToUse:function(event){
 				if(!game.online){

character/swd.js

@@ -10,7 +10,7 @@ character.swd={
 			swd_nicole:['female','qun',3,['huanjian','lingwu','minjing']],
 			swd_wangsiyue:['female','wei',3,['duishi','biyue']],
 			swd_weida:['female','qun',3,['yueren','zhenlie','duijue']],
-			swd_xuanyuanjianxian:['male','qun',4,['pozhou','huajian']],
+			swd_xuanyuanjianxian:['male','qun',4,['pozhou','huajian','xuanyuan']],
 
 			swd_chenjingchou:['male','wu',3,['youyin','yihua']],
 			swd_duguningke:['female','qun',3,['nlianji','touxi']],
@@ -2494,32 +2494,39 @@ character.swd={
 			}
 		},
 		xuanyuan:{
-			trigger:{global:'discardAfter'},
+			trigger:{player:'phaseBegin'},
+			unique:true,
 			filter:function(event,player){
-				if(event.player==player) return false;
+				return game.hasPlayer(function(current){
-				for(var i=0;i<event.cards.length;i++){
+					return current!=player&&current.num('e','xuanyuanjian');
-					if(event.cards[i].name=='xuanyuanjian'&&get.position(event.cards[i])=='d'){
+				});
-						return true;
-					}
-				}
-				return false;
 			},
-			frequent:true,
 			content:function(){
-				"step 0"
+				var target=game.findPlayer(function(current){
-				if(trigger.delay==false) game.delay();
+					return current!=player&&current.num('e','xuanyuanjian');
-				"step 1"
+				});
-				var cards=[];
+				if(target){
-				for(var i=0;i<trigger.cards.length;i++){
+					var card=target.get('e','xuanyuanjian');
-					if(event.cards[i].name=='xuanyuanjian'&&get.position(trigger.cards[i])=='d'){
+					player.gain(card,target);
-						cards.push(trigger.cards[i]);
+					target.$give(card,player);
+					player.line(target,'green');
+				}
+			},
+			global:'xuanyuan_ai'
+		},
+		xuanyuan_ai:{
+			ai:{
+				effect:{
+					player:function(card,player){
+						if(player.hasSkill('xuanyuan')) return;
+						if(card.name=='xuanyuanjian'&&game.hasPlayer(function(current){
+							return current.hasSkill('xuanyuan')&&ai.get.attitude(player,current)<=0;
+						})){
+							return [0,0,0,0];
+						}
 					}
-				}
+				},
-				if(cards.length){
+				threaten:2.2
-					player.gain(cards);
-					player.$gain2(cards);
-					game.log(player,'发动','【轩辕】','，获得了',cards);
-				}
 			},
 		},
 		jilve:{
@@ -3786,6 +3793,7 @@ character.swd={
 			popup:false,
 			direct:true,
 			filter:function(event,player){
+				if(event.addedTargets) return false;
 				// return event.card&&get.color(event.card)=='red'&&event.player!=player;
 				return event.targets.length==1&&event.player!=player&&player.num('h')>=2;
 			},
@@ -3798,7 +3806,8 @@ character.swd={
 						return 5-ai.get.value(card);
 					}
 					return 0;
-				}
+				};
+				next.prompt2='反弹'+get.translation(trigger.player)+'的'+get.translation(trigger.card);
 				next.logSkill=['yihua',trigger.player];
 				"step 1"
 				if(result.bool){
@@ -7046,13 +7055,13 @@ character.swd={
 				return false;
 			},
 			prompt:function(event,player){
-				var list=game.hasPlayer(function(current){
+				var list=game.filterPlayer(function(current){
 					return current.hp<=player.hp&&current.isDamaged();
 				});
 				return get.prompt('lanzhi',list);
 			},
 			check:function(event,player){
-				var list=game.hasPlayer(function(current){
+				var list=game.filterPlayer(function(current){
 					return current.hp<=player.hp&&current.isDamaged();
 				});
 				var num=0;
@@ -7069,7 +7078,7 @@ character.swd={
 			},
 			content:function(){
 				"step 0"
-				var list=game.hasPlayer(function(current){
+				var list=game.filterPlayer(function(current){
 					return current.hp<=player.hp&&current.isDamaged();
 				});
 				player.line(list,'green');
@@ -8739,7 +8748,7 @@ character.swd={
 		huajian:'化剑',
 		huajian_info:'出牌阶段结束时，你可以弃置一张牌，视为对一张角色使用一张杀',
 		xuanyuan:'轩辕',
-		xuanyuan_info:'锁定技，你无视轩辕剑的装备条件；失去轩辕剑时不流失体力',
+		xuanyuan_info:'锁定技，你无视【轩辕剑】的装备条件及流失体力的效果；准备阶段，如果其他角色的装备区内有【轩辕剑】，你可以获得之',
 		jilve:'极略',
 		jilve_backup:'极略',
 		jilve2:'极略',

layout/default/layout.css

@@ -968,6 +968,7 @@ body>.background.upper {
 }
 .removing,.hidden {
 	opacity: 0 !important;
+	pointer-events: none;
 }
 
 #system>div>div.hidden {