diff --git a/card/standard.js b/card/standard.js index 3da1276f3..d9411f78f 100644 --- a/card/standard.js +++ b/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', diff --git a/card/swd.js b/card/swd.js index 749729abc..9ccce769d 100644 --- a/card/swd.js +++ b/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){ diff --git a/card/yunchou.js b/card/yunchou.js index 48f6c104e..6dd67df3a 100644 --- a/card/yunchou.js +++ b/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; } }, diff --git a/character/sp.js b/character/sp.js index a7c8b6d27..3400ccd80 100644 --- a/character/sp.js +++ b/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