Merge pull request #1017 from PZ157/PR-Branch

bugfix
This commit is contained in:
Spmario233 2024-03-05 16:18:00 +08:00 committed by GitHub
commit 2a0dc4dbd5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 6 deletions

View File

@ -14126,6 +14126,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var cards=result.cards; var cards=result.cards;
target.addToExpansion(cards,player,'give').gaintag.add('zlshoufu2'); target.addToExpansion(cards,player,'give').gaintag.add('zlshoufu2');
player.line(target,'green'); player.line(target,'green');
if(get.mode()!=='identity'||player.identity!=='nei') player.addExpose(0.12);
target.addSkill('zlshoufu2'); target.addSkill('zlshoufu2');
'step 3' 'step 3'
game.delayx(); game.delayx();

View File

@ -3445,15 +3445,15 @@ game.import('character',function(lib,game,ui,get,ai,_status){
else{ else{
switch(type){ switch(type){
case 'basic': case 'basic':
if(sha>0&&get.name(card)=='sha'){ if(sha>0&&get.name(i)=='sha'){
sha--; sha--;
var add=3; var add=3;
if(!player.hasValueTarget(card)&&player.hasValueTarget(card,false)) add+=player.getUseValue(card,false); if(!player.hasValueTarget(i)&&player.hasValueTarget(i,false)) add+=player.getUseValue(i,false);
eff+=add; eff+=add;
} }
break break
case 'trick': case 'trick':
if(player.hasValueTarget(card)) eff+=6; if(player.hasValueTarget(i)) eff+=6;
break; break;
case 'equip': case 'equip':
if(player.hasValueTarget({name:'guohe_copy2'})) eff+=player.getUseValue({name:'guohe_copy2'}); if(player.hasValueTarget({name:'guohe_copy2'})) eff+=player.getUseValue({name:'guohe_copy2'});
@ -3470,15 +3470,15 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(type==control) continue; if(type==control) continue;
switch(type){ switch(type){
case 'basic': case 'basic':
if(sha>0&&get.name(card)=='sha'){ if(sha>0&&get.name(i)=='sha'){
sha--; sha--;
var add=3; var add=3;
if(!player.hasValueTarget(card)&&player.hasValueTarget(card,false)) add+=player.getUseValue(card,false); if(!player.hasValueTarget(i)&&player.hasValueTarget(i,false)) add+=player.getUseValue(i,false);
eff+=add; eff+=add;
} }
break break
case 'trick': case 'trick':
if(player.hasValueTarget(card)) eff+=6; if(player.hasValueTarget(i)) eff+=6;
break; break;
case 'equip': case 'equip':
if(player.hasValueTarget({name:'guohe_copy2'})) eff+=player.getUseValue({name:'guohe_copy2'}); if(player.hasValueTarget({name:'guohe_copy2'})) eff+=player.getUseValue({name:'guohe_copy2'});