Merge pull request #814 from kuangshen04/PR-Branch

bugfix
This commit is contained in:
Spmario233 2024-01-19 22:14:53 +08:00 committed by GitHub
commit 42c5cd47e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions

View File

@ -954,7 +954,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
forced:true,
content:function(){
'step 0'
player.addTempSkill('olsilv'+(trigger.getg?'gain':'lose'));
player.addTempSkill('olsilv_'+(trigger.getg?'gain':'lose'));
if(!trigger.visible){
var cards,name=player.storage.ollianju;
if(trigger.getg) cards=trigger.getg(player).filter(card=>card.name==name);

View File

@ -8818,7 +8818,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
function isDefined(opd) {
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;
}
}

View File

@ -2005,8 +2005,8 @@ export const Content = {
arrangeTrigger: async function (event,trigger,player) {
while(event.doingList.length>0){
event.doing = event.doingList.shift();
if (trigger.filterStop && trigger.filterStop()) return event.finish();
while(true){
if (trigger.filterStop && trigger.filterStop()) return;
const usableSkills = event.doing.todoList.filter(info => {
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);