diff --git a/character/hearth.js b/character/hearth.js index 430a1365d..96fb73547 100755 --- a/character/hearth.js +++ b/character/hearth.js @@ -39,7 +39,7 @@ character.hearth={ // hs_sapphiron:['male','wei',4,['bingdong','stuxi']], hs_kchromaggus:['male','wei',4,['fenlie']], hs_lreno:['male','shu',4,['tanmi']], - hs_brann:['male','shu',4,['qianghua']], + hs_brann:['male','shu',3,['mashu','qianghua']], hs_finley:['male','wu',3,['maoxian']], hs_kcthun:['male','qun',4,['luanji','xianji']], hs_anomalus:['male','wei',4,['mobao']], @@ -1002,24 +1002,27 @@ character.hearth={ trigger:{player:'useCardToBegin'}, direct:true, filter:function(event,player){ + if(event.getParent(2).name=='yuanzheng') return false; return event.target&&event.target!=player&&get.distance(player,event.target,'attack')>1; }, content:function(){ 'step 0' - if(trigger.target.num('he')){ - player.chooseControl('draw_card','discard_card','cancel').prompt='是否发动【远征】?'; - } - else{ - player.chooseControl('draw_card','cancel').prompt='是否发动【远征】?'; - } + player.chooseControl('draw_card','出杀','cancel',function(){ + if(ai.get.effect(trigger.target,{name:'sha'},player,player)>0){ + return '出杀'; + } + return 'draw_card'; + }).prompt='是对'+get.translation(trigger.target)+'发动否发动【远征】?'; 'step 1' if(result.control!='cancel'){ - player.logSkill('yuanzheng'); if(result.control=='draw_card'){ player.draw(); + player.logSkill('yuanzheng'); } else{ - player.discardPlayerCard(trigger.target,'he',true); + player.logSkill('yuanzheng',trigger.target); + player.useCard({name:'sha'},trigger.target,false).animate=false; + // player.discardPlayerCard(trigger.target,'he',true); } } } @@ -1041,26 +1044,13 @@ character.hearth={ return true; }, content:function(){ - 'step 0' - player.unmarkSkill('yuhuo'); player.storage.byuhuo=true; - player.addSkill('busi'); - player.loseMaxHp(); - 'step 1' - player.recover(player.maxHp); - 'step 2' - var targets=game.players.slice(0); - targets.remove(player); - targets.sort(lib.sort.seat); - event.targets=targets; - event.num=0; - 'step 3' - if(num