diff --git a/card/standard.js b/card/standard.js index 6351e587c..356fd2d5c 100644 --- a/card/standard.js +++ b/card/standard.js @@ -268,7 +268,9 @@ game.import('card',function(lib,game,ui,get,ai,_status){ let ignore=get.copy(ui.selected.cards),used=player.getCardUsable('sha')-1.5,ph=player.getCards('hs'); ignore.add(item); if(typeof item==='object'&&item.cards) ignore.addArray(item.cards); - let na=get.natureList(item),number=get.number(item),natures=['thunder','fire','ice','kami'],nb; + let na=get.natureList(item),number,natures=['thunder','fire','ice','kami'],nb; + if(typeof item==='object') number=get.number(item); + else number=0; for(let i of ph){ if(ignore.includes(i)||get.name(i)!=='sha'||!lib.filter.cardEnabled(i,player)) continue; nb=get.natureList(i); diff --git a/character/collab.js b/character/collab.js index 493644c2a..d0cbbf870 100644 --- a/character/collab.js +++ b/character/collab.js @@ -96,7 +96,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if(get.tag(card,'damage')){ const hp=target.getHp(); player._dcsantou_temp=true; - const losehp=get.effect(card,{name:'losehp'},target,target)/get.attitude(target,target); + const losehp=get.effect(target,{name:'losehp'},target,target)/get.attitude(target,target); delete player._dcsantou_temp; if(hp>=3){ if(target.hasHistory('useSkill',evt=>evt.skill=='dcsantou'&&evt.event.getTrigger().source==player)) return [0,losehp,0,0]; @@ -114,7 +114,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ } return false; }).length; - if(player.hasSkillTag('damage')) hs++; + if(player.hasSkillTag('damage',null,{target:target})) hs++; if(!hs) return 'zeroplayertarget'; num=1-2/3/hs; return [num,0,num,0];