v1.9.95.0.1

This commit is contained in:
Spmario233 2019-11-08 22:25:46 +08:00 committed by GitHub
parent b814c80491
commit dd20b4a35d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 15 deletions

View File

@ -2957,10 +2957,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
jiang:{ jiang:{
audio:2, audio:2,
audioname:['sp_lvmeng'], audioname:['sp_lvmeng'],
trigger:{global:['useCard']}, trigger:{
player:'useCardToPlayered',
target:'useCardToTargeted',
},
filter:function(event,player){ filter:function(event,player){
if(!(event.card.name=='juedou'||(event.card.name=='sha'&&get.color(event.card)=='red'))) return false; if(!(event.card.name=='juedou'||(event.card.name=='sha'&&get.color(event.card)=='red'))) return false;
return player==event.player||event.targets.contains(player); return player==event.target||event.getParent().triggeredTargets3.length==1;
}, },
frequent:true, frequent:true,
content:function(){ content:function(){
@ -4317,15 +4320,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return 0.5; return 0.5;
}, },
maixie:true, maixie:true,
effect:{
target:function(card,player,target){
if(target.maxHp<=3) return;
if(get.tag(card,'damage')){
if(target.hp==target.maxHp) return [0,1];
}
if(get.tag(card,'recover')&&player.hp>=player.maxHp-1) return [0,0];
}
}
} }
}, },
jiuchi:{ jiuchi:{

View File

@ -570,6 +570,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
skill:{ skill:{
//新1v1 //新1v1
yanhuo:{ yanhuo:{
audio:2,
trigger:{player:'die'}, trigger:{player:'die'},
forceDie:true, forceDie:true,
filter:function(event,player){ filter:function(event,player){
@ -603,6 +604,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
}, },
mouzhu:{ mouzhu:{
audio:2,
enable:'phaseUse', enable:'phaseUse',
usable:1, usable:1,
filterTarget:function(card,player,target){ filterTarget:function(card,player,target){
@ -648,6 +650,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
viewAs:{name:'sha'}, viewAs:{name:'sha'},
filterCard:{color:'black'}, filterCard:{color:'black'},
position:'he', position:'he',
check:function(card){return 5-get.value(card)},
}, },
cuorui:{ cuorui:{
audio:2, audio:2,
@ -666,6 +669,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player:'phaseJudgeBefore', player:'phaseJudgeBefore',
}, },
forced:true, forced:true,
audio:'cuorui',
filter:function(event,player){ filter:function(event,player){
return !player.storage.cuorui&&(get.is.single()||player.countCards('j')); return !player.storage.cuorui&&(get.is.single()||player.countCards('j'));
}, },
@ -719,9 +723,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
audio:'lianhua', audio:'lianhua',
sub:true, sub:true,
trigger:{player:'phaseBegin'}, trigger:{player:'phaseBegin'},
filter:function(event,player){ //filter:function(event,player){
return player.storage.lianhua&&player.storage.lianhua.red+player.storage.lianhua.black>0; // return player.storage.lianhua&&player.storage.lianhua.red+player.storage.lianhua.black>0;
}, //},
forced:true, forced:true,
content:function(){ content:function(){
var cards=[]; var cards=[];

View File

@ -4960,7 +4960,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
audio:2, audio:2,
filter:function (event,player){ filter:function (event,player){
if(event.name=='dying') return true; if(event.name=='dying') return true;
return event.bySelf!=true; return event.player!=player&&event.bySelf!=true;
}, },
check:function (event,player){ check:function (event,player){
return get.attitude(player,event.player)>0; return get.attitude(player,event.player)>0;