From 5af7df807d4e64ca9a8d23b1392f45973d417317 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Wed, 29 Mar 2017 00:38:53 +0800
Subject: [PATCH] v1.9.18.2

---
 character/rank.js    |  2 +-
 character/sp.js      | 42 ++++++++++++++++++++++++------------------
 character/yijiang.js | 15 ++++++++-------
 game/update.js       |  2 ++
 4 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/character/rank.js b/character/rank.js
index 99b13b1bc..36826bfe5 100644
--- a/character/rank.js
+++ b/character/rank.js
@@ -149,6 +149,7 @@ window.characterRank={
         'pal_muchanglan',
         'yxs_luzhishen',
         'hs_jaina',
+        're_lidian',
     ],
     am:[
         'ow_orisa',
@@ -265,7 +266,6 @@ window.characterRank={
         'yxs_kaisa',
         'sunluyu',
         'liyan',
-        're_lidian',
         'pal_jiangcheng',
         'zhugeguo',
         'xiaoqiao',
diff --git a/character/sp.js b/character/sp.js
index bcf87b414..160d0dd01 100644
--- a/character/sp.js
+++ b/character/sp.js
@@ -3898,38 +3898,44 @@ character.sp={
 			filter:function(event,player){
 				return player.storage.yinbing&&player.storage.yinbing.length>0;
 			},
-			direct:true,
+			forced:true,
 			audio:2,
 			content:function(){
 				'step 0'
-				player.chooseTarget(get.prompt('juedi'),function(card,player,target){
+				player.chooseTarget(get.prompt('juedi'),true,function(card,player,target){
 					return player.hp>=target.hp;
 				}).set('ai',function(target){
 					var player=_status.event.player;
 					var nh=player.countCards('h');
-					if(target==player){
-						if(nh>=player.maxHp) return 0;
-						if(player.maxHp-nh>=3) return 4;
-						return 0.5;
-					}
 					var att=ai.get.attitude(player,target);
-					if(att<2) return 0;
-					if(target.hp==1&&att>2){
-						att+=2;
+					if(att<2) return att-10;
+					if(target==player){
+						if(player.hasJudge('lebu')){
+							player.maxHp-nh-2;
+						}
+						return player.maxHp-nh;
 					}
-					if(player.hasJudge('lebu')){
-						if(target.hp==target.maxHp) return att-2;
-						return att-1;
+					if(target.hp==target.maxHp){
+						return att/10;
 					}
-					if(target.hp==target.maxHp) return 0;
-					if(nh<player.hp-1){
-						return att-3;
+					if(target.hp==1){
+						return 5+att/10;
 					}
-					return att-2;
+					var nh2=target.countCards('h');
+					if(target.hp==2){
+						if(nh2<=1){
+							return 3+att/10;
+						}
+						return 2+att/10;
+					}
+					if(nh2<=2){
+						return 2+att/10;
+					}
+					return 1+att/10;
 				});
 				'step 1'
 				if(result.bool){
-					player.logSkill('juedi',result.targets);
+					player.line(result.targets[0],'green');
 					if(result.targets[0]==player){
 						player.$throw(player.storage.yinbing,1000);
 						var num=player.maxHp-player.countCards('h');
diff --git a/character/yijiang.js b/character/yijiang.js
index 7eb331ebb..729136121 100644
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -2319,7 +2319,7 @@ character.yijiang={
 					if(get.color(trigger.card)=='red'){
 						player.draw();
 					}
-					player.logSkill('longyin',trigger.player);
+					// player.logSkill('longyin',trigger.player);
 				}
 			},
 			ai:{
@@ -2916,12 +2916,13 @@ character.yijiang={
 			group:['zhanjue2','zhanjue3','zhanjue4'],
 			ai:{
 				order:1,
-				result:{
-					target:function(player,target){
-						if(player.countCards('h')>=3||target.countCards('h')>=3) return 0;
-						if(player.countCards('h','tao')) return 0;
-						if(target.countCards('h','sha')>1) return 0;
-						return -1.5;
+				effect:{
+					player:function(card,player,target){
+						if(_status.event.skill=='zhanjue'){
+							if(player.countCards('h')>=3||target.countCards('h')>=3) return 'zeroplayertarget';
+							if(player.countCards('h','tao')) return 'zeroplayertarget';
+							if(target.countCards('h','sha')>1) return 'zeroplayertarget';
+						}
 					}
 				}
 			}
diff --git a/game/update.js b/game/update.js
index cd0fdd5e5..eb99006cf 100644
--- a/game/update.js
+++ b/game/update.js
@@ -14,6 +14,8 @@ window.noname_update={
         'card/sp.js',
         // 'character/*',
         'character/shenhua.js',
+        'character/yijiang.js',
+        'character/sp.js',
         'character/rank.js',
         // 'mode/boss.js',
         'mode/versus.js',