Add files via upload

This commit is contained in:
Spmario233 2019-11-14 14:05:56 +08:00 committed by GitHub
parent 0965573f00
commit d54147f9be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions

View File

@ -541,7 +541,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
popup:false,
filter:function(event,player){
if(event.player==player) return false;
if(event.getParent().directHitcontains(player)) return false;
if(event.getParent().directHit.contains(player)) return false;
var num=player.countCards('h','jinchan');
return num&&num==player.countCards('h');
},

View File

@ -2811,7 +2811,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
content:function(){
player.chooseToUse({name:'sha'},'诛害:是否对'+get.translation(trigger.player)+'使用一张杀?').set('logSkill','zhuhai').set('complexSelect',true).set('filterTarget',function(card,player,target){
if(target!=_status.event.sourcex&&!ui.selected.targets.contains(_status.event.sourcex)) return false;
return lib.filter.filterTarget.apply(this,arguments);
return lib.filter.targetEnabled.apply(this,arguments);
}).set('sourcex',trigger.player);
}
},

View File

@ -4443,10 +4443,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
content:function(){
var evt=event.getParent('arrangeTrigger');
if(evt&&evt.map){
for(var i in evt.map){
evt.map[i].list=[];
}
evt.list=[];
evt.map=[];
evt.doing.list=[];
}
game.log(player,'跳过了',event.triggername=='phaseBegin'?'准备阶段':'结束阶段');
},