From 655f0a599fdd1dede723bd8ceb0849b69ddf61c5 Mon Sep 17 00:00:00 2001 From: Manu <52102823+Manu098vm@users.noreply.github.com> Date: Mon, 12 Aug 2024 13:34:14 +0200 Subject: [PATCH] Use full species list for event outbreaks --- TeraFinder.Plugins/Forms/OutbreakForm.cs | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/TeraFinder.Plugins/Forms/OutbreakForm.cs b/TeraFinder.Plugins/Forms/OutbreakForm.cs index 57869ab..b34d90d 100644 --- a/TeraFinder.Plugins/Forms/OutbreakForm.cs +++ b/TeraFinder.Plugins/Forms/OutbreakForm.cs @@ -21,6 +21,7 @@ public partial class OutbreakForm : Form private Size DefSize = new(0, 0); private bool Loaded = false; private bool Importing = false; + private bool PrevWasEvent = false; private readonly string[] SpeciesList = null!; private readonly string[] FormsList = null!; @@ -179,9 +180,22 @@ private void cmbOutbreaks_IndexChanged(object sender, EventArgs e) var massOutbreaks = CurrMap switch { TeraRaidMapParent.Paldea => MassOutbreaksMain, TeraRaidMapParent.Kitakami => MassOutbreaksDLC1, _ => MassOutbreaksDLC2 }; var outbreak = massOutbreaks[cmbOutbreaks.SelectedIndex]; + if (outbreak.IsEvent && !PrevWasEvent) + { + cmbSpecies.Items.Clear(); + cmbSpecies.Items.AddRange(SpeciesList); + } + else if (!outbreak.IsEvent && PrevWasEvent) + { + var specieslist = CurrMap switch { TeraRaidMapParent.Paldea => PaldeaSpeciesList, TeraRaidMapParent.Kitakami => KitakamiSpeciesList, _ => BlueberrySpeciesList }; + cmbSpecies.Items.Clear(); + cmbSpecies.Items.AddRange(specieslist); + } + PrevWasEvent = outbreak.IsEvent; + var species = SpeciesConverter.GetNational9((ushort)outbreak.Species); if (!SpeciesList[species].Equals(cmbSpecies.Text)) - cmbSpecies.SelectedIndex = Array.IndexOf(CurrMap switch + cmbSpecies.SelectedIndex = Array.IndexOf(outbreak.IsEvent ? SpeciesList : CurrMap switch { TeraRaidMapParent.Paldea => PaldeaSpeciesList, TeraRaidMapParent.Kitakami => KitakamiSpeciesList,