From d3f650c5a393afaf5e019f91f7b5cb240fbc2dd1 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Fri, 31 Mar 2017 14:57:59 +0800
Subject: [PATCH] pre

---
 card/swd.js         | 27 ---------------------------
 character/gujian.js | 36 +-----------------------------------
 character/hearth.js | 44 +++++++++++++++++++++++++++++++++++++++++++-
 game/game.js        | 18 ++++++++++--------
 4 files changed, 54 insertions(+), 71 deletions(-)

diff --git a/card/swd.js b/card/swd.js
index 9ccce769d..5f2e2f271 100644
--- a/card/swd.js
+++ b/card/swd.js
@@ -4579,33 +4579,6 @@ card.swd={
 				}
 			}
 		},
-		xujin:{
-			trigger:{player:'phaseBefore'},
-			check:function(){return false;},
-			filter:function(event,player){
-				return player.storage.xujin<player.hp;
-			},
-			content:function(){
-				player.storage.xujin++;
-				trigger.untrigger();
-				trigger.finish();
-			},
-			intro:{
-				content:'已积攒#点力量'
-			},
-			group:['xujin2']
-		},
-		xujin2:{
-			trigger:{source:'damageBegin'},
-			forced:true,
-			filter:function(event,player){
-				return player.storage.xujin>0;
-			},
-			content:function(){
-				trigger.num+=player.storage.xujin;
-				player.storage.xujin--;
-			}
-		},
 		sadengjinhuan:{
 			trigger:{player:'shaMiss'},
 			check:function(event,player){
diff --git a/character/gujian.js b/character/gujian.js
index 2c452f0f1..686fb11b1 100644
--- a/character/gujian.js
+++ b/character/gujian.js
@@ -642,40 +642,6 @@ character.gujian={
 				}
 			}
 		},
-		meiying_old:{
-			trigger:{global:'phaseBefore'},
-			filter:function(event,player){
-				return event.player!=player&&!player.isTurnedOver()&&!player.storage.meiying;
-			},
-			check:function(event,player){
-				return ai.get.attitude(player,event.player)<0&&
-				((player.countCards('h')>player.hp&&player.countCards('h','lebu')==0)||get.distance(player,event.player)>1);
-			},
-			logTarget:'player',
-			content:function(){
-				"step 0"
-				player.line(trigger.player,'green');
-				player.phase();
-				player.storage.meiying=trigger.player;
-				"step 1"
-				if(!player.isTurnedOver()){
-					player.turnOver();
-				}
-				delete player.storage.meiying;
-			},
-			mod:{
-				targetInRange:function(card,player,target,now){
-					if(target==player.storage.meiying) return true;
-				},
-			},
-			ai:{
-				effect:{
-					target:function(card){
-						if(card.name=='guiyoujie') return [0,0];
-					}
-				}
-			}
-		},
 		xidie:{
 			trigger:{player:'phaseBegin'},
 			direct:true,
@@ -869,7 +835,7 @@ character.gujian={
 				}
 				if(trigger.source){
 					trigger.source.storage.mingkong=true;
-					trigger.source.addTempSkill('mingkong2','phaseBefore');
+					trigger.source.addTempSkill('mingkong2','phaseAfter');
 				}
 			},
 			ai:{
diff --git a/character/hearth.js b/character/hearth.js
index 1a08b8932..f5160e78a 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -169,6 +169,47 @@ character.hearth={
 		hs_malfurion:['hs_malorne'],
 	},
 	skill:{
+		mengye:{
+			trigger:{global:'phaseBegin'},
+			priority:19,
+			filter:function(event,player){
+				if(get.mode()=='identity'&&_status.mode=='zhong'&&game.zhu&&!game.zhu.isZhu) return false;
+				if(event.player.identity=='zhu'||get.is.jun(event.player)) return false;
+				return !player.isTurnedOver()&&event.player!=player;
+			},
+			check:function(event,player){
+				var att=ai.get.attitude(player,event.player);
+				return att<=-3&&!game.hasPlayer(function(current){
+					return ai.get.attitude(player,current)<att;
+				});
+			},
+			logTarget:'player',
+			content:function(){
+				player.turnOver();
+				trigger.player.storage.mengye=player;
+				trigger.player.addSkill('mengye');
+				trigger.player.ai.modAttitudeFrom=function(from,to){
+					return ai.get.attitude(player,to);
+				}
+				trigger.player.ai.modAttitudeTo=function(){
+					return 0;
+				}
+				// if()
+			}
+		},
+		mengye2:{
+			temp:true,
+			mark:true,
+			intro:{
+				content:'由$控制本回合行动'
+			},
+			onremove:true,
+			trigger:{player:['phaseAfter','dieBegin']},
+			forced:true,
+			content:function(){
+
+			}
+		},
 		lianzhan:{
 			trigger:{source:'damageEnd'},
 			forced:true,
@@ -6117,7 +6158,8 @@ character.hearth={
 		hs_wujiyuansu:'无羁元素',
 
 		mengye:'梦魇',
-		mengye_info:'在一名其他角色的回合开始前，若你的武将牌正面朝上，你可以翻面并代替其进行一回合行动',
+		mengye2:'梦魇',
+		mengye_info:'在一名非主公的其他角色的回合开始前，若你的武将牌正面朝上，你可以翻面并代替其进行一回合行动',
 		fuhua:'腐化',
 		fuhua2:'腐化',
 		fuhua_info:'出牌阶段，你可以将一张毒交给一名没有魔血技能的其他角色，该角色选择一项：1. 获得技能魔血，此后每个出牌阶段开始时需交给你一张牌；2. 视为你对其使用一张决斗，若你因此受到伤害，本局不能再对其发动腐化',
diff --git a/game/game.js b/game/game.js
index ab7bc8690..79306df96 100644
--- a/game/game.js
+++ b/game/game.js
@@ -23966,14 +23966,16 @@
 					players[i].style.transition='all 0s';
 				}
 				game.addVideo('swapPlayer',player,get.cardsInfo(player.getCards('h')));
-				var pos=parseInt(player.dataset.position);
-				var num=game.players.length+game.dead.length;
-				var players=game.players.concat(game.dead);
-				var temp;
-				for(var i=0;i<players.length;i++){
-					temp=parseInt(players[i].dataset.position)-pos;
-					if(temp<0) temp+=num;
-					players[i].dataset.position=temp;
+				if(!game.chess){
+					var pos=parseInt(player.dataset.position);
+					var num=game.players.length+game.dead.length;
+					var players=game.players.concat(game.dead);
+					var temp;
+					for(var i=0;i<players.length;i++){
+						temp=parseInt(players[i].dataset.position)-pos;
+						if(temp<0) temp+=num;
+						players[i].dataset.position=temp;
+					}
 				}
 				game.me.node.handcards1.remove();
 				game.me.node.handcards2.remove();