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

arrangeTrigger async化

This commit is contained in:
Spmario233 2024-01-19 00:50:39 +08:00
parent 80cd06f754
commit 1627809546
2 changed files with 36 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
character/jsrg.js
View File

@ -976,6 +976,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
global:['gainAfter','equipAfter','addJudgeAfter','loseAsyncAfter','addToExpansionAfter'], global:['gainAfter','equipAfter','addJudgeAfter','loseAsyncAfter','addToExpansionAfter'],
}, },
filter(event,player){ filter(event,player){
if(player.isHealthy()) return false;
const evt=event.getl(player); const evt=event.getl(player);
return evt&&evt.es&&evt.es.length>0; return evt&&evt.es&&evt.es.length>0;
}, },
@ -1010,7 +1011,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
charlotte:true, charlotte:true,
forced:true, forced:true,
silent:true, silent:true,
async content(event,trigger,player){ content(){
trigger.player.addGaintag(trigger.cards,'jsrgtuigu'); trigger.player.addGaintag(trigger.cards,'jsrgtuigu');
trigger.player.addTempSkill('jsrgtuigu_blocked',{player:'phaseAfter'}); trigger.player.addTempSkill('jsrgtuigu_blocked',{player:'phaseAfter'});
} }

75
noname/library/element/content.js
View File

@ -2002,48 +2002,41 @@ export const Content = {
event.callback(); event.callback();
} }
}, },
arrangeTrigger: function () { arrangeTrigger: async function (event,trigger,player) {
'step 0'; while(event.doingList.length>0){
event.doing = event.doingList[0]; event.doing = event.doingList.shift();
if (event.doing && event.doing.todoList.length) return; if (trigger.filterStop && trigger.filterStop()) return event.finish();
if (event.doingList.length) { while(true){
event.doingList.shift(); const usableSkills = event.doing.todoList.filter(info => {
return event.redo(); if (!lib.filter.filterTrigger(trigger, info.player, event.triggername, info.skill)) return false;
return lib.skill.global.includes(info.skill) || info.player.hasSkill(info.skill, true);
});
if (usableSkills.length == 0){
break;
}
else {
event.doing.todoList = event.doing.todoList.filter(i => i.priority <= usableSkills[0].priority);
event.choice = usableSkills.filter(n => n.priority == usableSkills[0].priority);
const currentChoice = event.choice[0] , currentSkillInfo = lib.skill[currentChoice.skill];
if (event.choice.length == 1 || typeof event.doing.player=='string' || (currentSkillInfo && currentSkillInfo.silent)) {
event.current = currentChoice;
}
else{
const currentPlayer = currentChoice.player , skillsToChoose = event.choice.map(i => i.skill);
const next = currentPlayer.chooseControl(skillsToChoose);
next.set('prompt', '选择下一个触发的技能');
next.set('forceDie', true);
next.set('arrangeSkill', true);
next.set('includeOut', true);
const {result} = await next;
event.current = event.doing.todoList.find(info => info.skill == result.control);
}
event.doing.doneList.push(event.current);
event.doing.todoList.remove(event.current);
await game.createTrigger(event.triggername, event.current.skill, event.current.player, trigger);
}
}
} }
event.finish();
'step 1';
if (trigger.filterStop && trigger.filterStop()) return event.finish();
event.current = event.doing.todoList.find(info => lib.filter.filterTrigger(trigger, info.player, event.triggername, info.skill));
if (!event.current) {
event.doing.todoList = [];
return event.goto(0);
}
event.doing.todoList = event.doing.todoList.filter(i => i.priority <= event.current.priority);
const directUse = info => lib.skill[info.skill].silent || !lib.translate[info.skill];//是否不触发同顺序选择
if (directUse(event.current)) return event.goto(4);
event.choice = event.doing.todoList.filter(info => {
if (!lib.filter.filterTrigger(trigger, info.player, event.triggername, info.skill)) return false;
if (directUse(info)) return false;
if (event.current.player !== info.player) return false;
return lib.skill.global.includes(info.skill) || event.current.player.hasSkill(info.skill, true);
});
event.choice = event.choice.filter(n=>n.priority == event.choice[0].priority);
if (event.choice.length < 2) return event.goto(4);
'step 2';
const next = event.choice[0].player.chooseControl(event.choice.map(i => i.skill));
next.set('prompt', '选择下一个触发的技能');
next.set('forceDie', true);
next.set('arrangeSkill', true);
next.set('includeOut', true);
'step 3';
if (result.control) event.current = event.doing.todoList.find(info => info.skill == result.control && info.player == event.choice[0].player);
'step 4';
if (!event.current || !event.doing.todoList.includes(event.current)) return;
event.doing.doneList.push(event.current);
event.doing.todoList.remove(event.current);
game.createTrigger(event.triggername, event.current.skill, event.current.player, trigger);
event.goto(0);
}, },
createTrigger: function () { createTrigger: function () {
"step 0"; "step 0";