From 8a1d5eb07b2dc9e9feafc314c96039c6ab05d3ca Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Tue, 21 Feb 2017 00:42:06 +0800
Subject: [PATCH] dy

---
 card/swd.js          |  2 +-
 card/yunchou.js      |  2 +-
 character/rank.js    |  2 +-
 character/shenhua.js |  2 +-
 character/sp.js      | 40 ++++++++++++++++++++++++----------------
 5 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/card/swd.js b/card/swd.js
index 2597df005..ad3620cf8 100644
--- a/card/swd.js
+++ b/card/swd.js
@@ -1473,7 +1473,7 @@ card.swd={
 					useful:[7,2],
 					value:[7,2],
 				},
-				order:7,
+				order:2.2,
 				result:{
 					target:2
 				},
diff --git a/card/yunchou.js b/card/yunchou.js
index bd15950cd..564b3e0d5 100644
--- a/card/yunchou.js
+++ b/card/yunchou.js
@@ -459,7 +459,7 @@ card.yunchou={
 				if(target.isLowestHp()) target.recover();
 			},
 			ai:{
-				order:2,
+				order:2.5,
 				value:6,
 				result:{
 					target:function(player,target){
diff --git a/character/rank.js b/character/rank.js
index 22ee12f5c..d528dcb10 100644
--- a/character/rank.js
+++ b/character/rank.js
@@ -228,6 +228,7 @@ window.characterRank={
     ],
     bp:[
         'yanbaihu',
+        'dongyun',
         'sunziliufang',
         'shen_zhouyu',
         'yj_jushou',
@@ -368,7 +369,6 @@ window.characterRank={
         'hs_lrexxar',
         'huatuo',
         'sunhao',
-        'dongyun',
         'swd_jiting',
         'hs_nozdormu',
     ],
diff --git a/character/shenhua.js b/character/shenhua.js
index 3793e6b56..c39787c17 100644
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -1968,7 +1968,7 @@ character.shenhua={
 							}
 							if(ai.get.attitude(player,target)>0&&!hastarget) return;
 							if(turnfriend||target.hp==target.maxHp) return [0.5,1];
-							if(target.hp>1) return [1,1];
+							if(target.hp>1) return [1,0.5];
 						}
 					}
 				}
diff --git a/character/sp.js b/character/sp.js
index 121ee670e..8a98aec4a 100644
--- a/character/sp.js
+++ b/character/sp.js
@@ -377,28 +377,33 @@ character.sp={
 				}).set('ai',function(target){
 					var player=_status.event.player;
 					var att=ai.get.attitude(player,target);
-					if(att>0&&target.num('h')==target.hp-1){
-						if(player==target) return att+1;
-						return att+2;
+					var nh=target.num('h');
+					if(att>0){
+						if(nh==target.hp-1){
+							if(player==target) return att+1;
+							return att+2;
+						}
+						if(player==target&&player.needsToDiscard()) return att/3;
+						return att;
+					}
+					else{
+						if(nh==target.hp+1) return -att;
+						if(nh==0) return 0;
+						return -att/2;
 					}
-					if(player==target&&player.needsToDiscard()) return att/3;
-					return att;
 				});
 				'step 1'
 				if(result.bool){
 					player.logSkill('bingzheng',result.targets);
 					event.target=result.targets[0];
 					if(event.target.num('h')){
-						event.target.chooseToDiscard('弃置一张手牌，或取消并摸一张牌').set('ai',function(card){
-							if(_status.event.player==_status.event.getParent().player) return 0;
-							if(card.name=='du') return 0;
-							if(_status.event.goon) return 6-ai.get.value(card);
+						player.chooseControl(function(event,player){
+							var target=event.target;
+							if(ai.get.attitude(player,target)<0) return 1;
+							if(target.num('h')==target.hp+1) return 1;
 							return 0;
-						}).set('goon',(
-							event.target.num('h')==event.target.hp+1&&
-							ai.get.attitude(event.target,player)>1&&
-							!player.needsToDiscard()&&player.num('h')<event.target.num('h')
-						));
+						}).set('choiceList',['令'+get.translation(event.target)+'摸一张牌',
+						'令'+get.translation(event.target)+'弃置一张手牌']);
 					}
 					else{
 						event.directfalse=true;
@@ -408,9 +413,12 @@ character.sp={
 					event.finish();
 				}
 				'step 2'
-				if(event.directfalse||!result.bool){
+				if(event.directfalse||result.index==0){
 					event.target.draw();
 				}
+				else{
+					event.target.chooseToDiscard('h',true);
+				}
 				'step 3'
 				if(event.target.num('h')==event.target.hp){
 					player.draw();
@@ -427,7 +435,7 @@ character.sp={
 						if(_status.event.goon){
 							return 10-ai.get.value(card);
 						}
-						return 0;
+						return -ai.get.value(card,_status.event.player,'raw');
 					});
 					if(ai.get.attitude(player,event.target)>1&&
 						player.num('h','shan')>1&&player.num('h')>event.target.num('h')){