From fc2ad0a5456a6689b854b69d8e743b5359f02730 Mon Sep 17 00:00:00 2001
From: libccy <libccy@gmail.com>
Date: Mon, 30 May 2016 16:07:55 +0800
Subject: [PATCH] 1

---
 card/yunchou.js     | 19 +++++++++++++++----
 character/hearth.js |  5 +++--
 game/game.js        | 18 ++++++++++++++++--
 mode/versus.js      | 16 ++++++++++++----
 4 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/card/yunchou.js b/card/yunchou.js
index bcf95869b..d256260fe 100644
--- a/card/yunchou.js
+++ b/card/yunchou.js
@@ -56,7 +56,6 @@ card.yunchou={
 			multitarget:true,
 			multiline:true,
 			filterTarget:function(card,player,target){
-				if(player==target) return true;
 				var num=target.num('h');
 				for(var i=0;i<game.players.length;i++){
 					if(game.players[i].num('h')<num) return false;
@@ -64,14 +63,26 @@ card.yunchou={
 				return true;
 			},
 			content:function(){
-				// target.draw();
-				game.asyncDraw(targets);
+				var num=[];
+				for(var i=0;i<targets.length;i++){
+					if(targets[i]==player){
+						num.push(2);
+					}
+					else{
+						num.push(1);
+					}
+				}
+				if(!targets.contains(player)){
+					targets.add(player);
+				}
+				game.asyncDraw(targets,num);
 			},
 			ai:{
 				order:1,
 				value:5,
 				result:{
-					target:1
+					target:1,
+					player:0.1,
 				}
 			}
 		},
diff --git a/character/hearth.js b/character/hearth.js
index 248ba911e..42157a444 100755
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -300,7 +300,7 @@ character.hearth={
 			selectTarget:-1,
 			selectCard:[1,3],
 			check:function(card){
-				return 7-ai.get.value(card);
+				return 8-ai.get.value(card);
 			},
 			filterCard:{color:'black'},
 			line:'thunder',
@@ -312,7 +312,7 @@ character.hearth={
 				threaten:0.7,
 				result:{
 					target:function(player,target){
-						return ai.get.damageEffect(target,player,player,'thunder');
+						return ai.get.damageEffect(target,player,target,'thunder');
 					}
 				}
 			},
@@ -2196,6 +2196,7 @@ character.hearth={
 			},
 			content:function(){
 				trigger.player.recover();
+				player.line(trigger.player,'green');
 				player.addTempSkill('shengyan2','phaseAfter');
 			},
 			ai:{
diff --git a/game/game.js b/game/game.js
index 92bf80f17..dd5d07786 100755
--- a/game/game.js
+++ b/game/game.js
@@ -52,7 +52,7 @@
 	};
 	var lib={
 		configprefix:'noname_0.9_',
-        versionOL:8,
+        versionOL:9,
 		updateURL:localStorage.getItem('noname_update_url')||'http://websha.cn/',
 		assetURL:'',
         hallURL:'websha.cn',
@@ -2252,6 +2252,12 @@
                         },
                         frequent:true
                     },
+                    connect_four_cross:{
+                        name:'交叉座位',
+						init:false,
+						frequent:true,
+						restart:true,
+                    },
                     connect_replace_handcard:{
                         name:'末位可换牌',
                         init:true,
@@ -2299,11 +2305,13 @@
 							map.change_choice.hide();
 							map.enable_all.show();
 							map.four_assign.show();
+                            map.four_cross.show();
 						}
 						else{
 							map.change_choice.show();
 							map.enable_all.hide();
 							map.four_assign.hide();
+                            map.four_cross.hide();
 						}
                         if(config.versus_mode=='jiange'||config.versus_mode=='two'){
                             map.free_choose.show();
@@ -2346,7 +2354,13 @@
 					},
 					four_assign:{
 						name:'代替队友选将',
-						init:true,
+						init:false,
+						frequent:true,
+						restart:true,
+					},
+					four_cross:{
+						name:'交叉座位',
+						init:false,
 						frequent:true,
 						restart:true,
 					},
diff --git a/mode/versus.js b/mode/versus.js
index 15c4d6f5d..98c5dd4fe 100755
--- a/mode/versus.js
+++ b/mode/versus.js
@@ -75,8 +75,10 @@ mode.versus={
 			}
 		}
 		else if(_status.mode=='four'){
-			var list=['zhu','zhong','zhong','zhong','ezhu','ezhong','ezhong','ezhong'];
-			list.randomSort();
+			var list=['zhong','ezhong','zhong','ezhong','zhong','ezhong','zhong','ezhong'];
+			list[2*Math.floor(Math.random()*4)]='zhu';
+			list[2*Math.floor(Math.random()*4)+1]='ezhu';
+			if(!get.config('four_cross')) list.randomSort();
 			var side=Math.random()<0.5;
 			for(var i=0;i<8;i++){
 				if(list[i][0]=='e'){
@@ -320,6 +322,9 @@ mode.versus={
 			else if(lib.configOL.versus_mode=='2v2'||lib.configOL.versus_mode=='3v3'){
 				uiintro.add('<div class="text chat">四号位换牌：'+(lib.configOL.replace_handcard?'开启':'关闭'));
 			}
+			else if(lib.configOL.versus_mode=='4v4'){
+				uiintro.add('<div class="text chat">交叉座位：'+(lib.configOL.four_cross?'开启':'关闭'));
+			}
 			uiintro.add('<div class="text chat">出牌时限：'+lib.configOL.choose_timeout+'秒');
 			uiintro.add('<div class="text chat">屏蔽弱将：'+(lib.configOL.ban_weak?'开启':'关闭'));
 			uiintro.add('<div class="text chat">屏蔽强将：'+(lib.configOL.ban_strong?'开启':'关闭')).style.paddingBottom='8px';
@@ -1404,8 +1409,11 @@ mode.versus={
 			var next=game.createEvent('chooseCharacter',false);
 			next.content=function(){
 				"step 0"
-				var list=['zhu','zhong','zhong','zhong','ezhu','ezhong','ezhong','ezhong'];
-				list.randomSort();
+				var list=['zhong','ezhong','zhong','ezhong','zhong','ezhong','zhong','ezhong'];
+				list[2*Math.floor(Math.random()*4)]='zhu';
+				list[2*Math.floor(Math.random()*4)+1]='ezhu';
+				if(!lib.configOL.four_cross) list.randomSort();
+
 				var side=Math.random()<0.5;
 				var map={};
 				for(var i=0;i<8;i++){