From d16422b69cfdcc85f90d005acca053b0878a415e Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Wed, 8 Feb 2017 12:02:19 +0800
Subject: [PATCH] a

---
 character/hearth.js   |  6 +++---
 character/refresh.js  | 13 ++++++++++---
 character/shenhua.js  |  8 ++++++--
 character/sp.js       | 10 ++++++----
 character/standard.js | 11 ++++++++---
 character/xianjian.js |  4 ++--
 character/yxs.js      | 20 ++++++++++++++------
 game/game.js          | 44 ++++++++++++++++++++++++++++++-------------
 mode/boss.js          |  6 ++++--
 mode/chess.js         |  6 ++++--
 10 files changed, 88 insertions(+), 40 deletions(-)

diff --git a/character/hearth.js b/character/hearth.js
index 20acab90f..31cf2cb83 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -3732,10 +3732,10 @@ character.hearth={
 				if(result.bool){
 					player.logSkill('shijie',result.targets);
 					var target=result.targets[0];
-					player.gain(target.get('h').randomGet(),target);
+					var card=target.get('h').randomGet()
+					player.gain(card,target);
 					event.target=target;
-					target.$give(1,player);
-					game.delay();
+					target.$giveAuto(card,player);
 					event.target.draw();
 				}
 			},
diff --git a/character/refresh.js b/character/refresh.js
index 0f2ab1559..425d6b043 100644
--- a/character/refresh.js
+++ b/character/refresh.js
@@ -272,11 +272,18 @@ character.refresh={
 				if(result.bool){
 					player.logSkill('retuxi',result.targets);
 					for(var i=0;i<result.targets.length;i++){
-						player.gain(result.targets[i].get('h').randomGet(),result.targets[i]);
-						result.targets[i].$give(1,player);
+						var card=result.targets[i].get('h').randomGet();
+						player.gain(card,result.targets[i]).delay=false;
+						result.targets[i].$giveAuto(card,player);
 					}
-					trigger.num-=result.targets.length
+					trigger.num-=result.targets.length;
+					game.delay();
 				}
+				else{
+					event.finish();
+				}
+				"step 2"
+				if(trigger.num<=0) game.delay();
 			},
 			ai:{
 				threaten:1.6,
diff --git a/character/shenhua.js b/character/shenhua.js
index dee1844e1..1d0624a50 100644
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -801,11 +801,15 @@ character.shenhua={
 				}
 				"step 2"
 				for(var i=0;i<event.targets.length;i++){
-					player.gain(event.targets[i].get('h').randomGet(),event.targets[i]);
-					event.targets[i].$give(1,player);
+					var gainedcard=event.targets[i].get('h').randomGet();
+					player.gain(gainedcard,event.targets[i]).delay=false;
+					event.targets[i].$giveAuto(gainedcard,player);
 				}
 				trigger.finish();
 				trigger.untrigger();
+				game.delay();
+				"step 3"
+				game.delay();
 			},
 			ai:{
 				expose:0.2
diff --git a/character/sp.js b/character/sp.js
index f417b61b4..ed1d108a4 100644
--- a/character/sp.js
+++ b/character/sp.js
@@ -6767,8 +6767,9 @@ character.sp={
 				return event.target.num('h')>0;
 			},
 			content:function(){
-				player.gain(trigger.target.get('h').randomGet(),trigger.target);
-				trigger.target.$give(1,player);
+				var card=trigger.target.get('h').randomGet();
+				player.gain(card,trigger.target);
+				trigger.target.$giveAuto(card,player);
 				game.delay();
 			}
 		},
@@ -6780,8 +6781,9 @@ character.sp={
 				return event.source&&event.source.num('h')>0;
 			},
 			content:function(){
-				player.gain(trigger.source.get('h').randomGet(),trigger.source);
-				trigger.source.$give(1,player);
+				var card=trigger.source.get('h').randomGet();
+				player.gain(card,trigger.source);
+				trigger.source.$giveAuto(card,player);
 				game.delay();
 			}
 		},
