diff --git a/character/huicui.js b/character/huicui.js index 68eff99f8..af0e6172c 100644 --- a/character/huicui.js +++ b/character/huicui.js @@ -71,7 +71,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ zhanghu:['male','wei',4,['cuijian','zhtongyuan']], luyusheng:['female','wu',3,['zhente','zhiwei']], huaxin:['male','wei',3,['spwanggui','xibing']], - mengyou:['male','qun',5,['hmmanyi','dcmanzhi']], + mengyou:['male','qun',5,['manyi','dcmanzhi']], liuyong:['male','shu',3,['zhuning','fengxiang']], dc_sunru:['female','wu',3,['xiecui','youxu']], xiahoulingnv:['female','wei',4,['fuping','weilie']], diff --git a/character/xianding.js b/character/xianding.js index 673c82382..983071991 100644 --- a/character/xianding.js +++ b/character/xianding.js @@ -80,7 +80,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ re_liuzan:['male','wu',4,['refenyin','liji']], wenyang:['male','wei',5,['xinlvli','choujue']], wangshuang:['male','wei',8,['spzhuilie']], - huaman:['female','shu',3,['hmmanyi','mansi','souying','zhanyuan']], + huaman:['female','shu',3,['manyi','mansi','souying','zhanyuan']], puyuan:['male','shu',4,['pytianjiang','pyzhuren']], guanlu:['male','wei',3,['tuiyan','busuan','mingjie']], gexuan:['male','wu',3,['gxlianhua','zhafu']], @@ -11613,19 +11613,38 @@ game.import('character',function(lib,game,ui,get,ai,_status){ //花鬘 manyi:{ audio:2, - audioname:['mengyou'], - }, - hmmanyi:{ + audioname:['mengyou','menghuo','zhurong'], trigger:{target:'useCardToBefore'}, - forced:true, - audio:'manyi', - audioname:['mengyou'], filter:function(event,player){ return event.card.name=='nanman'; }, + forced:true, content:function(){ trigger.cancel(); }, + ai:{ + effect:{ + target:function(card){ + if(card.name=='nanman') return 'zerotarget'; + }, + }, + }, + group:'manyi_single', + subSkill:{ + single:{ + trigger:{ + player:'enterGame', + global:'gameDrawAfter', + }, + filter:function(event,player){ + return get.mode()=='single'&&_status.mode=='normal'; + }, + direct:true, + content:function(){ + player.chooseUseTarget('nanman',get.prompt('manyi'),'视为使用一张【南蛮入侵】').logSkill='manyi'; + }, + }, + }, }, mansi:{ audio:2, @@ -12931,8 +12950,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){ wlcuorui_info_identity:'出牌阶段开始时,你可以弃置一名你至其的距离不大于1的角色区域里的一张牌,然后你选择一项:1.弃置另一名其他角色装备区里至多两张与此牌颜色相同的牌;2.展示另一名其他角色的至多两张手牌,然后获得其中与此牌颜色相同的牌。', wlcuorui_info_guozhan:'出牌阶段开始时,你可以弃置一名你至其的距离不大于1的角色区域里的一张牌,然后你选择一项:1.弃置另一名其他角色装备区里至多两张与此牌颜色相同的牌;2.展示另一名其他角色的至多两张手牌,然后获得其中与此牌颜色相同的牌。', huaman:'花鬘', - hmmanyi:'蛮裔', - hmmanyi_info:'锁定技,【南蛮入侵】对你无效。', + manyi:'蛮裔', + manyi_info:'锁定技,【南蛮入侵】对你无效。', + manyi_info_single_normal:'锁定技,【南蛮入侵】对你无效。当你登场时,你可以视为使用一张【南蛮入侵】。', mansi_viewas:'蛮嗣', mansi:'蛮嗣', mansi_info:'出牌阶段限一次,你可以将所有手牌当做【南蛮入侵】使用;当有角色受到【南蛮入侵】的伤害后,你摸一张牌。', diff --git a/mode/single.js b/mode/single.js index 088a32df3..514ef3ad2 100644 --- a/mode/single.js +++ b/mode/single.js @@ -883,35 +883,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ }, }, skill:{ - manyi:{ - audio:2, - trigger:{target:'useCardToBefore'}, - forced:true, - filter:function(event,player){ - return event.card.name=='nanman'; - }, - content:function(){ - trigger.cancel(); - }, - ai:{ - effect:{ - target:function(card){ - if(card.name=='nanman') return 'zerotarget'; - }, - }, - }, - group:'manyi2', - }, - manyi2:{ - trigger:{ - player:'enterGame', - global:'gameDrawAfter', - }, - direct:true, - content:function(){ - player.chooseUseTarget('nanman',get.prompt('manyi'),'视为使用一张【南蛮入侵】').logSkill='manyi'; - }, - }, wanrong:{ audio:2, trigger:{target:'useCardToTargeted'}, @@ -1191,8 +1162,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ changban2:'血战长坂坡', dianjiang2:'点将单挑', - manyi:'蛮裔', - manyi_info:'锁定技,【南蛮入侵】对你无效。当你登场时,你可以视为使用一张【南蛮入侵】。', wanrong:'婉容', wanrong_info:'当你成为【杀】的目标后,你可以摸一张牌。', sgzhiheng:'制衡',