From fb317ca1a08a97c5ae2a8e5da214c7d1e3e540b3 Mon Sep 17 00:00:00 2001
From: Derick M <58572875+TurtIeSocks@users.noreply.github.com>
Date: Sat, 7 Oct 2023 10:54:54 -0400
Subject: [PATCH 1/5] fix: missing form 0s

---
 src/classes/Pokemon.ts | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/classes/Pokemon.ts b/src/classes/Pokemon.ts
index 100efd9..1a39581 100644
--- a/src/classes/Pokemon.ts
+++ b/src/classes/Pokemon.ts
@@ -701,9 +701,6 @@ export default class Pokemon extends Masterfile {
                 isCostume: forms[i].isCostume,
               }
             }
-            if (this.options.allUnset && !this.options.noFormPlaceholders) {
-              this.parsedPokemon[id].forms.push(0)
-            }
           }
         } else {
           if (!this.parsedPokemon[id]) {
@@ -714,9 +711,9 @@ export default class Pokemon extends Masterfile {
               ...this.getGeneration(+id),
             }
           }
-          if (this.options.includeUnset && !this.options.noFormPlaceholders) {
-            this.parsedPokemon[id].forms.push(0)
-          }
+        }
+        if (this.options.includeUnset && !this.options.noFormPlaceholders) {
+          this.parsedPokemon[id].forms.push(0)
         }
       } catch (e) {
         console.warn(e, '\n', JSON.stringify(object, null, 2))

From b5ef6d3d318987ed3a9576c5c8091391bcbddd52 Mon Sep 17 00:00:00 2001
From: Derick M <58572875+TurtIeSocks@users.noreply.github.com>
Date: Sat, 7 Oct 2023 10:55:01 -0400
Subject: [PATCH 2/5] deps: bump protos

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 43388cd..92f95f1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pogo-data-generator",
-  "version": "1.16.3",
+  "version": "1.16.4",
   "description": "Pokemon GO project data generator",
   "author": "TurtIeSocks",
   "license": "Apache-2.0",

From 06a0c407cf3f123dba87dd692dea634771f9ef5d Mon Sep 17 00:00:00 2001
From: Derick M <58572875+TurtIeSocks@users.noreply.github.com>
Date: Sat, 7 Oct 2023 10:55:33 -0400
Subject: [PATCH 3/5] fix: some template typings

---
 src/typings/inputs.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/typings/inputs.ts b/src/typings/inputs.ts
index 375a525..5fecf62 100644
--- a/src/typings/inputs.ts
+++ b/src/typings/inputs.ts
@@ -96,7 +96,7 @@ interface Form extends BaseStats {
         formId?: boolean
         genderRequirement?: boolean
         candyCost?: boolean
-        itemRequirement?: boolean
+        itemRequirement?: boolean | string
         tradeBonus?: boolean
         mustBeBuddy?: boolean
         onlyDaytime?: boolean
@@ -325,7 +325,7 @@ export interface FullTemplate {
     enabled?: boolean
     options: Options
     template: TranslationsTemplate
-    locales: { [key in Locales[number]]: boolean }
+    locales: { [key in Locales[number]]?: boolean }
   }
   raids?: {
     enabled?: boolean

From fa186d439a24a52b4f32e06f786cef2e152872e0 Mon Sep 17 00:00:00 2001
From: Derick M <58572875+TurtIeSocks@users.noreply.github.com>
Date: Sat, 7 Oct 2023 10:55:35 -0400
Subject: [PATCH 4/5] Update yarn.lock

---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index fcccd7d..5c848dc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -692,9 +692,9 @@
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
 "@na-ji/pogo-protos@<3.0.0":
-  version "2.80.0"
-  resolved "https://registry.yarnpkg.com/@na-ji/pogo-protos/-/pogo-protos-2.80.0.tgz#7b598b25fdbdef7da678107a7edb0410a3cc94a3"
-  integrity sha512-zOs3qlqdpYfg/mU77KxlCX5/r5rmgZ1oDtCiS8ElTyUQz44bNUj2cNmFjeKenq0VXozIcvnzIvFUvU8JuZ9CuA==
+  version "2.91.0"
+  resolved "https://registry.yarnpkg.com/@na-ji/pogo-protos/-/pogo-protos-2.91.0.tgz#6e2680448f09579de0f07524a3305a9e9df8ad26"
+  integrity sha512-8k3JFek+B+6URYFuefq+3qR2NKG+aT0SjPMbTO51KGGWEhY9rPuSUSPGldtKseQh2YPJWDXE3q+m9hmOM749YQ==
   dependencies:
     protobufjs "^6.11.3"
 
@@ -868,9 +868,9 @@
   integrity sha512-6qKpDtoaYLM+5+AFChLhHermMQxc3TOEFIDzrZLPRGHPrLEwqFkkT5Kx3ju05g6X7uDPazz3jHbKPX0KzCjntg==
 
 "@types/node@>=13.7.0":
-  version "20.5.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.5.7.tgz#4b8ecac87fbefbc92f431d09c30e176fc0a7c377"
-  integrity sha512-dP7f3LdZIysZnmvP3ANJYTSwg+wLLl8p7RqniVlV7j+oXSXAbt9h0WIBFmJy5inWZoX9wZN6eXx+YXd9Rh3RBA==
+  version "20.8.3"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.3.tgz#c4ae2bb1cfab2999ed441a95c122bbbe1567a66d"
+  integrity sha512-jxiZQFpb+NlH5kjW49vXxvxTjeeqlbsnTAdBTKpzEdPs9itay7MscYXz3Fo9VYFEsfQ6LJFitHad3faerLAjCw==
 
 "@types/prettier@^2.1.5":
   version "2.6.4"

From 95e622d98bf74749b63b8cfe79883f0fa1533493 Mon Sep 17 00:00:00 2001
From: Derick M <58572875+TurtIeSocks@users.noreply.github.com>
Date: Sat, 7 Oct 2023 12:15:16 -0400
Subject: [PATCH 5/5] fix: test

---
 tests/defaultValues.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/defaultValues.json b/tests/defaultValues.json
index 249f7d3..a1f080c 100644
--- a/tests/defaultValues.json
+++ b/tests/defaultValues.json
@@ -192,7 +192,8 @@
           "charged_moves": [
             "Dig",
             "Night Slash",
-            "Gyro Ball"
+            "Gyro Ball",
+            "Trailblaze"
           ],
           "types": [
             "Steel"