3

card/gwent.js

@@ -852,6 +852,12 @@ game.import('card',function(lib,game,ui,get,ai,_status){
     					}
 						hs2.push(game.createCard(list.randomGet()));
 					}
+					var list=get.libCard(function(info){
+						return info.type=='spell'&&info.subtype!='spell_gold';
+					});
+					if(list.length){
+						hs2.push(game.createCard(list.randomGet()));
+					}
 					if(hs2.length){
 						player.gain(hs2,'draw');
 					}
@@ -2236,7 +2242,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 			gw_huangjiashenpan:'皇家审判',
 			gw_huangjiashenpan_info:'获得任意一张金卡法术（皇家审判除外），然后结束出牌阶段',
 			gw_chongci:'冲刺',
-			gw_chongci_info:'弃置所有牌，每弃置一张手牌，便随机获得一张类别相同的牌；每弃置一张装备区内的牌，随机装备一件类别相同的装备；获得潜行直到下一回合开始，然后结束出牌阶段',
+			gw_chongci_info:'弃置所有牌并随机获得一张非金法术牌，每弃置一张手牌，便随机获得一张类别相同的牌；每弃置一张装备区内的牌，随机装备一件类别相同的装备；获得潜行直到下一回合开始，然后结束出牌阶段',
 			gw_tunshi:'吞噬',
 			gw_tunshi_info:'随机移除一名敌方角色的一个随机技能，你获得此技能并减少一点体力和体力上限，被移除技能的角色增加一点体力和体力上限，然后结束出牌阶段',
 			gw_dieyi:'蝶翼',

character/swd.js

