#1 Pulled orchestrion list data.

ApkalluFalls · Jun 2, 2019 · 22ccad1 · 22ccad1
1 parent a86afab
commit 22ccad1
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 10 deletions.
diff --git a/data/content/emotes.json b/data/content/emotes.json
diff --git a/data/content/orchestrion.json b/data/content/orchestrion.json
diff --git a/src/config/emotes.js b/src/config/emotes.js
@@ -8,7 +8,8 @@ module.exports = {
       'Icon',
       'IconID',
       'ID',
-      ...helper.localisedColumnProperty(`Name`)
+      ...helper.localisedColumnProperty(`Name`),
+      'UnlockLink'
     ],
     isPaginated: true,
     method: 'fetch',

diff --git a/src/config/orchestrion.js b/src/config/orchestrion.js
@@ -0,0 +1,16 @@
+const helper = require('../xivapi/helper');
+
+module.exports = {
+  list: {
+    columns: [
+      ...helper.localisedColumnProperty(`Description`),
+      'GamePatch.ID',
+      'ID',
+      ...helper.localisedColumnProperty(`Name`),
+      'OrchestrionUiparam'
+    ],
+    isPaginated: true,
+    method: 'fetch',
+    name: 'Orchestrion'
+  }
+};
diff --git a/src/parsers/lists.js b/src/parsers/lists.js
@@ -7,7 +7,23 @@ module.exports = (data, config) => {
     name
   } = config;
 
-  const parsed = data.map(content => {
+  const parsed = data.filter(content => {
+    // Content without an English name can be ignored.
+    if (!content.Name_en) {
+      return false;
+    }
+
+    switch (name) {
+      /**
+       * Some achievements have no category. Those ones aren't accessible in the game and never
+       * have been.
+       */
+      case 'Achievements':
+        return !!content.AchievementCategory;
+    }
+
+    return true;
+  }).map(content => {
     const response = {
       name: helper.getLocalisedNamesObject(content),
       patch: content.GamePatch.ID
@@ -20,13 +36,8 @@ module.exports = (data, config) => {
 
     switch (name) {
       case 'Achievements':
-        if (content.AchievementCategory) {
-          response.category = content.AchievementCategory.ID;
-          response.kind = content.AchievementCategory.AchievementKind.ID;
-        } else {
-          response.category = -1;
-          response.kind = -1;
-        }
+        response.category = content.AchievementCategory.ID;
+        response.kind = content.AchievementCategory.AchievementKind.ID;
         response.description = helper.getLocalisedNamesObject(content, 'Description');
         response.points = content.Points;
         break;
@@ -45,6 +56,13 @@ module.exports = (data, config) => {
 
       case 'Emotes':
         response.category = content.EmoteCategoryTargetID;
+        response.link = content.UnlockLink;
+        break;
+
+      case 'Orchestrion':
+        response.category = content.OrchestrionUiparam.OrchestrionCategoryTargetID;
+        response.description = helper.getLocalisedNamesObject(content, 'Description');
+        response.order = content.OrchestrionUiparam.Order;
         break;
     }
 

diff --git a/src/update.js b/src/update.js
@@ -17,6 +17,7 @@ class API {
       'emotes',
       'minions',
       'mounts',
+      'orchestrion',
 
       // Icon images and sprite sheets.
       'icons'

diff --git a/src/xivapi/urls.js b/src/xivapi/urls.js
@@ -16,6 +16,7 @@ module.exports = {
   minions: () => `${xivapiBase}/companion`,
   mount: (id) => `${xivapiBase}/mount/${id}`,
   mounts: () => `${xivapiBase}/mount`,
+  orchestrion: () => `${xivapiBase}/orchestrion`,
   search: () => `${xivapiBase}/search`,
   spearfishingItems: () => `${xivapiBase}/spearfishingitem`,
   territoryTypes: () => `${xivapiBase}/territorytype`