diff --git a/character/standard.js b/character/standard.js
index c3e337bfd..4fa6ce3c4 100644
--- a/character/standard.js
+++ b/character/standard.js
@@ -270,14 +270,19 @@ character.standard={
 				if(result.bool){
 					player.logSkill('tuxi',result.targets);
 					for(var i=0;i<result.targets.length;i++){
-						player.gain(result.targets[i].get('h').randomGet(),result.targets[i]);
-						result.targets[i].$give(1,player);
+						var card=result.targets[i].get('h').randomGet();
+						player.gain(card,result.targets[i]).set('delay',false);
+						result.targets[i].$giveAuto(card,player);
 					}
 					trigger.finish();
 					trigger.untrigger();
+					game.delay();
+				}
+				else{
+					event.finish();
 				}
 				"step 2"
-				if(result.bool) game.delay();
+				game.delay();
 			},
 			ai:{
 				threaten:2,
diff --git a/character/xianjian.js b/character/xianjian.js
index 110469a60..f39595513 100644
--- a/character/xianjian.js
+++ b/character/xianjian.js
@@ -1019,8 +1019,8 @@ character.xianjian={
 				if(result.bool){
 					player.gain(event.card,target);
 					target.gain(result.cards,player);
-					player.$give(1,target);
-					target.$give(1,player);
+					player.$giveAuto(result.cards,target);
+					target.$giveAuto(event.card,player);
 					game.log(player,'与',target,'交换了一张手牌');
 				}
 			},
diff --git a/character/yxs.js b/character/yxs.js
index bfe0069a8..647afb4d6 100644
--- a/character/yxs.js
+++ b/character/yxs.js
@@ -1123,8 +1123,9 @@ character.yxs={
 				'step 1'
 				if(result.bool){
 					player.logSkill('xiadao',result.targets);
-					result.targets[0].gain(trigger.player.get('h').randomGet(),trigger.player);
-					trigger.player.$give(1,result.targets[0]);
+					var card=trigger.player.get('h').randomGet();
+					result.targets[0].gain(card,trigger.player);
+					trigger.player.$giveAuto(card,result.targets[0]);
 				}
 			},
 			ai:{
@@ -1638,11 +1639,18 @@ character.yxs={
 				}
 				"step 2"
 				if(event.targets.length){
-					var target=event.targets.shift();
-					player.gain(target.get('h').randomGet(),target);
-					target.$give(1,player);
-					event.redo();
+					for(var i=0;i<event.targets.length;i++){
+						var gainedcard=event.targets[i].get('h').randomGet();
+						player.gain(gainedcard,event.targets[i]).delay=false;
+						event.targets[i].$giveAuto(gainedcard,player);
+					}
+					game.delay();
 				}
+				else{
+					event.finish();
+				}
+				"step 3"
+				game.delay();
 			}
 		},
 		seyou:{
diff --git a/game/game.js b/game/game.js
index d839e6682..750c18d35 100644
--- a/game/game.js
+++ b/game/game.js
@@ -8128,20 +8128,25 @@
 						cards.push(event.result.links[i]);
 					}
 					event.cards=cards;
-					var hs=[],oths=[];
-					for(var i=0;i<cards.length;i++){
-						if(get.position(cards[i])=='h'){
-							hs.push(cards[i]);
-						}
-						else{
-							oths.push(cards[i]);
-						}
+					if(!_status.connectMode&&(target.isUnderControl(true)||player.isUnderControl(true))){
+						target.$give(cards,player);
 					}
-					if(hs.length){
-						target.$give(hs.length,player);
-					}
-					if(oths.length){
-						target.$give(oths,player);
+					else{
+						var hs=[],oths=[];
+						for(var i=0;i<cards.length;i++){
+							if(get.position(cards[i])=='h'){
+								hs.push(cards[i]);
+							}
+							else{
+								oths.push(cards[i]);
+							}
+						}
+						if(hs.length){
+							target.$give(hs.length,player);
+						}
+						if(oths.length){
+							target.$give(oths,player);
+						}
 					}
 					"step 4"
 					player.gain(event.cards,target);
@@ -13678,6 +13683,19 @@
 					lib.listenEnd(node);
 					return node;
 				},
+				$giveAuto:function(card,player){
+					var args=Array.from(arguments);
+					if(_status.connectMode||(!this.isUnderControl(true)&&!player.isUnderControl(true))){
+						if(Array.isArray(card)){
+							card=card.length;
+						}
+						else{
+							card=1;
+						}
+						args[0]=card;
+					}
+					return this.$give.apply(this,args);
+				},
 				$give:function(card,player,log,init){
 					if(init!==false){
                         game.broadcast(function(source,card,player,init){
diff --git a/mode/boss.js b/mode/boss.js
index 513eda910..ecc2c5aa5 100644
--- a/mode/boss.js
+++ b/mode/boss.js
@@ -2596,13 +2596,15 @@ mode.boss={
 				var players=get.players(player);
 				players.remove(player);
 				event.players=players;
+				player.line(players,'green');
 				"step 1"
 				if(event.players.length){
 					var current=event.players.shift();
 					var hs=current.get('h')
 					if(hs.length){
-						player.gain(hs.randomGet(),current);
-						current.$give(1,player);
+						var card=hs.randomGet();
+						player.gain(card,current);
+						current.$giveAuto(card,player);
 					}
 					event.redo();
 				}
diff --git a/mode/chess.js b/mode/chess.js
index d58a1fbe8..fc32676a3 100644
--- a/mode/chess.js
+++ b/mode/chess.js
@@ -4524,13 +4524,15 @@ mode.chess={
 				var players=get.players(player);
 				players.remove(player);
 				event.players=players;
+				player.line(players,'green');
 				"step 1"
 				if(event.players.length){
 					var current=event.players.shift();
 					var hs=current.get('h')
 					if(hs.length){
-						player.gain(hs.randomGet(),current);
-						current.$give(1,player);
+						var card=hs.randomGet();
+						player.gain(card,current);
+						current.$giveAuto(card,player);
 					}
 					event.redo();
 				}