From 87d2eee3ecaf1fa8aeda6879e2a0e3f6fc7dc1eb Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Sat, 18 Feb 2017 23:52:04 +0800
Subject: [PATCH] j

---
 card/swd.js          |  3 +++
 character/rank.js    |  7 +++----
 character/swd.js     | 50 +++++++++++++++++++++++++++++++++++++++++---
 character/yijiang.js |  3 +++
 game/game.js         | 22 +++++++++++++++++++
 5 files changed, 78 insertions(+), 7 deletions(-)

diff --git a/card/swd.js b/card/swd.js
index 14c20d770..b50d9fd86 100644
--- a/card/swd.js
+++ b/card/swd.js
@@ -1184,6 +1184,8 @@ card.swd={
 				result:{
 					target:function(player,target){
 						if(target.hasSkillTag('noe')) return target.num('e')*2;
+						if(target.getEquip('baiyin')&&target.isDamaged()) return 2;
+						if(target.getEquip('xuanyuanjian')||target.getEquip('qiankundai')) return 1;
 						var num=0;
 						var es=target.get('e');
 						for(var i=0;i<es.length;i++){
@@ -4191,6 +4193,7 @@ card.swd={
 			filter:function(event,player){
 				return !event.target.isTurnedOver();
 			},
+			logTarget:'target',
 			content:function(){
 				trigger.unhurt=true;
 				trigger.target.turnOver();
diff --git a/character/rank.js b/character/rank.js
index 27c73eab6..b902ca923 100644
--- a/character/rank.js
+++ b/character/rank.js
@@ -385,6 +385,9 @@ window.characterRank={
         'huatuo',
         'sunhao',
         'dongyun',
+        'swd_jiting',
+        'hs_nozdormu',
+        //...
     ],
     b:[
         'diy_liufu',
@@ -403,9 +406,7 @@ window.characterRank={
         'sp_xiahoudun',
         'jsp_huangyueying',
         'sp_zhangfei',
-        'hs_nozdormu',
         'yxs_lishimin',
-        'hs_ruanniguai',
         'daxiaoqiao',
         'pal_linyueru',
         'zhuran',
@@ -419,8 +420,6 @@ window.characterRank={
         'yxs_chengyaojin',
         'yxs_yujix',
         'swd_jialanduo',
-        'swd_jiting',
-        //......
         'kanze',
         'mazhong',
         'zhaoxiang',
diff --git a/character/swd.js b/character/swd.js
index bbfd104ec..944b0e0ce 100644
--- a/character/swd.js
+++ b/character/swd.js
@@ -52,7 +52,7 @@ character.swd={
 			swd_jialanduo:['male','qun',4,['xianyin','mailun']],
 			swd_rongshuang:['female','wu',3,['suiyan','duanxing']],
 			swd_zhuoshanzhu:['male','wu',4,['suiyan','wanjun']],
-			swd_jiting:['female','wei',4,['guanhu','chuanyang']],
+			swd_jiting:['female','wei',4,['guanhu','lingshi']],
 
 			swd_sikongyu:['male','wu',4,['sliufeng','linyun','hutian']],
 			swd_muyue:['female','wei',3,['xingzhui','lingxian','shouyin']],
@@ -143,6 +143,39 @@ character.swd={
 		swd_luchengxuan:['swd_xiarou'],
 	},
 	skill:{
+		lingshi:{
+			mod:{
+				attackFrom:function(from,to,distance){
+					return distance-from.num('e')*2;
+				},
+				cardUsable:function(card,player,num){
+					if(card.name=='sha'&&player.get('e','5')) return num+1;
+				}
+			},
+			group:['lingshi_hit','lingshi_draw'],
+			subSkill:{
+				hit:{
+					trigger:{player:'shaBegin'},
+					filter:function(event,player){
+						return player.get('e','1')||player.get('e','2');
+					},
+					forced:true,
+					content:function(){
+						trigger.directHit=true;
+					}
+				},
+				draw:{
+					trigger:{player:'phaseDrawBegin'},
+					filter:function(event,player){
+						return player.get('e','3')||player.get('e','4');
+					},
+					forced:true,
+					content:function(){
+						trigger.num++;
+					}
+				}
+			}
+		},
 		tiebi:{
 			trigger:{global:'shaBegin'},
 			filter:function(event,player){
@@ -4922,7 +4955,16 @@ character.swd={
 				return ai.get.attitude(player,event.player)<0;
 			},
 			content:function(){
-				player.discardPlayerCard(trigger.player).logSkill=['guanhu',trigger.player];
+				var num=1;
+				if(trigger.player.num('e')&&trigger.player.num('h')){
+					num=2;
+				}
+				var next=player.discardPlayerCard(trigger.player,[1,num],get.prompt('guanhu',trigger.player));
+				next.logSkill=['guanhu',trigger.player];
+				next.filterButton=function(button){
+					if(ui.selected.buttons.length) return get.position(button.link)!=get.position(ui.selected.buttons[0].link);
+					return true;
+				}
 			},
 			ai:{
 				expose:0.2
@@ -8538,6 +8580,8 @@ character.swd={
 		swd_quxian:'屈娴',
 		swd_xiyan:'犀衍',
 
+		lingshi:'灵矢',
+		lingshi_info:'你的装备区内每有一张牌，你的攻击范围+2；当你的装备区内有武器牌或防具牌时，你的杀不可闪避；当你的装备区内有马时，你摸牌阶段额外摸一张牌；当你的装备内的宝物牌时，你回合内可以额外使用一张杀',
 		tiebi:'铁壁',
 		tiebi_info:'当距离你1以内的一名角色成为杀的目标时，若其没有护甲，你可以弃置一张黑色手牌使其获得一点护甲',
 		shenyan:'神炎',
@@ -8808,7 +8852,7 @@ character.swd={
 		ningxian:'凝霰',
 		ningxian_info:'每当你受到一次伤害，你可以弃置任意张黑色牌并选择等量其他角色对其各造成一点伤害',
 		guanhu:'贯鹄',
-		guanhu_info:'每当你使用杀造成伤害，你可以弃置对方一张牌',
+		guanhu_info:'每当你使用杀造成伤害，你可以弃置对方一张手牌和一张装备牌',
 		chuanyang:'穿杨',
 		chuanyang_info:'每当你使用一张杀，若你不在目标的攻击范围，你可以令此杀不可闪避',
 		fengming:'凤鸣',
diff --git a/character/yijiang.js b/character/yijiang.js
index b7c6cd053..75bc8680e 100644
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -6124,6 +6124,9 @@ character.yijiang={
 		olddanshou:{
 			trigger:{source:'damageEnd'},
 			priority:9,
+			check:function(event,player){
+				return ai.get.attitude(player,event.player)<=0;
+			},
 			content:function(){
 				"step 0"
 				player.draw();
diff --git a/game/game.js b/game/game.js
index 1ca3fb8de..ad7b7fb1b 100644
--- a/game/game.js
+++ b/game/game.js
@@ -22706,6 +22706,8 @@
             }
             else{
                 node.addEventListener('mouseenter',ui.click.intro);
+				// node.addEventListener('mousemove',ui.click.logv);
+				// node.addEventListener('mouseleave',ui.click.logvleave);
             }
             node.logvid=logvid;
             node.added=[];
@@ -33677,6 +33679,23 @@
 				}
 				game.resume();
 			},
+			logv:function(e){
+				if(_status.currentlogv){
+					clearTimeout(_status.currentlogv.logvtimeout);
+					delete _status.currentlogv.logvtimeout;
+				}
+				var that=this;
+				_status.currentlogv=that;
+				that.logvtimeout=setTimeout(function(){
+					ui.click.intro.call(that,e);
+				},200);
+			},
+			logvleave:function(){
+				if(_status.currentlogv){
+					clearTimeout(_status.currentlogv.logvtimeout);
+					delete _status.currentlogv.logvtimeout;
+				}
+			},
 			intro:function(e){
 				if(_status.dragged) return;
 				_status.clicked=true;
@@ -36129,6 +36148,9 @@
 					table.style.marginLeft='10px';
 
 					uiintro.content.appendChild(table);
+					if(!lib.config.show_favourite){
+						table.style.paddingBottom='5px'
+					}
 				}
                 if(!simple||get.is.phoneLayout()){
                     var es=node.get('e');