diff --git a/character/jsrg.js b/character/jsrg.js index 1f2045e47..3c56f7b44 100644 --- a/character/jsrg.js +++ b/character/jsrg.js @@ -445,7 +445,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }); if(targets.length){ game.delayex(); - player.useCard({name:'sha',isCard:true,storage:{jsrgbaohe:0}},targets,false); + player.useCard({name:'sha',isCard:true,storage:{jsrgbaohe:true}},targets,false); player.addTempSkill('jsrgbaohe_add'); } } @@ -460,7 +460,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ forced:true, filter:function(event,player){ let evt=event.getParent(3),respondTo=event.respondTo; - if(evt.name!='useCard'||!Array.isArray(respondTo)||!respondTo[1].storage||typeof respondTo[1].storage.jsrgbaohe!='number') return false; + if(evt.name!='useCard'||!Array.isArray(respondTo)||!respondTo[1].storage||!respondTo[1].storage.jsrgbaohe) return false; return evt.targets.length>evt.num+1; }, logTarget:function(event){ @@ -471,7 +471,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ 'step 0' var evt=trigger.getParent(3); var targets=evt.targets.slice(evt.num+1); - var map=trigger.customArgs; + var map=evt.customArgs; for(var target of targets){ var id=target.playerid; if(!map[id]) map[id]={}; @@ -6126,7 +6126,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ jsrgzhenfeng_info:'出牌阶段每种类别各限一次。你可以视为使用一张存活角色的技能描述中包含的基本牌或普通锦囊牌(无距离和次数限制)。当此牌对技能描述中包含此牌的角色生效时,你对其造成1点伤害。', jsrg_zhangfei:'转张飞', jsrg_zhangfei_prefix:'转', - jsrgbaohe:'暴吓', + jsrgbaohe:'暴喝', jsrgbaohe_info:'一名角色的出牌阶段结束时,你可以弃置两张牌,然后视为你对攻击范围内包含其的所有角色使用一张【杀】。当一名角色使用牌响应此【杀】后,此【杀】对后续目标角色造成的伤害+1。', jsrgxushi:'虚势', jsrgxushi_info:'出牌阶段限一次。你可以交给任意名角色各一张牌,然后你获得两倍数量的【影】。', diff --git a/character/tw.js b/character/tw.js index dbdba60ef..8ea382a3d 100644 --- a/character/tw.js +++ b/character/tw.js @@ -11522,7 +11522,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ var num=2; if(target.hasSkill('twyujue_effect0')) num--; if(target.hasSkill('twyujue_effect1')) num--; - num=Math.min(num,trigger.getl(target).cards2.length); + var cards=trigger.getg(player); + num=Math.min(num,trigger.getl(target).cards2.filter(i=>cards.includes(i)).length); if(num>0) event.count=num; else if(targets.length>0) event.redo(); else event.finish(); diff --git a/game/pinyinjs.js b/game/pinyinjs.js index fcd3d0b40..f57abafc2 100644 --- a/game/pinyinjs.js +++ b/game/pinyinjs.js @@ -126,6 +126,7 @@ var pinyin_dict_polyphone = { "度势": "duó ", "诛綝": " chēn", "大喝": "dà hè", + "暴喝": "bào hè", "曲误": "qǔ ", "媛丽": "yuán lì", "调归": "diào ", diff --git a/image/character/jsrg_chendeng.jpg b/image/character/jsrg_chendeng.jpg index ee824b632..d476e6522 100644 Binary files a/image/character/jsrg_chendeng.jpg and b/image/character/jsrg_chendeng.jpg differ diff --git a/image/character/jsrg_guanyu.jpg b/image/character/jsrg_guanyu.jpg index 7d6198a46..e6c8b2383 100644 Binary files a/image/character/jsrg_guanyu.jpg and b/image/character/jsrg_guanyu.jpg differ diff --git a/image/character/jsrg_hejin.jpg b/image/character/jsrg_hejin.jpg index c4c947c05..932b45ed1 100644 Binary files a/image/character/jsrg_hejin.jpg and b/image/character/jsrg_hejin.jpg differ diff --git a/image/character/jsrg_huangfusong.jpg b/image/character/jsrg_huangfusong.jpg index 4510678e7..ef3513563 100644 Binary files a/image/character/jsrg_huangfusong.jpg and b/image/character/jsrg_huangfusong.jpg differ diff --git a/image/character/jsrg_liubei.jpg b/image/character/jsrg_liubei.jpg index b51bfd049..edffaa253 100644 Binary files a/image/character/jsrg_liubei.jpg and b/image/character/jsrg_liubei.jpg differ diff --git a/image/character/jsrg_liuhong.jpg b/image/character/jsrg_liuhong.jpg index 7d479a79a..3f4a9c026 100644 Binary files a/image/character/jsrg_liuhong.jpg and b/image/character/jsrg_liuhong.jpg differ diff --git a/image/character/jsrg_qiaoxuan.jpg b/image/character/jsrg_qiaoxuan.jpg index ba6f81084..103bf6bc5 100644 Binary files a/image/character/jsrg_qiaoxuan.jpg and b/image/character/jsrg_qiaoxuan.jpg differ diff --git a/image/character/jsrg_sunjian.jpg b/image/character/jsrg_sunjian.jpg index 7df76c833..f5469de1b 100644 Binary files a/image/character/jsrg_sunjian.jpg and b/image/character/jsrg_sunjian.jpg differ diff --git a/image/character/jsrg_wangyun.jpg b/image/character/jsrg_wangyun.jpg index 8c4cc2881..ef62fe436 100644 Binary files a/image/character/jsrg_wangyun.jpg and b/image/character/jsrg_wangyun.jpg differ diff --git a/image/character/jsrg_xushao.jpg b/image/character/jsrg_xushao.jpg index 193aeec15..070c171b1 100644 Binary files a/image/character/jsrg_xushao.jpg and b/image/character/jsrg_xushao.jpg differ diff --git a/image/character/jsrg_xuyou.jpg b/image/character/jsrg_xuyou.jpg index 33e0ac497..074b75919 100644 Binary files a/image/character/jsrg_xuyou.jpg and b/image/character/jsrg_xuyou.jpg differ diff --git a/image/character/jsrg_zhangfei.jpg b/image/character/jsrg_zhangfei.jpg index 81f0bbfff..243fa3b53 100644 Binary files a/image/character/jsrg_zhangfei.jpg and b/image/character/jsrg_zhangfei.jpg differ diff --git a/image/character/jsrg_zhanghe.jpg b/image/character/jsrg_zhanghe.jpg index 9922b1c95..3634d7c66 100644 Binary files a/image/character/jsrg_zhanghe.jpg and b/image/character/jsrg_zhanghe.jpg differ diff --git a/image/character/jsrg_zhangliao.jpg b/image/character/jsrg_zhangliao.jpg index e5aca1767..6117cbd77 100644 Binary files a/image/character/jsrg_zhangliao.jpg and b/image/character/jsrg_zhangliao.jpg differ diff --git a/image/character/jsrg_zoushi.jpg b/image/character/jsrg_zoushi.jpg index 6552f7a7d..cd4bb5b1d 100644 Binary files a/image/character/jsrg_zoushi.jpg and b/image/character/jsrg_zoushi.jpg differ