From e8ddd9be61fea5e56ea9ba5287e204a6d53f226a Mon Sep 17 00:00:00 2001
From: sora10pls <17801814+sora10pls@users.noreply.github.com>
Date: Fri, 1 Jan 2021 13:34:47 -0500
Subject: [PATCH] Update PKHeX exports Target typed new for Nests, Dynamax
 Adventures, and Trades

---
 .../Encounter/Gen8/FlatNest/EncounterNest8Archive.cs          | 4 ++--
 .../Encounter/Gen8/FlatNest/EncounterUnderground8Archive.cs   | 2 +-
 .../Encounter/Gen8/FlatTrade/EncounterTrade8Archive.cs        | 2 +-
 pkNX.WinForms/Dumping/GameDumperSWSH.cs                       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkNX.Structures/Encounter/Gen8/FlatNest/EncounterNest8Archive.cs b/pkNX.Structures/Encounter/Gen8/FlatNest/EncounterNest8Archive.cs
index ac2f4b0e..2a277143 100644
--- a/pkNX.Structures/Encounter/Gen8/FlatNest/EncounterNest8Archive.cs
+++ b/pkNX.Structures/Encounter/Gen8/FlatNest/EncounterNest8Archive.cs
@@ -64,11 +64,11 @@ IEnumerable<string> Summary(EncounterNest8 e)
                             curMin = i;
 
                         if (i == max)
-                            yield return $"            new EncounterStatic8N(Nest{index:00},{curMin},{i},{flawless}) {{ Species = {e.Species:000}, Ability = {ability}{gender}{altform}{giga} }},{comment}";
+                            yield return $"            new(Nest{index:000},{curMin},{i},{flawless}) {{ Species = {e.Species:000}, Ability = {ability}{gender}{altform}{giga} }},{comment}";
                     }
                     else if (curMin != -1)
                     {
-                        yield return $"            new EncounterStatic8N(Nest{index:00},{curMin},{i - 1},{flawless}) {{ Species = {e.Species:000}, Ability = {ability}{gender}{altform}{giga} }},{comment}";
+                        yield return $"            new(Nest{index:000},{curMin},{i - 1},{flawless}) {{ Species = {e.Species:000}, Ability = {ability}{gender}{altform}{giga} }},{comment}";
                         curMin = -1;
                     }
                 }
diff --git a/pkNX.Structures/Encounter/Gen8/FlatNest/EncounterUnderground8Archive.cs b/pkNX.Structures/Encounter/Gen8/FlatNest/EncounterUnderground8Archive.cs
index 8123cc69..7a881579 100644
--- a/pkNX.Structures/Encounter/Gen8/FlatNest/EncounterUnderground8Archive.cs
+++ b/pkNX.Structures/Encounter/Gen8/FlatNest/EncounterUnderground8Archive.cs
@@ -48,7 +48,7 @@ public string GetSummary(IReadOnlyList<string> species)
             var moves = $", Moves = new[] {{{Move0:000},{Move1:000},{Move2:000},{Move3:000}}}";
             var game = Version != 0 ? Version == 1 ? ", Version = GameVersion.SW" : ", Version = GameVersion.SH" : "";
             var g = IsGigantamax ? ", CanGigantamax = true" : "";
-            return $"            new EncounterStatic8U({(int)Species:000},{AltForm},{Level:00}) {{ Ability = A{Ability}{gender}{moves}{g}{game} }},{comment}";
+            return $"            new({(int)Species:000},{AltForm},{Level:00}) {{ Ability = A{Ability}{gender}{moves}{g}{game} }},{comment}";
         }
     }
 }
\ No newline at end of file
diff --git a/pkNX.Structures/Encounter/Gen8/FlatTrade/EncounterTrade8Archive.cs b/pkNX.Structures/Encounter/Gen8/FlatTrade/EncounterTrade8Archive.cs
index 4997bfca..f49ae261 100644
--- a/pkNX.Structures/Encounter/Gen8/FlatTrade/EncounterTrade8Archive.cs
+++ b/pkNX.Structures/Encounter/Gen8/FlatTrade/EncounterTrade8Archive.cs
@@ -138,7 +138,7 @@ public string GetSummary(IReadOnlyList<string> species)
             var ball = Ball == Ball.Poke ? string.Empty : $", Ball = {Ball}";
 
             return
-                $"            new EncounterTrade8({(int)Species:000},{Level:00},{Memory:00},{TextVar:000},{Feeling:00},{Intensity}) {{ {ability}{tid}{ivs}{dyna}{otgender}{gender}{shiny}{nature}{giga}{relearn}{altform}{ball} }},{comment}";
+                $"            new({(int)Species:000},{Level:00},{Memory:00},{TextVar:000},{Feeling:00},{Intensity}) {{ {ability}{tid}{ivs}{dyna}{otgender}{gender}{shiny}{nature}{giga}{relearn}{altform}{ball} }},{comment}";
         }
     }
 }
\ No newline at end of file
diff --git a/pkNX.WinForms/Dumping/GameDumperSWSH.cs b/pkNX.WinForms/Dumping/GameDumperSWSH.cs
index c97119f0..32b9a6fe 100644
--- a/pkNX.WinForms/Dumping/GameDumperSWSH.cs
+++ b/pkNX.WinForms/Dumping/GameDumperSWSH.cs
@@ -347,7 +347,7 @@ public void DumpNestEntries()
             foreach (var game in new[] { 1, 2 })
             {
                 var tables = nest_encounts.Tables.Where(z => z.GameVersion == game).ToList();
-                var entries = tables.Select((_, x) => $"private const int Nest{x:00} = {x + 100_000};");
+                var entries = tables.Select((_, x) => $"private const int Nest{x:000} = {x + 100_000};");
                 var encounters = tables.SelectMany((z, x) => z.GetSummary(speciesNames, x)).ToArray();
 
                 var path1 = GetPath($"nestHex{game}.txt");