coh-content-db 2.0.0-rc.6 → 2.0.0-rc.7

package/src/main/db/badge.ts

@@ -4,11 +4,13 @@ import { BadgeData } from '../api/badge-data'
 import { BadgeRequirement } from './badge-requirement'
 import { Key } from './key'
 import { Alternates } from './alternates'
-import { Alignments } from './alignments'
 import { MarkdownString } from '../api/markdown-string'
+import { coalesceToArray } from '../util'
+import { MoralityList } from './morality-list'
 
 export class Badge {
   readonly #requirementsIndex: Record<string, BadgeRequirement> = {}
+  readonly #zoneKeys = new Set<string>()
 
   /**
    * The database key for this badge.
@@ -28,14 +30,14 @@ export class Badge {
   readonly name: Alternates<string>
 
   /**
-   * The character alignments that this badge is available to.
+   * The character moralities that this badge is available to.
    */
-  readonly alignment: Alignments
+  readonly morality: MoralityList
 
   /**
    * The badge text as it appears in-game. May vary by character sex or alignment.
    */
-  readonly badgeText: Alternates<string>
+  readonly badgeText: Alternates<MarkdownString>
 
   /**
    * Short description of how to acquire the badge. Detailed instructions will be in the notes field.
@@ -60,33 +62,10 @@ export class Badge {
   readonly links: Link[]
 
   /**
-   * For exploration badges, the key of the {@link Zone} that this badge is found on.
+   * The id used with the in-game `/settitle` command to apply the badge.
+   * The first value is the id for primal characters and the (optional) second number is the id for praetorian characters.
    */
-  readonly zoneKey?: string
-
-  /**
-   * For exploration badges, the `/loc` coordinates of the badge.
-   */
-  readonly loc?: [number, number, number]
-
-  /**
-   * For plaques that appear on a Vidiot Map, the number or letter the badge appears as.
-   */
-  readonly vidiotMapKey?: string
-
-  /**
-   * ID used with the in-game `/settitle` command to apply the badge.
-   */
-  readonly setTitle?: {
-    /**
-     * `/settitle` id.
-     */
-    id?: number
-    /**
-     * `/settitle` id if different for praetorian characters.
-     */
-    praetorianId?: number
-  }
+  readonly setTitleId?: [number, number?]
 
   /**
    * A description of the effect the badge will have, such as a buff or granting a temporary power.
@@ -94,16 +73,9 @@ export class Badge {
   readonly effect?: MarkdownString
 
   /**
-   * Represents the layered requirements for badges with multiple fulfillment steps,
-   * such as visiting plaques for history badges or collecting other badges.
-   *
-   * The outer array represents groups of requirements evaluated with OR logic —
-   * fulfilling any group satisfies the badge.
-   *
-   * Each inner array represents individual requirements evaluated with AND logic —
-   * all conditions in the group must be met.
+   * Represents the requirements for badges with multiple fulfillment steps, such as visiting monuments for history badges, completing missions, or collecting other badges.
    */
-  readonly requirements?: BadgeRequirement[][]
+  readonly requirements?: BadgeRequirement[]
 
   /**
    * Some badges are not included in the badge total count... such as Flames of Prometheus, which can be removed by redeeming it for a Notice of the Well.
@@ -114,29 +86,24 @@ export class Badge {
     this.key = new Key(badgeData.key).value
     this.type = badgeData.type
     this.name = new Alternates(badgeData.name)
-    this.alignment = new Alignments(badgeData.alignment)
+    this.morality = new MoralityList(coalesceToArray(badgeData.morality))
     this.badgeText = new Alternates(badgeData.badgeText ?? [])
     this.acquisition = badgeData.acquisition
     this.icon = new Alternates(badgeData.icon ?? [])
     this.notes = badgeData.notes
     this.links = badgeData.links ?? []
-    this.zoneKey = badgeData.zoneKey
-    this.loc = badgeData.loc
     this.effect = badgeData.effect
-    this.vidiotMapKey = badgeData.vidiotMapKey
-    this.setTitle = badgeData.setTitle
+    this.setTitleId = badgeData.setTitleId
     this.ignoreInTotals = badgeData.ignoreInTotals ?? false
 
-    this.requirements = badgeData.requirements?.map((groups, index) => {
-      const existingKeysInGroup = new Set<string>()
-      return groups.map((requirementData) => {
-        if (existingKeysInGroup.has(requirementData.key)) throw new Error(`Duplicate badge requirement key [${badgeData.key}:${requirementData.key}] in group [${index + 1}]`)
-        existingKeysInGroup.add(requirementData.key)
-
-        const badge = new BadgeRequirement(requirementData)
-        this.#requirementsIndex[badge.key] = badge
-        return badge
-      })
+    this.requirements = badgeData.requirements?.map((requirementData) => {
+      if (this.#requirementsIndex[requirementData.key]) throw new Error(`Duplicate badge requirement key [${badgeData.key}:${requirementData.key}]`)
+      const requirement = new BadgeRequirement(requirementData)
+      this.#requirementsIndex[requirement.key] = requirement
+      if (requirement.location) for (const location of requirement.location) {
+        if (location.zoneKey) this.#zoneKeys.add(location.zoneKey)
+      }
+      return requirement
     })
   }
 
@@ -145,4 +112,36 @@ export class Badge {
     if (result === undefined) throw new Error(`Unknown badge requirement key [${key}]`)
     return result
   }
+
+  /**
+   * Return a list of all the zone keys referenced by this badge.
+   */
+  get zoneKeys(): string[] {
+    return [...this.#zoneKeys]
+  }
+
+  /**
+   * The zone key if this badge relates to a single zone.
+   */
+  get zoneKey(): string | undefined {
+    return this.#zoneKeys.size === 1 ? this.#zoneKeys.values().next().value : undefined
+  }
+}
+
+export function compareByDefaultName(a?: Badge, b?: Badge): number {
+  const aName = a?.name.default?.value
+  const bName = b?.name.default?.value
+  if (!aName && !bName) return 0
+  if (!aName) return 1
+  if (!bName) return -1
+  return aName.localeCompare(bName)
+}
+
+export function compareByZoneKey(a?: Badge, b?: Badge): number {
+  const aZone = a?.zoneKey
+  const bZone = b?.zoneKey
+  if (!aZone && !bZone) return 0
+  if (!aZone) return 1
+  if (!bZone) return -1
+  return aZone.localeCompare(bZone)
 }

package/src/main/db/coh-content-database.ts

@@ -7,11 +7,13 @@ import { BadgeIndex } from './badge-index'
 import { BadgeSearchOptions } from './badge-search-options'
 import { Paged } from './paged'
 import { Contact } from './contact'
+import { Mission } from './mission'
 
 export class CohContentDatabase {
   readonly #archetypeIndex: Record<string, Archetype> = {}
   readonly #zoneIndex: Record<string, Zone> = {}
   readonly #contactIndex: Record<string, Contact> = {}
+  readonly #missionIndex: Record<string, Mission> = {}
   readonly #badgeIndex: BadgeIndex
 
   /**
@@ -41,6 +43,11 @@ export class CohContentDatabase {
    */
   readonly contacts: Contact[]
 
+  /**
+   * List of missions.
+   */
+  readonly missions: Contact[]
+
   /**
    * List of badges.
    */
@@ -75,44 +82,41 @@ export class CohContentDatabase {
       return contact
     }) ?? []
 
-    this.badges = bundle.badges?.map(data => new Badge(data)) ?? []
-    this.#badgeIndex = new BadgeIndex(this.badges, this.zones)
-  }
+    this.missions = bundle.missions?.map((data) => {
+      if (this.#missionIndex[data.key] !== undefined) throw new Error(`Duplicate mission key '${data.key}'`)
+      const mission = new Mission(data)
+      this.#missionIndex[mission.key] = mission
+      return mission
+    }) ?? []
 
-  getArchetype(key: string): Archetype {
-    const result = this.#archetypeIndex[key]
-    if (result === undefined) throw new Error(`Unknown archetype key '${key}'`)
-    return result
+    this.badges = bundle.badges?.map(data => new Badge(data)) ?? []
+    this.#badgeIndex = new BadgeIndex(this.badges)
   }
 
-  getZone(key: string): Zone {
-    const result = this.#zoneIndex[key]
-    if (result === undefined) throw new Error(`Unknown zone key '${key}'`)
-    return result
+  getArchetype(key?: string): Archetype | undefined {
+    if (!key) return undefined
+    return this.#archetypeIndex[key]
   }
 
-  getContact(key: string): Contact {
-    const result = this.#contactIndex[key]
-    if (result === undefined) throw new Error(`Unknown contact key '${key}'`)
-    return result
+  getZone(key?: string): Zone | undefined {
+    if (!key) return undefined
+    return this.#zoneIndex[key]
   }
 
-  zoneExists(key: string): boolean {
-    return !!this.#zoneIndex[key]
+  getContact(key?: string): Contact | undefined {
+    if (!key) return undefined
+    return this.#contactIndex[key]
   }
 
-  contactExists(key: string): boolean {
-    return !!this.#contactIndex[key]
+  getMission(key?: string): Mission | undefined {
+    if (!key) return undefined
+    return this.#missionIndex[key]
   }
 
-  getBadge(key: string): Badge {
+  getBadge(key?: string): Badge | undefined {
     return this.#badgeIndex.getBadge(key)
   }
 
-  badgeExists(key: string): boolean {
-    return this.#badgeIndex.badgeExists(key)
-  }
-
   /**
    * Search, sort and filter the badge list.
    * This is a fairly brute-forced approach and will not be as performant as loading the badge data into a traditional

package/src/main/db/contact.ts

@@ -2,12 +2,15 @@ import { Link } from '../api/link'
 import { Key } from './key'
 import { MarkdownString } from '../api/markdown-string'
 import { ContactData } from '../api/contact-data'
+import { Location } from './location'
+import { MoralityList } from './morality-list'
+import { coalesceToArray } from '../util'
 
 export class Contact {
   /**
    * Unique key used to reference this contact.
    *
-   * Keys can only contain lowercase letters, numbers and hyphens (`-`).
+   * Keys must be unique and can only contain lowercase letters, numbers and hyphens (`-`).
    */
   readonly key: string
 
@@ -22,14 +25,14 @@ export class Contact {
   readonly title?: string
 
   /**
-   * The zone this character is located in.
+   * The character moralities that this contact will interact with.
    */
-  readonly zoneKey?: string
+  readonly morality?: MoralityList
 
   /**
-   * The `/loc` coordinates of the contact.
+   * The location of this contact.
    */
-  readonly loc?: [number, number, number]
+  readonly location?: Location
 
   /**
    * The level range this contact will offer missions for.
@@ -46,14 +49,14 @@ export class Contact {
    */
   readonly links: Link[]
 
-  constructor(contactData: ContactData) {
-    this.key = new Key(contactData.key).value
-    this.name = contactData.name
-    this.title = contactData.title
-    this.zoneKey = contactData.zoneKey
-    this.loc = contactData.loc
-    this.levelRange = contactData.levelRange
-    this.notes = contactData.notes
-    this.links = contactData.links ?? []
+  constructor(data: ContactData) {
+    this.key = new Key(data.key).value
+    this.name = data.name
+    this.title = data.title
+    this.morality = new MoralityList(coalesceToArray(data.morality))
+    this.location = data.location
+    this.levelRange = data.levelRange
+    this.notes = data.notes
+    this.links = data.links ?? []
   }
 }

package/src/main/db/location.ts

@@ -0,0 +1,30 @@
+import { Coords, LocationData, LocationIcon } from '../api/location-data'
+
+export class Location {
+  /**
+   * Key of the {@link Zone} that the location references.
+   */
+  readonly zoneKey?: string
+
+  /**
+   * In-game `/loc` coordinates of the location.
+   */
+  readonly coords?: Coords
+
+  /**
+   * The type of icon to use if the location appears on a map. (Typically the Vidiot map icon).
+   */
+  readonly icon?: LocationIcon
+
+  /**
+   * The text that should appear in the location icon. (Typically a number or symbol from the Vidiot map).
+   */
+  readonly iconText?: string
+
+  constructor(data: LocationData) {
+    this.zoneKey = data.zoneKey
+    this.coords = data.coords
+    this.icon = data.icon
+    this.iconText = data.iconText
+  }
+}

package/src/main/db/mission.ts

@@ -0,0 +1,107 @@
+import { MissionType } from '../api/mission-type'
+import { MarkdownString } from '../api/markdown-string'
+import { Link } from '../api/link'
+import { MissionData } from '../api/mission-data'
+import { Key } from './key'
+import { coalesceToArray } from '../util'
+import { MoralityList } from './morality-list'
+
+export class Mission {
+  /**
+   * Unique key used to reference this mission.
+   *
+   * Keys must be unique and can only contain lowercase letters, numbers and hyphens (`-`).
+   */
+  readonly key: string
+
+  /**
+   * The name of the mission as it appears from the contact.
+   *
+   * The name may be different when viewed in Ouroboros as a Flashback.
+   */
+  readonly name: string
+
+  /**
+   * The type of mission... Story arc, task force, trial, etc.
+   */
+  readonly type: MissionType
+
+  /**
+   * The character moralities that may accept the mission.
+   */
+  readonly morality: MoralityList
+
+  /**
+   * The keys of any contacts that provide this mission.
+   */
+  readonly contactKeys?: string[]
+
+  /**
+   * The level range this mission is available for.
+   */
+  readonly levelRange?: [number, number?]
+
+  /**
+   * Freeform notes or tips about the mission.
+   */
+  readonly notes?: MarkdownString
+
+  /**
+   * List of external links. Wiki, forums, etc.
+   */
+  readonly links: Link[]
+
+  /**
+   * If the mission is available in Ouroboros as a Flashback.
+   */
+  readonly flashback?: {
+
+    /**
+     * The id of the mission as seen in the Flashback menu, i.e. '14.01'.
+     */
+    readonly id: string
+
+    /**
+     * The level range this mission appears under as a Flashback. Leave undefined if the same as the base mission.
+     */
+    readonly levelRange?: [number, number?]
+
+    /**
+     * The name as it appears in the Flashback list. Leave undefined if the same as the base mission.
+     */
+    readonly name?: string
+
+    /**
+     * The character moralities that the mission will appear for in the Flashback list. Leave undefined if the same as the base mission.
+     */
+    readonly morality?: MoralityList
+
+    /**
+     * Freeform notes or tips about the Flashback version of the mission.
+     */
+    readonly notes?: MarkdownString
+  }
+
+  constructor(data: MissionData) {
+    this.key = new Key(data.key).value
+    this.name = data.name
+    this.type = data.type
+    this.morality = new MoralityList(coalesceToArray(data.morality))
+    this.contactKeys = coalesceToArray(data.contactKeys)
+    this.levelRange = data.levelRange
+    this.notes = data.notes
+    this.links = data.links ?? []
+    this.flashback = createFlashback(data)
+  }
+}
+
+function createFlashback(data: MissionData): Mission['flashback'] {
+  if (!data.flashback) return undefined
+  return {
+    id: data.flashback.id,
+    levelRange: data.flashback.levelRange ?? data.levelRange,
+    name: data.flashback.name ?? data.name,
+    morality: new MoralityList(coalesceToArray(data.flashback.morality ?? data.morality)),
+    notes: data.flashback.notes,
+  }
+}

package/src/main/db/morality-list.ts

@@ -0,0 +1,99 @@
+import { MORALITY, Morality, MoralityExtended } from '../api/morality'
+
+export class MoralityList {
+  readonly #items: Set<Morality>
+
+  readonly hero: boolean
+  readonly vigilante: boolean
+  readonly villain: boolean
+  readonly rogue: boolean
+  readonly resistance: boolean
+  readonly loyalist: boolean
+
+  readonly primal: boolean
+  readonly praetorian: boolean
+  readonly heroic: boolean
+  readonly villainous: boolean
+  readonly paragonCityAccess: boolean
+  readonly rogueIslesAccess: boolean
+
+  readonly all: boolean
+
+  constructor(items?: MoralityExtended[]) {
+    const set = new Set(items ?? [...MORALITY])
+    this.hero = set.has('hero') || set.has('primal') || set.has('heroic') || set.has('paragon-city-access') || set.has('all')
+    this.vigilante = set.has('vigilante') || set.has('primal') || set.has('heroic') || set.has('paragon-city-access') || set.has('rogue-isles-access') || set.has('all')
+    this.villain = set.has('villain') || set.has('primal') || set.has('villainous') || set.has('rogue-isles-access') || set.has('all')
+    this.rogue = set.has('rogue') || set.has('primal') || set.has('villainous') || set.has('paragon-city-access') || set.has('rogue-isles-access') || set.has('all')
+    this.resistance = set.has('resistance') || set.has('praetorian') || set.has('all')
+    this.loyalist = set.has('loyalist') || set.has('praetorian') || set.has('all')
+
+    this.primal = this.hero && this.vigilante && this.villain && this.rogue
+    this.praetorian = this.loyalist && this.resistance
+    this.heroic = this.hero && this.vigilante
+    this.villainous = this.villain && this.rogue
+    this.paragonCityAccess = this.heroic && this.rogue
+    this.rogueIslesAccess = this.villainous && this.vigilante
+
+    this.all = this.primal && this.praetorian
+
+    this.#items = new Set()
+    if (this.hero) this.#items.add('hero')
+    if (this.vigilante) this.#items.add('vigilante')
+    if (this.villain) this.#items.add('villain')
+    if (this.rogue) this.#items.add('rogue')
+    if (this.resistance) this.#items.add('resistance')
+    if (this.loyalist) this.#items.add('loyalist')
+  }
+
+  get items(): Morality[] {
+    return [...this.#items]
+  }
+
+  has(morality?: MoralityExtended): boolean {
+    switch (morality) {
+      case 'hero': {
+        return this.hero
+      }
+      case 'vigilante': {
+        return this.vigilante
+      }
+      case 'villain': {
+        return this.villain
+      }
+      case 'rogue': {
+        return this.rogue
+      }
+      case 'resistance': {
+        return this.resistance
+      }
+      case 'loyalist': {
+        return this.loyalist
+      }
+      case 'primal' : {
+        return this.primal
+      }
+      case 'praetorian': {
+        return this.praetorian
+      }
+      case 'heroic': {
+        return this.hero
+      }
+      case 'paragon-city-access': {
+        return this.paragonCityAccess
+      }
+      case 'rogue-isles-access': {
+        return this.rogueIslesAccess
+      }
+      case 'villainous': {
+        return this.villainous
+      }
+      case 'all': {
+        return this.all
+      }
+      default: {
+        return false
+      }
+    }
+  }
+}

package/src/main/db/zone.ts

@@ -6,7 +6,7 @@ export class Zone {
   /**
    * Unique key used to reference this zone.
    *
-   * Keys can only contain lowercase letters, numbers and hyphens (`-`).
+   * Keys must be unique and can only contain lowercase letters, numbers and hyphens (`-`).
    */
   readonly key: string
 

package/src/main/index.ts

@@ -11,13 +11,16 @@ export * from './api/contact-data'
 export * from './api/content-bundle'
 export * from './api/enhancement-category'
 export * from './api/link'
+export * from './api/location-data'
 export * from './api/markdown-string'
-export * from './api/plaque-type'
+export * from './api/mission-data'
+export * from './api/mission-type'
+export * from './api/morality'
 export * from './api/sex'
 export * from './api/zone-data'
 
 // DB
-export * from './db/alignments'
+export * from './db/alignment-list'
 export * from './db/alternates'
 export * from './db/archetype'
 export * from './db/badge'
@@ -28,10 +31,12 @@ export * from './db/bundle-metadata'
 export * from './db/coh-content-database'
 export * from './db/contact'
 export * from './db/key'
+export * from './db/location'
+export * from './db/mission'
+export * from './db/morality-list'
 export * from './db/paged'
 export * from './db/zone'
 
 // ROOT
 export { CHANGELOG } from './changelog'
-
 export * from './util'

package/src/main/util.ts

@@ -4,9 +4,11 @@ import { ZoneData } from './api/zone-data'
 import { Zone } from './db/zone'
 import { Contact } from './db/contact'
 import { ContactData } from './api/contact-data'
+import { Mission } from './db/mission'
+import { MissionData } from './api/mission-data'
 
 /**
- * Returns the URI of the given badge that can be used in {@link MarkdownString} links.
+ * Returns the URI of the given badge that can be used in {@link MarkdownString} fields.
  *
  * URI format: `badge://<key>`
  *
@@ -30,7 +32,7 @@ export function badgeLink(target: string | Badge | BadgeData): string {
 }
 
 /**
- * Returns the URI of the given contact that can be used in {@link MarkdownString} links.
+ * Returns the URI of the given contact that can be used in {@link MarkdownString} fields.
  *
  * URI format: `contact://<key>`
  *
@@ -54,7 +56,31 @@ export function contactLink(target: string | Contact | ContactData): string {
 }
 
 /**
- * Returns the URI of the given zone that can be used in {@link MarkdownString} links.
+ * Returns the URI of the given mission that can be used in {@link MarkdownString} fields.
+ *
+ * URI format: `mission://<key>`
+ *
+ * @param target The {@link Mission} or mission key to target.
+ */
+export function missionUri(target: string | Mission | MissionData): string {
+  const key = typeof target === 'string' ? target : target.key
+  return `mission://${key}`
+}
+
+/**
+ * Returns a {@link MarkdownString} link to the given mission.
+ *
+ * Link format: `[<key>](mission://<key>)`
+ *
+ * @param target The {@link Mission} or mission key to target.
+ */
+export function missionLink(target: string | Mission | MissionData): string {
+  const key = typeof target === 'string' ? target : target.key
+  return `[${key}](${missionUri(target)})`
+}
+
+/**
+ * Returns the URI of the given zone that can be used in {@link MarkdownString} fields.
  *
  * URI format: `zone://<key>`
  *
@@ -76,3 +102,17 @@ export function zoneLink(target: string | Zone | ZoneData): string {
   const key = typeof target === 'string' ? target : target.key
   return `[${key}](${zoneUri(target)})`
 }
+
+/**
+ * For fields that accept either an array of values or a single value, coalesces the value to an array.
+ *
+ * Arrays are returned as-is.
+ * Single values are returned as a single-value array.
+ * Undefined values are returned as undefined.
+ *
+ * @param value The value to coalesce.
+ */
+export function coalesceToArray<T>(value?: T | T[]): T[] | undefined {
+  if (!value) return undefined
+  return Array.isArray(value) ? value as T[] : [value]
+}