Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-10-01 12:47:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor clean

Browse Source 
Remove GoPark as a "Type" since it is now baked into the encounter object type
This commit is contained in:
Kurt
2020-11-14 12:55:30 -08:00
parent ad9e9ddfa0
commit 377ec02c9b
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PKHeX.Core/Legality/Areas/EncounterArea7g.cs
View File

@@ -20,11 +20,11 @@ private EncounterArea7g(int species, int form) : base(GameVersion.GO)
Location = 50;
}
internal static EncounterArea7g[] GetArea(byte[][] pickle)
internal static EncounterArea7g[] GetArea(byte[][] data)
{
var areas = new EncounterArea7g[pickle.Length];
var areas = new EncounterArea7g[data.Length];
for (int i = 0; i < areas.Length; i++)
areas[i] = GetArea(pickle[i]);
areas[i] = GetArea(data[i]);
return areas;
}

6
PKHeX.Core/Legality/Areas/EncounterArea8g.cs
View File

@@ -20,11 +20,11 @@ private EncounterArea8g(int species, int form) : base(GameVersion.GO)
Location = Locations.GO8;
}
internal static EncounterArea8g[] GetArea(byte[][] pickle)
internal static EncounterArea8g[] GetArea(byte[][] data)
{
var areas = new EncounterArea8g[pickle.Length];
var areas = new EncounterArea8g[data.Length];
for (int i = 0; i < areas.Length; i++)
areas[i] = GetArea(pickle[i]);
areas[i] = GetArea(data[i]);
return areas;
}

2
PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot7GO.cs
View File

@@ -6,6 +6,8 @@ public sealed class EncounterSlot7GO : EncounterSlot, IPogoSlot
public PogoType Type { get; }
public Shiny Shiny { get; }
public override string LongName => $"{Name} ({Type})";
public EncounterSlot7GO(EncounterArea7g area, int species, int form, Shiny shiny, PogoType type) : base(area)
{
Species = species;

2
PKHeX.Core/Legality/Enums/SlotType.cs
View File

@@ -62,7 +62,7 @@ public enum SlotType : byte
BugContest = 9,
HiddenGrotto = 10,
GoPark = 11,
// GoPark = 11,
FriendSafari = 12,
Horde = 13,
// Pokeradar = 14,

7
PKHeX.Core/Legality/Verifiers/EffortValueVerifier.cs
View File

@@ -68,12 +68,13 @@ private void VerifyAwakenedValues(LegalityAnalysis data, IAwakened awakened)
if (sum != 0)
data.AddLine(GetInvalid(LEffortShouldBeZero));
var EncounterMatch = data.EncounterMatch;
if (!awakened.AwakeningAllValid())
data.AddLine(GetInvalid(LAwakenedCap));
if (EncounterMatch is EncounterSlot s && s.Area.Type == SlotType.GoPark && Enumerable.Range(0, 6).Select(awakened.GetAV).Any(z => z < 2))
var enc = data.EncounterMatch;
if (enc is EncounterSlot7GO && Enumerable.Range(0, 6).Select(awakened.GetAV).Any(z => z < 2))
data.AddLine(GetInvalid(string.Format(LAwakenedShouldBeValue, 2))); // go park transfers have 2 AVs for all stats.
else if (awakened.AwakeningSum() == 0 && !EncounterMatch.IsWithinRange(pkm))
else if (awakened.AwakeningSum() == 0 && !enc.IsWithinRange(pkm))
data.AddLine(Get(LAwakenedEXPIncreased, Severity.Fishy));
}
}