This commit is contained in:
libccy 2017-07-20 09:56:12 +08:00
parent bbe53d626e
commit d0f0c0b431
2 changed files with 40 additions and 6 deletions

View File

@ -564,6 +564,24 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
}
},
fuqi:{
mod:{
wuxieRespondable:function(card,player,target,current){
if(player!=current&&get.distance(player,current)<=1){
return false;
}
}
},
ai:{
norespond:true,
skillTagFilter:function(player,tag,arg){
if(tag=='norespond'&&Array.isArray(arg)){
if(get.distance(player,arg[1])<=1) return true;
}
return false;
}
}
},
wylianji:{
enable:'phaseUse',
usable:1,
@ -3956,6 +3974,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
}
},
jiaozi:{
trigger:{player:'damageBegin',source:'damageBegin'},
forced:true,
filter:function(event,player){
return player.isMaxHandcard(true);
},
content:function(){
trigger.num++;
}
},
jiqiao:{
trigger:{player:'phaseUseBegin'},
direct:true,

View File

@ -16910,7 +16910,7 @@
},
isMaxHp:function(equal){
for(var i=0;i<game.players.length;i++){
if(game.players[i].isOut()) continue;
if(game.players[i].isOut()||game.players[i]==this) continue;
if(equal){
if(game.players[i].hp>=this.hp) return false;
}
@ -16922,7 +16922,7 @@
},
isMinHp:function(equal){
for(var i=0;i<game.players.length;i++){
if(game.players[i].isOut()) continue;
if(game.players[i].isOut()||game.players[i]==this) continue;
if(equal){
if(game.players[i].hp<=this.hp) return false;
}
@ -16935,7 +16935,7 @@
isMaxCard:function(equal){
var nh=this.countCards('he');
for(var i=0;i<game.players.length;i++){
if(game.players[i].isOut()) continue;
if(game.players[i].isOut()||game.players[i]==this) continue;
if(equal){
if(game.players[i].countCards('he')>=nh) return false;
}
@ -16948,7 +16948,7 @@
isMinCard:function(equal){
var nh=this.countCards('he');
for(var i=0;i<game.players.length;i++){
if(game.players[i].isOut()) continue;
if(game.players[i].isOut()||game.players[i]==this) continue;
if(equal){
if(game.players[i].countCards('he')<=nh) return false;
}
@ -16961,7 +16961,7 @@
isMaxHandcard:function(equal){
var nh=this.countCards('h');
for(var i=0;i<game.players.length;i++){
if(game.players[i].isOut()) continue;
if(game.players[i].isOut()||game.players[i]==this) continue;
if(equal){
if(game.players[i].countCards('h')>=nh) return false;
}
@ -16974,7 +16974,7 @@
isMinHandcard:function(equal){
var nh=this.countCards('h');
for(var i=0;i<game.players.length;i++){
if(game.players[i].isOut()) continue;
if(game.players[i].isOut()||game.players[i]==this) continue;
if(equal){
if(game.players[i].countCards('h')<=nh) return false;
}
@ -19706,6 +19706,12 @@
},
cardRespondable:function(card,player){
if(_status.event.name!='chooseToRespond') return true;
var source=_status.event.getParent().player;
if(source!=player){
if(source.hasSkillTag('norespond',false,[card,player],true)){
return false;
}
}
if(player==undefined) player=_status.event.player;
var mod=game.checkMod(card,player,'unchanged','cardRespondable',player);
if(mod!='unchanged') return mod;