diff --git a/card/standard.js b/card/standard.js index f86d5a84b..449be6320 100644 --- a/card/standard.js +++ b/card/standard.js @@ -1686,6 +1686,8 @@ game.import('card',function(lib,game,ui,get,ai,_status){ }; 'step 1' var list=game.filterPlayer(function(current){ + if(game.checkMod(trigger.card,player,trigger.target,current,'unchanged','wuxieEnabled',current)==false) return false; + if(game.checkMod(trigger.card,player,trigger.target,current,'unchanged','wuxieRespondable',player)==false) return false; return current.hasWuxie(); }); event.list=list; diff --git a/character/shenhua.js b/character/shenhua.js index eb4896e45..ea5c8215c 100644 --- a/character/shenhua.js +++ b/character/shenhua.js @@ -2607,7 +2607,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ player.loseHp(); } else{ - player.loseMaxHp(); + player.loseMaxHp(true); } }, ai:{ diff --git a/character/sp.js b/character/sp.js index 1628d1958..51f6840be 100644 --- a/character/sp.js +++ b/character/sp.js @@ -2846,10 +2846,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if(get.type(card)=='delay'&&player!=target){ return false; } - } - }, - ai:{ - playernowuxie:true + }, + wuxieRespondable:function(){ + return false; + } } }, jianshu:{ @@ -3689,15 +3689,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){ mod:{ globalFrom:function(from,to){ if(to.hasSkill('tanhu2')) return -Infinity; - } - }, - trigger:{player:'useCardToBegin'}, - frequent:true, - filter:function(event){ - return get.type(event.card)=='trick'&&event.target&&event.target.hasSkill('tanhu2'); - }, - content:function(){ - player.draw(); + }, + wuxieRespondable:function(card,player,target){ + if(target.hasSkill('tanhu2')) return false; + } } }, jiqiao:{ @@ -9161,7 +9156,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ tanhu:'探虎', tanhu2:'探虎', tanhu3:'探虎', - tanhu_info:'出牌阶段限一次,你可以与一名其他角色拼点。若你赢,你获得以下技能直到回合结束:你与该角色的距离为1,你对该角色使用普通锦囊牌时可以摸一张牌', + tanhu_info:'出牌阶段限一次,你可以与一名其他角色拼点。若你赢,你获得以下技能直到回合结束:你与该角色的距离为1,你对该角色使用的普通锦囊牌不能被无懈可击响应', mouduan:'谋断', mouduan_info:'通常状态下,你拥有标记“武”并拥有技能“激昂”和“谦逊”。当你的手牌数为2张或以下时,你须将你的标记翻面为“文”,将该两项技能转化为“英姿”和“克己”。任一角色的回合开始前,你可弃一张牌将标记翻回', jiqiao:'机巧', diff --git a/game/game.js b/game/game.js index b1d3c0013..0a7759c1a 100644 --- a/game/game.js +++ b/game/game.js @@ -19525,10 +19525,8 @@ if(lib.filter.targetEnabled(card,player,target)) return true; if(card==undefined) return false; - var mod=game.checkMod(card,player,target,'unchanged','playerEnabled',player); - if(mod==false) return false; - var mod=game.checkMod(card,player,target,'unchanged','targetEnabled',target); - if(mod==false) return false; + if(game.checkMod(card,player,target,'unchanged','playerEnabled',player)==false) return false; + if(game.checkMod(card,player,target,'unchanged','targetEnabled',target)==false) return false; var filter=get.info(card).modTarget; if(typeof filter=='boolean') return filter; diff --git a/mode/boss.js b/mode/boss.js index b583deb4b..d82555cc6 100644 --- a/mode/boss.js +++ b/mode/boss.js @@ -1437,13 +1437,9 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ }, targetInRange:function(card){ if(get.color(card)=='red') return true; - } - }, - ai:{ - playernowuxie:true, - skillTagFilter:function(player,tag,arg){ - if(arg&&get.color(arg)=='red') return true; - return false; + }, + wuxieRespondable:function(card,player,target){ + if(get.color(card)=='red'&&player!=target) return false; } }, global:'boss_fentian2' @@ -2378,9 +2374,11 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ } }, fengqi2:{ - ai:{ - playernowuxie:true - } + mod:{ + wuxieRespondable:function(){ + return false; + } + } }, gaiming:{ trigger:{player:'judgeBefore'},