This commit is contained in:
libccy 2017-03-27 17:42:45 +08:00
parent 120e2dc6f3
commit 11d6dfa674
11 changed files with 18 additions and 18 deletions

View File

@ -96,7 +96,7 @@ card.extra={
if(game.hasPlayer(function(current){
return (ai.get.attitude(target,current)<0&&
target.canUse(card,current,true,true)&&
!current.num('e','baiyin')&&
!current.getEquip('baiyin')&&
ai.get.effect(current,card,target)>0);
})){
return 1;

View File

@ -122,7 +122,7 @@ card.standard={
},
result:{
target:function(player,target){
if(player.hasSkill('jiu')&&!target.num('e','baiyin')){
if(player.hasSkill('jiu')&&!target.getEquip('baiyin')){
if(ai.get.attitude(player,target)>0){
return -6;
}

View File

@ -219,10 +219,10 @@ character.diy={
var subtype=get.subtype(event.cards[0]);
if(att>0){
if(event.player.countCards('h')>=player.countCards('h')+2) return true;
return event.player.num('e',{subtype:subtype})==0;
return event.player.countCards('e',{subtype:subtype})==0;
}
else{
return event.player.num('e',{subtype:subtype})>0;
return event.player.countCards('e',{subtype:subtype})>0;
}
},
content:function(){

View File

@ -182,7 +182,7 @@ character.refresh={
effect:{
target:function(card,player,target){
if(player==target&&get.type(card)=='equip'){
if(player.num('e',{subtype:get.subtype(card)})){
if(player.countCards('e',{subtype:get.subtype(card)})){
if(game.hasPlayer(function(current){
return current!=player&&ai.get.attitude(player,current)>0;
})){

View File

@ -253,7 +253,7 @@ character.shenhua={
return current!=player&&ai.get.attitude(player,current)>3;
});
var player=_status.event.player;
var num=player.num('he',function(card){
var num=player.countCards('he',function(card){
return ai.get.value(card)<7;
});
var count=null;
@ -964,7 +964,7 @@ character.shenhua={
return !targets1.hasJudge(button.link.viewAs||button.link.name);
}
else{
return !targets1.num('e',{subtype:get.subtype(button.link)});
return !targets1.countCards('e',{subtype:get.subtype(button.link)});
}
});
}
@ -3310,7 +3310,7 @@ character.shenhua={
var hastarget=game.hasPlayer(function(current){
return ai.get.attitude(target,current)<0;
});
var be=target.num('e',{color:'black'});
var be=target.countCards('e',{color:'black'});
if(target.countCards('h','shan')&&be){
if(!target.hasSkill('guidao')) return 0;
return [0,hastarget?target.countCards('he')/2:0];
@ -3952,7 +3952,7 @@ character.shenhua={
var hastarget=game.hasPlayer(function(current){
return ai.get.attitude(target,current)<0;
});
if(target.countCards('h','shan')&&target.num('e',{suit:'spade'})){
if(target.countCards('h','shan')&&target.countCards('e',{suit:'spade'})){
return [0,hastarget?target.countCards('he')/2:0];
}
if(target.countCards('h','shan')){

View File

@ -556,7 +556,7 @@ character.standard={
effect:{
target:function(card,player,target){
if(player==target&&get.type(card)=='equip'){
if(player.num('e',{subtype:get.subtype(card)})){
if(player.countCards('e',{subtype:get.subtype(card)})){
var players=game.filterPlayer();
for(var i=0;i<players.length;i++){
if(players[i]!=player&&ai.get.attitude(player,players[i])>0){

View File

@ -2718,7 +2718,7 @@ character.swd={
return;
}
}
if(target.countCards('h')>2||target.num('e',{color:'black'})){
if(target.countCards('h')>2||target.countCards('e',{color:'black'})){
return [1,0,0,-1];
}
return [1,-0.5];
@ -3224,7 +3224,7 @@ character.swd={
player:function(card,player){
if(_status.currentPhase!=player) return;
if(get.type(card)=='equip'&&
player.num('e',{subtype:get.subtype(card)})&&
player.countCards('e',{subtype:get.subtype(card)})&&
lib.filter.filterCard({name:'sha'},player)){
return 0;
}
@ -7133,7 +7133,7 @@ character.swd={
event.finish();
}
"step 5"
var renum=event.current.num('e',{color:event.color});
var renum=event.current.countCards('e',{color:event.color});
if(renum){
event.current.recover();
}

View File

@ -2712,7 +2712,7 @@ character.yxs={
player.chooseTarget('选择一个角色装备'+get.translation(result.links),function(card,player,target){
return !target.isMin();
}).ai=function(target){
if(!target.num('e',{subtype:get.subtype(event.card)})){
if(!target.countCards('e',{subtype:get.subtype(event.card)})){
return ai.get.attitude(player,target);
}
return 0;

View File

@ -18667,13 +18667,13 @@
logv:false,
prompt:'将要重铸的牌置入弃牌堆并摸一张牌',
filter:function(event,player){
return (player.hasCard(function(card){
return player.hasCard(function(card){
var info=get.info(card);
if(typeof info.chongzhu=='function'){
return info.chongzhu(event,player);
}
return info.chongzhu;
})>0);
});
},
filterCard:function(card){
var info=get.info(card);

View File

@ -2527,7 +2527,7 @@ mode.boss={
hastarget=true;break;
}
}
var be=target.num('e',{color:'black'});
var be=target.countCards('e',{color:'black'});
if(target.countCards('h','shan')&&be){
if(!target.hasSkill('guidao')) return 0;
return [0,hastarget?target.countCards('he')/2:0];

View File

@ -1482,7 +1482,7 @@ mode.guozhan={
effect:{
target:function(card,player,target){
if(player==target&&get.type(card)=='equip'){
if(player.num('e',{subtype:get.subtype(card)})){
if(player.countCards('e',{subtype:get.subtype(card)})){
var players=game.filterPlayer();
for(var i=0;i<players.length;i++){
if(players[i]!=player&&ai.get.attitude(player,players[i])>0){