Merge pull request #50 from WatWowMap/grab-latest-remote

Grab Latest Remote
WatWowMap · Jan 6, 2022 · 6d58ffe · 6d58ffe
2 parents d13231d + 0760d07
commit 6d58ffe
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 16 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pogo-data-generator",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "description": "Pokemon GO project data generator",
   "author": "TurtIeSocks",
   "license": "Apache-2.0",

diff --git a/src/classes/Masterfile.ts b/src/classes/Masterfile.ts
@@ -55,13 +55,13 @@ export default class Masterfile {
     return merged
   }
 
-  async fetch(url: string): Promise<any> {
+  async fetch(url: string, text = false): Promise<any> {
     try {
       const data = await Fetch(url)
       if (!data.ok) {
         throw new Error(`${data.status} ${data.statusText} URL: ${url}`)
       }
-      return data.json()
+      return text ? data.text() : data.json()
     } catch (e) {
       console.error(e, `Unable to fetch ${url}`)
     }

diff --git a/src/classes/Translations.ts b/src/classes/Translations.ts
@@ -12,6 +12,7 @@ export default class Translations extends Masterfile {
   manualTranslations: { [key: string]: TranslationKeys }
   parsedTranslations: { [key: string]: TranslationKeys }
   codes: { [id: string]: string }
+  latestRemoteLocales: { [id: string]: string }
   masterfile: FinalResult
   generics: { [key: string]: { [key: string]: string } }
   reference: TranslationKeys
@@ -39,6 +40,19 @@ export default class Translations extends Masterfile {
       th: 'thai',
       'zh-tw': 'chinesetraditional',
     }
+    this.latestRemoteLocales = {
+      de: 'German',
+      en: 'English',
+      es: 'Spanish',
+      fr: 'French',
+      it: 'Italian',
+      ja: 'Japanese',
+      ko: 'Korean',
+      'pt-br': 'BrazilianPortuguese',
+      ru: 'Russian',
+      th: 'Thai',
+      'zh-tw': 'ChineseTraditional',
+    }
     this.generics = {
       de: {
         none: 'Keiner',
@@ -148,6 +162,18 @@ export default class Translations extends Masterfile {
       for (let i = 0; i < data.length; i += 2) {
         this.rawTranslations[locale][data[i]] = data[i + 1]
       }
+
+      const textFile = await this.fetch(
+        `https://raw.githubusercontent.com/PokeMiners/pogo_assets/master/Texts/Latest%20Remote/${this.latestRemoteLocales[locale] || 'English'}.txt`,
+        true
+      )
+      const splitText = textFile.split('\n')
+
+      splitText.forEach((line: string, i: number) => {
+        if (line?.startsWith('RESOURCE ID')) {
+          this.rawTranslations[locale][line.replace('RESOURCE ID: ', '')] = splitText[i + 1].replace('TEXT: ', '')
+        }
+      })
     } catch (e) {
       console.warn(e, '\n', `Unable to process ${locale} from GM`)
     }
@@ -648,7 +674,10 @@ export default class Translations extends Masterfile {
           .replace(/{/g, `${this.options.questVariables.prefix}amount_`)
           .replace(/\}/g, this.options.questVariables.suffix)
         if (
-          (key.startsWith('quest_') || key.startsWith('score') || key.startsWith('geotarget_quest') || key.startsWith('challenge')) &&
+          (key.startsWith('quest_') ||
+            key.startsWith('score') ||
+            key.startsWith('geotarget_quest') ||
+            key.startsWith('challenge')) &&
           this.options.questTitleTermsToSkip.every(term => !key.includes(term)) &&
           !value.includes('%PLAYERNAME%')
         ) {

diff --git a/static/tempEvos.json b/static/tempEvos.json
@@ -38,15 +38,7 @@
       ]
     },
     "142": {
-      "tempEvolutions": [
-        {
-          "tempEvoId": 1,
-          "attack": 292,
-          "defense": 210,
-          "stamina": 190,
-          "unreleased": true
-        }
-      ]
+      "tempEvolutions": []
     },
     "150": {
       "tempEvolutions": [
@@ -659,14 +651,14 @@
     "849": {
       "tempEvolutions": [
         {
-          "tempEvoId": "Amped Gmax",
+          "tempEvoId": "Low Key Gmax",
           "attack": 224,
           "defense": 140,
           "stamina": 181,
           "unreleased": true
         },
         {
-          "tempEvoId": "Low Key Gmax",
+          "tempEvoId": "Amped Gmax",
           "attack": 224,
           "defense": 140,
           "stamina": 181,