From 5b1b46d3f153f5e063f1a26e8a6101b44bff0bd8 Mon Sep 17 00:00:00 2001
From: libccy <operawidget@163.com>
Date: Fri, 4 Aug 2017 13:32:46 +0800
Subject: [PATCH] v1.9.35

---
 character/gwent.js  | 63 +++++++++++++++++++++++++++++++++++++++++++--
 character/hearth.js |  2 +-
 game/asset.js       |  2 +-
 mode/versus.js      |  7 +++++
 4 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/character/gwent.js b/character/gwent.js
index 69b5f034f..4e76f3ce0 100644
--- a/character/gwent.js
+++ b/character/gwent.js
@@ -49,7 +49,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 
 			gw_bierna:['female','qun',4,['gwfengshi']],
 			gw_haizhiyezhu:['male','qun',4,['yangfan']],
-			gw_nitelila:['male','qun',4,['shuangxi']],
+			gw_nitelila:['male','wei',4,['shuangxi']],
 		},
 		characterIntro:{
 			gw_huoge:'那个老年痴呆?不知道他是活着还是已经被制成标本了!',
@@ -65,6 +65,65 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			gw_yioufeisi:'国王还是乞丐，两者有何区别，人类少一个算一个',
 		},
 		skill:{
+			shuangxi:{
+				enable:'phaseUse',
+				round:2,
+				filterTarget:function(card,player,target){
+					if(player.getStat('damage')){
+						return player.canUse('gw_baishuang',target);
+					}
+					else{
+						return player.canUse('gw_ciguhanshuang',target);
+					}
+				},
+				// changeTarget:function(player,targets){
+				// 	if(!player.getStat('damage')){
+				// 		game.filterPlayer(function(current){
+		        //             return get.distance(targets[0],current,'pure')==1;
+		        //         },targets);
+				// 	}
+				// },
+				selectTarget:function(){
+					if(_status.event.player.getStat('damage')){
+						return [1,3];
+					}
+					else{
+						return 1;
+					}
+				},
+				delay:0,
+				multitarget:true,
+				multiline:true,
+				prompt:function(){
+					if(_status.event.player.getStat('damage')){
+						return '视为使用一张【白霜】';
+					}
+					else{
+						return '视为使用一张【刺骨寒霜】';
+					}
+				},
+				content:function(){
+					if(player.getStat('damage')){
+						player.useCard({name:'gw_baishuang'},targets);
+					}
+					else{
+						player.useCard({name:'gw_ciguhanshuang'},targets);
+					}
+				},
+				ai:{
+					order:1,
+					result:{
+						player:function(player,target){
+							if(player.getStat('damage')){
+								return get.effect(target,{name:'gw_baishuang'},player,player);
+							}
+							else{
+								return get.effect(target,{name:'gw_ciguhanshuang'},player,player);
+							}
+						}
+					}
+				}
+			},
 			yangfan:{
 				trigger:{player:'useCard'},
 				forced:true,
@@ -2246,7 +2305,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			gw_nitelila:'尼斯里拉',
 
 			shuangxi:'霜袭',
-			shuangxi_info:'每两轮限一次，你可以视为使用一张【刺骨寒霜】；若你本回合造成过伤害，改为使用【白霜】',
+			shuangxi_info:'每两轮限一次，出牌阶段，你可以视为使用一张【刺骨寒霜】；若你在本回合造成过伤害，改为使用【白霜】',
 			gwfengshi:'风蚀',
 			gwfengshi_info:'结束阶段，你可以选择一项：1. 为自己施加一个随机负面效果，并对两名随机敌人施加一个随机负面效果；2. 为自己施加两个随机正面效果，并对一名随机敌人施加一个随机正面效果',
 			yangfan:'扬帆',
diff --git a/character/hearth.js b/character/hearth.js
index 91a275852..e810aaca9 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -107,7 +107,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 
             hs_zhihuanhua:['female','wei',3,['huanjue']],
             hs_shirencao:['male','wu',3,['srjici']],
-            hs_kaituozhe:['female','wei',3,['tansuo','yinzong']],
+            hs_kaituozhe:['female','wu',3,['tansuo','yinzong']],
 
             hs_fachaotuteng:['male','wei',3,['xiyong']],
             hs_huolituteng:['male','wei',3,['hllingxi']],
diff --git a/game/asset.js b/game/asset.js
index 42c059493..db3fd6bf2 100644
--- a/game/asset.js
+++ b/game/asset.js
@@ -1,5 +1,5 @@
 window.noname_asset_list=[
-    '1.9.33.2',
+    '1.9.35',
     'image/background/huangtian_bg.jpg',
     'image/background/ol_bg.jpg',
     'image/background/september_bg.jpg',
diff --git a/mode/versus.js b/mode/versus.js
index a49da5b20..f0084ba1a 100644
--- a/mode/versus.js
+++ b/mode/versus.js
@@ -1563,6 +1563,13 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
                     if(_status.rechoose){
                         delete _status.rechoose;
                         event.goto(0);
+                        var dialog=event.xdialog;
+    					if(dialog){
+                            for(var i=0;i<dialog.buttons.length;i++){
+    							dialog.buttons[i].classList.remove('unselectable');
+    							dialog.buttons[i].classList.remove('noclick');
+        					}
+    					}
                         return;
                     }
                     if(event.seatsbutton){