v1.9.94.1.1

This commit is contained in:
Spmario233 2019-10-24 22:50:30 +08:00 committed by GitHub
parent a54b4b9f50
commit e60d556073
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions

View File

@ -196,7 +196,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
audio:'danshou', audio:'danshou',
trigger:{ trigger:{
global:['phaseEnd','phaseBefore'], global:['phaseEnd','phaseBefore'],
player:'useCardToTargeted', target:'useCardToTargeted',
}, },
forced:true, forced:true,
popup:false, popup:false,
@ -6291,7 +6291,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
zuoding:{ zuoding:{
trigger:{global:'useCardToPlayered'}, trigger:{global:'useCardToPlayered'},
filter:function(event,player){ filter:function(event,player){
if(event.getParent().triggeredTargets.length>1) return false; if(event.getParent().triggeredTargets3.length>1) return false;
return !player.hasSkill('zuoding2')&&get.suit(event.card)=='spade'&& return !player.hasSkill('zuoding2')&&get.suit(event.card)=='spade'&&
_status.currentPhase==event.player&&event.targets&&event.targets.length&& _status.currentPhase==event.player&&event.targets&&event.targets.length&&
event.player!=player; event.player!=player;
@ -8605,16 +8605,19 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.logSkill('xinxuanhuo',result.targets); player.logSkill('xinxuanhuo',result.targets);
event.target=result.targets[0]; event.target=result.targets[0];
event.target.draw(2); event.target.draw(2);
player.chooseTarget('选择出杀的目标',true,function(card,player,target){
return _status.event.target.canUse('sha',target)&&player!=target;
}).set('ai',function(target){
return get.effect(target,{name:'sha'},_status.event.target,_status.event.player);
}).set('target',event.target);
} }
else{ else{
event.finish(); event.finish();
} }
"step 2" "step 2"
if(game.hasPlayer(function(current){
return target.canUse('sha',current);
})) player.chooseTarget('选择出杀的目标',true,function(card,player,target){
return _status.event.target.canUse('sha',target);
}).set('ai',function(target){
return get.effect(target,{name:'sha'},_status.event.target,_status.event.player);
}).set('target',event.target);
"step 3"
if(result.bool&&result.targets.length){ if(result.bool&&result.targets.length){
game.log(player,'指定的出杀目标为',result.targets); game.log(player,'指定的出杀目标为',result.targets);
event.target.line(result.targets); event.target.line(result.targets);
@ -8623,7 +8626,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
else{ else{
event.bool=true; event.bool=true;
} }
"step 3" "step 4"
if(event.bool||result.bool==false){ if(event.bool||result.bool==false){
player.gainPlayerCard('he',event.target,Math.min(2,event.target.countCards('he')),true); player.gainPlayerCard('he',event.target,Math.min(2,event.target.countCards('he')),true);
} }