Update and fix vendors

ProjectCeleste · Oct 28, 2023 · 4f07b22 · 4f07b22
1 parent 56ede3a
commit 4f07b22
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 21 deletions.
diff --git a/db/advisors/build.ts b/db/advisors/build.ts
@@ -1,7 +1,7 @@
 import { merge } from "lodash"
 
 import { API, downloadIcon } from "../download"
-import { Advisor } from "../interfaces"
+import { Advisor, Vendor } from "../interfaces"
 import { translateEn, convertCivilization } from "../shared/convert-text"
 import { findVendors } from "../vendors"
 
@@ -39,18 +39,23 @@ export async function buildAdvisors(): Promise<Advisor[]> {
       level: advisor.minlevel,
       civilization,
       rarities,
-      vendors: undefined,
+      vendors: [],
       search: "",
       marketplace: [],
       lootTable: convertLootTable(advisor)
     }
-
-    result.vendors = await findVendors(rarity.id);
-    (result.vendors || []).forEach(vendor => {
+    
+    const vendorData = await findVendors(rarity.id);
+    (vendorData || []).forEach(vendor => {
       vendor.rarity = advisor.rarity
     })
 
     const merged = merge(mergedByName[name], result)
+
+    for (let i=0; i<vendorData.length;i++) {
+      merged.vendors.push(vendorData[i])
+    }
+
     merged.search = await buildSearchString(advisor, merged)
 
     merged.marketplace = Object.keys(merged.rarities).reduce((queries, key) => {
@@ -60,7 +65,7 @@ export async function buildAdvisors(): Promise<Advisor[]> {
       })
       return queries
     }, [] as typeof result.marketplace)
-
+    
     mergedByName[name] = merged
   }
 

diff --git a/db/consumables/build.ts b/db/consumables/build.ts
@@ -80,7 +80,7 @@ export async function buildConsumables(): Promise<Consumable[]> {
     const result: Consumable = {
       id: rarity.id,
       name,
-      vendors: undefined,
+      vendors: [],
       rarities,
       civilization,
       search: "",
@@ -94,9 +94,9 @@ export async function buildConsumables(): Promise<Consumable[]> {
     }
 
 
-    result.vendors = await findVendors(result.id);
+    const vendorData = await findVendors(result.id);
 
-    (result.vendors || []).forEach(vendor => {
+    (vendorData || []).forEach(vendor => {
       if (consumable.rarity === "cRarityLegendary") {
         vendor.rarity = "legendary"
       }
@@ -117,6 +117,12 @@ export async function buildConsumables(): Promise<Consumable[]> {
 
 
     const merged = merge(mergedByName[name], result)
+
+    for (let i=0; i<vendorData.length;i++) {
+      merged.vendors.push(vendorData[i])
+    }
+
+
     merged.search = await buildSearchString(merged,consumable)
 
 

diff --git a/db/interfaces/Advisor.ts b/db/interfaces/Advisor.ts
@@ -13,7 +13,7 @@ export interface Advisor {
   age: number
   level: number
   civilization: string | undefined
-  vendors: Vendor[] | undefined
+  vendors: Vendor[] 
   rarities: {
     [index: string]: AdvisorRarity,
   }

diff --git a/db/interfaces/Consumable.ts b/db/interfaces/Consumable.ts
@@ -24,7 +24,7 @@ export interface Consumable {
     [index: string]: ConsumableRarity,
   }
   civilization: string | undefined
-  vendors: Vendor[] | undefined
+  vendors: Vendor[] 
   search: string
   marketplace: MarketplaceQuery[],
   event?: {

diff --git a/db/items/legendary-rotation.ts b/db/items/legendary-rotation.ts
@@ -55,6 +55,7 @@ export function addToLegendaryRotation(item: Item, trait: Trait): void {
     rotation,
     price,
     blueprint: undefined,
+    quantity: 0
   })
   item.vendors.sort(compareVendors)
 }
diff --git a/db/vendors/find.ts b/db/vendors/find.ts
@@ -24,7 +24,7 @@ const romanAdvisorCheatFilter = [
  * Searches all vendors and collects the ones that sell the
  * specified item.
  */
-export async function findVendors(id: string): Promise<Vendor[] | undefined> {
+export async function findVendors(id: string): Promise<Vendor[]> {
   const results: Vendor[] = []
 
   const vendors = await API.getVendors()
@@ -95,5 +95,5 @@ export async function findVendors(id: string): Promise<Vendor[] | undefined> {
   })
   unique.sort(compareVendors)
 
-  return unique.length ? unique : undefined
+  return unique
 }
diff --git a/src/app/interfaces/Advisor.ts b/src/app/interfaces/Advisor.ts
@@ -13,7 +13,7 @@ export interface Advisor {
   age: number
   level: number
   civilization: string | undefined
-  vendors: Vendor[] | undefined
+  vendors: Vendor[] 
   rarities: {
     [index: string]: AdvisorRarity,
   }

diff --git a/src/app/interfaces/Consumable.ts b/src/app/interfaces/Consumable.ts
@@ -24,7 +24,7 @@ export interface Consumable {
     [index: string]: ConsumableRarity,
   }
   civilization: string | undefined
-  vendors: Vendor[] | undefined
+  vendors: Vendor[] 
   search: string
   marketplace: MarketplaceQuery[],
   event?: {

diff --git a/src/assets/db/advisors.json b/src/assets/db/advisors.json
diff --git a/src/assets/db/blueprints.json b/src/assets/db/blueprints.json
diff --git a/src/assets/db/consumables.json b/src/assets/db/consumables.json
diff --git a/src/assets/db/designs.json b/src/assets/db/designs.json
diff --git a/src/assets/db/items.json b/src/assets/db/items.json
diff --git a/src/assets/db/materials.json b/src/assets/db/materials.json