From cee0d3bb98d73a82312a1dd4730d6f06f0e569dd Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Thu, 10 Sep 2015 17:35:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=81=AB=E6=94=BBbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.MD          |  8 ++----
 card/extra.js         |  6 +++--
 character/hearth.js   | 59 +++++++++++++++++++++++++++++--------------
 character/refresh.js  |  2 +-
 character/swd.js      | 34 +++++++++++++++++++++++++
 character/xianjian.js | 16 +++++++-----
 character/xswd.js     |  2 +-
 7 files changed, 92 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 8f5aa5456..033d9c638 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -1,6 +1,2 @@
-1.2.10
-国战部分技能bug修正
-部分单挑AI修正
-拼点AI改进
-补全珠联璧合
-新炉石武将
+1.2.11
+火攻bug
diff --git a/card/extra.js b/card/extra.js
index 707e453af..b29998e5c 100755
--- a/card/extra.js
+++ b/card/extra.js
@@ -111,7 +111,8 @@ card.extra={
 					player:function(player){
 						var nh=player.num('h');
 						if(nh<=player.hp&&_status.event.name=='chooseToUse'){
-							if(_status.event.filterCard({name:'huogong'})){
+							if(_status.event.filterCard&&
+								_status.event.filterCard({name:'huogong'})){
 								return -10;
 							}
 							if(_status.event.skill){
@@ -125,7 +126,8 @@ card.extra={
 					target:function(player,target){
 						if(target.skills.contains('huogong2')||target.num('h')==0) return 0;
 						if(target==player){
-							if(_status.event.filterCard({name:'huogong'})){
+							if(_status.event.filterCard&&
+								_status.event.filterCard({name:'huogong'})){
 								return -1.5;
 							}
 							if(_status.event.skill){
diff --git a/character/hearth.js b/character/hearth.js
index 1eead2de6..6918283ce 100755
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -8,7 +8,7 @@ character.hearth={
 		hs_malfurion:['male','wu',4,['jihuo'],['fullskin']],
 		hs_guldan:['male','qun',3,['fenliu','hongxi'],['fullskin']],
 		hs_anduin:['male','qun',3,['shengguang','shijie','anying'],['fullskin']],
-		hs_sthrall:['male','qun',4,['tuteng','tzhenji'],['fullskin']],
+		hs_sthrall:['male','wu',4,['tuteng','tzhenji'],['fullskin']],
 		hs_waleera:['female','qun',3,['jianren','mengun','wlianji'],['fullskin']],
 
 		hs_medivh:['male','wei',3,['jingxiang','moying','mdzhoufu'],['fullskin']],
@@ -19,7 +19,7 @@ character.hearth={
 		hs_wvelen:['male','qun',3,['shengyan','xianzhi'],['fullskin']],
 		hs_antonidas:['male','wei',3,['yanshu','bingshuang'],['fullskin']],
 		hs_alakir:['male','wei',3,['fengnu','shengdun'],['fullskin']],
-		hs_zhouzhuo:['male','qun',3,['jubao','qingnang'],['fullskin']],
+		hs_zhouzhuo:['male','qun',3,['jubao','qice'],['fullskin']],
 		hs_yngvar:['male','wei',3,['huanwu'],['fullskin']],
 		hs_bchillmaw:['male','wei',6,['hanshuang','bingshi'],['fullskin']],
 		hs_malorne:['male','wu',3,['shenen','chongsheng'],['fullskin']],
@@ -29,7 +29,13 @@ character.hearth={
 		hs_mijiaojisi:['female','qun',3,['kuixin'],['fullskin']],
 		hs_huzhixiannv:['female','wu',3,['jingmeng','qingliu'],['fullskin']],
 		hs_tgolem:['male','qun',4,['guozai'],['fullskin']],
-		hs_totemic:['male','qun',3,['s_tuteng'],['fullskin']],
+		hs_totemic:['male','wu',3,['s_tuteng'],['fullskin']],
+	},
+	perfectPair:{
+		hs_sthrall:['hs_totemic','hs_alakir','hs_neptulon','hs_yngvar','hs_tgolem'],
+		hs_anduin:['hs_wvelen','hs_mijiaojisi'],
+		hs_jaina:['hs_antonidas'],
+		hs_malfurion:['hs_malorne'],
 	},
 	skill:{
 		shenen:{
@@ -104,27 +110,42 @@ character.hearth={
 			}
 		},
 		guozai:{
-			trigger:{player:'phaseDrawBegin'},
-			check:function(event,player){
-				return player.num('h')<player.hp;
-			},
+			enable:'phaseUse',
+			usable:2,
 			filter:function(event,player){
-				return !player.skills.contains('guozai2');
+				return player.num('h')<4;
+			},
+			init:function(player){
+				player.storage.guozai2=0;
 			},
 			content:function(){
-				trigger.num+=2;
-				player.addTempSkill('guozai2','phaseAfter');
+				var num=4-player.num('h');
+				player.draw(num);
+				player.addSkill('guozai2');
+				player.storage.guozai2+=num;
+			},
+			ai:{
+				order:1,
+				result:{
+					player:function(player){
+						return (player.num('h')<=1)?1:0;
+					}
+				}
 			}
 		},
 		guozai2:{
 			mark:true,
 			intro:{
-				content:'已发动过载'
-			},
-			mod:{
-				maxHandcard:function(player,num){
-					return num-1;
+				content:function(storage){
+					return '需弃置'+get.cnNumber(storage)+'张牌';
 				}
+			},
+			trigger:{player:'phaseUseEnd'},
+			forced:true,
+			content:function(){
+				player.chooseToDiscard('he',true,player.storage.guozai2);
+				player.storage.guozai2=0;
+				player.removeSkill('guozai2');
 			}
 		},
 		hanshuang:{
@@ -1627,7 +1648,7 @@ character.hearth={
 		guozai:'过载',
 		guozai2:'过载',
 		guozai2_bg:'载',
-		guozai_info:'摸牌阶段，你可以额外摸两张牌，若如此做，你本回合的手牌上限-1',
+		guozai_info:'出牌阶段，你可将手牌补至四张，并于此阶段结束时弃置等量的牌，每阶段最多发动两次',
 		hanshuang:'寒霜',
 		hanshuang_info:'锁定技，你使用黑色牌造成伤害后，受伤害角色须将武将牌翻至背面，然后你流失一点体力',
 		bingshi:'冰噬',
@@ -1683,10 +1704,10 @@ character.hearth={
 		bianxing_info:'当一其他角色于回合内使用卡牌指定了惟一的其他目标后，你可以用一张合理的基本牌替代此牌，每名角色的回合限一次',
 		xianzhi:'先知',
 		xianzhi_info:'任意一名角色进行判定前，你可以观看牌堆顶的两张牌，并可以将其调换顺序',
-		mdzhoufu:'诅咒',
-		mdzhoufu2:'诅咒',
+		mdzhoufu:'缚魂',
+		mdzhoufu2:'缚魂',
 		mdzhoufu_info:'出牌阶段，你可以将一张黑色手牌置于一名其他角色的武将牌上，在其判定时以此牌作为判定结果，然后你获得亮出的判定牌',
-		moying:'魔影',
+		moying:'诅咒',
 		moying_info:'锁定技，回合开始阶段，若场上没有闪电且你手牌中有黑桃牌，你将牌堆中的一张闪电置于你的判定区，否则你摸一张牌',
 		moying_old_info:'每当你造成或受到一次伤害，你可以令伤害目标或来源进行一次判定，若结果为黑色，其流失一点体力',
 		jingxiang:'镜像',
diff --git a/character/refresh.js b/character/refresh.js
index d30897c7d..f0505e607 100755
--- a/character/refresh.js
+++ b/character/refresh.js
@@ -342,7 +342,7 @@ character.refresh={
 				target.chooseControl('refanjian_card','refanjian_hp').ai=function(event,player){
 					var cards=target.get('he',{suit:get.suit(player.storage.refanjian)});
 					if(cards.length==1) return 0;
-					if(cards.length==2){
+					if(cards.length>=2){
 						for(var i=0;i<cards.length;i++){
 							if(get.tag(cards[i],'save')) return 1;
 						}
diff --git a/character/swd.js b/character/swd.js
index 766b5f9a2..f6b8ea98f 100755
--- a/character/swd.js
+++ b/character/swd.js
@@ -57,6 +57,40 @@ character.swd={
 			swd_ziqiao:['female','shu',3,['guaili','fuyan'],['fullskin']],
 			swd_fengyu:['male','shu',4,['zhenwei','shangxi'],['fullskin']],
 	},
+	perfectPair:{
+		swd_fengtianling:['swd_huyue','swd_jiting'],
+		swd_rongshuang:['swd_zhuoshanzhu'],
+		swd_jialanduo:['swd_zhuoshanzhu'],
+		swd_sikongyu:['swd_muyue'],
+		swd_fengyu:['swd_ziqiao'],
+		swd_zhaoyun:['swd_hengai','swd_yeyaxi','zhaoyun'],
+		swd_hengai:['zhugeliang','zhugeliangwolong'],
+		swd_duanmeng:['swd_shangzhang'],
+		swd_shangzhang:['swd_situqiang'],
+		swd_tuwei:['swd_hengai'],
+		swd_jiangwu:['swd_zhaoyun'],
+		swd_muyun:['swd_lanyin','swd_zhiyin','swd_zhanggao','xushu'],
+		swd_lanyin:['swd_zhiyin'],
+		swd_yuli:['swd_chunyuheng'],
+		swd_jiuyou:['swd_zhiyin'],
+		swd_qiner:['swd_hengai'],
+		swd_huzhongxian:['swd_jiliang','swd_jipeng'],
+		swd_anka:['swd_kama'],
+		swd_septem:['swd_nicole','swd_kama','swd_weida','swd_wangsiyue'],
+		swd_nicole:['swd_lilian'],
+		swd_xuanyuanjianxian:['swd_xuanyuanjiantong'],
+		swd_chenjingchou:['swd_yuxiaoxue','swd_tuobayuer'],
+		swd_yuxiaoxue:['swd_yuwentuo'],
+		swd_zhanglie:['swd_tuobayuer'],
+		swd_duguningke:['swd_yuwentuo','swd_shanxiaoxiao','swd_yuchiyanhong'],
+		swd_jiliang:['swd_shuijing','swd_jipeng'],
+		swd_jipeng:['swd_duopeng'],
+		swd_cheyun:['swd_huanyuanzhi','swd_murongshi'],
+		swd_murongshi:['swd_huanyuanzhi','swd_shuijing'],
+		swd_huanyuanzhi:['swd_jipeng'],
+		swd_qi:['swd_huzhongxian'],
+		swd_luchengxuan:['swd_xiarou'],
+	},
 	skill:{
 		miaobi:{
 			enable:'phaseUse',
diff --git a/character/xianjian.js b/character/xianjian.js
index 6f1133f76..be33cf07a 100755
--- a/character/xianjian.js
+++ b/character/xianjian.js
@@ -492,6 +492,7 @@ character.xianjian={
 			},
 			selectTarget:[1,Infinity],
 			filterCard:true,
+			usable:1,
 			check:function(card){
 				var player=_status.currentPhase;
 				if(player.num('h')>player.hp){
@@ -501,9 +502,9 @@ character.xianjian={
 			},
 			content:function(){
 				"step 0"
-				var suit=get.suit(cards[0]);
+				var color=get.color(cards[0]);
 				target.judge(function(card){
-					return get.suit(card)==suit?1:0;
+					return get.color(card)==color?1:0;
 				});
 				"step 1"
 				if(result.bool){
@@ -517,12 +518,13 @@ character.xianjian={
 						return ai.get.recoverEffect(target);
 					}
 				},
-				threaten:1.2
+				threaten:1.5
 			}
 		},
 		jubao:{
 			trigger:{global:'discardAfter'},
 			filter:function(event,player){
+				if(player.skills.contains('jubao2')) return false;
 				if(event.player==player) return false;
 				if(_status.currentPhase==player) return false;
 				for(var i=0;i<event.cards.length;i++){
@@ -548,12 +550,14 @@ character.xianjian={
 					player.gain(card);
 					player.$gain2(card);
 					game.log(get.translation(player)+'获得了'+get.translation(card));
+					player.addTempSkill('jubao2','phaseAfter');
 				}
 			},
 			ai:{
-				threaten:2
+				threaten:1.5
 			}
 		},
+		jubao2:{},
 		duci:{
 			trigger:{player:'loseEnd'},
 			direct:true,
@@ -1364,9 +1368,9 @@ character.xianjian={
 		changnian2:'追思',
 		changnian_info:'你死亡时，可以将所有牌交给一名其他角色，令其获得技能【追思】；若你有至少1张“蕴”，该角色增加1点体力上限回复X点体力，X为“蕴”的个数',
 		sajin:'洒金',
-		sajin_info:'出牌阶段，你可以弃置一张手牌并指定任意名角色进行判定，若判定花色与你弃置的牌相同，该角色回复一点体力',
+		sajin_info:'出牌阶段限一次，你可以弃置一张手牌并指定任意名角色进行判定，若判定颜色与你弃置的牌相同，该角色回复一点体力',
 		jubao:'聚宝',
-		jubao_info:'当其他角色于你的回合外弃置非基本牌时，你可以随机获得其中的一张',
+		jubao_info:'当其他角色于你的回合外首次弃置非基本牌时，你可以获得其中的随机一张',
 		guiyuan:'归元',
 		guiyuan_info:'出牌阶段限一次，你可以弃置一张杀并回复一点体力',
 		shuangren:'双刃',
diff --git a/character/xswd.js b/character/xswd.js
index 85dc8170e..f885298cb 100755
--- a/character/xswd.js
+++ b/character/xswd.js
@@ -1,7 +1,7 @@
 character.xswd={
 	character:{
 		swd_wushi:['male','wei',3,['zhoufu','yingbin','xuying']],
-			swd_lanmoshen:['female','wei',3,['bingjian','lieren'],['fullskin']],
+			// swd_lanmoshen:['female','wei',3,['bingjian','lieren'],['fullskin']],
 			swd_huanglei:['male','qun',3,['jilve','gongshen'],['fullskin']],
 		swd_libai:['female','qun',3,['miaobi','zhexian']],
 		swd_kendi:['male','qun',3,['guanxing','jianyan']],