#1 Added Fan Festival methods.

ApkalluFalls · Jun 17, 2019 · 3cf4c74 · 3cf4c74
1 parent c273ce4
commit 3cf4c74
Show file tree

Hide file tree

Showing 15 changed files with 71 additions and 10 deletions.
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/en/minions.json b/docs/en/minions.json
diff --git a/docs/en/mounts.json b/docs/en/mounts.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/icons/methods.json b/docs/icons/methods.json
@@ -1 +1 @@
-{"1":[24,0,24,24],"2":[72,24,24,24],"3":[0,24,24,24],"4":[24,24,24,24],"5":[48,0,24,24],"6":[48,24,24,24],"7":[0,48,24,24],"c1":[24,48,24,24],"c2":[48,48,24,24],"c3":[72,0,24,24],"c4":[0,0,24,24],"c6":[72,48,24,24],"c7":[0,72,24,24],"c8":[24,72,24,24],"g1":[48,72,24,24],"g2":[72,72,24,24],"g3":[96,0,24,24],"q1":[96,24,24,24],"q2":[96,48,24,24],"q3":[96,72,24,24]}
+{"1":[24,0,24,24],"2":[72,24,24,24],"3":[0,24,24,24],"4":[24,24,24,24],"5":[48,0,24,24],"6":[48,24,24,24],"7":[0,48,24,24],"8":[24,48,24,24],"c1":[48,48,24,24],"c2":[72,0,24,24],"c3":[0,0,24,24],"c4":[72,48,24,24],"c6":[0,72,24,24],"c7":[24,72,24,24],"c8":[48,72,24,24],"g1":[72,72,24,24],"g2":[96,0,24,24],"g3":[96,24,24,24],"q1":[96,48,24,24],"q2":[96,72,24,24],"q3":[0,96,24,24]}
diff --git a/docs/icons/methods.png b/docs/icons/methods.png
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/version.json b/docs/version.json
@@ -1 +1 @@
-123
+125
diff --git a/extensions/obtain-methods.js b/extensions/obtain-methods.js
@@ -336,6 +336,18 @@ module.exports = {
       // Xelphatol
       { fn: instancedContent, args: [instances.find(instance => instance.id === 46)] }
     ],
+    220: [
+      { fn: fanFestival, args: [2016, { de: 'Frankfurt', en: 'Frankfurt', fr: 'Francfort', ja: 'フランクフルト' }] },
+      { fn: fanFestivalStream, args: [2016, { de: 'Frankfurt', en: 'Frankfurt', fr: 'Francfort', ja: 'フランクフルト' }] }
+    ],
+    221: [
+      { fn: fanFestival, args: [2016, { de: 'Las Vegas', en: 'Las Vegas', fr: 'Las Vegas', ja: 'ラスベガス' }] },
+      { fn: fanFestivalStream, args: [2016, { de: 'Las Vegas', en: 'Las Vegas', fr: 'Las Vegas', ja: 'ラスベガス' }] }
+    ],
+    222: [
+      { fn: fanFestival, args: [2016, { de: 'Tokyo', en: 'Tokyo', fr: 'Tokyo', ja: '東京' }] },
+      { fn: fanFestivalStream, args: [2016, { de: 'Tokyo', en: 'Tokyo', fr: 'Tokyo', ja: '東京' }] }
+    ],
     225: [
       { fn: mogStation, args: [] }
     ],
@@ -435,6 +447,9 @@ module.exports = {
       // Alphascape V4.0 (Savage)
       { fn: instancedContent, args: [instances.find(instance => instance.id === 30076)] }
     ],
+    311: [
+      { fn: fanFestival, args: [2018, { de: 'Las Vegas', en: 'Las Vegas', fr: 'Las Vegas', ja: 'ラスベガス' }]}
+    ],
     312: [
       // Saint Mociannes Arboretum (Hard)
       { fn: instancedContent, args: [instances.find(instance => instance.id === 62)] }
@@ -513,6 +528,11 @@ module.exports = {
     69: [
       { fn: mogStation, args: [] }
     ],
+    71: [
+      { fn: fanFestival, args: [2018, { de: 'Las Vegas', en: 'Las Vegas', fr: 'Las Vegas', ja: 'ラスベガス' }]},
+      { fn: fanFestival, args: [2018, { de: 'Paris', en: 'Paris', fr: 'Paris', ja: 'パリ' }]},
+      { fn: fanFestival, args: [2018, { de: 'Tokyo', en: 'Tokyo', fr: 'Tokyo', ja: '東京' }]}
+    ],
     74: [
       { fn: mogStation, args: [] }
     ],
@@ -649,6 +669,36 @@ function collectorsEdition(contentId, expansion, language) {
   }, language);
 }
 
+/**
+ * Fan Festival attendance.
+ * @param {Number} contentId - The ID of the content
+ * @param {Number} year - The year the festival was held
+ * @param {Object} location - A location name
+ * @param {String} language - The localisation code (e.g. `"en"`)
+ */
+function fanFestival(contentId, year, location, language) {
+  return _localisationHelper.fanFestivalShort({
+    contentId,
+    year,
+    location
+  }, language)
+}
+
+/**
+ * Fan Festival attendance.
+ * @param {Number} contentId - The ID of the content
+ * @param {Number} year - The year the festival was held
+ * @param {Object} location - A location name
+ * @param {String} language - The localisation code (e.g. `"en"`)
+ */
+function fanFestivalStream(contentId, year, location, language) {
+  return _localisationHelper.fanFestivalStreamShort({
+    contentId,
+    year,
+    location
+  }, language)
+}
+
 /**
  * Instanced content like dungeons.
  * @param {Number} contentId - The ID of the content

diff --git a/icons-raw/methods/8.png b/icons-raw/methods/8.png
diff --git a/src/config/_localisationHelper.js b/src/config/_localisationHelper.js
@@ -14,6 +14,16 @@ module.exports = {
     entry.icon,
     [entry.job.level, entry.job.name[language], new Array(entry.job.stars).fill('★').join('')]
   ]),
+  fanFestivalShort: (entry, language) => ([
+    'fanFestShort',
+    8,
+    [entry.year, entry.location[language]]
+  ]),
+  fanFestivalStreamShort: (entry, language) => ([
+    'fanFestStreamShort',
+    8,
+    [entry.year, entry.location[language]]
+  ]),
   gatherShort: (entry, language) => ([
     'gatherShort',
     entry.icon,

diff --git a/src/parsers/icons.js b/src/parsers/icons.js
@@ -571,6 +571,7 @@ async function parseMethodIcons() {
     { path: '/i/092000/092003.png', as: 5 }, // Legacy-related.
     { path: '/i/092000/092044.png', as: 6 }, // Recruit a Friend campaign.
     { path: '/i/092000/092065.png', as: 7 }, // Mog Station.
+    { path: '/i/092000/092047.png', as: 8 }, // Fan Festival.
   ];
 
   await processIconGroup(paths, 'methods', { resize: 24 });