diff --git a/character/clan.js b/character/clan.js index 7327da977..f5d1a62d1 100644 --- a/character/clan.js +++ b/character/clan.js @@ -2189,7 +2189,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ audio:2, clanSkill:true, audioname:['clan_wuxian','clan_wuban','clan_wukuang'], - trigger:{player:'phaseZhunbeiBegin'}, + trigger:{player:'phaseBegin'}, isMax:function(player){ var num=player.getHandcardLimit(); return !game.hasPlayer(function(current){ @@ -2283,7 +2283,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ clanguixiang:'贵相', clanguixiang_info:'锁定技。你的非出牌阶段开始前，若此阶段即将成为你本回合内的第X个阶段（X为你的手牌上限），则你终止此阶段，改为进行一个出牌阶段。', clanmuyin:'穆荫', - clanmuyin_info:'宗族技。准备阶段，你可以选择一名手牌上限不为全场最多的陈留吴氏角色。该角色的手牌上限+1。', + clanmuyin_info:'宗族技。回合开始时，你可以选择一名手牌上限不为全场最多的陈留吴氏角色。该角色的手牌上限+1。', chenliuwushi:'陈留·吴氏', clan_wuban:'族吴班', clanzhanding:'斩钉', diff --git a/character/extra.js b/character/extra.js index d7dbf9541..159a34b87 100755 --- a/character/extra.js +++ b/character/extra.js @@ -190,14 +190,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ const character=node.link,characterInfo=get.character(node.link); let capt=get.translation(character); if(characterInfo){ - const infoSex=characterInfo[0]; - if(infoSex) capt+=`  ${infoSex=='none'?'无':lib.translate[infoSex]}`; - const infoGroup=characterInfo[1]; - if(infoGroup){ - const group=get.is.double(character,true); - if(group) capt+=`  ${group.map(value=>get.translation(value)).join('/')}`; - else capt+=`  ${lib.translate[infoGroup]}`; - } + const infoHp=get.infoMaxHp(characterInfo[2]); + capt+=`  范围：${infoHp}`; } uiintro.add(capt); diff --git a/character/huicui.js b/character/huicui.js index 294124cf6..22406944f 100644 --- a/character/huicui.js +++ b/character/huicui.js @@ -3051,7 +3051,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ trigger:{target:'useCardToTargeted'}, forced:true, filter:function(event,player){ - return get.type2(event.card)=='trick'&&(event.targets.length==1||player.countCards('he')>0); + return player!=event.player&&get.type2(event.card)=='trick'&&(event.targets.length==1||player.countCards('he')>0); }, content:function(){ if(trigger.targets.length==1) player.draw(); @@ -10138,7 +10138,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ dcqinqing:'寝情', dcqinqing_info:'结束阶段，你可以弃置一名攻击范围内包含一号位的其他角色一张牌。然后若其手牌数大于一号位，你摸一张牌。', dccunwei:'存畏', - dccunwei_info:'锁定技。当你成为锦囊牌的目标后，若你是唯一目标，你摸一张牌；否则你弃置一张牌。', + dccunwei_info:'锁定技。当你成为其他角色使用的锦囊牌的目标后，若你是唯一目标，你摸一张牌；否则你弃置一张牌。', dc_zhaotongzhaoguang:'赵统赵广', dcqingren:'青刃', dcqingren_info:'结束阶段，你可以摸X张牌（X为你本回合发动〖翊赞〗的次数）。', diff --git a/character/mobile.js b/character/mobile.js index a9c9b990d..e7cea28d9 100644 --- a/character/mobile.js +++ b/character/mobile.js @@ -11122,8 +11122,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){ content:function(){ 'step 0' trigger.cancel(); - var cards=trigger.cards.filterInD(); - if(cards.length) player.gain(cards,'gain2','log'); + if(trigger.cards){ + var cards=trigger.cards.filterInD(); + if(cards.length) player.gain(cards,'gain2','log'); + } 'step 1' player.loseMaxHp(); }, diff --git a/character/offline.js b/character/offline.js index 73c331884..cd33ceda5 100644 --- a/character/offline.js +++ b/character/offline.js @@ -2013,7 +2013,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, prompt:function(event){ var player=_status.event.player; - return '将一张'+get.translation(player.storage.pshuxiao_use.suit)+'牌或点数为'+get.strNumber(player.storage.pshuxiao_use.number)+'的牌当'+(player.storage.pshuxiao_use.card.nature?player.storage.pshuxiao_use.card.nature:'')+'【'+get.translation(player.storage.pshuxiao_use.card.name)+'】使用'; + return '将一张'+get.translation(player.storage.pshuxiao_use.suit)+'牌或点数为'+get.strNumber(player.storage.pshuxiao_use.number)+'的牌当作'+(player.storage.pshuxiao_use.card)+'使用'; } } } diff --git a/character/refresh.js b/character/refresh.js index 417e58d5c..8f93e023b 100755 --- a/character/refresh.js +++ b/character/refresh.js @@ -4492,7 +4492,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ reyanyu2:{ trigger:{player:'phaseUseEnd'}, direct:true, - filter:(event,player)=>player.hasHistory('useSkill',evt=>evt.skill=='reyanyu'&&evt.event.getParent(2)==event), + filter:(event,player)=>player.hasHistory('useSkill',evt=>evt.skill=='reyanyu'&&evt.event.getParent(2)==event)&&game.hasPlayer(target=>target.hasSex('male')&&target!=player), content:function(){ 'step 0' event.num=Math.min(3,player.getHistory('useSkill',evt=>evt.skill=='reyanyu'&&evt.event.getParent(2)==trigger).length); diff --git a/character/sb.js b/character/sb.js index f6d0df573..92075ecaa 100644 --- a/character/sb.js +++ b/character/sb.js @@ -607,10 +607,15 @@ game.import('character',function(lib,game,ui,get,ai,_status){ lose:false, delay:false, filter:function(event,player){ - return player.countCards('hes',{suit:'diamond'})>0; + return player.hasCard(card=>get.suit(card)=='diamond','hes')||game.hasPlayer(current=>current.hasJudge('lebu')); }, position:'hes', - filterCard:{suit:'diamond'}, + filterCard:function(card,player){ + if(get.suit(card)!='diamond') return false; + var mod=game.checkMod(ui.selected.cards[0],player,'unchanged','cardEnabled2',player); + if(!mod) return false; + return true; + }, selectCard:[0,1], filterTarget:function(card,player,target){ if(!ui.selected.cards.length){ @@ -618,10 +623,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){ return false; } if(player==target) return false; - var mod=game.checkMod(ui.selected.cards[0],player,'unchanged','cardEnabled2',player); - if(!mod) return false; - return player.canUse({name:'lebu',cards:ui.selected.cards},target); + return player.canUse(get.autoViewAs({name:'lebu'},ui.selected.cards),target); }, + complexSelect:true, check:function(card){ return 7-get.value(card); }, diff --git a/character/tw.js b/character/tw.js index bfb5e9d86..530dcaa61 100644 --- a/character/tw.js +++ b/character/tw.js @@ -13461,9 +13461,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ var hs=player.getCards('h'); for(var i=0;i激昂：八张牌进入弃牌堆。', + twlijian_info:'昂扬技。其他角色的弃牌阶段结束时，你可以令其获得任意本阶段进入弃牌堆的牌（可不选），然后你获得其余的牌，若其得到的牌数大于你，你可以对其造成1点伤害。
激昂：八张牌进入弃牌堆。', twchungang:'纯刚', twchungang_info:'锁定技。一名其他角色于摸牌阶段外得到超过一张牌时，你令其弃置一张牌。', tw_zhanghong:'张纮', diff --git a/character/yijiang.js b/character/yijiang.js index 1a978110d..ed9417849 100755 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -9246,10 +9246,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){ trigger:{player:'phaseUseEnd'}, direct:true, filter:function(event,player){ - return player.getHistory('lose',function(evt){ - var evt2=evt.getParent(); - return evt2.name=='useSkill'&&evt2.skill=='yanyu'&&evt.getParent(3)==event; - }).length>=2; + return player.getHistory('useSkill',function(evt){ + return evt.skill=='yanyu'&&evt.event.getParent(2)==event; + }).length>=2&&game.hasPlayer(target=>target.hasSex('male')&&target!=player); }, content:function(){ 'step 0' diff --git a/game/game.js b/game/game.js index 7693d74fc..277770392 100644 --- a/game/game.js +++ b/game/game.js @@ -57182,6 +57182,7 @@ } }, number:function(card,player){ + if(!card) return; //狗卡你是真敢出啊 var number=null; if(card.hasOwnProperty('number')){