Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-30 15:59:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add weather indication to detailed parse output

Browse source
This commit is contained in:
Kurt 2019-11-28 12:56:26 -08:00
parent 5ba396db6e
commit ea2f7f338b
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
PKHeX.Core/Legality/Areas/EncounterArea8.cs
View file

@ -184,13 +184,19 @@ namespace PKHeX.Core
Snowstorm = 1 << 6, Snowstorm = 1 << 6,
Sandstorm = 1 << 7, Sandstorm = 1 << 7,
Heavy_Fog = 1 << 8, Heavy_Fog = 1 << 8,
All = Normal | Overcast | Raining | Thunderstorm | Intense_Sun | Snowing | Snowstorm | Sandstorm | Heavy_Fog,
Shaking_Trees = 1 << 9, Shaking_Trees = 1 << 9,
Fishing = 1 << 10, Fishing = 1 << 10,
NotWeather = Shaking_Trees | Fishing,
} }
public sealed class EncounterSlot8 : EncounterSlot public sealed class EncounterSlot8 : EncounterSlot
{ {
public readonly AreaWeather8 Weather; 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) public EncounterSlot8(int specForm, int min, int max, AreaWeather8 weather)
{ {

4
PKHeX.Core/Legality/Encounters/EncounterSlot.cs
View file

@ -72,10 +72,10 @@ namespace PKHeX.Core
public bool IsMatchStatic(int index, int count) => index == Permissions.StaticIndex && count == Permissions.StaticCount; 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; 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 Name => wild;
public string LongName public virtual string LongName
{ {
get get
{ {