From 7240a729ed86c2b71fd3aa2a1646a8a8ee454cf2 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Sat, 16 Apr 2016 17:31:51 +0800
Subject: [PATCH] qice

---
 character/yijiang.js |  3 ++-
 mode/boss.js         |  1 +
 mode/chess.js        |  1 +
 mode/guozhan.js      |  1 +
 mode/stone.js        | 36 +++++++++++++++---------------------
 mode/versus.js       |  1 +
 6 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/character/yijiang.js b/character/yijiang.js
index 0f17208ed..d4f82d78a 100755
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -4512,7 +4512,8 @@ character.yijiang={
 				filter:function(button,player){
 					return lib.filter.filterCard({name:button.link[2]},player,_status.event.getParent());
 				},
-				check:function(button,player){
+				check:function(button){
+					var player=_status.event.player;
 					var recover=0,lose=1;
 					for(var i=0;i<game.players.length;i++){
 						if(!game.players[i].isOut()){
diff --git a/mode/boss.js b/mode/boss.js
index 57217d856..f666e8c6e 100755
--- a/mode/boss.js
+++ b/mode/boss.js
@@ -779,6 +779,7 @@ mode.boss={
 	ai:{
 		get:{
 			attitude:function(from,to){
+				if(!from||!to) return 0;
 				var t=(from.side===to.side?1:-1);
 				if(from.isMad()){
 					t=-t;
diff --git a/mode/chess.js b/mode/chess.js
index 6157badf1..98bc5262c 100755
--- a/mode/chess.js
+++ b/mode/chess.js
@@ -5954,6 +5954,7 @@ mode.chess={
 	ai:{
 		get:{
 			attitude:function(from,to){
+				if(!from||!to) return 0;
 				var t=(from.side===to.side?1:-1);
 				if(from.isMad()){
 					t=-t;
diff --git a/mode/guozhan.js b/mode/guozhan.js
index c8ebac0dd..24a11de73 100755
--- a/mode/guozhan.js
+++ b/mode/guozhan.js
@@ -1193,6 +1193,7 @@ mode.guozhan={
 				return -0.5;
 			},
 			attitude:function(from,to){
+				if(!from||!to) return 0;
 				if(to.identity=='unknown'&&game.players.length==2) return -5;
 				if(_status.currentPhase==from&&from.ai.tempIgnore&&
 					from.ai.tempIgnore.contains(to)&&to.identity=='unknown'&&
diff --git a/mode/stone.js b/mode/stone.js
index 5662ba39d..8a82c7e04 100755
--- a/mode/stone.js
+++ b/mode/stone.js
@@ -1142,7 +1142,7 @@ mode.stone={
 			stone_xukongkongmo:['male','qun',3,['warlock_tunshi'],['minskin','stone'],[3,3,'warlock']],
 			stone_fukongmoyan:['male','qun',4,['warlock_shijie'],['minskin','stone'],[5,4,'warlock']],
 
-			stone_zhihuiguan:['female','qun',2,['warrior_tongling'],['minskin','stone'],[2,2,'warrior']],
+			stone_zhihuiguan:['female','qun',2,['warrior_tongling'],['minskin','stone'],[3,2,'warrior']],
 			stone_kuangzhanshi:['male','qun',2,['warrior_baoluan'],['minskin','stone'],[3,1,'warrior']],
 			stone_zhujiashi:['male','qun',2,['warrior_zhujia'],['minskin','stone'],[2,1,'warrior']],
 			stone_jiangong:['male','qun',2,['warrior_jiangong'],['minskin','stone'],[2,2,'warrior']],
@@ -7154,7 +7154,7 @@ mode.stone={
 				trigger.finish();
 			},
 			ai:{
-				threaten:0
+				threaten:0.1
 			}
 		},
 		stone_jingxiang:{
@@ -7182,7 +7182,7 @@ mode.stone={
 				}
 			},
 			ai:{
-				threaten:0
+				threaten:0.1
 			}
 		},
 		priest_xundao:{
@@ -7423,26 +7423,18 @@ mode.stone={
 			}
 		},
 		warrior_tongling:{
-			trigger:{source:'fellow'},
+			trigger:{global:'fellow'},
 			forced:true,
 			unique:true,
 			filter:function(event,player){
-				for(var i=0;i<game.players.length;i++){
-					if(game.players[i].isMin()&&game.players[i]!=player&&
-						game.players[i].side==player.side&&game.players[i].isTurnedOver()){
-						return true;
-					}
-				}
-				return false;
+				return event.source.side==player.side&&event.source!=player&&event.source.num('h')<=2;
 			},
 			content:function(){
-				for(var i=0;i<game.players.length;i++){
-					if(game.players[i].isMin()&&game.players[i]!=player&&
-						game.players[i].side==player.side&&game.players[i].isTurnedOver()){
-						game.players[i].turnOver();
-						player.line(game.players[i],'green');
-					}
-				}
+				trigger.source.classList.remove('turnedover');
+				player.line(trigger.source,'green');
+			},
+			ai:{
+				threaten:1.3
 			}
 		},
 		warrior_baoluan:{
@@ -8976,10 +8968,11 @@ mode.stone={
 			}
 		},
 		stone_zhufu:{
-			trigger:{player:'phaseEnd'},
+			trigger:{global:'phaseEnd'},
 			forced:true,
 			unique:true,
 			filter:function(event,player){
+				if(event.player!=player.getLeader()) return false;
 				for(var i=0;i<game.players.length;i++){
 					if(game.players[i].isMin()&&game.players[i]!=player&&
 					game.players[i].side==player.side&&game.players[i].hp<game.players[i].maxHp){
@@ -9746,7 +9739,7 @@ mode.stone={
 		warrior_zhifu_info:'每当你受到一次伤害，对敌方主将造成一点伤害',
 
 		warrior_tongling:'统领',
-		warrior_tongling_info:'你出场时，将所有友方随从的武将牌翻至正面',
+		warrior_tongling_info:'每当你召唤一个初始手牌数不大于2的随从，令其获得冲锋',
 		warrior_baoluan:'暴乱',
 		warrior_baoluan_info:'每当一名随从受到一次伤害，摸一张牌',
 		warrior_jiangong:'监工',
@@ -10084,7 +10077,7 @@ mode.stone={
 		stone_mingguangjisi:'明光祭司',
 		stone_nianqingjisi:'年轻祭司',
 		stone_zhufu:'祝福',
-		stone_zhufu_info:'回合结束阶段，你令一名随机的受伤友方随从回复一点体力',
+		stone_zhufu_info:'己方主将的回合结束阶段，你令一名随机的受伤友方随从回复一点体力',
 		stone_aomishouwei:'奥秘守卫',
 		stone_yanjingshe:'眼镜蛇',
 		stone_yanjingshe1:'毒噬',
@@ -10141,6 +10134,7 @@ mode.stone={
 	ai:{
 		get:{
 			attitude:function(from,to){
+				if(!from||!to) return 0;
 				var num;
 				if(to.isMin()&&!to.skills.contains('chaofeng')){
 					num=5;
diff --git a/mode/versus.js b/mode/versus.js
index c26ce9223..513bc31c4 100755
--- a/mode/versus.js
+++ b/mode/versus.js
@@ -2484,6 +2484,7 @@ mode.versus={
 	ai:{
 		get:{
 			attitude:function(from,to){
+				if(!from||!to) return 0;
 				if(from.side==to.side){
 					if(to.identity=='zhu'){
 						if(_status.connectMode){