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

将部分新武将改回原写法

This commit is contained in:
copcap 2024-02-27 14:39:25 +08:00
parent 703727751f
commit eeac0ae2c6
No known key found for this signature in database
GPG Key ID: 30E7AB6699451AEE
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
character/huicui.js
View File

@ -248,18 +248,20 @@ game.import('character',function(lib,game,ui,get,ai,_status){
} }
return false; return false;
}, },
costContent(event,player){ direct:true,
return player.chooseTarget((card,player,target)=>{ async content(event,trigger,player){
const result=await player.chooseTarget(get.prompt('dczhenrao'),'对一名可选角色造成1点伤害',(card,player,target)=>{
return get.event('targets').includes(target); return get.event('targets').includes(target);
}) })
.set('targets',event.targets.concat(event.player).filter(target=>target.countCards('h')>player.countCards('h'))) .set('targets',trigger.targets.concat(trigger.player).filter(target=>target.countCards('h')>player.countCards('h')))
.set('ai',target=>{ .set('ai',target=>{
const player=get.player(); const player=get.player();
return get.damageEffect(target,player,player); return get.damageEffect(target,player,player);
}) })
}, .forResult();
async content(event,trigger,player){ if(!result.bool) return;
const {costResult}=event,target=costResult.targets[0]; const target=result.targets[0];
player.logSkill('dczhenrao',target);
await target.damage(); await target.damage();
await game.asyncDelayx(); await game.asyncDelayx();
if(!player.storage.dczhenrao){ if(!player.storage.dczhenrao){
@ -592,25 +594,28 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return evts.some(evt=>evt.targets.includes(target)); return evts.some(evt=>evt.targets.includes(target));
}); });
}, },
costContent(event,player){ direct:true,
const evt=event.getParent(); async content(event,trigger,player){
const evt=trigger.getParent();
const evts=game.getGlobalHistory('useCard',null,evt).slice().remove(evt); const evts=game.getGlobalHistory('useCard',null,evt).slice().remove(evt);
const targets=event.targets.filter(target=>{ const chooseableTargets=trigger.targets.filter(target=>{
return evts.some(evt=>evt.targets.includes(target)); return evts.some(evt=>evt.targets.includes(target));
}); });
return player.chooseTarget() const result=await player.chooseTarget()
.set('prompt',get.prompt('dcyingshi'))
.set('prompt2',`令一名可选角色选择本回合未被选择过的一项：⒈令你于此牌结算结束后视为对其使用一张${get.translation(trigger.card.name)}；⒉弃置${get.cnNumber(player.countCards('e'))}张牌，此牌对其无效。`)
.set('filterTarget',(card,player,target)=>{ .set('filterTarget',(card,player,target)=>{
return get.event('targets').includes(target); return get.event('targets').includes(target);
}) })
.set('targets',targets) .set('targets',chooseableTargets)
.set('toFriends',(()=>{ .set('toFriends',(()=>{
const isPositive=targets.some(current=>{ const isPositive=chooseableTargets.some(current=>{
return get.effect(current,event.card,event.player,player)>0; return get.effect(current,trigger.card,trigger.player,player)>0;
}),isNegative=targets.some(current=>{ }),isNegative=chooseableTargets.some(current=>{
return get.effect(current,event.card,event.player,player)<-5; return get.effect(current,trigger.card,trigger.player,player)<-5;
}); });
if((player.hasSkill('dcyingshi_choice1')||player.countCards('e')<2)&&isNegative) return true; if((player.hasSkill('dcyingshi_choice1')||player.countCards('e')<2)&&isNegative) return true;
if(!player.hasSkill('dcyingshi_choice1')&&(get.tag(event.card,'norepeat')&&isNegative||isPositive)) return true; if(!player.hasSkill('dcyingshi_choice1')&&(get.tag(trigger.card,'norepeat')&&isNegative||isPositive)) return true;
return false; return false;
})()) })())
.set('ai',target=>{ .set('ai',target=>{
@ -621,10 +626,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
} }
if(player.hasSkill('dcyingshi_choice1')&&!count) return 0; if(player.hasSkill('dcyingshi_choice1')&&!count) return 0;
return -get.attitude(player,target); return -get.attitude(player,target);
}); })
}, .forResult();
async content(event,trigger,player){ if(!result.bool) return;
const {costResult:{targets}}=event,target=targets[0]; const target=result.targets[0];
player.logSkill('dcyingshi',target);
let bool; let bool;
if(!player.hasSkill(`dcyingshi_choice2`)){ if(!player.hasSkill(`dcyingshi_choice2`)){
const count=player.countCards('e'),forced=player.hasSkill('dcyingshi_choice1'); const count=player.countCards('e'),forced=player.hasSkill('dcyingshi_choice1');

17
character/xianding.js
View File

@ -150,17 +150,18 @@ game.import('character',function(lib,game,ui,get,ai,_status){
filter(event,player){ filter(event,player){
return game.hasPlayer(current=>current.isDamaged()); return game.hasPlayer(current=>current.isDamaged());
}, },
costContent(event,player){
const maxCount=player.getAllHistory('useSkill',evt=>evt.skill==='dcanjing').length+1;
return player.chooseTarget((card,player,target)=>target.isDamaged(),[1,maxCount]);
},
check(target){
return get.attitude(get.player(),target)>0;
},
usable:1, usable:1,
async content(event,trigger,player){ async content(event,trigger,player){
const {costResult:{targets}}=event; const maxCount=player.getAllHistory('useSkill',evt=>evt.skill==='dcanjing').length+1;
const result=await player.chooseTarget(get.prompt2('dcanjing'),(card,player,target)=>target.isDamaged(),[1,maxCount])
.set('ai',target=>{
return get.attitude(get.player(),target)>0;
})
.forResult();
if(!result.bool) return;
const targets=result.targets.slice();
targets.sortBySeat(_status.currentPhase); targets.sortBySeat(_status.currentPhase);
player.logSkill('dcanjing',targets);
for(const target of targets) await target.draw(); for(const target of targets) await target.draw();
const minHp=targets.map(i=>i.getHp()).sort((a,b)=>a-b)[0]; const minHp=targets.map(i=>i.getHp()).sort((a,b)=>a-b)[0];
await game.asyncDelayx(); await game.asyncDelayx();