commit
42c5cd47e5
|
@ -954,7 +954,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
forced:true,
|
forced:true,
|
||||||
content:function(){
|
content:function(){
|
||||||
'step 0'
|
'step 0'
|
||||||
player.addTempSkill('olsilv'+(trigger.getg?'gain':'lose'));
|
player.addTempSkill('olsilv_'+(trigger.getg?'gain':'lose'));
|
||||||
if(!trigger.visible){
|
if(!trigger.visible){
|
||||||
var cards,name=player.storage.ollianju;
|
var cards,name=player.storage.ollianju;
|
||||||
if(trigger.getg) cards=trigger.getg(player).filter(card=>card.name==name);
|
if(trigger.getg) cards=trigger.getg(player).filter(card=>card.name==name);
|
||||||
|
|
|
@ -8818,7 +8818,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
|
||||||
}
|
}
|
||||||
function isDefined(opd) {
|
function isDefined(opd) {
|
||||||
if(opd!=undefined){
|
if(opd!=undefined){
|
||||||
if (opd.get||opd.set||opd.writable!=true||opd.configurable!=true||opd.enumerable!=true){
|
if (opd.get||opd.set||opd.writable!=true||opd.configurable!=true){
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2005,8 +2005,8 @@ export const Content = {
|
||||||
arrangeTrigger: async function (event,trigger,player) {
|
arrangeTrigger: async function (event,trigger,player) {
|
||||||
while(event.doingList.length>0){
|
while(event.doingList.length>0){
|
||||||
event.doing = event.doingList.shift();
|
event.doing = event.doingList.shift();
|
||||||
if (trigger.filterStop && trigger.filterStop()) return event.finish();
|
|
||||||
while(true){
|
while(true){
|
||||||
|
if (trigger.filterStop && trigger.filterStop()) return;
|
||||||
const usableSkills = event.doing.todoList.filter(info => {
|
const usableSkills = event.doing.todoList.filter(info => {
|
||||||
if (!lib.filter.filterTrigger(trigger, info.player, event.triggername, info.skill)) return false;
|
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);
|
return lib.skill.global.includes(info.skill) || info.player.hasSkill(info.skill, true);
|
||||||
|
|
Loading…
Reference in New Issue