diff --git a/PKHeX.Core/Legality/Areas/EncounterArea8.cs b/PKHeX.Core/Legality/Areas/EncounterArea8.cs index e86554a01..401563c89 100644 --- a/PKHeX.Core/Legality/Areas/EncounterArea8.cs +++ b/PKHeX.Core/Legality/Areas/EncounterArea8.cs @@ -184,13 +184,19 @@ namespace PKHeX.Core Snowstorm = 1 << 6, Sandstorm = 1 << 7, Heavy_Fog = 1 << 8, + + All = Normal | Overcast | Raining | Thunderstorm | Intense_Sun | Snowing | Snowstorm | Sandstorm | Heavy_Fog, + Shaking_Trees = 1 << 9, Fishing = 1 << 10, + + NotWeather = Shaking_Trees | Fishing, } public sealed class EncounterSlot8 : EncounterSlot { public readonly AreaWeather8 Weather; + public override string LongName => Weather == AreaWeather8.All ? wild : $"{wild} - {Weather.ToString().Replace("_", string.Empty)}"; public EncounterSlot8(int specForm, int min, int max, AreaWeather8 weather) { diff --git a/PKHeX.Core/Legality/Encounters/EncounterSlot.cs b/PKHeX.Core/Legality/Encounters/EncounterSlot.cs index f8dbbce1e..7e5548160 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterSlot.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterSlot.cs @@ -72,10 +72,10 @@ namespace PKHeX.Core public bool IsMatchStatic(int index, int count) => index == Permissions.StaticIndex && count == Permissions.StaticCount; public bool IsMatchMagnet(int index, int count) => index == Permissions.MagnetPullIndex && count == Permissions.MagnetPullCount; - private const string wild = "Wild Encounter"; + private protected const string wild = "Wild Encounter"; public string Name => wild; - public string LongName + public virtual string LongName { get {