v1.9.96.4.1

This commit is contained in:
Spmario233 2019-12-16 22:41:32 +08:00 committed by GitHub
parent 4fda1d2874
commit 87706237b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions

View File

@ -1551,7 +1551,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
target:'useCardToTargeted', target:'useCardToTargeted',
}, },
filter:function (event,player,name){ filter:function (event,player,name){
if(!event.nzry_shicai) return false; if(!event.nzry_shicai&&!event.getParent().nzry_shicai) return false;
if(name=='useCardToTargeted'&&('equip'!=get.type(event.card)||event.player!=player)) return false; if(name=='useCardToTargeted'&&('equip'!=get.type(event.card)||event.player!=player)) return false;
if(name=='useCardAfter'&&['equip','delay'].contains(get.type(event.card))) return false; if(name=='useCardAfter'&&['equip','delay'].contains(get.type(event.card))) return false;
return event.cards.filterInD().length>0; return event.cards.filterInD().length>0;
@ -3237,7 +3237,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
group:["guzheng_count"], group:["guzheng_count"],
subSkill:{ subSkill:{
count:{ count:{
trigger:{global:['dloseEnd','cardsDiscardAfter']}, trigger:{global:['loseEnd','cardsDiscardAfter']},
forced:true, forced:true,
silent:true, silent:true,
popup:false, popup:false,

View File

@ -719,6 +719,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
next.set('source',player); next.set('source',player);
next.set('jijiang',true); next.set('jijiang',true);
next.set('skillwarn','替'+get.translation(player)+'打出一张杀'); next.set('skillwarn','替'+get.translation(player)+'打出一张杀');
next.noOrdering=true;
next.autochoose=lib.filter.autoRespondSha; next.autochoose=lib.filter.autoRespondSha;
} }
else{ else{
@ -786,6 +787,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
next.set('target',target); next.set('target',target);
next.set('jijiang',true); next.set('jijiang',true);
next.set('skillwarn','替'+get.translation(player)+'打出一张杀'); next.set('skillwarn','替'+get.translation(player)+'打出一张杀');
next.noOrdering=true;
next.autochoose=lib.filter.autoRespondSha; next.autochoose=lib.filter.autoRespondSha;
} }
else{ else{

View File

@ -6356,6 +6356,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}); });
next.set('sourcex',player); next.set('sourcex',player);
next.set('jijiang',true); next.set('jijiang',true);
next.noOrdering=true;
next.autochoose=lib.filter.autoRespondSha; next.autochoose=lib.filter.autoRespondSha;
} }
else{ else{
@ -6434,6 +6435,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
next.set('source',player); next.set('source',player);
next.set('target',target); next.set('target',target);
next.set('jijiang',true); next.set('jijiang',true);
next.noOrdering=true;
next.autochoose=lib.filter.autoRespondSha; next.autochoose=lib.filter.autoRespondSha;
} }
else{ else{