@@ -3075,6 +3075,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				mingzhi:false,
     				effect:{
     					target:function(card,player,target){
+            				if(player==_status.currentPhase) return;
     						if(!game.hasPlayer(function(current){
     							return get.distance(player,current,'attack')>1&&player!=current&&get.attitude(player,current)>=0;
     						})){

mode/boss.js

@@ -715,18 +715,18 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				boss_taowu:['male','shen',16,['boss_xiongshou','boss_minwan','boss_nitai','boss_luanchang','boss_luanchang_switch'],['qun','boss','bossallowed'],'qun'],
 				boss_zhuyin:['male','shen',4,['boss_xiongshou'],['qun','hiddenboss','bossallowed'],'qun'],
 
-				boss_chiyanshilian:['male','',0,['boss_chiyan','boss_chiyan_intro1','boss_chiyan_intro2','boss_chiyan_intro3'],['boss'],'zhu'],
-				boss_zhuque:['female','shen',4,['boss_shenyi','boss_fentian','boss_chiyan2'],['shu','hiddenboss','bossallowed']],
-				boss_huoshenzhurong:['male','shen',5,['boss_shenyi','boss_xingxia','boss_chiyan3'],['shu','hiddenboss','bossallowed']],
-				boss_yanling:['male','shen',4,['boss_huihuo','boss_furan'],['shu','hiddenboss','bossallowed']],
-				boss_yandi:['male','shen',6,['boss_shenyi','boss_shenen','boss_chiyi'],['shu','hiddenboss','bossallowed']],
-
 				boss_qingmushilian:['male','',0,['boss_qingmu','boss_qingmu_intro1','boss_qingmu_intro2','boss_qingmu_intro3'],['boss'],'wu'],
 				boss_qinglong:['male','shen',4,['boss_shenyi','releiji','boss_qingmu2'],['wu','hiddenboss','bossallowed']],
 				boss_mushengoumang:['male','shen',5,['boss_shenyi','boss_buchun','boss_qingmu3'],['wu','hiddenboss','bossallowed']],
 				boss_shujing:['female','shen',2,['boss_cuidu'],['wu','hiddenboss','bossallowed']],
 				boss_taihao:['male','shen',6,['boss_shenyi','boss_shenen','boss_qingyi'],['wu','hiddenboss','bossallowed']],
 
+				boss_chiyanshilian:['male','',0,['boss_chiyan','boss_chiyan_intro1','boss_chiyan_intro2','boss_chiyan_intro3'],['boss'],'zhu'],
+				boss_zhuque:['female','shen',4,['boss_shenyi','boss_fentian','boss_chiyan2'],['shu','hiddenboss','bossallowed']],
+				boss_huoshenzhurong:['male','shen',5,['boss_shenyi','boss_xingxia','boss_chiyan3'],['shu','hiddenboss','bossallowed']],
+				boss_yanling:['male','shen',4,['boss_huihuo','boss_furan'],['shu','hiddenboss','bossallowed']],
+				boss_yandi:['male','shen',6,['boss_shenyi','boss_shenen','boss_chiyi'],['shu','hiddenboss','bossallowed']],
+
 				boss_baimangshilian:['male','',0,['boss_baimang','boss_baimang_intro1','boss_baimang_intro2','boss_baimang_intro3'],['boss'],'qun'],
 				boss_baihu:['male','shen',4,['boss_shenyi','boss_kuangxiao','boss_baimang2'],['qun','hiddenboss','bossallowed']],
 				boss_jinshenrushou:['male','shen',5,['boss_shenyi','boss_xingqiu','boss_baimang3'],['qun','hiddenboss','bossallowed']],
@@ -766,7 +766,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				boss_zhangchunhua:['female','shen',4,['jueqing','boss_wuxin','shangshix'],['wei','boss','bossallowed'],'wei'],
 				boss_zhenji:['female','shen',4,['tashui','lingbo','jiaoxia','fanghua'],['wei','boss','bossallowed'],'wei'],
 
-				boss_liubei:['male','shen',12,['xiaoxiong','boss_zhangwu'],['shu','boss','bossallowed'],'qun'],
+				boss_liubei:['male','shen',8,['xiaoxiong','boss_zhangwu'],['shu','boss','bossallowed'],'qun'],
 				boss_zhugeliang:['male','shen',Infinity,['xiangxing','yueyin','fengqi','gaiming'],['shu','boss','bossallowed'],'qun'],
 				boss_huangyueying:['female','shen',4,['boss_gongshen','boss_jizhi','qicai','boss_guiyin'],['shu','boss','bossallowed'],'wei'],
 				boss_pangtong:['male','shen',4,['boss_tianyu','qiwu','niepan','boss_yuhuo'],['shu','boss','bossallowed'],'zhu'],
@@ -3874,45 +3874,67 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				},
 				content:function(){
 					player.gain(game.createCard(trigger.card),'gain2');
+				},
+				group:'xiaoxiong_damage',
+				subSkill:{
+					damage:{
+						trigger:{global:'phaseEnd'},
+						forced:true,
+						filter:function(event,player){
+							return event.player!=player&&event.player.countUsed()==0;
+						},
+						logTarget:'player',
+						content:function(){
+							trigger.player.damage();
+						}
+					}
 				}
 			},
 			boss_zhangwu:{
 				global:'boss_zhangwu_ai',
 				trigger:{player:'damageEnd'},
 				check:function(event,player){
-					return event.source&&get.damageEffect(event.source,player,player)>0;
+					return event.source&&event.source.isIn()&&get.damageEffect(event.source,player,player)>0;
 				},
 				filter:function(event){
 					return event.source&&event.source.isAlive();
 				},
+				direct:true,
 				logTarget:'source',
 				content:function(){
 					'step 0'
-					var target=trigger.source;
+					player.chooseToDiscard(get.prompt('boss_zhangwu',trigger.source),'he',[1,Infinity]).set('ai',function(card){
-					if(target.countCards('h')==0){
+						if(get.attitude(player,target)<0) return 8-get.value(card);
-						target.damage(2);
+						return 0;
+					}).set('logSkill',['boss_zhangwu',trigger.source]);
+					'step 1'
+					if(result.bool){
+						var num=result.cards.length;
+						var cnum=get.cnNumber(num);
+						event.num=num;
+						trigger.source.chooseToDiscard('he','章武：弃置'+cnum+'张牌，或取消并受到'+cnum+'点伤害',num).set('ai',function(card){
+							if(!trigger.source.hasSkillTag('nodamage')) return 10-get.value(card);
+							return 0;
+						});
+					}
+					else{
 						event.finish();
 					}
-					else{
+					'step 2'
-						target.chooseControl('discard_card','get_damage',function(){
+					if(!result.bool){
-							if(get.damageEffect(target,player,target)>=0) return 'get_damage';
+						trigger.source.damage(event.num);
-							var nh=target.countCards('h');
-							if(nh<=3||target.hp<=3||target.hasSkillTag('noh')) return 'discard_card';
-							return 'get_damage';
-						})
-					}
-					'step 1'
-					var target=trigger.source;
-					if(result.control=='discard_card'){
-						target.discard(target.getCards('h'));
-					}
-					else{
-						target.damage(2);
 					}
 				},
 				ai:{
 					maixie:true,
 					maixie_hp:true,
+					effect:{
+						target:function(card,player,target){
+							if(get.tag(card,'damage')&&get.attitude(target,player)<0&&player.countCards('he')<target.countCards('he')){
+								return [0,2];
+							}
+						}
+					}
 				}
 			},
 			boss_zhangwu_ai:{
@@ -6405,7 +6427,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 			boss_guojia:'世之奇士',
 			boss_caocao:'魏武大帝',
 
-			boss_chiyanshilian:'赤炎试炼',
+			boss_chiyanshilian:'夏之试炼',
 			boss_zhuque:'朱雀',
 			boss_huoshenzhurong:'火神祝融',
 			boss_yanling:'焰灵',
@@ -6472,19 +6494,19 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 			honghuangzhili_cbg:'洪',
 			honghuangzhili_info:'若该角色的势力是神，你获得其一张牌，其【神裔】无效直到其下家的回合（这个下家是动态变化的，会随着一个人的死或者复活而变化）开始；若该角色的势力不是神，其翻面。',
 
-			boss_qingmushilian:'青木试炼',
+			boss_qingmushilian:'春之试炼',
 			boss_qinglong:'青龙',
 			boss_mushengoumang:'木神勾芒',
 			boss_shujing:'树精',
 			boss_taihao:'太昊',
 
-			boss_baimangshilian:'白芒试炼',
+			boss_baimangshilian:'秋之试炼',
 			boss_baihu:'白虎',
 			boss_jinshenrushou:'金神蓐收',
 			boss_mingxingzhu:'明刑柱',
 			boss_shaohao:'少昊',
 
-			boss_xuanlinshilian:'玄鳞试炼',
+			boss_xuanlinshilian:'冬之试炼',
 			boss_xuanwu:'玄武',
 			boss_shuishenxuanming:'水神玄冥',
 			boss_shuishengonggong:'水神共工',
@@ -6547,9 +6569,9 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 			xiongcai:'雄才',
 			xiongcai_info:'锁定技，你在回合结束后随机获得一个魏势力角色的所有技能',
 			xiaoxiong:'枭雄',
-			xiaoxiong_info:'锁定技，每当一名其他角色使用一张基本牌或锦囊牌，你获得一张与之同名的牌',
+			xiaoxiong_info:'锁定技，每当一名其他角色使用一张基本牌或锦囊牌，你获得一张与之同名的牌；在一名其他角色的结束阶段，若其本回合没有使用牌，你对其造成一点伤害',
 			boss_zhangwu:'章武',
-			boss_zhangwu_info:'每当你受到一次伤害，你可以令伤害来源选择一项：弃置所有手牌（至少一张），或受到两点伤害',
+			boss_zhangwu_info:'每当你受到一次伤害，你可以弃置任意张牌并令伤害来源选择一项：弃置等量的牌，或受到等量的伤害',
 			xiangxing:'禳星',
 			xiangxing_info:'锁定技，游戏开始时，你获得7枚星；每当你累计扣减7点体力，你失去一枚星，并造成7点雷属性伤害，随机分配给其他角色；当你失去全部星后，你的体力上限变为3',
 			yueyin:'月隐',