From 7b3960a37ae73ec97599eedecd00ca6f0ea251cd Mon Sep 17 00:00:00 2001
From: libccy <libccy@gmail.com>
Date: Fri, 1 May 2015 16:38:20 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"Revert=20"Revert=20"Revert=20"Bug?=
 =?UTF-8?q?=E3=80=81AI=E4=BF=AE=E6=AD=A3""""?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f373916b5a1d2ec053a92850153d610f85eb9186.
---
 game/game.js | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/game/game.js b/game/game.js
index 847b5c5fc..c5ef57309 100644
--- a/game/game.js
+++ b/game/game.js
@@ -1051,7 +1051,8 @@ window.play={};
 					for(var i=0;i<event.result.buttons.length;i++){
 						cards.push(event.result.buttons[i].link);
 					}
-					player.gain(cards);
+					target.lose(cards,ui.special);
+					event.resultcards=cards;
 					var hs=[],oths=[];
 					for(var i=0;i<cards.length;i++){
 						if(get.position(cards[i])=='h'){
@@ -1067,7 +1068,10 @@ window.play={};
 					else{
 						target.$give(oths,player);
 					}
-					game.delay();
+					"step 3"
+					game.delay(2);
+					"step 4"
+					player.gain(event.resultcards);
 				},
 				showHandcards:function(){
 					"step 0"
@@ -1486,7 +1490,7 @@ window.play={};
 					if(cards){
 						event.source=get.owner(cards[0]);
 						if(event.source){
-							event.source.lose(cards);
+							event.source.lose(cards,ui.special);
 						}
 					}
 					else{
@@ -2616,20 +2620,12 @@ window.play={};
 					else next.ai=function(card){
 						var player=get.owner(card);
 						var event=_status.event.parent;
+						var to=(player==event.player?event.target:event.player);
 						var addi=(ai.get.value(card)>=8&&get.type(card)!='equip')?-10:0;
-						if(player==event.player){
-							if(event.small){
-								return -get.number(card)-ai.get.value(card)/2+addi;
-							}
-							return get.number(card)-ai.get.value(card)/2+addi;
+						if(event.small&&ai.get.attitude(player,to)>0){
+							return -get.number(card)-ai.get.value(card)+addi;
 						}
-						if(ai.get.attitude(player,_status.event.parent.player)>0){
-							if(event.small){
-								return get.number(card)-ai.get.value(card)/2+addi;
-							}
-							return -get.number(card)-ai.get.value(card)/2+addi;
-						}
-						return get.number(card)-ai.get.value(card)/2+addi;
+						return get.number(card)-ai.get.value(card)+addi;
 					}
 					next.content=lib.element.playerproto.chooseToCompare;
 					return next;
@@ -4377,8 +4373,8 @@ window.play={};
 									return;
 								}
 								if(!event.revealed&&!get.info(event.skill).forced){
-									if(game.versusSwapControl&&get.info(event.skill).direct&&player.isUnderControl()){
-										game.versusSwapControl(player);
+									if(get.info(event.skill).direct&&player.isUnderControl()){
+										game.modeSwapPlayer(player);
 										event._result={bool:true};
 									}
 									else if(get.info(event.skill).frequent&&!lib.config.autoskilllist.contains(event.skill)){
@@ -7725,11 +7721,12 @@ window.play={};
 					return;
 				}
 				var uiintro=this._poppedfunc();
-				if(!uiintro) return;
 				if(ui.currentpopped&&ui.currentpopped._uiintro){
 					ui.currentpopped._uiintro.delete();
 					delete ui.currentpopped._uiintro;
+					_status.currentpopped=null;
 				}
+				if(!uiintro) return;
 				ui.currentpopped=this;
 				uiintro.classList.add('popped');
 				uiintro.classList.add('static');