YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v1.9.96.2.1

This commit is contained in:
Spmario233 2019-12-12 23:00:19 +08:00 committed by GitHub
parent d981b9e25b
commit 4d5aed2ab1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
card/standard.js
View File

@ -98,7 +98,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
var target=_status.event.player; var target=_status.event.player;
var evt=_status.event.getParent(); var evt=_status.event.getParent();
var bool=true; var bool=true;
if(_status.event.shanRequired>1&&target.countCards('h','shan')<_status.event.shanRequired){ if(_status.event.shanRequired>1&&!get.is.object(card)&&target.countCards('h','shan')<_status.event.shanRequired){
bool=false; bool=false;
} }
else if(target.hasSkillTag('useShan')){ else if(target.hasSkillTag('useShan')){
@ -128,7 +128,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
//next.autochoose=lib.filter.autoRespondShan; //next.autochoose=lib.filter.autoRespondShan;
} }
"step 2" "step 2"
if(!result||!result.result||result.result!='shaned'){ if(!result||!result.bool||!result.result||result.result!='shaned'){
event.trigger('shaHit'); event.trigger('shaHit');
} }
else{ else{
@ -142,7 +142,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
} }
} }
"step 3" "step 3"
if((!result||!result.result||result.result!='shaned')&&!event.unhurt){ if((!result||!result.bool||!result.result||result.result!='shaned')&&!event.unhurt){
target.damage(get.nature(event.card),event.baseDamage+event.extraDamage); target.damage(get.nature(event.card),event.baseDamage+event.extraDamage);
event.result={bool:true} event.result={bool:true}
event.trigger('shaDamage'); event.trigger('shaDamage');
@ -1707,6 +1707,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
trigger.untrigger(); trigger.untrigger();
trigger.trigger('shaHit'); trigger.trigger('shaHit');
trigger._result.bool=false; trigger._result.bool=false;
trigger._result.result=null;
} }
} }
}, },