From 6e0c12e1e289c2aae802c32c3ef8ab847b1eea51 Mon Sep 17 00:00:00 2001
From: libccy <libccy@gmail.com>
Date: Sat, 2 May 2015 22:43:52 +0800
Subject: [PATCH] null

---
 card/standard.js |  3 +++
 character/swd.js | 12 ++++++++----
 game/game.js     |  2 +-
 mode/guozhan.js  |  3 +++
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/card/standard.js b/card/standard.js
index 8a408ba0f..b3d29f3d3 100644
--- a/card/standard.js
+++ b/card/standard.js
@@ -423,6 +423,9 @@ card.standard={
 				else document.getElementById('wugu').close();
 			},
 			ai:{
+				wuxie:function(){
+					if(Math.random()<0.5) return 0;
+				},
 				basic:{
 					order:3,
 					useful:1,
diff --git a/character/swd.js b/character/swd.js
index 9cad69119..d07c84126 100644
--- a/character/swd.js
+++ b/character/swd.js
@@ -4213,11 +4213,15 @@ character.swd={
 			},
 			content:function(){
 				"step 0"
-				trigger.player.draw();
-				"step 1"
-				if(player.num('h')<trigger.player.num('h')){
-					player.draw();
+				if(trigger.player!=player&&trigger.player.num('h')>=player.num('h')){
+					game.asyncDraw([trigger.player,player]);
 				}
+				else{
+					trigger.player.draw();
+					event.finish();
+				}
+				"step 1"
+				game.delay();
 			},
 			ai:{
 				expose:0.2
diff --git a/game/game.js b/game/game.js
index d11b97cd5..73e862ea1 100644
--- a/game/game.js
+++ b/game/game.js
@@ -8861,7 +8861,7 @@ window.play={};
 				if(_status.config2){
 					game.resume2();
 				}
-				e.stopPropagation();
+				// e.stopPropagation();
 				return false;
 			},
 			swap:function(){
diff --git a/mode/guozhan.js b/mode/guozhan.js
index 05a068b0b..6e757366b 100644
--- a/mode/guozhan.js
+++ b/mode/guozhan.js
@@ -209,6 +209,9 @@ mode.guozhan={
 							list=event.list.splice(0,7);
 							_status.event.dialog.close();
 							_status.event.dialog=ui.create.dialog('选择角色',[list,'character']);
+							if(get.config('change_identity')){
+								addSetting(_status.event.dialog);
+							}
 							game.uncheck();
 							game.check();
 						});