Skip to content

Commit

Permalink
fix: missing vault status for some primes (#504)
Browse files Browse the repository at this point in the history
  • Loading branch information
SlayerOrnstein committed Feb 2, 2024
1 parent 7b3092e commit 29460cc
Showing 1 changed file with 19 additions and 10 deletions.
29 changes: 19 additions & 10 deletions build/parser.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ class Parser {
this.addPatchlogs(result, data.patchlogs);
this.addAdditionalWikiaData(result, category, data.wikia);
this.addIsPrime(result);
this.addVaultData(result, data.vaultData);
this.addVaultData(result, data.vaultData, category, data.wikia);
this.addResistanceData(result, category);
this.addRelics(result, data.relics);
this.applyMasterable(result);
Expand All @@ -220,7 +220,7 @@ class Parser {
this.addImageName(result, data.manifest, previous);
this.addCategory(result, category);

this.addVaultData(result, data.vaultData);
this.addVaultData(result, data.vaultData, category, data.wikia);

return result;
}
Expand Down Expand Up @@ -954,12 +954,21 @@ class Parser {
* data from "Ducats or Plat".
* @param {Item} item data to append vault data to
* @param {VaultData} vaultData to look up data for the {@param item}
* @param {module:warframe-items.Category} category of the data
* @param {WikiaData} wikiaData from wikia to apply
*/
addVaultData(item, vaultData) {
addVaultData(item, vaultData, category, wikiaData) {
let vaultCategory = category;
if (item.type === 'Archwing') vaultCategory = 'archwings';

if (!item.name.endsWith('Prime')) return;
if (!['weapons', 'warframes', 'archwings', 'sentinels'].includes(vaultCategory.toLowerCase())) return;

if (vaultCategory === 'Sentinels') vaultCategory = 'companions';
const wikiaItem = wikiaData[vaultCategory.toLowerCase()].filter((i) => i).find((i) => i.name === item.name);
const target = vaultData.find((i) => i.Name.toLowerCase() === item.name.toLowerCase());

if (!target) {
if (!target && !wikiaItem) {
const isManuallyExcluded = primeExcludeRegex.test(item.name);
const isSkin = item.category === 'Skins';
const isSentinelWeapon =
Expand All @@ -971,18 +980,18 @@ class Parser {
return;
}

if (target.ReleaseDate) {
if (target?.ReleaseDate) {
item.releaseDate = this.normalizeOggDate(target.ReleaseDate);
}
if (target.VaultedDate) {
if (target?.VaultedDate) {
item.vaultDate = this.normalizeOggDate(target.VaultedDate);
}
if (target.EstimatedVaultedDate) {
if (target?.EstimatedVaultedDate) {
item.estimatedVaultDate = this.normalizeOggDate(target.EstimatedVaultedDate);
}
if (target.Vaulted) {
item.vaulted = target.Vaulted;
}

item.vaulted = target?.Vaulted ?? wikiaItem.vaulted;
if (item.vaulted === 'N/A') item.vaulted = true;
}

/**
Expand Down

0 comments on commit 29460cc

Please sign in to comment.