From 7f733bec3d14fce4dc5661409ecaafcaa1eebac4 Mon Sep 17 00:00:00 2001 From: sora10pls <17801814+sora10pls@users.noreply.github.com> Date: Thu, 26 Oct 2023 21:16:30 -0400 Subject: [PATCH] Delivery outbreak pretty dump fixes Skip encounters that have already been dumped to another file Revise pretty dump file name --- pkNX.WinForms/Dumping/MassOutbreakRipper.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkNX.WinForms/Dumping/MassOutbreakRipper.cs b/pkNX.WinForms/Dumping/MassOutbreakRipper.cs index 0d95e05d..2c6f7da0 100644 --- a/pkNX.WinForms/Dumping/MassOutbreakRipper.cs +++ b/pkNX.WinForms/Dumping/MassOutbreakRipper.cs @@ -15,6 +15,7 @@ namespace pkNX.WinForms; public static class MassOutbreakRipper { private static readonly List Encounters = new(); + private static int EncounterIndex; private static Dictionary NameDict = new(); public static void DumpDeliveryOutbreaks(IFileInternal ROM, string path, string dump) @@ -78,6 +79,7 @@ private static void DumpDeliveryOutbreakData(IFileInternal ROM, string path) AddToPickleJar(ROM, tableZoneF0, tableZoneF1, tableZoneF2, tablePokeData); DumpPretty(ROM, dirDistText); + EncounterIndex += Encounters.Count; } private static void ExportPickle(string dump, IEnumerable encounters) @@ -438,11 +440,14 @@ private static string[] GetCommonText(IFileInternal ROM, string name, string lan private static void DumpPretty(IFileInternal ROM, string dir) { - string fileName = $"pretty_{Encounters[0].Parent.Poke.ID}.txt"; + string ident = $"{Encounters[EncounterIndex].Parent.Poke.ID}"[..8]; // yyyyMMdd, remove 3 digit index + string fileName = $"pretty_{ident}.txt"; using var sw = File.CreateText(Path.Combine(dir, fileName)); foreach (var enc in Encounters) { + if (EncounterIndex > Encounters.IndexOf(enc)) + continue; var parent = enc.Parent; WriteParent(ROM, sw, parent); WriteLocationList(sw, parent.MetInfo, parent.MetBase);