#1 Added GC NPC mappings.

ApkalluFalls · Jun 8, 2019 · 37a7922 · 37a7922
1 parent 534421f
commit 37a7922
Show file tree

Hide file tree

Showing 21 changed files with 27 additions and 22 deletions.
diff --git a/data/methods/shops.json b/data/methods/shops.json
diff --git a/docs/de/emotes.json b/docs/de/emotes.json
diff --git a/docs/de/minions.json b/docs/de/minions.json
diff --git a/docs/de/mounts.json b/docs/de/mounts.json
diff --git a/docs/de/orchestrion.json b/docs/de/orchestrion.json
diff --git a/docs/en/emotes.json b/docs/en/emotes.json
diff --git a/docs/en/minions.json b/docs/en/minions.json
diff --git a/docs/en/mounts.json b/docs/en/mounts.json
diff --git a/docs/en/orchestrion.json b/docs/en/orchestrion.json
diff --git a/docs/fr/emotes.json b/docs/fr/emotes.json
diff --git a/docs/fr/minions.json b/docs/fr/minions.json
diff --git a/docs/fr/mounts.json b/docs/fr/mounts.json
diff --git a/docs/fr/orchestrion.json b/docs/fr/orchestrion.json
diff --git a/docs/ja/emotes.json b/docs/ja/emotes.json
diff --git a/docs/ja/minions.json b/docs/ja/minions.json
diff --git a/docs/ja/mounts.json b/docs/ja/mounts.json
diff --git a/docs/ja/orchestrion.json b/docs/ja/orchestrion.json
diff --git a/docs/version.json b/docs/version.json
@@ -1 +1 @@
-81
+83
diff --git a/extensions/npcs.js b/extensions/npcs.js
@@ -4,7 +4,7 @@
  * manually entered here instead. NPCs are missing when they're from expired events, or simply from
  * times when Mappy hasn't captured new NPC positions.
  * 
- * Data IDs must be added to the first array, then mapped to a location afterwards. Failure to do
+ * NPC IDs must be added to the first array, then mapped to a location afterwards. Failure to do
  * so will result in an error.
  * 
  * Remember that `npm run update data` will need running to apply any changes.

diff --git a/src/config/_localisationHelper.js b/src/config/_localisationHelper.js
@@ -34,7 +34,7 @@ module.exports = {
   shop: {
     gilShort: (entry, language) => ([
       'gilShopShort',
-      'shop',
+      1,
       [
         entry.cost,
         entry.currency.name[language],
@@ -46,7 +46,7 @@ module.exports = {
     ]),
     specialShort: (entry, language) => ([
       'specialShopShort',
-      2,
+      1,
       [
         entry.cost,
         entry.currency.name[language],

diff --git a/src/parsers/shops.js b/src/parsers/shops.js
@@ -166,6 +166,7 @@ module.exports = (
     }
 
     let currency;
+    let npcId;
 
     const {
       ID
@@ -178,12 +179,15 @@ module.exports = (
     if (ID < 10) {
       // Immortal Flames -> Flame Seals
       currency = currencies.find(currency => currency.id === 20);
+      npcId = 1002390; // Flame Quartermaster
     } else if (ID < 20) {
       // Maelstrom -> Storm Seals
       currency = currencies.find(currency => currency.id === 21);
+      npcId = 1002387; // Storm Quartermaster
     } else if (ID < 30) {
       // Order of the Twin Adder -> Serpent Seals
       currency = currencies.find(currency => currency.id === 22);
+      npcId = 1002393; // Serpent Quatermaster
     } else {
       // Unknown.
       console.warn(
@@ -195,7 +199,8 @@ module.exports = (
     parsed[contentType].push({
       contentId,
       cost: gcScripShopItem.CostGCSeals,
-      currency
+      currency,
+      npc: npcId
     })
   });