Merge pull request #987 from lieren2023/lieren2023-patch-1

fix:部分技能中坐骑代码没加equip6
This commit is contained in:
Spmario233 2024-02-25 12:01:34 +08:00 committed by GitHub
commit 5e343d3881
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions

View File

@ -12062,7 +12062,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
if(get.type(he[i])=='equip'){
var subtype=get.subtype(he[i]);
if(subtype=='equip3'||subtype=='equip4'){
if(subtype=='equip3'||subtype=='equip4'||subtype=='equip6'){
num++;
}
}
@ -12078,7 +12078,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
if(get.type(he[i])=='equip'){
var subtype=get.subtype(he[i]);
if(subtype=='equip3'||subtype=='equip4'){
if(subtype=='equip3'||subtype=='equip4'||subtype=='equip6'){
list.push(he[i]);
}
}
@ -13879,7 +13879,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(result.bool){
var card=result.cards[0];
if(get.position(card)=='d'){
if(get.subtype(card)=='equip3'||get.subtype(card)=='equip4'){
if(get.subtype(card)=='equip3'||get.subtype(card)=='equip4'||get.subtype(card)=='equip6'){
player.gain(card,player,'gain2');
}
}
@ -13902,7 +13902,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(result.bool){
var card=result.cards[0];
if(get.position(card)=='d'){
if(get.subtype(card)=='equip3'||get.subtype(card)=='equip4'){
if(get.subtype(card)=='equip3'||get.subtype(card)=='equip4'||get.subtype(card)=='equip6'){
player.gain(card,player,'gain2');
}
}

View File

@ -13374,7 +13374,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
case 'equip2':
target.draw();
break;
case 'equip3': case 'equip4': case 'equip5':
case 'equip3': case 'equip4': case 'equip5': case 'equip6':
target.recover();
break;
}
@ -13400,7 +13400,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var hp=player.hp,hs=player.countCards('h',(card)=>card!=ui.selected.cards[0]);
var tp=target.hp,ts=target.countCards('h');
if(sub=='equip2') ts++;
if(tp<target.maxHp&&(sub=='equip3'||sub=='equip4'||sub=='equip5')) tp++;
if(tp<target.maxHp&&(sub=='equip3'||sub=='equip4'||sub=='equip5'||sub=='equip6')) tp++;
if(tp<=hp||ts<=hs) eff+=2;
}
if(sub=='equip1'){
@ -13418,7 +13418,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var sub=get.subtype(ui.selected.cards[0],false);
var eff=get.effect(target,ui.selected.cards[0],player,target);
if(sub=='equip2') eff+=(get.effect(target,{name:'draw'},target,target));
if(target.isDamaged()&&(sub=='equip3'||sub=='equip4'||sub=='equip5')) eff+=get.recoverEffect(target,player,player);
if(target.isDamaged()&&(sub=='equip3'||sub=='equip4'||sub=='equip5'||sub=='equip6')) eff+=get.recoverEffect(target,player,player);
return eff;
},
},