diff --git a/character/extra.js b/character/extra.js index 256698cac..62f2f50a0 100755 --- a/character/extra.js +++ b/character/extra.js @@ -7014,11 +7014,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){ source:'damageSource' }, filter:function(event,player){ - if(get.attitude(_status.event.player,event.player)>=0) return false; if(player.storage.drlt_duorui.length) return false; return event.player.isIn()&&_status.currentPhase==player; }, check:function(event,player){ + if(get.attitude(_status.event.player,event.player)>=0) return false; if(player.hasEnabledSlot()&&!player.hasEnabledSlot(5)) return false; return true; }, diff --git a/character/huicui.js b/character/huicui.js index 81683ea41..c5296134a 100644 --- a/character/huicui.js +++ b/character/huicui.js @@ -11551,10 +11551,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){ yue_xiaoqiao:'乐小乔', yue_xiaoqiao_prefix:'乐', dcqiqin:'绮琴', - dcqiqin_tag:'乐', - dcqiqin_info:'锁定技。①游戏开始时,你将所有手牌标记为“乐”。②你的“乐”牌不计入手牌上限。③准备阶段,你获得弃牌堆中所有你标记过的“乐”牌。', + dcqiqin_tag:'琴', + dcqiqin_info:'锁定技。①游戏开始时,你将所有手牌标记为“琴”。②你的“琴”牌不计入手牌上限。③准备阶段,你获得弃牌堆中所有你标记过的“琴”牌。', dcweiwan:'媦婉', - dcweiwan_info:'出牌阶段限一次,你可以弃置一张“乐”并获得一名其他角色区域内花色与此牌不相同的牌各一张,若你获得了:一张牌,其失去1点体力;两张牌,本回合你对其使用牌无距离和次数限制;三张牌,本回合你不能对其使用牌。', + dcweiwan_info:'出牌阶段限一次,你可以弃置一张“琴”并随机获得一名其他角色区域内花色与此牌不相同的牌各一张,若你获得了:一张牌,其失去1点体力;两张牌,本回合你对其使用牌无距离和次数限制;三张牌,本回合你不能对其使用牌。', sp_baigei:'无双上将', sp_caizijiaren:'才子佳人', diff --git a/character/refresh.js b/character/refresh.js index 4e75e2c6a..71930bb29 100755 --- a/character/refresh.js +++ b/character/refresh.js @@ -6656,7 +6656,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, ai:{ order:function(item,player){ - var num=player.getStorage('gzquanji').length; + var num=player.getExpansions('gzquanji').length; if(num==1) return 8; return 1; }, diff --git a/character/shenhua.js b/character/shenhua.js index 34750ef38..95ce88be9 100755 --- a/character/shenhua.js +++ b/character/shenhua.js @@ -3667,7 +3667,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ target:function(card,player,target,current){ if(typeof card==='object'&&get.name(card)==='sha'&&target.mayHaveShan(player,'use')) return [0.6,0.75]; if(!target.hasFriend()&&!player.hasUnknown()) return; - if(_status.currentPhase==target) return; + if(_status.currentPhase==target||get.type(card)==='delay') return; if(card.name!='shuiyanqijunx'&&get.tag(card,'loseCard')&&target.countCards('he')){ if(target.hasSkill('ziliang')) return 0.7; return [0.5,Math.max(2,target.countCards('h'))];