From 96224a79b7ed998a29d2f6b387225d24b92a6a9a Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Thu, 9 Feb 2017 20:12:24 +0800
Subject: [PATCH] 1.9.8.1

---
 card/gujian.js            |  8 +++++---
 card/sp.js                |  4 ++--
 character/hearth.js       |  4 ++--
 character/refresh.js      |  4 ++++
 game/game.js              | 23 +++++++++++++----------
 layout/default/layout.css |  3 +++
 6 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/card/gujian.js b/card/gujian.js
index 5113e75f6..e9864c455 100644
--- a/card/gujian.js
+++ b/card/gujian.js
@@ -1289,9 +1289,11 @@ card.gujian={
                         }
                     }
                     var target=list.randomGet();
-                    player.logSkill('mapodoufu',target);
-                    target.discard(target.get('he').randomGet());
-                    target.addExpose(0.2);
+                    if(target){
+                        player.logSkill('mapodoufu',target);
+                        target.discard(target.get('he').randomGet());
+                        target.addExpose(0.2);
+                    }
                 }
                 player.storage.mapodoufu_markcount--;
                 if(player.storage.mapodoufu_markcount==0){
diff --git a/card/sp.js b/card/sp.js
index 0bd81c0e8..b71b3d20b 100644
--- a/card/sp.js
+++ b/card/sp.js
@@ -94,7 +94,7 @@ card.sp={
 					player.chooseCard('h','将一张手牌交给'+get.translation(event.target1),true);
 				}
 				'step 1'
-				player.$give(1,event.target1);
+				player.$giveAuto(result.cards,event.target1);
 				event.target1.gain(result.cards,player);
 				'step 2'
 				if(!event.target1.num('h')){
@@ -113,7 +113,7 @@ card.sp={
 				if(!event.directresult){
 					event.directresult=result.cards;
 				}
-				event.target1.$give(event.directresult.length,event.target2);
+				event.target1.$giveAuto(event.directresult,event.target2);
 				event.target2.gain(event.directresult,event.target1);
 			},
 			ai:{
diff --git a/character/hearth.js b/character/hearth.js
index a12100fe2..883ef42c0 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -800,7 +800,7 @@ character.hearth={
 			}
 		},
 		peiyu:{
-			trigger:{player:['phaseBegin','phaseEnd']},
+			trigger:{player:['phaseBegin']},
 			direct:true,
 			content:function(){
 				'step 0'
@@ -5627,7 +5627,7 @@ character.hearth={
 		yingxi:'影袭',
 		yingxi_info:'结束阶段，若你本回合未造成伤害，你可以将一张黑色牌当作杀对任意一名角色使用，若目标未受到伤害，此杀不可闪避',
 		peiyu:'培育',
-		peiyu_info:'准备阶段和结束阶段，你可以令一名没有图腾的角色获得一个随机图腾直到其首次受到伤害',
+		peiyu_info:'准备阶段，你可以令一名没有图腾的角色获得一个随机图腾直到其首次受到伤害',
 		peiyu_old_info:'出牌阶段，你可以弃置一张牌令一名没有图腾的角色获得一个随机图腾，或令一名有图腾的角色替换一个图腾；你死亡时，其他角色失去以此法获得的图腾',
 		wzhanyi:'战意',
 		wzhanyi_info:'你可以跳过出牌阶段，改为摸三张牌并展示之，将摸到的装备牌置于装备区，然后可以使用手牌中的杀',
diff --git a/character/refresh.js b/character/refresh.js
index f337b187a..65e6ed81e 100644
--- a/character/refresh.js
+++ b/character/refresh.js
@@ -1438,6 +1438,10 @@ character.refresh={
 				if(event.player==player) return ai.get.attitude(player,event.source)>-3;
 				return ai.get.attitude(player,event.player)>-3;
 			},
+			logTarget:function(event,player){
+				if(event.player==player) return event.source;
+				return event.player;
+			},
 			content:function(){
 				"step 0"
 				game.asyncDraw([trigger.player,trigger.source],trigger.num);
diff --git a/game/game.js b/game/game.js
index 424579a9e..2d171abe0 100644
--- a/game/game.js
+++ b/game/game.js
@@ -21202,7 +21202,7 @@
 					event.nodes.push(ui.create.div('.shadowed.reduce_radius.choosedouble'));
 				}
 				event.moveAvatar=function(node,i){
-					if(!node.moved){
+					if(!node.classList.contains('moved')){
 						event.blank.push(node.index);
 					}
 					event.nodes[node.index].style.display='';
@@ -21221,7 +21221,7 @@
 				event.aiMove=function(){
 					var list=[];
 					for(var i=0;i<event.avatars.length;i++){
-						if(!event.avatars[i].moved){
+						if(!event.avatars[i].classList.contains('moved')){
 							list.push(event.avatars[i]);
 						}
 					}
@@ -21229,7 +21229,7 @@
 						if(Math.random()<0.7||i==list.length-1){
 							event.moveAvatar(list[i],event.enemy.length);
 							event.enemy.push(list[i]);
-							list[i].moved=true;
+							list[i].classList.add('moved');
 							break;
 						}
 					}
@@ -21316,16 +21316,19 @@
 						}
 					}
 					else{
-						if(this.moved) return;
 						if(!event.imchoosing) return;
 						if(event.replacing){
 							this.link=event.replacing;
 							this.setBackground(event.replacing,'character');
 							delete event.replacing;
+							if(this.classList.contains('moved')){
+								event.custom.add.window();
+							}
 						}
+						if(this.classList.contains('moved')) return;
 						event.moveAvatar(this,event.friend.length+event.config.width*(event.config.height-1));
 						event.friend.push(this.link);
-						this.moved=true;
+						this.classList.add('moved');
 						game.resume();
 					}
 				};
@@ -21357,9 +21360,9 @@
 						event.friend.length=0;
 						event.enemy.length=0;
 						for(var i=0;i<event.avatars.length;i++){
-							if(event.avatars[i].moved){
+							if(event.avatars[i].classList.contains('moved')){
 								event.moveAvatar(event.avatars[i],event.blank.randomRemove());
-								delete event.avatars[i].moved;
+								delete event.avatars[i].classList.remove('moved');
 							}
 						}
 						event.redoing=true;
@@ -21390,7 +21393,7 @@
 						e.stopPropagation();
 						event.freechoosedialog.style.transform='scale(0.8)';
 						if(event.replacing){
-							event.prompt('用'+get.translation(event.replacing)+'替换一名未选择武将');
+							event.prompt('用'+get.translation(event.replacing)+'替换一名武将');
 						}
 						else{
 							if(event.side==0){
@@ -21550,7 +21553,7 @@
 				if(event.reselectnode) event.reselectnode.delete();
 				if(event.freechoosenode) event.freechoosenode.delete();
 				for(var i=0;i<event.avatars.length;i++){
-					if(!event.avatars[i].moved){
+					if(!event.avatars[i].classList.contains('moved')){
 						if(event.side<2){
 							event.moveAvatar(event.avatars[i],event.friend.length+event.config.width*(event.config.height-1));
 							event.friend.push(event.avatars[i]);
@@ -21559,7 +21562,7 @@
 							event.moveAvatar(event.avatars[i],event.enemy.length);
 							event.enemy.push(event.avatars[i]);
 						}
-						event.avatars[i].moved=true;
+						event.avatars[i].classList.add('moved');
 					}
 				}
 				game.delay();
diff --git a/layout/default/layout.css b/layout/default/layout.css
index 2ba9e090d..09f9ffa5f 100644
--- a/layout/default/layout.css
+++ b/layout/default/layout.css
@@ -1714,6 +1714,9 @@ div:hover>.intro{opacity: 1;}
 #window>.choosedouble.character{
 	transform-origin: top left;
 }
+#window>.choosedouble.character.moved{
+	z-index: 1;
+}
 #window>.choosedouble.character>.name{
 	left: 6%;
 	top: 8%;