Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-27 06:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

More genloc memory refinements

Browse source 
starting to see the flaws in how things are organized
This commit is contained in:
Kurt 2021-08-22 11:10:29 -07:00
parent 40d1249f1e
commit b099b8d82c
2 changed files with 40 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
PKHeX.Core/Legality/Restrictions/Memories.cs
View file

@ -152,14 +152,17 @@ namespace PKHeX.Core
#region Tables for Gen8
public static bool IsInvalidGenLoc8(int memory, int loc, byte arg)
public static bool IsInvalidGenLoc8(int memory, int loc, int egg, int variable)
{
if (!IsGeneralLocationMemoryMet(memory))
return false;
if (arg > 255)
if (variable > 255)
return true;
if (loc > 255)
var arg = (byte)variable;
if (loc > 255) // gift
return memory != 3 || !PossibleGeneralLocations.Contains(arg);
if (memory == 2 && egg == 0)
return true;
if (loc is Encounters8Nest.SharedNest)
return !PossibleGeneralLocations.Contains(arg) || arg is 79; // dangerous place - all locations are Y-Comm locked
if (SingleGenLocAreas.TryGetValue((byte)loc, out var val))
return arg != val;
if (MultiGenLocAreas.TryGetValue((byte)loc, out var arr))
@ -167,6 +170,17 @@ namespace PKHeX.Core
return false;
}
public static bool IsInvalidGenLoc8Other(int memory, int variable)
{
if (variable > byte.MaxValue)
return true;
var arg = (byte)variable;
return memory switch
{
_ => !PossibleGeneralLocations.Contains(arg),
};
}
// {met, values allowed}
private static readonly Dictionary<byte, byte[]> MultiGenLocAreas = new()
{
@ -330,10 +344,22 @@ namespace PKHeX.Core
{244, 40}, // Max Lair, cave
{246, 28}, // Crown Tundra Station, train station
};
private static readonly HashSet<byte> PossibleGeneralLocations = new()
{
01, 02, 03, 04, 06, 08, 09,
11, 12, 16,
20, 22, 24, 28, 29,
30, 31, 33, 34, 35, 37, 38,
40, 41, 44, 47, 48, 49,
50, 51, 53,
65,
71, 72, 73, 74, 75, 76, 77, 78, 79,
};
#endregion
private static bool IsGeneralLocationMemoryMet(int memory) => memory is (1 or 2 or 3);
private static readonly HashSet<int> MemoryGeneral = new() { 1, 2, 3, 4, 19, 24, 31, 32, 33, 35, 36, 37, 38, 39, 42, 52, 59, 70, 86 };
internal static readonly HashSet<int> MemoryGeneral = new() { 1, 2, 3, 4, 19, 24, 31, 32, 33, 35, 36, 37, 38, 39, 42, 52, 59, 70, 86 };
private static readonly HashSet<int> MemorySpecific = new() { 6 };
private static readonly HashSet<int> MemoryMove = new() { 12, 16, 48, 49, 80, 81, 89 };
private static readonly HashSet<int> MemoryItem = new() { 5, 15, 26, 34, 40, 51, 84, 88 };

9
PKHeX.Core/Legality/Verifiers/MemoryVerifier.cs
View file

@ -31,9 +31,16 @@ namespace PKHeX.Core
return GetInvalid(string.Format(LMemoryArgBadMove, memory.Handler));
}
if (gen == 8 && Memories.MemoryGeneral.Contains(memory.MemoryID) && Memories.IsInvalidGenLoc8Other(memory.MemoryID, memory.Variable))
return GetInvalid(string.Format(LMemoryArgBadLocation, memory.Handler));
switch (memory.MemoryID)
{
case 1 or 2 or 3 when gen == 8 && Memories.IsInvalidGenLoc8(memory.MemoryID, pkm.Met_Location, (byte)memory.Variable):
case 1 or 2 or 3 when gen == 8 && Memories.IsInvalidGenLoc8(memory.MemoryID, pkm.Met_Location, pkm.Egg_Location, memory.Variable):
return GetInvalid(string.Format(LMemoryArgBadLocation, memory.Handler));
case 19 when pkm.Species is (int)Species.Urshifu && memory.Variable is not 34: // tall building is the only location for evolving Urshifu
case 19 when pkm.Species is (int)Species.Runerigus && memory.Variable is not 72: // vast field is the only location for evolving Runerigus
return GetInvalid(string.Format(LMemoryArgBadLocation, memory.Handler));
// {0} saw {2} carrying {1} on its back. {4} that {3}.