v1.9.114.4.1

card/extra.js

@@ -1015,7 +1015,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 			["club",11,"tiesuo"],
 			["club",12,"tiesuo"],
 			["club",13,"tiesuo"],
-			["heart",13,"wuxie"],
+			["heart",1,"wuxie"],
 			["heart",13,"wuxie"],
 			["spade",13,"wuxie"],
 			["spade",10,"bingliang"],

card/guozhan.js

@@ -1256,9 +1256,8 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				equipSkill:true,
 				trigger:{player:'linkBefore'},
 				forced:true,
-				//priority:20,
 				filter:function(event,player){
-					return !player.isMajor()&&!player.isLinked();
+					return player.isNotMajor()&&!player.isLinked();
 				},
 				content:function(){
 					trigger.cancel();

card/standard.js

@@ -20,7 +20,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						target:-1.5
 					},
 					tag:{
-						losehp:1
+						loseHp:1
 					}
 				}
 			},

card/yingbian.js

@@ -402,7 +402,12 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				forced:true,
 				audio:true,
 				filter:function(event,player){
-					if(event.targets.length<2||(event.card.name!='sha'&&(get.type(event.card)!='trick'||get.color(event.card)!='black'))) return false;
+					if(event.targets.length<2) return false;
+					if(event.card.name!='sha'){
+						var type=get.type(event.card);
+						if(type!='trick') return false;
+						if(get.color(event.card)!='black'&&!get.tag(event.card,'damage')) return false;
+					}
 					if(player.hasSkillTag('unequip2')) return false;
 					if(event.player.hasSkillTag('unequip',false,{
 						name:event.card?event.card.name:null,
@@ -747,7 +752,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				ai:{
 					effect:{
 						player:function(card,player,target){
-							if(typeof card!='object'||!target||get.name(card)!='sha'&&(get.type(card)!='trick'||get.color(card)!='black')) return;
+							if(typeof card!='object'||!target||get.name(card)!='sha'&&(get.type(card)!='trick'||(get.color(card)!='black'&&!get.tag(card,'damage')))) return;
 							var info=get.info(card);
 							var targets=[];
 							targets.addArray(ui.selected.targets);
@@ -809,7 +814,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 			wutiesuolian_info:'锁定技，当你使用【杀】指定目标后，若其未横置，则其横置。',
 			heiguangkai:'黑光铠',
 			heiguangkai_skill:'黑光铠',
-			heiguangkai_info:'锁定技，当你成为【杀】或黑色普通锦囊牌的目标后，若此牌的目标数大于1，则你令此牌对你无效。',
+			heiguangkai_info:'锁定技，当你成为【杀】或伤害类锦囊牌或黑色普通锦囊牌的目标后，若此牌的目标数大于1，则你令此牌对你无效。',
 			tongque:'铜雀',
 			tongque_skill:'铜雀',
 			tongque_info:'锁定技，你于一回合内使用的第一张带有【应变】效果的牌无视条件直接生效。',

character/diy.js

@@ -82,7 +82,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			key_nao:['female','key',3,['nao_duyin','nao_wanxin','nao_shouqing']],
 			key_yuuki:['female','key',3,['yuuki_yicha']],
 			key_kotarou:['male','key',3,['kotarou_rewrite','kotarou_aurora']],
-			key_tenzen:['male','key',4,['tenzen_yixing','tenzen_lingyu']],
+			key_tenzen:['male','key',4,['tenzen_fenghuan','tenzen_retianquan']],
 			key_kyouko:['female','key',3,['kyouko_rongzhu','kyouko_gongmian']],
 			key_kyou:['female','key',3,['kyou_zhidian','kyou_duanfa']],
 			
@@ -514,6 +514,106 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			key_lucia:['key_shizuru'],
 		},
 		skill:{
+			tenzen_fenghuan:{
+				trigger:{global:'useCardAfter'},
+				direct:true,
+				filter:function(event,player){
+					if(player==event.player||event.targets.length!=1||event.targets[0]!=player||!event.player.isIn()||
+						(event.card.name!='sha'&&(get.type(event.card,null,false)!='trick'||!get.tag(event.card,'damage')))) return false;
+					if(!player.canUse({
+						name:event.card.name,
+						nature:event.card.nature,
+						isCard:true,
+					},event.player,false)) return false;
+					var num=get.number(event.card);
+					if(typeof num!='number') return false;
+					num*=2;
+					var hs=player.getCards('he');
+					for(var i of hs){
+						num-=get.number(i);
+						if(num<=0) return true;
+					}
+					return false;
+				},
+				content:function(){
+					'step 0'
+					var num=get.number(trigger.card)*2;
+					var card={
+						name:trigger.card.name,
+						nature:trigger.card.nature,
+						isCard:true,
+					};
+					player.chooseToDiscard('he',get.prompt('tenzen_fenghuan',trigger.player),'弃置任意张点数之和不小于'+num+'的牌，然后视为对其使用一张'+get.translation(card)).set('selectCard',function(){
+						var cards=ui.selected.cards,num=_status.event.cardNumber;
+						for(var i of cards){
+							num-=get.number(i);
+							if(num<=0) return [cards.length,cards.length+1];
+						}
+						return [cards.length+1,cards.length+1];
+					}).set('cardNumber',num).set('logSkill',['tenzen_fenghuan',trigger.player]);
+					'step 1'
+					if(result.bool){
+						var card={
+							name:trigger.card.name,
+							nature:trigger.card.nature,
+							isCard:true,
+						},target=trigger.player;
+						if(target.isIn()&&player.canUse(card,target,false)) player.useCard(card,target,false);
+					}
+				},
+			},
+			tenzen_retianquan:{
+				trigger:{player:'useCardToPlayered'},
+				filter:function(event,player){
+					return event.card.name=='sha'&&(player.hp>0||player.countCards('he')>0);
+				},
+				logTarget:'target',
+				usable:1,
+				check:function(event,player){
+					return get.attitude(player,event.target)<0;
+				},
+				prompt2:'你可失去1点体力或弃置一张牌，展示牌堆顶的三张牌（若你的体力值小于体力上限的50%，则改为展示五张牌）。每有一张基本牌，其所需使用的【闪】的数量便+1。然后若此牌造成过伤害，则你获得展示牌中的所有非基本牌。',
+				content:function(){
+					'step 0'
+					player.chooseToDiscard('弃置一张牌，或点「取消」失去一点体力','he');
+					'step 1'
+					if(!result.bool) player.loseHp();
+					'step 2'
+					var cards=get.cards(player.hp<=player.maxHp/2?5:3);
+					player.showCards(cards,get.translation(player)+'发动了【天全】');
+					game.cardsGotoOrdering(cards).relatedEvent=trigger.getParent();
+					var num=cards.filter(function(card){
+						return get.type(card,false)=='basic';
+					}).length;
+					if(num){
+						if(trigger.card.name=='sha'){
+							var id=trigger.target.playerid;
+							var map=trigger.getParent().customArgs;
+							if(!map[id]) map[id]={};
+							if(typeof map[id].shanRequired=='number'){
+								map[id].shanRequired+=num;
+							}
+							else{
+								map[id].shanRequired=1+num;
+							}
+						}
+					}
+					if(num<5){
+						var next=game.createEvent('tenzen_retianqua_gain');
+						next.cards=cards;
+						next.player=player;
+						event.next.remove(next);
+						trigger.getParent().after.push(next);
+						next.setContent(function(){
+							if(player.getHistory('sourceDamage',function(evt){
+								return evt.card==event.parent.card;
+							}).length>0) player.gain(cards.filter(function(card){
+								return get.type(card,false)!='basic';
+							}),'gain2');
+						});
+					}
+				},
+			},
 			satomi_luodao:{
 				trigger:{player:'useCardToPlayered'},
 				logTarget:'target',
@@ -15719,6 +15819,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			satomi_daohai:'稻海',
 			satomi_daohai_info:'结束阶段，若你本回合内弃置过牌，则你可以视为使用一张【五谷丰登】。然后你可以将你于此【五谷丰登】中获得的牌当做【乐不思蜀】使用。',
 			satomi_daohai_append:'<span style="font-family: yuanli">五穀豊穣、刈り入れ時だね！</span>',
+			tenzen_fenghuan:'封还',
+			tenzen_fenghuan_info:'其他角色使用的【杀】或伤害性锦囊牌结算结束后，若你是此牌的唯一目标，则你可以弃置任意张点数之和大于等于此牌点数两倍的牌，然后视为对其使用一张名称相同的牌。',
+			tenzen_retianquan:'天全',
+			tenzen_retianquan_info:'每回合限一次。当你使用【杀】指定目标后，你可失去1点体力或弃置一张牌，然后展示牌堆顶的三张牌（若你的体力值小于体力上限的50%，则改为展示五张牌）。这些牌中每有一张基本牌，响应此牌所需的【闪】的数量便+1。此牌结算结束后，若此牌造成过伤害，则你获得展示牌中的所有非基本牌。',
 
 			key_kud:'库特莉亚芙卡',
 			kud_qiaoshou:'巧手',

character/extra.js

@@ -1895,7 +1895,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					else event.finish();
 					'step 6'
 					if(result.index==0) target.draw();
-					else target.chooseToDiscard('he',true);
+					else target.chooseToDiscard('h',true);
 					'step 7'
 					if(target.hp==target.countCards('h')) event.goto(4);
 				},

character/hearth.js

@@ -3161,7 +3161,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 				content:function(){
 					if(!lib.character.stone_misha){
-						lib.character.stone_misha=['male','shu',3,['chaofeng'],['minskin','stone','mode:stone'],[3,3,'hunter']];
+						lib.character.stone_misha=['male','shu',3,['lslschaofeng'],['minskin','stone','mode:stone'],[3,3,'hunter']];
 					}
 					if(!lib.character.stone_huofu){
 						lib.character.stone_huofu=['male','qun',2,['stone_chongfeng'],['minskin','stone','mode:stone'],[3,4,'hunter']];

character/rank.js

@@ -269,6 +269,7 @@ window.noname_character_rank={
 		're_fengfangnv',
 		'caomao',
 		'guanning',
+		'ol_puyuan',
 		'key_misuzu',
 		'key_sunohara',
 		'key_umi',
@@ -514,6 +515,7 @@ window.noname_character_rank={
 		'tengfanglan',
 		'tenggongzhu',
 		'sp_menghuo',
+		'ruiji',
 	],
 	bp:[
 		'chess_diaochan',
@@ -780,6 +782,8 @@ window.noname_character_rank={
 		'tengyin',
 		'old_yangzhi',
 		'laiyinger',
+		'yanrou',
+		'weizi',
 	],
 	b:[
 		'diy_feishi',
@@ -1008,6 +1012,7 @@ window.noname_character_rank={
 		'liuba',
 		'jin_guohuai',
 		'tw_tianyu',
+		'zhangyao',
 	],
 	bm:[
 		'diy_xizhenxihong',
@@ -1215,6 +1220,7 @@ window.noname_character_rank={
 		're_chenqun',
 		'sp_huaxin',
 		'sp_xujing',
+		'caimaozhangyun',
 	],
 	d:[
 		'lvmeng',
@@ -1235,6 +1241,7 @@ window.noname_character_rank={
 		'key_youta',
 		'old_chenqun',
 		'duanwei',
+		'wangxiang',
 	],
 	rarity:{
 		legend:[
@@ -1353,6 +1360,7 @@ window.noname_character_rank={
 			'zhangmancheng',
 			'guanning',
 			'shen_jiangwei',
+			'ol_puyuan',
 			'key_tomoya',
 			'key_masato',
 			'key_shiorimiyuki',
@@ -1944,6 +1952,10 @@ window.noname_character_rank={
 			'tenggongzhu',
 			'tengfanglan',
 			'dc_bulianshi',
+			'ruiji',
+			'weizi',
+			'yanrou',
+			'zhangyao',
 		],
 		junk:[
 			'sunshao',
@@ -1964,6 +1976,7 @@ window.noname_character_rank={
 			'key_youta',
 			'sp_xujing',
 			'fanjiangzhangda',
+			'wangxiang',
 		],
 	}
 };

character/refresh.js

@@ -8500,7 +8500,17 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					effect:{
 						target:function (card,player,target){
 							if(player.hasSkillTag('jueqing',false,target)) return [1,-1];
-							if(get.tag(card,'damage')&&player!=target) return [1,0.6];
+							if(get.tag(card,'damage')&&player!=target){
+								var cards=card.cards,evt=_status.event;
+								if(evt.player==target&&card.name=='damage'&&evt.getParent().type=='card') cards=evt.getParent().cards.filterInD();
+								if(target.hp<=1) return;
+								if(get.itemtype(cards)!='cards') return;
+								for(var i of cards){
+									if(get.name(i,target)=='tao') return [1,5];
+								}
+								if(get.value(cards,target)>=(6+player.getDamagedHp())) return [1,3];
+								return [1,0.6];
+							}
 						},
 					},
 				},
@@ -10586,21 +10596,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					order:8,
 					result:{
 						player:function(player){
-							if(player.hp<=2) return player.countCards('h')==0?1:0;
+							return get.effect(player,{name:'losehp'},player,player);
-							if(player.countCards('h',{name:'sha',color:'red'})) return 1;
-							return player.countCards('h')<=player.hp?1:0;
 						}
 					},
-					effect:function(card,player,target){
-						if(get.tag(card,'damage')){
-							if(player.hasSkillTag('jueqing',false,target)) return [1,1];
-							return 1.2;
-						}
-						if(get.tag(card,'loseHp')){
-							if(player.hp<=1) return;
-							return [0,0];
-						}
-					}
 				}
 			},
 			zhaxiang:{
@@ -10620,7 +10618,22 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					}
 				},
 				ai:{
-					maihp:true
+					maihp:true,
+					effect:function(card,player,target){
+						if(get.tag(card,'damage')){
+							if(player.hasSkillTag('jueqing',false,target)) return [1,1];
+							return 1.2;
+						}
+						if(get.tag(card,'loseHp')){
+							if(target.hp<=1) return;
+							var using=target.isPhaseUsing();
+							if(target.hp<=2) return [1,player.countCards('h')<=1&&using?3:0];
+							if(using&&target.countCards('h',{name:'sha',color:'red'})) return [1,3];
+							return [1,(target.countCards('h')<=target.hp||using&&game.hasPlayer(function(current){
+								return current!=player&&get.attitude(player,current)<0&&player.inRange(current);
+							}))?3:2]
+						}
+					}
 				}
 			},
 			zhaxiang2:{

character/shenhua.js

@@ -1373,7 +1373,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 								return 6-get.value(card);
 							});
 						}else{
-							event.target.chooseToDiscard(1,'e',true);
+							event.target.chooseToDiscard(1,'he',true,{type:'equip'});
 							event.finish();
 						};
 					}else{
@@ -7363,7 +7363,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			"nzry_zhenglun":"整论",
 			"nzry_zhenglun_info":"若你没有“橘”，你可以跳过摸牌阶段然后获得一个“橘”",
 			"nzry_feijun":"飞军",
-			"nzry_feijun_info":"出牌阶段限一次，你可以弃置一张牌，然后选择一项：令一名手牌数大于你的角色交给你一张牌；或令一名装备区里牌数大于你的角色弃置一张装备牌",
+			"nzry_feijun_info":"出牌阶段限一次。你可以弃置一张牌，然后选择一项：⒈令一名手牌数大于你的角色交给你一张牌；⒉令一名装备区里牌数大于你的角色弃置一张装备牌。",
 			"nzry_binglve":"兵略",
 			"nzry_binglve_info":"锁定技，当你发动“飞军”时，若目标与你之前指定的目标均不相同，则你摸两张牌",
 			"nzry_juzhan1":"拒战",

character/sp2.js

@@ -4,6 +4,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 		name:'sp2',
 		connect:true,
 		character:{
+			caimaozhangyun:['male','wei',4,['lianzhou','jinglan']],
+			yanrou:['male','wei',4,['choutao','xiangshu']],
+			zhangyao:['female','wu',3,['yuanyu','xiyan']],
 			tenggongzhu:['female','wu',3,['xingchong','liunian']],
 			dc_huangchengyan:['male','qun',3,['dcjiezhen','dczecai','dcyinshi']],
 			laiyinger:['female','qun',3,['xiaowu','huaping']],
@@ -148,10 +151,350 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				sp_xuzhou:['re_taoqian','caosong','zhangmiao','qiuliju'],
 				sp_zhongyuan:['re_hucheer','re_zoushi','caoanmin','re_dongcheng'],
 				sp_xiaohu:['haomeng','yanfuren'],
-				sp_decade:['wulan','leitong','huaman','wangshuang','wenyang','re_liuzan','caobuxing','re_maliang','xin_baosanniang','re_xinxianying','dongxie','guozhao','fanyufeng','ruanyu','re_dongzhao','yangwan','re_panshu','dufuren','zhouyi','caojinyu','re_sunyi','re_zhangbao','re_fengfangnv','mamidi','dc_jiben','licaiwei','dc_luotong','dc_zhuling','tengyin','dc_gaolan','guanning','caomao','laiyinger','dc_huangchengyan','tenggongzhu'],
+				sp_decade:['wulan','leitong','huaman','wangshuang','wenyang','re_liuzan','caobuxing','re_maliang','xin_baosanniang','re_xinxianying','dongxie','guozhao','fanyufeng','ruanyu','re_dongzhao','yangwan','re_panshu','dufuren','zhouyi','caojinyu','re_sunyi','re_zhangbao','re_fengfangnv','mamidi','dc_jiben','licaiwei','dc_luotong','dc_zhuling','tengyin','dc_gaolan','guanning','caomao','laiyinger','dc_huangchengyan','tenggongzhu','yanrou','caimaozhangyun','zhangyao'],
 			}
 		},
 		skill:{
+			//蔡瑁张允
+			lianzhou:{
+				audio:2,
+				trigger:{player:'phaseZhunbeiBegin'},
+				forced:true,
+				filter:function(event,player){
+					if(!player.isLinked()) return true;
+					return game.hasPlayer(function(current){
+						return current!=player&&current.hp==player.hp&&!current.isLinked();
+					});
+				},
+				content:function(){
+					'step 0'
+					if(!player.isLinked()) player.link();
+					'step 1'
+					var num=game.countPlayer(function(current){
+						return current!=player&&current.hp==player.hp&&!current.isLinked();
+					});
+					if(num>0){
+						player.chooseTarget([1,num],'选择横置任意名体力值等于你的角色',function(card,player,current){
+							return current!=player&&current.hp==player.hp&&!current.isLinked();
+						}).set('ai',function(target){
+							var player=_status.event.player;
+							return get.effect(target,{name:'tiesuo'},player,player);
+						});
+					}
+					else event.finish();
+					'step 2'
+					if(result.bool){
+						var targets=result.targets.sortBySeat();
+						player.line(targets,'green');
+						for(var i of targets) i.link();
+					}
+				},
+				ai:{halfneg:true},
+			},
+			jinglan:{
+				audio:2,
+				trigger:{source:'damageSource'},
+				forced:true,
+				content:function(){
+					var delta=player.countCards('h')-player.hp;
+					if(delta>0) player.chooseToDiscard('h',3,true);
+					else if(delta==0){
+						player.chooseToDiscard('h',true);
+						player.recover();
+					}
+					else{
+						player.damage('fire','nosource');
+						player.draw(4);
+					}
+				},
+				ai:{halfneg:true},
+			},
+			//闫柔
+			choutao:{
+				audio:2,
+				trigger:{
+					player:'useCard',
+					target:'useCardToTargeted',
+				},
+				filter:function(event,player){
+					if(event.card.name!='sha'||!event.player.isIn()) return false;
+					if(player==event.player) return player.hasCard(function(card){
+						return lib.filter.cardDiscardable(card,player,'choutao');
+					},'he');
+					return event.player.hasCard(function(card){
+						return lib.filter.canBeDiscarded(card,player,event.player);
+					},'he');
+				},
+				check:function(event,player){
+					if(player==event.player){
+						if(!player.hasCard(function(card){
+							return get.value(card)<=5;
+						},'he')) return false;
+						for(var i of event.targets){
+							var eff1=get.damageEffect(i,player,player);
+							if(eff1<0) return false;
+							if(i.hasShan()&&eff1>0) return true;
+						}
+						var sha=false;
+						return player.getCardUsable({name:'sha'})<=0&&player.hasCard(function(card){
+							if(!sha&&get.name(card)=='sha'&&player.getUseValue(card)>0){
+								sha=true;
+								return false;
+							}
+							return sha&&get.value(card)<=5;
+						},'hs');
+					}
+					else{
+						var eff1=get.effect(event.player,{name:'guohe_copy2'},player,player);
+						var eff2=get.damageEffect(player,event.player,player);
+						if(!player.hasShan()) return eff1>0;
+						if(eff2>0) return eff1>0;
+						return player.hp>2&&eff2<eff1;
+					}
+					return false;
+				},
+				logTarget:'player',
+				shaRelated:true,
+				content:function(){
+					'step 0'
+					if(player!=game.me&&!player.isOnline()&&!player.isUnderControl()) game.delayx();
+					if(player==trigger.player) player.chooseToDiscard('he',true).set('ai',function(card){
+						var player=_status.event.player;
+						var val=player.getUseValue(card);
+						if(get.name(card)=='sha'&&player.getUseValue(card)>0) val+=5;
+						return 20-val;
+					});
+					else player.discardPlayerCard(trigger.player,true,'he');
+					'step 1'
+					trigger.directHit.addArray(game.players);
+					if(player==trigger.player&&trigger.addCount!==false){
+						trigger.addCount=false;
+						player.getStat().card.sha--;
+					}
+				},
+			},
+			xiangshu:{
+				audio:2,
+				trigger:{player:'phaseJieshuBegin'},
+				direct:true,
+				limited:true,
+				skillAnimation:true,
+				animationColor:'gray',
+				filter:function(event,player){
+					return (player.getStat('damage')||0)>0&&game.hasPlayer((current)=>current.isDamaged());
+				},
+				content:function(){
+					'step 0'
+					event.num=player.getStat('damage');
+					player.chooseTarget('是否发动限定技【襄戍】？','令一名角色回复'+event.num+'点体力并摸'+get.cnNumber(event.num)+'张牌',function(card,player,target){
+						return target.isDamaged();
+					}).set('ai',function(target){
+						var num=_status.event.getParent().num,player=_status.event.player;
+						var att=get.attitude(player,target);
+						if(att>0&&num>=Math.min(player.hp,2)) return att*Math.sqrt(target.getDamagedHp());
+						return 0;
+					});
+					'step 1'
+					if(result.bool){
+						var target=result.targets[0];
+						player.awakenSkill('xiangshu');
+						player.logSkill('xiangshu',target);
+						target.recover(num);
+						target.draw(num);
+						if(player!=target) player.addExpose(0.2);
+					}
+				},
+			},
+			//张瑶
+			//Partly powered by 烟雨墨染
+			yuanyu:{
+				audio:2,
+				enable:'phaseUse',
+				usable:1,
+				content:function(){
+					'step 0'
+					player.draw();
+					'step 1'
+					if(player.countCards('h')>0){
+						var suits=lib.suit.slice(0),cards=player.getExpansions('yuanyu');
+						for(var i of cards) suits.remove(get.suit(i,false));
+						var str='选择一张手牌，作为“怨”置于武将牌上；同时选择一名其他角色，令该角色获得〖怨语〗的后续效果。'
+						if(suits.length){
+							str+='目前“怨”中未包含的花色：';
+							for(var i of suits) str+=get.translation(i);
+						}
+						player.chooseCardTarget({
+							filterCard:true,
+							filterTarget:lib.filter.notMe,
+							position:'h',
+							prompt:'怨语：选择置于武将牌上的牌和目标',
+							prompt2:str,
+							suits:suits,
+							forced:true,
+							ai1:function(card){
+								var val=get.value(card),evt=_status.event;
+								if(evt.suits.contains(get.suit(card,false))) return 8-get.value(card);
+								return 5-get.value(card);
+							},
+							ai2:function(target){
+								var player=_status.event.player;
+								if(player.storage.yuanyu_damage&&player.storage.yuanyu_damage.contains(target)) return 0;
+								return -get.attitude(player,target);
+							},
+						});
+					}
+					else event.finish();
+					'step 2'
+					var target=result.targets[0];
+					player.addSkill('yuanyu_damage');
+					player.markAuto('yuanyu_damage',result.targets);
+					player.line(target,'green');
+					if(!target.storage.yuanyu_mark){
+						target.storage.yuanyu_mark=player;
+						target.markSkillCharacter('yuanyu_mark',player,'怨语','已获得〖怨语〗效果');
+						target.addSkill('yuanyu_mark');
+					}
+					player.addToExpansion(result.cards,player,'give').gaintag.add('yuanyu');
+				},
+				intro:{
+					content:'expansion',
+					markcount:'expansion',
+				},
+				onremove:function(player,skill){
+					var cards=player.getExpansions(skill);
+					if(cards.length) player.loseToDiscardpile(cards);
+					player.removeSkill('yuanyu_damage');
+				},
+				ai:{
+					order:7,
+					result:{
+						player:1,
+					},
+				},
+				subSkill:{
+					mark:{
+						mark:'character',
+						intro:{
+							content:'已获得〖怨语〗效果',
+							onunmark:true,
+						},
+					},
+					damage:{
+						trigger:{global:'damageSource'},
+						forced:true,
+						charlotte:true,
+						onremove:function(player,skill){
+							if(player.storage[skill]){
+								for(var i of player.storage[skill]){
+									if(i.storage.yuanyu_mark==player) i.unmarkSkill('yuanyu_mark');
+								}
+							}
+							delete player.storage[skill];
+						},
+						filter:function(event,player){
+							var source=event.source;
+							return source&&player.getStorage('yuanyu_damage').contains(source)&&source.countCards('h')>0;
+						},
+						content:function(){
+							'step 0'
+							event.count=trigger.num;
+							event.target=trigger.source;
+							'step 1'
+							event.count--;
+							var suits=lib.suit.slice(0),cards=player.getExpansions('yuanyu');
+							for(var i of cards) suits.remove(get.suit(i,false));
+							var next=target.chooseCard('h',true,'将一张手牌置于'+get.translation(target)+'的武将牌上');
+							next.set('suits',suits);
+							next.set('ai',function(card){
+								var val=get.value(card),evt=_status.event;
+								if(evt.suits.contains(get.suit(card,false))) return 5-get.value(card);
+								return 8-get.value(card);
+							});
+							if(suits.length){
+								var str='目前未包含的花色：';
+								for(var i of suits) str+=get.translation(i);
+								next.set('prompt2',str);
+							}
+							'step 2'
+							player.addToExpansion(result.cards,target,'give').gaintag.add('yuanyu');
+							'step 3'
+							if(event.count>0&&target.countCards('he')>0&&player.hasSkill('yuanyu_damage')) event.goto(1);
+						},
+					},
+				},
+			},
+			xiyan:{
+				audio:2,
+				trigger:{player:'addToExpansionAfter'},
+				filter:function(event,player){
+					if(!event.gaintag.contains('yuanyu')) return false;
+					var cards=player.getExpansions('yuanyu');
+					if(cards.length<lib.suit.length) return false;
+					var suits=lib.suit.slice(0);
+					for(var i of cards){
+						suits.remove(get.suit(i));
+						if(!suits.length) return true;
+					}
+					return false;
+				},
+				logTarget:()=>_status.currentPhase,
+				forced:true,
+				content:function(){
+					'step 0'
+					player.removeSkill('yuanyu_damage');
+					var cards=player.getExpansions('yuanyu');
+					player.gain(cards,'gain2');
+					'step 1'
+					var target=_status.currentPhase;
+					if(player==target){
+						player.addMark('xiyan_buff',4,false);
+						player.addTempSkill('xiyan_buff');
+					}
+					else{
+						target.addMark('xiyan_debuff',4,false);
+						target.addTempSkill('xiyan_debuff');
+					}
+				},
+				subSkill:{
+					buff:{
+						charlotte:true,
+						mark:true,
+						marktext:" +4 ",
+						intro:{
+							content:"本回合手牌上限+4且使用牌无次数限制",
+						},
+						mod:{
+							maxHandcard:function(player,num){
+								return num+player.countMark('xiyan_buff');
+							},
+							cardUsable:function(card,player){
+								return Infinity;
+							},
+						},
+						sub:true,
+					},
+					debuff:{
+						charlotte:true,
+						mark:true,
+						marktext:" -4 ",
+						intro:{
+							content:"本回合手牌上限-#且不能使用基本牌",
+						},
+						mod:{
+							maxHandcard:function(player,num){
+								return num-player.countMark('xiyan_debuff');
+							},
+							cardEnabled:function(card){
+								if(get.type(card)=='basic') return false;
+							},
+							cardSavable:function(card){
+								if(get.type(card)=='basic') return false;
+							},
+						},
+						sub:true,
+					},
+				},
+			},
 			//滕公主
 			xingchong:{
 				audio:2,
@@ -263,7 +606,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					shuffle1:{
 						charlotte:true,
 						forced:true,
-						trigger:{player:'phaseEnd'},
+						trigger:{global:'phaseEnd'},
 						content:function(){
 							player.gainMaxHp();
 							game.delayx();
@@ -272,7 +615,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					shuffle2:{
 						charlotte:true,
 						forced:true,
-						trigger:{player:'phaseEnd'},
+						trigger:{global:'phaseEnd'},
 						content:function(){
 							'step 0'
 							player.recover();
@@ -842,7 +1185,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				content:function(){
 					'step 0'
 					var str=get.translation(player);
-					trigger.player.chooseBool('是否响应'+player+'的主公技【助势】？','令'+get.translation(player)+'摸一张牌').set('goon',get.attitude(trigger.player,player)>0).set('ai',()=>_status.event.goon);
+					trigger.player.chooseBool('是否响应'+get.translation(player)+'的主公技【助势】？','令'+get.translation(player)+'摸一张牌').set('goon',get.attitude(trigger.player,player)>0).set('ai',()=>_status.event.goon);
 					'step 1'
 					if(result.bool){
 						player.logSkill('zhushi');
@@ -915,12 +1258,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							return Array.isArray(event.respondTo)&&event.respondTo[0]==player&&player.storage.xizhen_effect&&player.storage.xizhen_effect.isIn();
 						},
 						content:function(){
+							'step 0'
 							var target=player.storage.xizhen_effect;
-							if(target.isHealthy()) player.draw(2);
+							event.target=target;
-							else{
+							target.recover();
-								target.recover();
+							'step 1'
-								player.draw();
+							player.draw(target.isHealthy()?2:1);
-							}
 						},
 						mark:'character',
 						intro:{content:'已指定$为目标'},
@@ -1429,7 +1772,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					var type=result.control;
 					if(type!='cancel2'){
 						event.type=type;
-						var cards=player.getCards('h',function(card){
+						var cards=player.getCards('he',function(card){
 							return get.type2(card,player)==type;
 						});
 						if(cards.length){
@@ -13280,7 +13623,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				content:function(){
 					'step 0'
 					player.chooseTarget(get.prompt2('rewenji'),function(card,player,target){
-						return target!=player&&target.countCards('he');
+						return target!=player&&target.countCards('he')>0;
 					}).set('ai',function(target){
 						var att=get.attitude(_status.event.player,target);
 						if(att>0) return Math.sqrt(att)/10;
@@ -13339,7 +13682,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				content:function(){
 					'step 0'
 					player.chooseTarget(get.prompt2('spwenji'),function(card,player,target){
-						return target!=player&&target.countCards('he');
+						return target!=player&&target.countCards('he')>0;
 					}).set('ai',function(target){
 						var att=get.attitude(_status.event.player,target);
 						if(att>0) return Math.sqrt(att)/10;
@@ -14819,6 +15162,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			caomao:'曹髦（241年11月15日－260年6月2日）[1]，字彦士，沛国谯县（今安徽省亳州市）人，魏文帝曹丕之孙，东海王曹霖之子，曹魏第四位皇帝（254年11月1日－260年6月2日）。正始二年（241年），生于东海王宫，自幼聪明好学，才慧早成，正始五年（244年），封为高贵乡公，嘉平六年（254年），大将军司马师废除齐王曹芳后，拥立为帝，年号正元，曹髦文才武略，崇拜少康，不满司马氏专权秉政，甘露五年（260年），亲自讨伐司马昭，为太子舍人成济所弑，年仅十九岁，以王礼葬于洛阳西北。曹髦擅长诗文，创制了九言诗，传世文章有《伤魂赋并序》《颜子论》等。爱好儒学，亲赴太学论道，著有《春秋左氏传音》（失传）。精通绘画，一说为中国第一位成为画家的皇帝，唐张彦远《历代名画记》目曹髦为中品。',
 			laiyinger:'来莺儿，是个传说中的人物，正史及古代典籍并无记载。相传来莺儿是东汉歌妓，建安年间洛阳名妓，后爱上曹操的侍卫王图，王图因延误军机而押赴刑场，当时来莺儿奋不顾身以己命换王图一死。新编古装潮剧《曹营恋歌》，秦腔《雀台歌女》讲述了歌女来莺儿与情人王图及曹操三人之间催人泪下的故事。',
 			tenggongzhu:'滕公主，名讳不详，三国人物，吴大帝孙权之女。一说为养女，生父为孙权堂弟孙奂。黄武年间（222年—228年），以公主身份下嫁功臣滕胄之子滕胤，当时滕胤年仅20岁。滕胤皮肤白皙，容貌俊美，每逢入朝大臣们没有不惊叹称羡的。滕胤仕官后，上书言及时局，又对政策多有匡弼。孙权对公主也特别宠爱，因为滕胤的缘故，又格外增加对公主的赏赐，又几次探望慰劳。少帝孙亮时期，孙綝以宗室身份独揽大权作恶多端，引发群臣不满。五凤三年（256年）滕胤与连襟吕据密谋推翻孙綝，事败遭到夷三族 。公主则被亲兄孙壹救出，携其逃亡曹魏。',
+			zhangyao:'张美人，三国东吴末帝孙皓后妃，张布之女。另有张布女，张美人姊被孙皓立为左夫人。《吴书五妃嫔传第五》：江表传曰：皓以张布女为美人，有宠，皓问曰：“汝父所在？”答曰：“贼以杀之。”皓大怒，棒杀之。后思其颜色，使巧工刻木作美人形象，恒置座侧。问左右：“布复有女否？”答曰：“布大女适故卫尉冯朝子纯。”即夺纯妻入宫，大有宠，拜为左夫人，昼夜与夫人房宴，不听朝政，使尚方以金作华燧、步摇、假髻以千数。令宫人著以相扑，朝成夕败，辄出更作，工匠因缘偷盗，府藏为空。会夫人死，皓哀愍思念，葬于苑中，大作冢，使工匠刻柏作木人，内冢中以为兵卫，以金银珍玩之物送葬，不可称计。已葬之后，皓治丧於内，半年不出。国人见葬太奢丽，皆谓皓已死，所葬者是也。皓舅子何都颜状似皓，云都代立。临海太守奚熙信讹言，举兵欲还诛都，都叔父植时为备海督，击杀熙，夷三族，讹言乃息，而人心犹疑。',
+			yanrou:'阎柔（生卒年不详），燕国广阳（今北京市附近）人。三国时期曹魏名将。年少时曾被乌丸、鲜卑俘虏，后来却得到他们的信任。刘虞死后，阎柔被鲜于辅等推举为乌丸司马，联系鲜卑为刘虞报仇，和公孙瓒对抗。在官渡之战时归曹操，拜护乌丸校尉，对曹操讨伐乌丸有功，赐爵关内侯。曹操待其如子，曹丕也视其如亲兄弟，阎柔坐镇北方，统帅幽州兵马，抗击胡人的入侵。曹丕即位后，阎柔被拜为度辽将军。',
 		},
 		characterTitle:{
 			wulan:'#b对决限定武将',
@@ -15670,6 +16015,21 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			xingchong_info:'一轮游戏开始时，你可声明两个自然数X和Y，且(X+Y)≤min(5, 你的体力上限)。你摸X张牌并展示Y张牌。若如此做，当你于本轮内失去一张以此法展示的牌后，你摸两张牌。',
 			liunian:'流年',
 			liunian_info:'锁定技。牌堆第一次洗牌后，你于回合结束时加1点体力上限；牌堆第二次洗牌后，你于本回合结束时回复1点体力，且本局游戏内的手牌上限+10。',
+			zhangyao:'张媱',
+			yuanyu:"怨语",
+			yuanyu_info:"出牌阶段限一次。你可以摸一张牌，然后选择一张手牌和一名其他角色。该角色获得如下效果直到你发动〖夕颜〗：{当该角色造成1点伤害后，其须将一张手牌作为“怨”置于你的武将牌上}。然后你将你选择的手牌作为“怨”置于你的武将牌上。",
+			xiyan:"夕颜",
+			xiyan_info:"锁定技。当有牌作为“怨”移动到你的武将牌上后，若“怨”中的花色数达到4种，则你获得所有“怨”。然后若当前回合角色：是你，你本回合手牌上限+4且使用牌无次数限制；不是你，当前回合角色本回合手牌上限-4且不能使用基本牌。",
+			yanrou:'阎柔',
+			choutao:'仇讨',
+			choutao_info:'当你使用【杀】时，或成为【杀】的目标后，你可以弃置此【杀】使用者的一张牌，令此【杀】不可被响应。若你是此【杀】的使用者，则你令此【杀】不计入次数限制。',
+			xiangshu:'襄戍',
+			xiangshu_info:'限定技。结束阶段开始时，若你本回合内造成过伤害，则你可以选择一名已受伤的角色。该角色回复X点体力并摸X张牌（X为你本回合内造成的伤害值总和且至多为5）。',
+			caimaozhangyun:'蔡瑁张允',
+			lianzhou:'连舟',
+			lianzhou_info:'锁定技。准备阶段，你横置你的武将牌。然后你可横置任意名体力值等于你的角色。',
+			jinglan:'惊澜',
+			jinglan_info:'锁定技。当你造成伤害后，若你的手牌数：大于体力值，你弃置三张手牌；等于体力值，你弃置一张手牌并回复1点体力；小于体力值，你受到1点无来源火焰伤害并摸四张牌。',
 			
 			sp_whlw:"文和乱武",
 			sp_zlzy:"逐鹿中原",

character/tw.js

@@ -12,7 +12,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			},
 		},
 		character:{
-			tw_puyangxing:['male','wu',3,['twzhengjian','twzhongchi']],
+			tw_puyangxing:['male','wu',4,['twzhengjian','twzhongchi']],
 			tw_tianyu:['male','wei',4,['twzhenxi','twyangshi']],
 			old_quancong:['male','wu',4,['zhenshan']],
 			tw_wujing:['male','wu',4,['twfenghan','twcongji']],
@@ -191,10 +191,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					player.chooseControl().set('prompt','征建：请选择一种效果').set('choiceList',[
 						'令“出牌阶段内未使用过非基本牌”的其他角色受到惩罚',
 						'令“出牌阶段内未获得过牌”的其他角色受到惩罚',
-					]);
+					]).set('ai',()=>Math.random()<=0.5?0:1);
 					'step 1'
 					player.addSkill('twzhengjian_eff'+result.index);
-					game.log(player,'获得了','#g【征建】','的','#y效果'+get.cnNumber(result.index+1,true)).set('ai',()=>Math.random()<=0.5?0:1);
+					game.log(player,'获得了','#g【征建】','的','#y效果'+get.cnNumber(result.index+1,true));
 					game.delayx();
 				},
 				onremove:true,
@@ -538,7 +538,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						if(!arg||!arg.name||arg.name!='sha') return false;
 						if(player.storage.counttrigger&&player.storage.counttrigger.twzhenxi) return false;
 						if(!arg.target) return false;
-						var card=target.getEquip(2);
+						var card=arg.target.getEquip(2);
 						return card&&get.value(card)>0&&game.hasPlayer(function(current){
 							return current!=arg.target&&current.canEquip(card)&&get.effect(current,card,player,player)>0;
 						})
@@ -1190,7 +1190,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				content:function(){
 					'step 0'
 					player.changeZhuanhuanji('twfeifu');
-					trigger.target.chooseCard('he',true,'交给'+get.translation(trigger.player)+'一张牌','若选择装备牌，则其可以使用此牌');
+					trigger.target.chooseCard('he',true,'非服：交给'+get.translation(trigger.player)+'一张牌','若选择装备牌，则其可以使用此牌');
 					'step 1'
 					if(result.bool){
 						var card=result.cards[0];

character/yingbian.js

@@ -4,6 +4,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 		name:'yingbian',
 		connect:true,
 		character:{
+			wangxiang:['male','jin',3,['bingxin']],
 			jin_guohuai:['female','jin',3,['zhefu','yidu']],
 			jin_jiachong:['male','jin',3,['xiongshu','jianhui']],
 			xuangongzhu:['female','jin',3,['gaoling','qimei','ybzhuiji'],['hiddenSkill']],
@@ -32,11 +33,122 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				yingbian_pack1:['jin_simayi','jin_zhangchunhua','ol_lisu','simazhou','cheliji','ol_huaxin'],
 				yingbian_pack2:['jin_simashi','jin_xiahouhui','zhanghuyuechen','shibao','jin_yanghuiyu'],
 				yingbian_pack3:['jin_simazhao','jin_wangyuanji','duyu','weiguan','xuangongzhu'],
-				yingbian_pack4:['zhongyan','xinchang','jin_jiachong','jin_guohuai'],
+				yingbian_pack4:['zhongyan','xinchang','jin_jiachong','jin_guohuai','wangxiang'],
 				yingbian_pack5:['yangyan','yangzhi'],
 			},
 		},
 		skill:{
+			bingxin:{
+				audio:2,
+				enable:'chooseToUse',
+				hiddenCard:function(player,name){
+					if(get.type(name)=='basic'&&lib.inpile.contains(name)&&!player.getStorage('bingxin_count').contains(name)) return true;
+				},
+				filter:function(event,player){
+					if(event.type=='wuxie') return false;
+					var hs=player.getCards('h');
+					if(hs.length!=Math.max(0,player.hp)) return false;
+					if(hs.length>1){
+						var color=get.color(hs[0],player);
+						for(var i=1;i<hs.length;i++){
+							if(get.color(hs[i],player)!=color) return false;
+						}
+					}
+					var storage=player.storage.bingxin_count
+					for(var i of lib.inpile){
+						if(get.type(i)!='basic') continue;
+						if(storage&&storage.contains(i)) continue;
+						var card={name:i,isCard:true};
+						if(event.filterCard(card,player,event)) return true;
+						if(i=='sha'){
+							for(var j of lib.inpile_nature){
+								card.nature=j;
+								if(event.filterCard(card,player,event)) return true;
+							}
+						}
+					}
+					return false;
+				},
+				chooseButton:{
+					dialog:function(event,player){
+						var list=[];
+						var storage=player.storage.bingxin_count;
+						for(var i of lib.inpile){
+							if(get.type(i)!='basic') continue;
+							if(storage&&storage.contains(i)) continue;
+							var card={name:i,isCard:true};
+							if(event.filterCard(card,player,event)) list.push(['基本','',i]);
+							if(i=='sha'){
+								for(var j of lib.inpile_nature){
+									card.nature=j;
+									if(event.filterCard(card,player,event)) list.push(['基本','',i,j]);
+								}
+							}
+						}
+						return ui.create.dialog('冰心',[list,'vcard'],'hidden')
+					},
+					check:function(button){
+						if(button.link[2]=='shan') return 3;
+						var player=_status.event.player;
+						if(button.link[2]=='jiu'){
+							if(player.getUseValue({name:'jiu'})<=0) return 0;
+							if(player.countCards('h','sha')) return player.getUseValue({name:'jiu'});
+							return 0;
+						}
+						return player.getUseValue({name:button.link[2],nature:button.link[3]})/4;
+					},
+					backup:function(links,player){
+						return {
+							selectCard:-1,
+							filterCard:()=>false,
+							viewAs:{
+								name:links[0][2],
+								nature:links[0][3],
+								isCard:true,
+							},
+							precontent:function(){
+								player.logSkill('bingxin');
+								player.draw();
+								delete event.result.skill;
+								var name=event.result.card.name;
+								player.addTempSkill('bingxin_count');
+								player.markAuto('bingxin_count',[name]);
+							},
+						}
+					},
+					prompt:function(links,player){
+						var name=links[0][2];
+						var nature=links[0][3];
+						return '摸一张并视为使用'+(get.translation(nature)||'')+get.translation(name);
+					},
+				},
+				ai:{
+					order:function(item,player){
+						return 10;
+					},
+					respondShan:true,
+					respondSha:true,
+					skillTagFilter:function(player,tag){
+						var hs=player.getCards('h');
+						if(hs.length!=Math.max(0,hs.length)) return false;
+						if(hs.length>1){
+							var color=get.color(hs[0],player);
+							for(var i=1;i<hs.length;i++){
+								if(get.color(hs[i],player)!=color) return false;
+							}
+						}
+						var storage=player.storage.bingxin_count;
+						if(storage&&storage.contains('s'+tag.slice(8))) return false;
+					},
+					result:{
+						player:function(player){
+							if(_status.event.dying) return get.attitude(player,_status.event.dying);
+							return 1;
+						}
+					}
+				},
+				subSkill:{count:{charlotte:true,onremove:true}},
+			},
 			zhefu:{
 				audio:2,
 				trigger:{player:['useCard','respond']},
@@ -3366,6 +3478,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			xinchang:'辛敞（生卒年不详），字泰雍，陇西人氏，是曹魏时代官员。卫尉辛毗之子，辛宪英之弟。',
 			xuangongzhu:'高陵宣公主（？—？）司马氏，晋宣帝司马懿第二女。司马氏下嫁杜预。其侄司马炎登基时，司马氏已经去世。泰始年间（265年—274年）追赠高陵公主。',
 			jin_guohuai:'郭槐（237年-296年），字媛韶，太原阳曲（今山西太原）人，魏晋权臣贾充的妻子。父亲是曹魏城阳郡太守郭配，伯父是曹魏名将郭淮。出身太原郭氏。二十一岁时，嫁贾充作继室，生二女二子，长女贾南风，次女贾午，一子贾黎民。贾南风是西晋惠帝司马衷皇后，干预国政，专权误国，直接导致“八王之乱”和西晋亡国。',
+			wangxiang:'王祥（184年，一作180年－268年4月30日），字休徵。琅邪临沂（今山东省临沂市西孝友村）人。三国曹魏及西晋时大臣。王祥于东汉末隐居二十年，在曹魏，先后任县令、大司农、司空、太尉等职，封爵睢陵侯。西晋建立，拜太保，进封睢陵公。泰始四年四月戊戌日（268年4月30日）去世，年八十五（一作八十九），谥号“元”。有《训子孙遗令》一文传世。王祥侍奉后母朱氏极孝，为传统文化中二十四孝之一“卧冰求鲤”的主人翁。',
 		},
 		characterTitle:{},
 		perfectPair:{},
@@ -3568,6 +3681,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			zhefu_info:'当你于回合外使用或打出基本牌后，你可令一名有手牌的其他角色选择一项：⒈弃置一张名称相同的基本牌。⒉受到你造成的1点伤害。',
 			yidu:'遗毒',
 			yidu_info:'当你使用的【杀】或伤害性锦囊牌结算结束后，若此牌目标数为1且你未造成过渠道为此牌的伤害，则你可以展示目标角色的至多三张手牌。若这些牌颜色均相同，则其弃置这些牌。',
+			wangxiang:'王祥',
+			bingxin:'冰心',
+			bingxin_info:'每种牌名每回合限一次。当你需要使用基本牌时，若你的手牌数等于体力值且这些牌的颜色均相同，则你可以摸一张牌，视为使用一张基本牌。',
 
 			yingbian_pack1:'文德武备·理',
 			yingbian_pack2:'文德武备·备',

game/asset.js

@@ -176,6 +176,13 @@ window.noname_asset_list=[
 	'audio/card/male/yuanjiao.mp3',
 	'audio/card/male/zhibi.mp3',
 	
+	'audio/die/caimaozhangyun.mp3',
+	'audio/die/ol_puyuan.mp3',
+	'audio/die/wangxiang.mp3',
+	'audio/die/wenyang.mp3',
+	'audio/die/yanrou.mp3',
+	'audio/die/zhangyao.mp3',
+	
 	'audio/die/baosanniang.mp3',
 	'audio/die/beimihu.mp3',
 	'audio/die/bianfuren.mp3',
@@ -917,6 +924,27 @@ window.noname_asset_list=[
 	'audio/die/zuoci.mp3',
 	'audio/die/zuofen.mp3',
 
+	'audio/skill/bingxin1.mp3',
+	'audio/skill/bingxin2.mp3',
+	'audio/skill/choutao1.mp3',
+	'audio/skill/choutao2.mp3',
+	'audio/skill/jinglan1.mp3',
+	'audio/skill/jinglan2.mp3',
+	'audio/skill/lianzhou1.mp3',
+	'audio/skill/lianzhou2.mp3',
+	'audio/skill/olqisi1.mp3',
+	'audio/skill/olqisi2.mp3',
+	'audio/skill/olshengong1.mp3',
+	'audio/skill/olshengong2.mp3',
+	'audio/skill/xiangshu1.mp3',
+	'audio/skill/xiangshu2.mp3',
+	'audio/skill/xiyan1.mp3',
+	'audio/skill/xiyan2.mp3',
+	'audio/skill/yongjin_xin_lingtong1.mp3',
+	'audio/skill/yongjin_xin_lingtong2.mp3',
+	'audio/skill/yuanyu1.mp3',
+	'audio/skill/yuanyu2.mp3',
+
 	'audio/skill/anguo1.mp3',
 	'audio/skill/anguo2.mp3',
 	'audio/skill/anjian1.mp3',
@@ -4382,6 +4410,9 @@ window.noname_asset_list=[
 	'image/card/gx_chongyingshenfu.png',
 	'image/card/gx_lingbaoxianhu.png',
 	'image/card/gx_taijifuchen.png',
+	'image/card/bintieshuangji.png',
+	'image/card/sanlve.png',
+	'image/card/zhaogujing.png',
 
 	'image/card/bagua.png',
 	'image/card/baihupifeng.png',
@@ -5357,6 +5388,13 @@ window.noname_asset_list=[
 	'image/character/tenggongzhu.jpg',
 	'image/character/tw_puyangxing.jpg',
 	'image/character/tw_tianyu.jpg',
+	'image/character/caimaozhangyun.jpg',
+	'image/character/ol_puyuan.jpg',
+	'image/character/ruiji.jpg',
+	'image/character/wangxiang.jpg',
+	'image/character/weizi.jpg',
+	'image/character/yanrou.jpg',
+	'image/character/zhangyao.jpg',
 	
 	'image/character/baiwuchang.jpg',
 	'image/character/baosanniang.jpg',

game/update.js

@@ -1,16 +1,15 @@
 window.noname_update={
-	version:'1.9.114.4',
+	version:'1.9.114.4.1',
-	update:'1.9.114.3.1',
+	update:'1.9.114.4',
 	changeLog:[
-		'OL杨艳、杨芷、郭槐、SP孟获、滕芳兰',
+		'OL蒲元、芮姬、王祥、卫兹',
-		'十周年界步练师、黄承彦、来莺儿、滕公主',
+		'十周年蔡瑁张允、阎柔、张媱',
-		'手杀刘巴、TW濮阳兴、TW田豫',
 		'bug修复',
 	],
 	files:[
-		//'card/extra.js',
+		'card/extra.js',
 		//'card/gujian.js',
-		//'card/guozhan.js',
+		'card/guozhan.js',
 		//'card/gwent.js',
 		//'card/huanlekapai.js',
 		//'card/mtg.js',
@@ -18,24 +17,24 @@ window.noname_update={
 		'card/standard.js',
 		//'card/swd.js',
 		//'card/yunchou.js',
-		//'card/yingbian.js',
+		'card/yingbian.js',
 		//'card/yongjian.js',
 		//'card/zhenfa.js',
 		//'card/zhulu.js',
 		'character/diy.js',
 		'character/extra.js',
-		//'character/hearth.js',
+		'character/hearth.js',
 		//'character/gujian.js',
 		//'character/gwent.js',
         //'character/hearth.js',
-		'character/mobile.js',
+		//'character/mobile.js',
 		//'character/mtg.js',
 		//'character/offline.js',
-		'character/old.js',
+		//'character/old.js',
 		//'character/ow.js',
 		'character/rank.js',
 		'character/refresh.js',
-		//'character/shenhua.js',
+		'character/shenhua.js',
 		'character/sp.js',
 		'character/sp2.js',
 		//'character/standard.js',
@@ -44,7 +43,7 @@ window.noname_update={
 		//'character/xianjian.js',
 		//'character/xinghuoliaoyuan.js',
 		'character/yingbian.js',
-		'character/yijiang.js',
+		//'character/yijiang.js',
 		//'character/yxs.js',
 		//'extension/boss/extension.js',
 		//'layout/default/layout.css',
@@ -52,15 +51,15 @@ window.noname_update={
 		//'layout/default/menu.css',
 		//'layout/nova/layout.css',
 		//'layout/mobile/equip.css',
-		//'mode/boss.js',
+		'mode/boss.js',
 		//'mode/brawl.js',
 		//'mode/chess.js',
 		//'mode/connect.js',
 		//'mode/doudizhu.js',
-		//'mode/guozhan.js',
+		'mode/guozhan.js',
 		//'mode/identity.js',
 		//'mode/single.js',
-		//'mode/stone.js',
+		'mode/stone.js',
 		//'mode/tafang.js',
 		//'mode/versus.js',
 		'game/game.js',

mode/boss.js

@@ -620,57 +620,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					},
 				},
 			},
-			"wushuangfangtianji":{
-				type:"equip",
-				modeimage:'boss',
-				subtype:"equip1",
-				distance:{
-					attackFrom:-3,
-				},
-				ai:{
-					basic:{
-						equipValue:2.5,
-					},
-				},
-				skills:["wushuangfangtianji_skill"],
-				fullskin:true,
-			},
-			"shufazijinguan":{
-				type:"equip",
-				subtype:"equip5",
-				modeimage:'boss',
-				ai:{
-					basic:{
-						equipValue:9,
-					},
-				},
-				skills:["shufazijinguan_skill"],
-				fullskin:true,
-			},
-			"hongmianbaihuapao":{
-				type:"equip",
-				subtype:"equip2",
-				modeimage:'boss',
-				ai:{
-					basic:{
-						equipValue:7,
-					},
-				},
-				skills:["hongmianbaihuapao_skill"],
-				fullskin:true,
-			},
-			"linglongshimandai":{
-				type:"equip",
-				subtype:"equip2",
-				modeimage:'boss',
-				ai:{
-					basic:{
-						equipValue:7.5,
-					},
-				},
-				skills:["linglongshimandai_skill"],
-				fullskin:true,
-			},
 			sadouchengbing:{
 				fullskin:true,
 				type:'trick',
@@ -773,60 +722,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					}
 				}
 			},
-			guilongzhanyuedao:{
-				type:'equip',
-				fullskin:true,
-				modeimage:'boss',
-				subtype:'equip1',
-				distance:{attackFrom:-2},
-				skills:['guilongzhanyuedao'],
-				nomod:true,
-				nopower:true,
-				unique:true,
-				ai:{
-					equipValue:9
-				}
-			},
-			guofengyupao:{
-				type:'equip',
-				fullskin:true,
-				modeimage:'boss',
-				subtype:'equip2',
-				nomod:true,
-				nopower:true,
-				unique:true,
-				skills:['guofengyupao'],
-				ai:{
-					equipValue:9
-				}
-			},
-			qimenbagua:{
-				type:'equip',
-				fullskin:true,
-				modeimage:'boss',
-				subtype:'equip2',
-				skills:['qimenbagua'],
-				nomod:true,
-				nopower:true,
-				unique:true,
-				ai:{
-					equipValue:9
-				}
-			},
-			chixueqingfeng:{
-				type:'equip',
-				fullskin:true,
-				modeimage:'boss',
-				subtype:'equip1',
-				distance:{attackFrom:-1},
-				skills:['chixueqingfeng'],
-				nomod:true,
-				nopower:true,
-				unique:true,
-				ai:{
-					equipValue:9
-				}
-			},
 			chiyanzhenhunqin:{
 				type:'equip',
 				fullskin:true,
@@ -868,19 +763,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					equipValue:9
 				}
 			},
-			xuwangzhimian:{
-				type:'equip',
-				fullskin:true,
-				subtype:'equip5',
-				modeimage:'boss',
-				skills:['xuwangzhimian'],
-				nomod:true,
-				nopower:true,
-				unique:true,
-				ai:{
-					equipValue:9
-				}
-			},
 			longfenghemingjian:{
 				type:'equip',
 				fullskin:true,
@@ -1046,7 +928,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 			}
 		},
 		cardPack:{
-			mode_boss:['honghuangzhili','sadouchengbing','yihuajiemu','guilongzhanyuedao','guofengyupao','chiyanzhenhunqin','qimenbagua','xuwangzhimian','juechenjinge','xiuluolianyuji','chixueqingfeng','longfenghemingjian','qicaishenlu','wushuangfangtianji','shufazijinguan','hongmianbaihuapao','linglongshimandai','boss_mengpohuihun','lingsheji','shanrangzhaoshu','jinwuluorigong','xingtianpojunfu','gubuzifeng']
+			mode_boss:['honghuangzhili','sadouchengbing','yihuajiemu','chiyanzhenhunqin','juechenjinge','xiuluolianyuji','longfenghemingjian','qicaishenlu','hongmianbaihuapao','boss_mengpohuihun','lingsheji','shanrangzhaoshu','jinwuluorigong','xingtianpojunfu','gubuzifeng']
 		},
 		init:function(){
 			for(var i in lib.characterPack.mode_boss){
@@ -3556,133 +3438,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					},
 				},
 			},
-			"shufazijinguan_skill":{
-				equipSkill:true,
-				trigger:{
-					player:"phaseZhunbeiBegin",
-				},
-				direct:true,
-				content:function(){
-					"step 0"
-					player.chooseTarget(get.prompt('shufazijinguan'),function(card,player,target){
-						return player!=target;
-					}).ai=function(target){
-						return get.damageEffect(target,player,player);
-					}
-					"step 1"
-					if(result.bool){
-						player.line(result.targets,'white');
-						result.targets[0].damage();
-					}
-				},
-			},
-			"linglongshimandai_skill":{
-				equipSkill:true,
-				trigger:{
-					target:"useCardToTargeted",
-				},
-				filter:function(event,player){
-					if(event.targets&&event.targets.length>1||event.player==player) return false;
-					if(player.hasSkillTag('unequip2')) return false;
-					var evt=event.getParent();
-					if(evt.player&&evt.player.hasSkillTag('unequip',false,{
-						name:evt.card?evt.card.name:null,
-						target:player,
-						card:evt.card
-					})) return false;
-					return true;
-				},
-				audio:true,
-				check:function(event,player){
-					return get.effect(player,event.card,event.player,player)<=0;
-				},
-				content:function(){
-					"step 0"
-					player.judge('linglongshimandai',function(card){return (get.suit(card)=='heart')?1.5:-0.5});
-					"step 1"
-					if(result.judge>0){
-						trigger.getParent().excluded.add(player);
-					}
-				},
-				ai:{
-					effect:{
-						target:function(card,player,target,effect){
-							if(player.hasSkillTag('unequip',false,{
-								name:card?card.name:null,
-								target:player,
-								card:card
-							})) return;
-						},
-					},
-				},
-			},
-			"hongmianbaihuapao_skill":{
-				equipSkill:true,
-				trigger:{
-					player:"damageBegin4",
-				},
-				filter:function(event,player){
-					if(event.source&&event.source.hasSkillTag('unequip',false,{
-						name:event.card?event.card.name:null,
-						target:player,
-						card:event.card
-					})) return;
-					if(event.nature) return true;
-				},
-				forced:true,
-				content:function(){
-					trigger.cancel();
-				},
-				ai:{
-					nofire:true,
-					nothunder:true,
-					effect:{
-						target:function(card,player,target,current){
-							if(player.hasSkillTag('unequip',false,{
-								name:card?card.name:null,
-								target:player,
-								card:card
-							})) return;
-							if(get.tag(card,'natureDamage')) return 'zerotarget';
-						},
-					},
-				},
-			},
-			"wushuangfangtianji_skill":{
-				equipSkill:true,
-				trigger:{
-					source:"damageSource",
-				},
-				filter:function(event,player){
-					return event.card&&event.card.name=='sha';
-				},
-				content:function(){
-					'step 0'
-					player.line(trigger.player,'white');
-					if(!trigger.player.countCards('he')){
-						event.goto(1);
-					}else{
-						event.goto(2);
-					}
-					'step 1'
-					player.draw();
-					event.finish();
-					'step 2'
-					player.chooseControl('摸一张牌','弃置其一张牌',function(event,player){ 
-						if(get.attitude(player,trigger.player)>2) return '摸一张牌';
-						return '弃置其一张牌'; 
-					}); 
-					'step 3'
-					if(result.control=='摸一张牌'){ 
-						player.draw();
-						event.finish();
-					} 
-					else{ 
-						player.discardPlayerCard(trigger.player,'he',true); 
-						event.finish();
-					}   
-				},
-			},
 			
 			boss_yaoshou:{
 				mod:{
@@ -4806,19 +4561,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					noturn:true,
 				}
 			},
-			xuwangzhimian:{
-				equipSkill:true,
-				trigger:{player:'phaseDrawBegin'},
-				forced:true,
-				content:function(){
-					trigger.num+=2;
-				},
-				mod:{
-					maxHandcard:function(player,num){
-						return num-1;
-					}
-				}
-			},
 			xiuluolianyuji2:{
 				equipSkill:true,
 				vanish:true,
@@ -4873,98 +4615,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					trigger.nature='fire';
 				}
 			},
-			chixueqingfeng:{
-				equipSkill:true,
-				trigger:{player:'useCardToPlayered'},
-				filter:function(event){
-					return event.card.name=='sha';
-				},
-				logTarget:'target',
-				forced:true,
-				content:function(){
-					trigger.target.addTempSkill('chixueqingfeng2','shaAfter');
-				},
-				ai:{
-					unequip:true,
-					skillTagFilter:function(player,tag,arg){
-						if(arg&&arg.name=='sha') return true;
-						return false;
-					}
-				}
-			},
-			chixueqingfeng2:{
-				equipSkill:true,
-				mod:{
-					cardEnabled:function(){
-						return false;
-					},
-					cardUsable:function(){
-						return false;
-					},
-					cardRespondable:function(){
-						return false;
-					},
-					cardSavable:function(){
-						return false;
-					}
-				}
-			},
-			qimenbagua:{
-				equipSkill:true,
-				trigger:{target:'shaBefore'},
-				forced:true,
-				filter:function(event,player){
-					if(player.hasSkillTag('unequip2')) return false;
-					if(event.player.hasSkillTag('unequip',false,{
-						name:event.card?event.card.name:null,
-						target:player,
-						card:event.card
-					})) return false;
-					return true;
-				},
-				content:function(){
-					trigger.cancel();
-				},
-				ai:{
-					effect:{
-						target:function(card,player,target){
-							if(player.hasSkillTag('unequip',false,{
-								name:card?card.name:null,
-								target:player,
-								card:card
-							})) return;
-							if(card.name=='sha') return 'zerotarget';
-						}
-					}
-				}
-			},
-			guilongzhanyuedao:{
-				equipSkill:true,
-				trigger:{player:'useCard'},
-				forced:true,
-				filter:function(event,player){
-					return event.card&&event.card.name=='sha'&&get.color(event.card)=='red';
-				},
-				content:function(){
-					trigger.directHit.addArray(game.players);
-				}
-			},
-			guofengyupao:{
-				equipSkill:true,
-				mod:{
-					targetEnabled:function(card,player,target,now){
-					if(target.hasSkillTag('unequip2')) return false;
-						if(player!=target){
-							if(player.hasSkillTag('unequip',false,{
-								name:card?card.name:null,
-								target:player,
-								card:card
-							})){}
-							else if(get.type(card)=='trick') return false;
-						}
-					}
-				}
-			},
 			longfenghemingjian:{
 				equipSkill:true,
 				inherit:'cixiong_skill',
@@ -9263,22 +8913,12 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 			sadouchengbing_info:'出牌阶段对自己使用，若你的势力为“神”，摸X张牌；否则将你手牌补至X；（X为你的体力上限且至多为5）',
 			yihuajiemu:'移花接木',
 			yihuajiemu_info:'出牌阶段对一名有牌的其他角色使用，令其使用一张【杀】，或交给你两张牌',
-			guilongzhanyuedao:'鬼龙斩月刀',
-			guilongzhanyuedao_info:'锁定技，你使用的红色【杀】不能被【闪】响应',
-			guofengyupao:'国风玉袍',
-			guofengyupao_info:'锁定技，你不能成为其他角色使用普通锦囊牌的目标',
 			chiyanzhenhunqin:'赤焰镇魂琴',
 			chiyanzhenhunqin_info:'锁定技，你造成的伤害均视为具有火属性',
-			qimenbagua:'奇门八卦',
-			qimenbagua_info:'锁定技，其他角色使用的【杀】对你无效',
 			juechenjinge:'绝尘金戈',
 			juechenjinge_info:'锁定技，敌方角色计算与己方其他角色距离+1',
 			xiuluolianyuji:'修罗炼狱戟',
 			xiuluolianyuji_info:'你使用【杀】可以额外指定任意名攻击范围内的其他角色为目标；锁定技，你使用【杀】造成的伤害+1，然后令受到伤害的角色回复1点体力',
-			xuwangzhimian:'虚妄之冕',
-			xuwangzhimian_info:'锁定技，摸牌阶段，你额外摸两张牌；你的手牌上限-1',
-			chixueqingfeng:'赤血青锋',
-			chixueqingfeng_info:'锁定技，你使用【杀】结算结束前，目标角色不能使用或打出手牌，且此【杀】无视其防具',
 			longfenghemingjian:'鸾凤和鸣剑',
 			longfenghemingjian_info:'你使用的【雷杀】或【火杀】指定目标后，可令对方选择弃置一张牌或令你摸一张牌',
 			qicaishenlu:'七彩神鹿',
@@ -9599,23 +9239,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 			"boss_aozhan":"鏖战",
 			"boss_aozhan_info":"锁定技，若你装备区内有：武器牌，你可以多使用一张【杀】；防具牌，防止你受到的超过1点的伤害；坐骑牌，摸牌阶段多摸一张牌；宝物牌，跳过你的判定阶段。",
 			
-			"shufazijinguan_skill":"束发紫金冠",
-			"shufazijinguan_skill_info":"准备阶段，你可以对一名其他角色造成1点伤害。",
-			"linglongshimandai_skill":"玲珑狮蛮带",
-			"linglongshimandai_skill_info":"当其他角色使用牌指定你为唯一目标后，你可以进行一次判定，若判定结果为红桃，则此牌对你无效。",
-			"hongmianbaihuapao_skill":"红棉百花袍",
-			"hongmianbaihuapao_skill_info":"锁定技，防止你受到的属性伤害。",
-			"wushuangfangtianji_skill":"无双方天戟",
-			"wushuangfangtianji_skill_info":"你使用【杀】对目标角色造成伤害后，可以摸一张牌或弃置目标角色一张牌。",
-			"wushuangfangtianji":"无双方天戟",
-			"wushuangfangtianji_info":"你使用【杀】对目标角色造成伤害后，可以摸一张牌或弃置目标角色一张牌。",
-			"shufazijinguan":"束发紫金冠",
-			"shufazijinguan_info":"准备阶段，你可以对一名其他角色造成1点伤害。",
-			"hongmianbaihuapao":"红棉百花袍",
-			"hongmianbaihuapao_info":"锁定技，防止你受到的属性伤害。",
-			"linglongshimandai":"玲珑狮蛮带",
-			"linglongshimandai_info":"当其他角色使用牌指定你为唯一目标后，你可以进行一次判定，若判定结果为红桃，则此牌对你无效。",
-			
 			boss_qinguangwang_ab:'秦广王',
 			boss_qinguangwang:'秦广王·蒋子文',
 			boss_panguan:'判官',

mode/guozhan.js

@@ -405,7 +405,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				gz_zhugeke:['male','wu',3,['aocai','gzduwu'],['gzskin']],
 				gz_wenqin:['male','wei',4,['gzjinfa'],['doublegroup:wei:wu','gzskin']],
 				gz_xf_sufei:['male','wu',4,['gzlianpian'],['doublegroup:wu:qun','gzskin']],
-				gz_liuba:['male','shu',3,['tongduo','qingyin'],['gzskin']],
+				gz_liuba:['male','shu',3,['gztongduo','qingyin'],['gzskin']],
 				gz_pengyang:['male','shu',3,['daming','xiaoni'],['doublegroup:shu:qun','gzskin']],
 				gz_zhuling:['male','wei',4,['gzjuejue','gzfangyuan'],['gzskin']],
 
@@ -1330,7 +1330,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				content:function(){
 					'step 0'
 					player.chooseTarget(lib.filter.notMe,get.prompt('gzlianyou'),'令一名其他角色获得〖兴火〗').set('forceDie',true).set('ai',function(target){
-						return 10+(get.attitude(_status.event.player,target)*target.hasSkillTag('fireAttack',null,null,true)?2:1)
+						return 10+(get.attitude(_status.event.player,target)*(target.hasSkillTag('fireAttack',null,null,true)?2:1));
 					});
 					'step 1'
 					if(result.bool){
@@ -2232,13 +2232,13 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				},
 			},
 			//刘巴
-			tongduo:{
+			gztongduo:{
 				audio:2,
 				trigger:{global:'phaseJieshuBegin'},
 				direct:true,
 				preHidden:true,
 				filter:function(event,player){
-					if(player!=event.player&&!player.hasSkill('tongduo')||!event.player.isFriendOf(player)) return false;
+					if(player!=event.player&&!player.hasSkill('gztongduo')||!event.player.isFriendOf(player)) return false;
 					return event.player.getHistory('lose',function(evt){
 						return evt.type=='discard'&&evt.cards2.length>0&&evt.getParent('phaseDiscard').player==event.player;
 					}).length>0;
@@ -2252,10 +2252,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					num=Math.min(3,num);
 					event.num=num;
 					var next=trigger.player.chooseBool('是否发动【统度】摸'+get.cnNumber(num)+'张牌？');
-					if(player==trigger.player) next.setHiddenSkill('tongduo');
+					if(player==trigger.player) next.setHiddenSkill('gztongduo');
 					'step 1'
 					if(result.bool){
-						player.logSkill('tongduo',trigger.player);
+						player.logSkill('gztongduo',trigger.player);
 						trigger.player.draw(num);
 					}
 				},
@@ -4145,7 +4145,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				content:function(){
 					'step 0'
 					player.chooseTarget(get.prompt2('gzwenji'),function(card,player,target){
-						return target!=player&&target.countCards('he');
+						return target!=player&&target.countCards('he')>0;
 					}).set('ai',function(target){
 						var att=get.attitude(_status.event.player,target);
 						if(target.identity=='unknown'&&att<=0) return 20;
@@ -11581,8 +11581,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 			daming_info:'一名己方角色A的出牌阶段开始时，你可弃置一张锦囊牌，横置一名角色并摸X张牌（X为拥有横置角色的势力数）。然后你选择一项：①视为对A使用一张【桃】；②令A视为对由你选择的另一名角色使用一张雷【杀】。',
 			xiaoni:'嚣逆',
 			xiaoni_info:'锁定技，当你使用牌时，或成为其他角色使用牌的目标后，若场上存在其他己方角色且这些角色的手牌数均不大于你，则目标角色/你不可响应此牌。',
-			tongduo:'统度',
+			gztongduo:'统度',
-			tongduo_info:'己方角色的结束阶段开始时，其可以摸X张牌（X为其本回合弃牌阶段弃置的牌数且至多为3）。 ',
+			gztongduo_info:'己方角色的结束阶段开始时，其可以摸X张牌（X为其本回合弃牌阶段弃置的牌数且至多为3）。 ',
 			qingyin:'清隐',
 			qingyin_info:'限定技，出牌阶段，你可令所有己方角色将体力值回满，然后移除此武将牌。',
 			gzlianpian:'联翩',
@@ -12880,7 +12880,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 						return;
 					}
 					game.addVideo('showCharacter',this,num);
-					if(this.identity=='unknown'||(this.identity!='ye'&&(num==0||num==2)&&lib.character[this.name1][1]=='ye')){
+					if(this.identity=='unknown'||((num==0||num==2)&&lib.character[this.name1][1]=='ye')){
 						this.group=this.getGuozhanGroup(num);
 						this._group=this.group;
 						if((num==0||num==2)&&lib.character[this.name1][1]=='ye'){

mode/stone.js

@@ -1086,7 +1086,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 			mode_stone:{
 				stone_tutengyongshi:['male','wei',4,['shaman_jili'],['minskin','stone'],[4,2,'shaman']],
 				stone_xuejuren:['male','wei',2,['shaman_xueju'],['minskin','stone'],[1,1,'shaman']],
-				stone_tuyuansu:['male','qun',5,['chaofeng'],['minskin','stone'],[5,4,'shaman']],
+				stone_tuyuansu:['male','qun',5,['lschaofeng'],['minskin','stone'],[5,4,'shaman']],
 				stone_huoyuansu:['male','shu',3,['shaman_huoxi'],['minskin','stone'],[4,3,'shaman']],
 				stone_fachao:['male','wei',3,['shaman_tuteng','shaman_fachao'],['minskin','stone'],[3,0,'shaman']],
 				stone_huoshe:['male','shu',3,['shaman_tuteng','shaman_huoshe'],['minskin','stone'],[3,0,'shaman']],
@@ -1099,13 +1099,13 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 
 				stone_kuangyedoushi:['male','wu',3,['druid_nuhuo'],['minskin','stone'],[4,2,'druid']],
 				stone_conglinshouwei:['male','wu',3,['druid_huwei'],['minskin','stone'],[4,2,'druid']],
-				stone_baohuzhishu:['male','qun',6,['chaofeng'],['minskin','stone'],[6,4,'druid']],
+				stone_baohuzhishu:['male','qun',6,['lschaofeng'],['minskin','stone'],[6,4,'druid']],
 				stone_liebao:['male','wei',3,['stone_chongfeng'],['minskin','stone'],[3,2,'druid']],
-				stone_zongxiong:['male','shu',4,['chaofeng'],['minskin','stone'],[4,2,'druid']],
+				stone_zongxiong:['male','shu',4,['lschaofeng'],['minskin','stone'],[4,2,'druid']],
 				stone_baoqishi:['female','wei',2,['druid_chengzhang'],['minskin','stone'],[2,2,'druid']],
 				stone_renyaqishi:['female','wei',1,['druid_renya'],['minskin','stone'],[1,1,'druid']],
 				stone_huangyeqishi:['male','wei',4,['druid_chicheng'],['minskin','stone'],[5,2,'druid']],
-				stone_huoshanxiemu:['male','wei',3,['druid_juhuo','chaofeng'],['minskin','stone'],[5,6,'druid']],
+				stone_huoshanxiemu:['male','wei',3,['druid_juhuo','lschaofeng'],['minskin','stone'],[5,6,'druid']],
 				stone_conglinxiaoshou:['male','wei',3,['druid_yuehuo'],['minskin','stone'],[4,4,'druid']],
 				stone_lindishuyao:['female','wei',3,['druid_yeyou'],['minskin','stone'],[3,3,'druid']],
 				stone_xunmenglong:['male','wei',2,['druid_qicheng'],['minskin','stone'],[3,3,'druid']],
@@ -1113,7 +1113,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				stone_caoyuanshi:['male','qun',5,['hunter_nuhou'],['minskin','stone'],[5,2,'hunter']],
 				stone_leiouke:['male','shu',2,['hunter_zhanhuo'],['minskin','stone'],[3,1,'hunter']],
 				stone_huofu:['male','qun',2,['stone_chongfeng'],['minskin','stone'],[3,4,'hunter']],
-				stone_misha:['male','shu',3,['chaofeng'],['minskin','stone'],[3,3,'hunter']],
+				stone_misha:['male','shu',3,['lschaofeng'],['minskin','stone'],[3,3,'hunter']],
 				stone_jiewangzhu:['male','wu',1,['hunter_jiewang'],['minskin','stone'],[1,2,'hunter']],
 				stone_xunshoushi:['male','qun',2,['hunter_xunshou'],['minskin','stone'],[4,3,'hunter']],
 				stone_senlinlang:['male','qun',1,['hunter_qunxi'],['minskin','stone'],[1,2,'hunter']],
@@ -1154,7 +1154,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				stone_xiaogui:['male','qun',1,[],['minskin','stone','stonehidden'],[1,1]],
 				stone_kongjuzhanma:['male','qun',1,['warlock_yongsheng'],['minskin','stone'],[3,1,'warlock']],
 				stone_morishouwei:['male','qun',4,['stone_chongfeng','warlock_zaihuo'],['minskin','stone'],[4,4,'warlock']],
-				stone_xukongxingzhe:['male','qun',2,['chaofeng'],['minskin','stone'],[1,1,'warlock']],
+				stone_xukongxingzhe:['male','qun',2,['lschaofeng'],['minskin','stone'],[1,1,'warlock']],
 				stone_diyuhuo:['male','qun',4,['warlock_yuhuo'],['minskin','stone'],[5,4,'warlock']],
 				stone_diyuhuox:['male','qun',2,[],['minskin','stone','stonehidden'],[2,2,'warlock']],
 				stone_heishitanfan:['male','qun',2,['warlock_anyu'],['minskin','stone'],[2,2,'warlock']],
@@ -1169,10 +1169,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				stone_zhujiashi:['male','qun',2,['warrior_zhujia'],['minskin','stone'],[2,1,'warrior']],
 				stone_jiangong:['male','qun',2,['warrior_jiangong'],['minskin','stone'],[2,2,'warrior']],
 				stone_chidunshinv:['female','qun',4,['warrior_tidun'],['minskin','stone'],[5,4,'warrior']],
-				stone_yuanhou:['male','qun',2,['chaofeng'],['minskin','stone'],[2,3,'warrior']],
+				stone_yuanhou:['male','qun',2,['lschaofeng'],['minskin','stone'],[2,3,'warrior']],
 				stone_heiyaoyaoshou:['male','qun',4,['warrior_heiyao'],['minskin','stone'],[5,4,'warrior']],
 				stone_honglongyongshi:['male','qun',2,['warrior_fenyong'],['minskin','stone'],[2,3,'warrior']],
-				stone_peilianshi:['male','qun',2,['chaofeng','warrior_peilian'],['minskin','stone'],[2,2,'warrior']],
+				stone_peilianshi:['male','qun',2,['lschaofeng','warrior_peilian'],['minskin','stone'],[2,2,'warrior']],
 				stone_jingyingweishi:['male','qun',3,['stone_chongfeng'],['minskin','stone'],[4,3,'warrior']],
 				stone_mengmaren:['male','qun',3,['warrior_chuanci'],['minskin','stone'],[4,4,'warrior']],
 				stone_zhifuzhe:['male','qun',2,['warrior_zhifu'],['minskin','stone'],[3,1,'warrior']],
@@ -1237,18 +1237,18 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				stone_shumiao:['none','wu',1,[],['minskin','stone','stonehidden'],[1,1]],
 				stone_shuren:['none','wu',2,['stone_chongfeng','stone_zibao'],['minskin','stone','stonehidden'],[2,2]],
 				stone_shurenx:['none','wu',2,[],['minskin','stone','stonehidden'],[2,2]],
-				stone_shurenxx:['none','wu',2,['chaofeng'],['minskin','stone','stonehidden'],[2,2]],
+				stone_shurenxx:['none','wu',2,['lschaofeng'],['minskin','stone','stonehidden'],[2,2]],
-				stone_youlinglang:['none','qun',2,['chaofeng'],['minskin','stone','stonehidden'],[2,2]],
+				stone_youlinglang:['none','qun',2,['lschaofeng'],['minskin','stone','stonehidden'],[2,2]],
 				stone_xiaojingling:['none','qun',1,['xuying'],['minskin','stone','stonehidden'],[1,1]],
 				stone_zhumo:['none','qun',2,[],['minskin','stone','stonehidden'],[2,2]],
-				stone_jingxiang:['none','qun',2,['stone_jingxiang','chaofeng'],['minskin','stone','stonehidden'],[2,0]],
+				stone_jingxiang:['none','qun',2,['stone_jingxiang','lschaofeng'],['minskin','stone','stonehidden'],[2,0]],
 				stone_shengguanghuwei:['female','qun',2,['priest_shengguang'],['minskin','stone','stonehidden'],[1,1]],
 				stone_liegou:['none','qun',1,['stone_chongfeng'],['minskin','stone','stonehidden'],[1,2]],
 				stone_mianyang:['none','qun',1,['mage_mianyang'],['minskin','stone','stonehidden'],[1,0]],
 				stone_qingwa:['none','wu',1,['shaman_qingwa'],['minskin','stone','stonehidden'],[1,0]],
-				stone_shengjiachong:['none','qun',1,['chaofeng'],['minskin','stone','stonehidden'],[1,1]],
+				stone_shengjiachong:['none','qun',1,['lschaofeng'],['minskin','stone','stonehidden'],[1,1]],
 
-				stone_tuteng1:['none','qun',2,['shaman_tuteng','chaofeng'],['minskin','stone','stonehidden'],[2,0]],
+				stone_tuteng1:['none','qun',2,['shaman_tuteng','lschaofeng'],['minskin','stone','stonehidden'],[2,0]],
 				stone_tuteng2:['none','qun',2,['shaman_tuteng','shaman_zhuore'],['minskin','stone','stonehidden'],[2,0]],
 				stone_tuteng3:['none','qun',2,['shaman_tuteng','shaman_fali'],['minskin','stone','stonehidden'],[2,0]],
 				stone_tuteng4:['none','qun',2,['shaman_tuteng','shaman_zhiliao'],['minskin','stone','stonehidden'],[2,0]],
@@ -1260,7 +1260,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				stone_nuoziduomu:['male','qun',4,['stone_shixu'],['minskin','stone','stonehidden','stonelegend'],[6,4]],
 				stone_maligousi:['male','qun',4,['stone_mowang'],['minskin','stone','stonehidden','stonelegend'],[6,2]],
 
-				stone_aolajier:['male','qun',4,['stone_chongfeng','shaman_fengnu','paladin_hudun','chaofeng'],['minskin','stone','stonehidden','stonelegend_shaman'],[6,4]],
+				stone_aolajier:['male','qun',4,['stone_chongfeng','shaman_fengnu','paladin_hudun','lschaofeng'],['minskin','stone','stonehidden','stonelegend_shaman'],[6,4]],
 				stone_andongni:['male','qun',4,['stone_zhiyin'],['minskin','stone','stonehidden','stonelegend_mage'],[6,4]],
 				stone_jialakesi:['male','qun',6,['stone_bianshen'],['minskin','stone','stonehidden','stonelegend_warlock'],[6,0]],
 				stone_jialakesix:['male','qun',6,['stone_lianyu'],['modeimage','stonehidden','stonespecial']],
@@ -1268,7 +1268,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				stone_geluomashi:['male','qun',4,['stone_chongfeng','stone_jinu'],['minskin','stone','stonehidden','stonelegend_warrior'],[6,4]],
 				stone_aidewen:['male','qun',3,['stone_lianji'],['minskin','stone','stonehidden','stonelegend_rogue'],[6,3]],
 				stone_sainaliusi:['male','qun',3,['stone_shenyu'],['minskin','stone','stonehidden','stonelegend_druid'],[6,3]],
-				stone_fuding:['male','qun',3,['paladin_hudun','chaofeng','stone_fuchou'],['minskin','stone','stonehidden','stonelegend_paladin'],[6,3]],
+				stone_fuding:['male','qun',3,['paladin_hudun','lschaofeng','stone_fuchou'],['minskin','stone','stonehidden','stonelegend_paladin'],[6,3]],
 				stone_weilun:['male','qun',4,['stone_shenyou'],['minskin','stone','stonehidden','stonelegend_priest'],[6,6]],
 			}
 		},
@@ -1688,7 +1688,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 		get:{
 			rawAttitude:function(from,to){
 				var num;
-				if(to.isMin()&&!to.hasSkill('chaofeng')){
+				if(to.isMin()&&!to.hasSkill('lschaofeng')){
 					num=5;
 				}
 				else{
@@ -5338,14 +5338,14 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				stoneact:1,
 				filterTarget:function(card,player,target){
 					return target.isMin()&&target.side==player.side&&
-					(!target.hasSkill('chaofeng')||target.hp<target.maxHp);
+					(!target.hasSkill('lschaofeng')||target.hp<target.maxHp);
 				},
 				content:function(){
 					if(target.hp<target.maxHp){
 						target.recover(target.maxHp-target.hp);
 					}
-					target.addSkill('chaofeng');
+					target.addSkill('lschaofeng');
-					target.markSkill('chaofeng');
+					target.markSkill('lschaofeng');
 					game.log(target,'获得了嘲讽');
 					target.popup('嘲讽');
 				},
@@ -5976,7 +5976,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				filter:function(event,player){
 					for(var i=0;i<game.players.length;i++){
 						if(game.players[i]!=player&&game.players[i].isMin()&&
-						!game.players[i].hasSkill('chaofeng')) return true;
+						!game.players[i].hasSkill('lschaofeng')) return true;
 					}
 					return false;
 				},
@@ -5984,7 +5984,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					"step 0"
 					event.chooser=player.getLeader();
 					event.chooser.chooseTarget('陪练：令一名随从获得嘲讽',function(card,playerx,target){
-						return player!=target&&target.isMin()&&!target.hasSkill('chaofeng');
+						return player!=target&&target.isMin()&&!target.hasSkill('lschaofeng');
 					}).ai=function(target){
 						return get.attitude(event.chooser,target)*target.hp;
 					};
@@ -5992,7 +5992,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					"step 1"
 					if(result.bool){
 						event.chooser.line(result.targets[0]);
-						result.targets[0].addSkill('chaofeng');
+						result.targets[0].addSkill('lschaofeng');
 					}
 				}
 			},
@@ -7267,7 +7267,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				},
 				content:function(){
 					player.draw();
-					player.addSkill('chaofeng');
+					player.addSkill('lschaofeng');
 				}
 			},
 			priest_guangyao:{
@@ -7881,7 +7881,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 						result.targets[0].hp++;
 						result.targets[0].update();
 						result.targets[0].draw(2);
-						result.targets[0].addSkill('chaofeng');
+						result.targets[0].addSkill('lschaofeng');
 					}
 				}
 			},
@@ -8617,19 +8617,19 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					}
 				}
 			},
-			chaofeng:{
+			lschaofeng:{
 				mark:true,
 				intro:{
 					content:'已获得嘲讽'
 				}
 			},
-			_chaofeng:{
+			_lschaofeng:{
 				mod:{
 					targetEnabled:function(card,player,target){
-						if(target.hasSkill('chaofeng')) return;
+						if(target.hasSkill('lschaofeng')) return;
 						if(card.name=='sha'){
 							for(var i=0;i<game.players.length;i++){
-								if(game.players[i].side==target.side&&game.players[i].hasSkill('chaofeng')){
+								if(game.players[i].side==target.side&&game.players[i].hasSkill('lschaofeng')){
 									return false;
 								}
 							}
@@ -10152,8 +10152,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 			spell_morizaihuo_info:'令场上所有随从立即死亡，回复两点体力',
 			spell_zhiliaozhichu:'治疗之触',
 			spell_zhiliaozhichu_info:'令目标随从恢复所有体力值并获得嘲讽',
-			chaofeng:'嘲讽',
+			lschaofeng:'嘲讽',
-			chaofeng_info:'同阵营的无嘲讽角色不以能成为杀的目标',
+			lschaofeng_info:'同阵营的无嘲讽角色不以能成为杀的目标',
 			spell_wangzhezhufu:'王者祝福',
 			spell_wangzhezhufu_info:'令一名随从增加两点体力和体力上限并摸两张牌',
 			spell_diyulieyan:'地狱烈焰',