Merge pull request #661 from PZ157/PR-Branch

bugfix
This commit is contained in:
Spmario233 2023-11-22 22:56:43 +08:00 committed by GitHub
commit 94a339229b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 13 deletions

View File

@ -4222,13 +4222,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
intro:{content:'上次受到伤害的花色:$'}, intro:{content:'上次受到伤害的花色:$'},
ai:{ ai:{
effect:{ effect:{
target:function(card,player,target){ target:(card,player,target)=>{
if(get.tag(card,'damage')){ if(typeof card==='object'&&get.tag(card,'damage')){
var color=get.suit(card); let suit=get.suit(card);
if(color=='none') return; if(suit==='none') return;
var all=target.getAllHistory('damage'); let all=target.getAllHistory('damage');
if(!all.length||!all[all.length-1].card) return; if(!all.length||!all[all.length-1].card) return;
if(get.suit(all[all.length-1].card)==color) return 'zerotarget'; if(get.suit(all[all.length-1].card)===suit) return 'zeroplayertarget';
} }
}, },
}, },

View File

@ -4976,13 +4976,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
ai:{ ai:{
effect:{ effect:{
target:function(card,player,target){ target:(card,player,target)=>{
if(get.tag(card,'damage')){ if(typeof card==='object'&&get.tag(card,'damage')){
var color=get.color(card); let color=get.color(card);
if(color=='none') return; if(color==='none') return;
var all=target.getAllHistory('damage'); let all=target.getAllHistory('damage');
if(!all.length||!all[all.length-1].card) return; if(!all.length||!all[all.length-1].card) return;
if(get.color(all[all.length-1].card)==color) return 'zerotarget'; if(get.color(all[all.length-1].card)===color) return 'zeroplayertarget';
} }
}, },
}, },

View File

@ -28761,7 +28761,7 @@ new Promise(resolve=>{
if(selected.includes(card)) return false; if(selected.includes(card)) return false;
let name=get.name(card,this); let name=get.name(card,this);
if(name==='shan'||name==='hufu'){ if(name==='shan'||name==='hufu'){
if(type==='use') return lib.filter.cardEnabled(card,this); if(type==='use') return lib.filter.cardEnabled(card,this,'forceEnable');
if(type==='respond') return lib.filter.cardRespondable(card,this); if(type==='respond') return lib.filter.cardRespondable(card,this);
return true; return true;
} }