Merge pull request #1040 from the-hideout/any-item-quest-display

hide display of all items from "any" item quests
the-hideout · Jan 28, 2025 · 79978cb · 79978cb
2 parents 55ccac9 + 381ef32
commit 79978cb
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 29 deletions.
diff --git a/src/components/quest-table/index.js b/src/components/quest-table/index.js
@@ -36,7 +36,7 @@ export function getRequiredQuestItems(quest, itemFilter = false) {
         req.count += count;
     };
     quest.objectives.forEach((objectiveData) => {
-        if (objectiveData.items && objectiveData.type !== 'findItem') {
+        if (objectiveData.items && objectiveData.type !== 'findItem' && objectiveData.items.length < 1000) {
             const alternates = objectiveData.items.length > 1;
             for (const objItem of objectiveData.items) {
                 addItem(objItem, objectiveData.count || 1, objectiveData.foundInRaid, alternates);

diff --git a/src/pages/quest/index.js b/src/pages/quest/index.js
@@ -444,35 +444,39 @@ function Quest() {
         if (objective.type === 'giveItem' || objective.type === 'findItem' || objective.type === 'sellItem') {
             let itemElements = [];
             let countElement = '';
-            for (const objItem of objective.items) {
-                let item = items.find((i) => i.id === objItem.id);
-                if (!item)
-                    continue;
-                if (item.properties?.defaultPreset) {
-                    const preset = items.find(i => i.id === item.properties.defaultPreset.id);
-                    item = {
-                        ...item,
-                        baseImageLink: preset.baseImageLink,
-                        width: preset.width,
-                        height: preset.height,
-                    };
+            if (objective.items.length < 1000) {
+                for (const objItem of objective.items) {
+                    let item = items.find((i) => i.id === objItem.id);
+                    if (!item)
+                        continue;
+                    if (item.properties?.defaultPreset) {
+                        const preset = items.find(i => i.id === item.properties.defaultPreset.id);
+                        item = {
+                            ...item,
+                            baseImageLink: preset.baseImageLink,
+                            width: preset.width,
+                            height: preset.height,
+                        };
+                    }
+                    itemElements.push(
+                        <ItemImage
+                            key={item.id}
+                            item={item}
+                            imageField="baseImageLink"
+                            linkToItem={true}
+                            count={objective.count > 1 && objective.items.length === 1 ? objective.count : false}
+                            isFIR={objective.foundInRaid}
+                        />
+                    );
                 }
-                itemElements.push(
-                    <ItemImage
-                        key={item.id}
-                        item={item}
-                        imageField="baseImageLink"
-                        linkToItem={true}
-                        count={objective.count > 1 && objective.items.length === 1 ? objective.count : false}
-                        isFIR={objective.foundInRaid}
-                    />
-                );
-            }
-            if (itemElements.length < 1) {
-                return null;
-            }
-            if (itemElements.length > 1 && objective.count > 1) {
-                countElement = <div>{t('{{itemCount}}x any of', {itemCount: objective.count})}:</div>;
+                if (itemElements.length < 1) {
+                    return null;
+                }
+                if (itemElements.length > 1 && objective.count > 1) {
+                    countElement = <div>{t('{{itemCount}}x any of', {itemCount: objective.count})}:</div>;
+                }
+            } else {
+                countElement = <div>{`x ${objective.count}`}</div>;
             }
             const attributes = [];
             if (objective.dogTagLevel) {