From 19d3fbd7384842b3c9dca5bc6eb41895b47682e8 Mon Sep 17 00:00:00 2001
From: libccy <operawidget@163.com>
Date: Sun, 2 Apr 2017 16:29:11 +0800
Subject: [PATCH] e

---
 card/standard.js |  8 ++++++++
 card/swd.js      |  1 +
 character/swd.js | 20 ++++++++------------
 game/game.js     |  8 ++++----
 mode/versus.js   |  5 +++--
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/card/standard.js b/card/standard.js
index ddc900185..a2be651e6 100644
--- a/card/standard.js
+++ b/card/standard.js
@@ -339,10 +339,18 @@ card.standard={
 						})){
 							return 1;
 						}
+						if(player.hasSha()&&_status.currentPhase==player){
+							if(player.getEquip('zhuge')||player.getCardUsable('sha')==0){
+								return 10;
+							}
+						}
 						var num=player.countCards('h','sha');
 						if(num>1) return 4+num;
 						return 2+num;
 					}
+				},
+				tag:{
+					valueswap:1
 				}
 			},
 			skills:['zhuge_skill']
diff --git a/card/swd.js b/card/swd.js
index 0bb5aab3d..ede1997f1 100644
--- a/card/swd.js
+++ b/card/swd.js
@@ -1206,6 +1206,7 @@ card.swd={
 						if(target.hasSkillTag('noe')) return target.countCards('e')*2;
 						if(target.getEquip('baiyin')&&target.isDamaged()) return 2;
 						if(target.getEquip('xuanyuanjian')||target.getEquip('qiankundai')) return 1;
+						if(target.hasSkill('jiguanyaoshu_skill')) return 0.5;
 						var num=0;
 						var es=target.getCards('e');
 						for(var i=0;i<es.length;i++){
diff --git a/character/swd.js b/character/swd.js
index a423ba907..0e97c3e09 100644
--- a/character/swd.js
+++ b/character/swd.js
@@ -420,6 +420,7 @@ character.swd={
 			content:function(){
 				if(targets.length==1){
 					target.damage('fire',2);
+					target.draw();
 				}
 				else{
 					target.damage('fire');
@@ -429,24 +430,19 @@ character.swd={
 			ai:{
 				order:15,
 				expose:0.2,
+				threaten:1.5,
 				result:{
 					target:function(player,target){
 						if(player.hp<2) return 0;
 						if(ai.get.attitude(player,target)>=0) return 0;
-						if(ui.selected.targets.length){
-							if(ui.selected.targets[0].hp>1&&target.hp>1) return 0;
-						}
+						if(target.hp>player.hp) return 0;
 						var eff=ai.get.damageEffect(target,player,target,'fire');
 						if(eff<0){
-							var num=game.countPlayer(function(current){
-								return ai.get.attitude(player,current)<0&&
-									ai.get.damageEffect(current,player,player,'fire')>0&&
-									current.hp<=player.hp;
-							});
-							if(num>=2){
-								if(target.nodying) return eff/10;
-								return eff/Math.sqrt(target.hp);
+							if(ui.selected.targets.length&&target.hp>1&&ui.selected.targets[0].hp>1){
+								return 0;
 							}
+							if(target.nodying) return eff/10;
+							return eff/Math.sqrt(target.hp);
 						}
 						return 0;
 					}
@@ -9303,7 +9299,7 @@ character.swd={
 		datong:'大同',
 		datong_info:'任意一名角色的结束阶段，若全场手牌数最多和最少的角色手牌数之差不超过1（人数不少于7时改为2），你摸两张牌',
 		huodan:'火丹',
-		huodan_info:'出牌阶段限一次，你可以弃置一张红色牌并失去一点体力，然后将两点火属性伤害分配给1~2名角色',
+		huodan_info:'出牌阶段限一次，你可以弃置一张红色牌并失去一点体力，然后将两点火属性伤害分配给1~2名角色；若你只分配了一名角色，该角色在结算后摸一张牌',
 		sxianjing:'陷阱',
 		sxianjing_bg:'阱',
 		sxianjing_info:'出牌阶段，你可以将一张手牌背面朝上置于你的武将牌上（不能与已有花色相同）。当一名其他角色使用与一张“陷阱”牌花色相同的牌指定你为目标时，你移去对应的“陷阱”牌，然后随机获得该角色的一张牌。每当你受到一次伤害，你随机将一张“陷阱”牌返回手牌',
diff --git a/game/game.js b/game/game.js
index 354d142da..e3b1db1a1 100644
--- a/game/game.js
+++ b/game/game.js
@@ -16007,7 +16007,7 @@
 				},
 				getEquip:function(name){
 					var es=this.getCards('e');
-					if(get.itemtype(name)=='card'){
+					if(typeof name=='object'&&get.info(name)){
 						name=get.info(name).subtype;
 						if(name){
 							name=parseInt(name[5]);
@@ -40762,12 +40762,12 @@
 				if(!card||card.name!=name){
 					card={name:name};
 				}
-				var value1=ai.get.value(card,target);
+				var value1=ai.get.equipValue(card,target);
 				var value2=0;
 				var current=target.getEquip(card);
 				if(current&&current!=card){
-					value2=ai.get.value(current,target);
-					if(value2>0&&!target.needsToDiscard()){
+					value2=ai.get.equipValue(current,target);
+					if(value2>0&&!target.needsToDiscard()&&!get.tag(card,'valueswap')){
 						return 0;
 					}
 				}
diff --git a/mode/versus.js b/mode/versus.js
index 5af937479..a1b9b6a8d 100644
--- a/mode/versus.js
+++ b/mode/versus.js
@@ -921,11 +921,12 @@ mode.versus={
 					ui.cheat2.close();
 					delete ui.cheat2;
 				}
+				for(var i=0;i<result.links.length;i++){
+					game.addRecentCharacter(result.links[i]);
+				}
 				game.me.init(result.links[0]);
-				game.addRecentCharacter(game.me.name);
 				if(_status.replacetwo){
 					game.me.replacetwo=result.links[1];
-					game.addRecentCharacter(game.me.replacetwo);
 				}
 				event.list.remove(game.me.name);
 				for(var i=0;i<game.players.length;i++){