Merge pull request #42 from TurtIeSocks/update-protos

Update Protos
WatWowMap · Nov 9, 2021 · 46a228d · 46a228d
2 parents 2314c1a + 2b74a74
commit 46a228d
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 13 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.2.7",
+  "version": "1.2.8",
   "description": "Pokemon GO project data generator",
   "author": "TurtIeSocks",
   "license": "Apache-2.0",

diff --git a/src/classes/Invasion.ts b/src/classes/Invasion.ts
@@ -62,6 +62,11 @@ export default class Invasion extends Masterfile {
   }
 
   invasions(invasionData: InvasionInfo) {
+    const positions = [
+      this.customFieldNames.first || 'first',
+      this.customFieldNames.second || 'second',
+      this.customFieldNames.third || 'third',
+    ]
     Object.entries(Rpc.EnumWrapper.InvasionCharacter).forEach(proto => {
       try {
         const [name, id] = proto
@@ -73,11 +78,6 @@ export default class Invasion extends Masterfile {
           }
           if (pogoInfo && pogoInfo.active) {
             this.parsedInvasions[id].secondReward = pogoInfo.lineup.rewards.length === 2
-            const positions = [
-              this.customFieldNames.first || 'first',
-              this.customFieldNames.second || 'second',
-              this.customFieldNames.third || 'third',
-            ]
             this.parsedInvasions[id].encounters = []
 
             positions.forEach((position, i) => {
@@ -87,7 +87,7 @@ export default class Invasion extends Masterfile {
             })
           } else if (this.options.placeholderData) {
             this.parsedInvasions[id].secondReward = false
-            this.parsedInvasions[id].encounters = []
+            this.parsedInvasions[id].encounters = positions.map(position => ({ position }))
           }
         }
       } catch (e) {

diff --git a/src/classes/Masterfile.ts b/src/classes/Masterfile.ts
@@ -139,6 +139,8 @@ export default class Masterfile {
               // edge case for encounters
               if (returnValue[customKey]) {
                 returnValue[customKey].push(child)
+              } else if (typeof child === 'object') {
+                returnValue[customKey] = []
               } else {
                 returnValue[customKey] = [child]
               }

diff --git a/tests/defaultValues.json b/tests/defaultValues.json
@@ -576,21 +576,33 @@
       "gender": 0,
       "grunt": "Unset",
       "second_reward": false,
-      "encounters": {}
+      "encounters": {
+        "first": [],
+        "second": [],
+        "third": []
+      }
     },
     "4": {
       "type": "Mixed",
       "gender": 1,
       "grunt": "Grunt",
       "second_reward": false,
-      "encounters": {}
+      "encounters": {
+        "first": [],
+        "second": [],
+        "third": []
+      }
     },
     "11": {
       "type": "Dark",
       "gender": 1,
       "grunt": "Grunt",
       "second_reward": false,
-      "encounters": {}
+      "encounters": {
+        "first": [],
+        "second": [],
+        "third": []
+      }
     }
   },
   "weather": {

diff --git a/tests/rawValues.json b/tests/rawValues.json
@@ -244,7 +244,17 @@
       "gender": 1,
       "grunt": "Grunt",
       "secondReward": false,
-      "encounters": []
+      "encounters": [
+        {
+          "position": "first"
+        },
+        {
+          "position": "second"
+        },
+        {
+          "position": "third"
+        }
+      ]
     }
   },
   "weather": {