Merge branch 'libccy:PR-Branch' into PR-Branch
This commit is contained in:
commit
4049f19f96
|
@ -5151,7 +5151,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
if(player===current||current.hp>1||get.attitude(player,current)>=0) return false;
|
if(player===current||current.hp>1||get.attitude(player,current)>=0) return false;
|
||||||
return player.inRange(current)&&player.countCards('hs','sha')&&player.getCardUsable('sha')||
|
return player.inRange(current)&&player.countCards('hs','sha')&&player.getCardUsable('sha')||
|
||||||
player.countCards('hs',card=>get.name(card)!=='sha'&&get.tag(card,'damage'))>1;
|
player.countCards('hs',card=>get.name(card)!=='sha'&&get.tag(card,'damage'))>1;
|
||||||
}) return 9.2;
|
})) return 9.2;
|
||||||
return 0;
|
return 0;
|
||||||
},
|
},
|
||||||
result:{
|
result:{
|
||||||
|
|
|
@ -11801,7 +11801,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
jueqing:true,
|
jueqing:true,
|
||||||
unequip_ai:true,
|
unequip_ai:true,
|
||||||
skillTagFilter:function(player,tag,arg){
|
skillTagFilter:function(player,tag,arg){
|
||||||
if(tag=='unequip_ai') return arg&&arg.name==='sha;
|
if(tag=='unequip_ai') return arg&&arg.name==='sha';
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue