From a85fd833b9ab5b53ffc43f41a5c6e370a3189271 Mon Sep 17 00:00:00 2001 From: VforValens Date: Sat, 3 Sep 2022 20:33:16 -0400 Subject: [PATCH] Fixing onlyFoundInRaid Function to properly work for reals this fucking time. Also changed nomenclature in items.ts for a for loop. --- src/items.ts | 6 +++--- src/quests.ts | 24 ++++++++---------------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/src/items.ts b/src/items.ts index 5ee098d..4c2e4b2 100644 --- a/src/items.ts +++ b/src/items.ts @@ -154,10 +154,10 @@ export class Items { for (const i in this.items[item]._props?.Grids) { - const grid = this.items[item]._props?.Grids[i]; - for (const j in grid._props.filters) + const grids = this.items[item]._props?.Grids[i]; + for (const j in grids._props.filters) { - const filters = grid._props.filters[j]; + const filters = grids._props.filters[j]; if (!filters.ExcludedFilter) { filters.ExcludedFilter = []; diff --git a/src/quests.ts b/src/quests.ts index 3bb6694..7006a86 100644 --- a/src/quests.ts +++ b/src/quests.ts @@ -27,21 +27,13 @@ export class Quests private onlyFoundInRaid(): void { const quests = this.tables.getTables().templates.quests; - - for (const questid in quests) - { - const questsAvailableForFinishConditions = quests[questid].conditions.AvailableForFinish; - const findItemConditions = questsAvailableForFinishConditions.find(x=>x._parent === "FindItem"); - - if (!findItemConditions) - { - continue; - } - - if (findItemConditions._props.onlyFoundInRaid) - { - findItemConditions._props.onlyFoundInRaid = false; - } - } + Object.values(quests).forEach(quest => { + quest.conditions.AvailableForFinish.forEach((prop, index) => { + if (prop._parent == 'FindItem' || prop._parent == 'HandoverItem') { + prop._props.onlyFoundInRaid = false; + quest.conditions.AvailableForFinish[index] = prop; + } + }) + }) } }