Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-10 14:44:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Temp fix egg detection

Browse source 
Egg location should be used to detect if it was an egg; encounter
matching should determine if it is a StaticEncounter gift.
This commit is contained in:
Kurt 2017-04-01 13:02:37 -07:00
parent d800ffdf97
commit d54bb72d59
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX/Legality/LegalityCheckStrings.cs
View file

@ -344,7 +344,7 @@ namespace PKHeX.Core
public static string V354 {get; set;} = "Non Platinum Shaymin from Flower Paradise. Unreleased event.";
public static string V357 {get; set;} = "Only one Ninjask move allowed.";
public static string V358 {get; set;} = "Inherited move learned by Level-up. Incompatible with event egg moves.";
public static string V359 {get; set;} = "Unable to match an gift egg encounter from origin game.";
public static string V359 {get; set;} = "Unable to match a gift egg encounter from origin game.";
public static string V360 {get; set;} = "Unable to match an event egg encounter from origin game.";
#endregion

1
PKHeX/PKM/PKM.cs
View file

@ -445,7 +445,6 @@ namespace PKHeX.Core
case 4: return Legal.GiftEggLocation4.Contains(Egg_Location);
case 5: return Egg_Location == 60003;
case 6: return Egg_Location == 60004;
case 7: return Egg_Location == 60002;
}
return false;
}

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

@ -27,7 +27,7 @@ V344 = Inherited egg move.
V345 = Inherited move learned by Level-up.
V346 = Inherited tutor move.
V349 = Inherited TM/HM move.
V355 = Learned by evolving Nincada into Ninjask.;
V355 = Learned by evolving Nincada into Ninjask.
V356 = Learned by evolving Nincada into Ninjask in generation {0}.
V203 = Genderless Pokémon should not have a gender.
V201 = Encryption Constant is not set.
@ -279,6 +279,6 @@ V353 = Non japanese Mew from Faraway Island. Unreleased event.
V354 = Non Platinum Shaymin from Flower Paradise. Unreleased event.
V357 = Only one Ninjask move allowed.
V358 = Inherited move learned by Level-up. Incompatible with event egg moves.
V359 = Unable to match an gift egg encounter from origin game.;
V360 = Unable to match an event egg encounter from origin game.;
V359 = Unable to match a gift egg encounter from origin game.
V360 = Unable to match an event egg encounter from origin game.