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

Detect English faraway island mew and hall of origin arceus as invalid, they are unreleased events

Browse source
This commit is contained in:
javierhimura 2017-03-27 01:51:19 +02:00
parent f1d4bccb09
commit a66f106aef
5 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
PKHeX/Legality/Checks.cs
View file

@ -659,6 +659,15 @@ namespace PKHeX.Core
{
var s = (EncounterStatic)EncounterMatch;
if (pkm.GenNumber == 4 && pkm.Species == 493 && s.Location == 086)
{
return new CheckResult(Severity.Invalid, V352, CheckIdentifier.Encounter);
}
if (pkm.GenNumber == 3 && pkm.Species == 151 && s.Location == 201 && pkm.Language != 1)
{
return new CheckResult(Severity.Invalid, V353, CheckIdentifier.Encounter);
}
// Re-parse relearn moves
if (s.EggLocation != 60002 || vRelearn.Any(rl => !rl.Valid))
{

2
PKHeX/Legality/LegalityCheckStrings.cs
View file

@ -337,6 +337,8 @@ namespace PKHeX.Core
public static string V348 {get; set;} = "Inherited tutor move. Not expected in an event egg.";
public static string V350 {get; set;} = "Inherited TM/HM move. Not expected in an event egg.";
public static string V351 {get; set;} = "Invalid Met Location, expected Transporter or Crown."; // Invalid
public static string V352 {get; set;} = "Arceus from Hall of Origin. Unreleased event.";
public static string V353 {get; set;} = "Non japanese Mew from Faraway Island. Unreleased event.";
#endregion
}

2
PKHeX/Legality/Tables3.cs
View file

@ -265,7 +265,7 @@ namespace PKHeX.Core
new EncounterStatic { Species = 384, Level = 70, Location = 085, }, // Rayquaza @ Sky Pillar
// Event
new EncounterStatic { Species = 151, Level = 30, Location = 201, Version = GameVersion.E, Fateful = true }, // Mew @ Faraway Island
new EncounterStatic { Species = 151, Level = 30, Location = 201, Version = GameVersion.E, Fateful = true }, // Mew @ Faraway Island (Unreleased outside of Japan)
new EncounterStatic { Species = 249, Level = 70, Location = 211, Version = GameVersion.E, }, // Lugia @ Navel Rock
new EncounterStatic { Species = 250, Level = 70, Location = 211, Version = GameVersion.E, }, // Ho-Oh @ Navel Rock
new EncounterStatic { Species = 386, Level = 30, Location = 200, Version = GameVersion.E, Form = 3, Fateful = true }, // Deoxys @ Birth Island

2
PKHeX/Legality/Tables4.cs
View file

@ -442,7 +442,7 @@ namespace PKHeX.Core
new EncounterStatic { Species = 491, Level = 40, Location = 079, Version = GameVersion.DP,}, //Darkrai @ Newmoon Island
new EncounterStatic { Species = 491, Level = 50, Location = 079, Version = GameVersion.Pt,}, //Darkrai @ Newmoon Island
new EncounterStatic { Species = 492, Form = 0, Level = 30, Location = 063, Fateful = true,}, //Shaymin @ Flower Paradise
//new EncounterStatic { Species = 493, Level = 80, Location = 086,}, //Arceus @ Hall of Origin
new EncounterStatic { Species = 493, Form = 0, Level = 80, Location = 086,}, //Arceus @ Hall of Origin (Unreleased)
};
internal static readonly EncounterStatic[] Encounter_DPPt = Encounter_DPPt_Roam.SelectMany(e => e.Clone(Roaming_MetLocation_DPPt)).Concat(Encounter_DPPt_Regular).ToArray();

2
PKHeX/Resources/text/en/LegalityCheckStrings_en.txt
View file

@ -272,3 +272,5 @@ V347 = Inherited move learned by Level-up. Not expected in an event egg.
V348 = Inherited tutor move. Not expected in an event egg.
V350 = Inherited TM/HM move. Not expected in an event egg.
V351 = Invalid Met Location, expected Transporter or Crown.
V352 = Arceus from Hall of Origin. Unreleased event.
V353 = Non japanese Mew from Faraway Island. Unreleased event.