From 131a242000ff07ee2189253c1c229b68c7d9ddc0 Mon Sep 17 00:00:00 2001
From: libccy <operawidget@163.com>
Date: Wed, 31 May 2017 16:02:36 +0800
Subject: [PATCH] t

---
 character/swd.js | 25 ++++++++++---------------
 game/game.js     |  9 ++++++---
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/character/swd.js b/character/swd.js
index e78050fcd..9af9644f8 100644
--- a/character/swd.js
+++ b/character/swd.js
@@ -4143,8 +4143,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			trigger:{global:'phaseEnd'},
     			check:function(event,player){
     				if(get.damageEffect(event.player,player,player,'thunder')>0){
-    					if(get.is.altered('touxi')){
-    						if(get.attitude(player,event.player)<0&&event.player.hp==1&&player.hp>1){
+    					if(get.is.altered('touxi')&&get.attitude(player,event.player)<0&&player.countCards('he')){
+    						if(event.player.hp==1&&player.hp>1){
     							return true;
     						}
     					}
@@ -4172,18 +4172,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     					event.finish();
     				}
     				else{
-    					if(get.is.altered('touxi')){
-    						player.damage(trigger.player);
-    					}
-    					else{
-    						if(player.countCards('he')){
-    	                        var att=get.attitude(trigger.player,player);
-    							trigger.player.discardPlayerCard(player,'he',function(button){
-    	                            if(att>0) return 0;
-    	                            return get.buttonValue(button);
-    	                        });
-    						}
-    					}
+						if(player.countCards('he')){
+	                        var att=get.attitude(trigger.player,player);
+							trigger.player[get.is.altered('touxi')?'gainPlayerCard':'discardPlayerCard'](player,'he',function(button){
+	                            if(att>0) return 0;
+	                            return get.buttonValue(button);
+	                        });
+						}
     				}
     			},
     			ai:{
@@ -9508,7 +9503,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 
     		touxi:'偷袭',
     		touxi_info:'在其他角色的结束阶段，你可以进行一次判定，若结果为黑色，你对其造成一点雷电伤害，且直到下一回合开始不能再次发动偷袭；若结果为红色，对方可以弃置你的一张牌',
-    		touxi_info_alter:'在其他角色的结束阶段，你可以进行一次判定，若结果为黑色，你对其造成一点雷电伤害，且直到下一回合开始不能再次发动偷袭；若结果为红色，对方对你造成一点伤害',
+    		touxi_info_alter:'在其他角色的结束阶段，你可以进行一次判定，若结果为黑色，你对其造成一点雷电伤害，且直到下一回合开始不能再次发动偷袭；若结果为红色，对方可以获得你的一张牌',
     		minjing:'明镜',
     		minjing_info:'若你没有防具牌，你视为装备了光纱天衣',
     		jqimou:'奇谋',
diff --git a/game/game.js b/game/game.js
index 1b805dbea..158d34bb9 100644
--- a/game/game.js
+++ b/game/game.js
@@ -8954,6 +8954,9 @@
 							if(typeof info.prompt2=='function'){
 								next.prompt2=info.prompt2(trigger,player);
 							}
+							else if(info.prompt2!=false&&lib.translate[event.skill+'_info']){
+								next.prompt2=lib.translate[event.skill+'_info'];
+							}
     					}
     				}
     				"step 3"
@@ -9699,7 +9702,7 @@
 								}
 								event.dialog=ui.create.dialog(str);
 								if(event.prompt2){
-									event.dialog.addText(event.prompt2);
+									event.dialog.addText(event.prompt2,event.prompt2.length<=20);
 								}
                                 if(Array.isArray(event.selectCard)){
                                     event.promptbar=event.dialog.add('0/'+get.numStr(event.selectCard[1],'card'));
@@ -10229,7 +10232,7 @@
 							}
 							event.dialog=ui.create.dialog(str);
 							if(event.prompt2){
-								event.dialog.addText(event.prompt2);
+								event.dialog.addText(event.prompt2,event.prompt2.length<=20);
 							}
 							event.promptbar=event.dialog.add('0/'+get.numStr(event.selectCard[1],'card'));
 							event.custom.add.card=function(){
@@ -10476,7 +10479,7 @@
 						else if(event.prompt){
 							event.dialog=ui.create.dialog(event.prompt);
 							if(event.prompt2){
-								event.dialog.addText(event.prompt2);
+								event.dialog.addText(event.prompt2,event.prompt2.length<=20);
 							}
 						}
 						game.pause();