mod

card/standard.js

@@ -1623,9 +1623,7 @@ card.standard={
 					var next=player.chooseToUse({
 						filterCard:function(card,player){
 							if(card.name!='wuxie') return false;
-							var mod=game.checkMod(card,player,'unchanged','cardEnabled',player.getSkills());
-							if(mod!='unchanged') return mod;
-							return true;
+							return lib.filter.cardEnabled(card,player,'forceEnable');
 						},
 						prompt:str,
 						type:'wuxie',

card/swd.js

@@ -2160,9 +2160,7 @@ card.swd={
 			content:function(){
 				player.chooseToUse(get.prompt('shencaojie',trigger.player).replace(/发动/,'使用'),function(card,player){
 					if(card.name!='shencaojie') return false;
-					var mod=game.checkMod(card,player,'unchanged','cardEnabled',player.getSkills());
-					if(mod!='unchanged') return mod;
-					return true;
+					return lib.filter.cardEnabled(card,player,'forceEnable');
 				},trigger.player,-1).targetRequired=true;
 			}
 		},
@@ -2199,9 +2197,7 @@ card.swd={
 				player.storage.shenmiguo=[card,(trigger._targets||trigger.targets).slice(0)];
 				player.chooseToUse('是否使用神秘果？',function(card,player){
 					if(card.name!='shenmiguo'&&card.name!='yuchankan') return false;
-					var mod=game.checkMod(card,player,'unchanged','cardEnabled',player.getSkills());
-					if(mod!='unchanged') return mod;
-					return true;
+					return lib.filter.cardEnabled(card,player,'forceEnable');
 				},trigger.player,-1).set('cardname',trigger.card.name).targetRequired=true;
 				'step 1'
 				if(result.bool){

card/yunchou.js

@@ -1054,9 +1054,7 @@ card.yunchou={
 			content:function(){
 				player.chooseToUse(get.prompt('chenhuodajie',trigger.player).replace(/发动/,'使用'),function(card,player){
 					if(card.name!='chenhuodajie') return false;
-					var mod=game.checkMod(card,player,'unchanged','cardEnabled',player.getSkills());
-					if(mod!='unchanged') return mod;
-					return true;
+					return lib.filter.cardEnabled(card,player,'forceEnable');
 				},trigger.player,-1).targetRequired=true;
 			}
 		},

character/sp.js

@@ -8030,7 +8030,7 @@ character.sp={
 				targetEnabled:function(card,player,target){
 					if(card.name!='sha') return;
 					if(player==_status.currentPhase&&player.hasSkill('chixin')){
-						var num=game.checkMod(card,player,1,'cardUsable',player.getSkills())-20;
+						var num=player.getCardUsable(card,true)-20;
 						var players=game.filterPlayer();
 						for(var i=0;i<players.length;i++){
 							if(players[i].hasSkill('chixin3')){

game/game.js

@@ -15410,7 +15410,7 @@
 						}
 					},time)
 				},
-				getCardUsable:function(card){
+				getCardUsable:function(card,pure){
 					var player=this;
 					if(typeof card=='string'){
 						card={name:card};
@@ -15420,7 +15420,7 @@
 					if(typeof num=='function') num=num(card,player);
 					num=game.checkMod(card,player,num,'cardUsable',player.getSkills());
 					if(typeof num!='number') return Infinity;
-					if(_status.currentPhase==player){
+					if(!pure&&_status.currentPhase==player){
 						return num-get.cardCount(card,player);
 					}
 					return num;