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

Merge pull request #1087 from mengxinzxz/PR-Branch 

bugfix
This commit is contained in:
Spmario233 2024-03-16 20:32:49 +08:00 committed by GitHub
parent b775c3317e 678f1e4cbc
commit caa7a211e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
character/tw.js
View File

@ -396,11 +396,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){
async content(event,trigger,player){
player.awakenSkill('twduwang');
game.log(player,'完成使命');
const {result:{index}}=await player.chooseControl().set('choiceList',[
let result;
if(player.hasSkill('twxiayong',null,false,false)) result={index:1};
else result=await player.chooseControl().set('choiceList',[
'获得技能【狭勇】',
//'重置【独往】和【延势】，删除【独往】的使命失败分支，获得【延势】的历战效果',
'重置【独往】和【延势】，删除【独往】的使命失败分支',
]).set('prompt','独往：请选择一项').set('ai',()=>{
/*
const player=get.event('player'),num=game.countPlayer(current=>{
return current!=player&&current.hasCard(card=>{
if(get.position(card)=='h') return true;
@ -408,12 +411,20 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},'he')&&get.effect(current,{name:'guohe_copy2'},current,player)+get.effect(player,{name:'juedou'},current,player);
});
return Math.max(0,Math.min(2,num)-1);
});
if(index==0) await player.addSkills('twxiayong');
*/
return 1;
}).forResult();
if(result.index==0) await player.addSkills('twxiayong');
else{
player.restoreSkill('twduwang');
player.restoreSkill('twylyanshi');
for(const skill of ['twduwang','twylyanshi']){
if(player.awakenedSkills.includes(skill)){
player.restoreSkill(skill);
player.popup(skill);
game.log(player,'重置了技能','#g【'+get.translation(skill)+'】');
}
}
player.storage.twduwang_fail=true;
game.log(player,'修改了技能','#g【独往】');
}
},
},
@ -638,7 +649,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
filter(event,player){
if(event.getParent().type!='card'||event.card.name!='juedou'||!event.player.isIn()) return false;
const evt=game.getGlobalHistory('useCard',evt=>evt.card==event.card)[0];
return evt&&evt.player!=event.player&&(event.player!=player||player.countCards('h'));
if(evt&&evt.targets&&(event.player!=player||player.countCards('h'))){
if(evt.player==player){
return evt.targets.includes(event.player)&&event.player!=player;
}
return evt.targets.includes(player)&&evt.player!=player;
}
return false;
},
forced:true,
logTarget:'player',
@ -711,7 +728,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
else result=await player.chooseTarget('请选择【败族】的目标','令你和这些角色同时弃置一张手牌，然后你对与你弃置牌类别相同的角色各造成1点伤害',filterTarget,sum,true).set('ai',target=>{
const player=get.event('player');
return get.effect(target,{name:'guohe_copy2'},target,player)+get.damageEffect(target,player,player);
});
}).forResult();
if(result.bool){
targets=result.targets.sortBySeat();
player.line(targets);