j

card/extra.js

@@ -5,7 +5,9 @@ card.extra={
 			audio:true,
 			fullskin:true,
 			type:"basic",
-			enable:true,
+			enable:function(event,player){
+				return !player.hasSkill('jiu');
+			},
 			lianheng:true,
 			logv:false,
 			savable:function(card,player,dying){
@@ -202,6 +204,7 @@ card.extra={
 					damage:1,
 					fireDamage:1,
 					natureDamage:1,
+					norepeat:1
 				}
 			}
 		},
@@ -241,6 +244,7 @@ card.extra={
 				tag:{
 					multitarget:1,
 					multineg:1,
+					norepeat:1
 				}
 			}
 		},

card/guozhan.js

@@ -18,6 +18,7 @@ card.guozhan={
 			lianheng:true,
 			enable:function(card,player){
 				if(get.mode()=='guozhan'&&!player.isMajor()) return false;
+				if(player.hasSkill('xietianzi')) return false;
 				return _status.event.getParent().name=='phaseUse';
 			},
 			filterTarget:function(card,player,target){

card/hearth.js

@@ -173,6 +173,9 @@ card.hearth={
 					target:function(player,target){
 						return Math.max(0,2-target.num('e'))+(target.num('h')?0:0.5);
 					},
+				},
+				tag:{
+					norepeat:1
 				}
 			}
 		},
@@ -267,6 +270,7 @@ card.hearth={
 					damage:1,
 					thunderDamage:1,
 					natureDamage:1,
+					norepeat:1
 				}
 			}
 		},
@@ -407,6 +411,9 @@ card.hearth={
 				useful:3,
 				result:{
 					target:1
+				},
+				tag:{
+					norepeat:1
 				}
 			}
 		},

card/swd.js

@@ -845,14 +845,7 @@ card.swd={
 				result:{
 					player:function(){
 						var cardname=_status.event.cardname;
-						if(cardname=='tiesuo') return 0;
+						if(get.tag({name:cardname},'norepeat')) return 0;
-						if(cardname=='jiu') return 0;
-						if(cardname=='tianxianjiu') return 0;
-						if(cardname=='toulianghuanzhu') return 0;
-						if(cardname=='shijieshu') return 0;
-						if(cardname=='xietianzi') return 0;
-						if(cardname=='huogong') return 0;
-						if(cardname=='shandianjian') return 0;
 						return 1;
 					}
 				},
@@ -1528,7 +1521,9 @@ card.swd={
 		tianxianjiu:{
 			fullskin:true,
 			type:'basic',
-			enable:true,
+			enable:function(event,player){
+				return !player.hasSkill('tianxianjiu');
+			},
 			savable:function(card,player){
 				return _status.event.dying==player;
 			},
@@ -2148,6 +2143,7 @@ card.swd={
 				if(event.card.name=='yuchankan') return false;
 				if(player.hasSkill('shenmiguo2')) return false;
 				if(get.info(event.card).complexTarget) return false;
+				if(!lib.filter.cardEnabled(event.card,player,event.parent)) return false;
 				var type=get.type(event.card);
 				if(type!='basic'&&type!='trick') return false;
 				var card=game.createCard(event.card.name,event.card.suit,event.card.number,event.card.nature);

card/yunchou.js

@@ -673,7 +673,8 @@ card.yunchou={
 				tag:{
 					loseCard:1,
 					multitarget:1,
-					multineg:1
+					multineg:1,
+					norepeat:1,
 				},
 				result:{
 					target:function(player,target){

character/hearth.js

@@ -2967,6 +2967,7 @@ character.hearth={
 				if(event.parent.parent.name!='phaseUse') return false;
 				if(!event.targets||!event.card) return false;
 				if(get.info(event.card).complexTarget) return false;
+				if(!lib.filter.cardEnabled(event.card,player,event.parent)) return false;
 				var type=get.type(event.card);
 				if(type!='basic'&&type!='trick') return false;
 				var card=game.createCard(event.card.name,event.card.suit,event.card.number,event.card.nature);
@@ -2980,12 +2981,7 @@ character.hearth={
 				return true;
 			},
 			check:function(event,player){
-				if(event.card.name=='tiesuo') return false;
+				if(get.tag({name:event.card.name},'norepeat')) return false;
-				if(event.card.name=='jiu') return false;
-				if(event.card.name=='tianxianjiu') return false;
-				if(event.card.name=='toulianghuanzhu') return false;
-				if(event.card.name=='shijieshu') return false;
-				if(event.card.name=='xietianzi') return false;
 				return true;
 			},
 			content:function(){
@@ -6038,7 +6034,7 @@ character.hearth={
 		midian_info:'出牌阶段限一次，你可以弃置一张锦囊牌，然后随机获得三张锦囊牌',
 		yuelu:'月露',
 		yuelu_info:'在一名角色的濒死阶段，你可以弃置一张黑色牌令其回复一点体力并获得一点护甲',
-		yuelu_info_info:'在一名角色的濒死阶段，你可以弃置一张黑色牌令其回复一点体力',
+		yuelu_info_alter:'在一名角色的濒死阶段，你可以弃置一张黑色牌令其回复一点体力',
 		xingluo:'星落',
 		xingluo_info:'准备阶段，你可以令任意名手牌数多于你的角色各弃置一张手牌，然后你可以从弃置的牌中选择一张加入手牌',
 		yushou:'御兽',