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

In PK6 and PK7 defer to base properties when GenNumber < 5 for WasEgg, WasTradedEgg and WasIngameTrade

Browse source
This commit is contained in:
javierhimura 2017-03-27 01:28:34 +02:00
parent ed681fa626
commit c93acf4767
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
PKHeX/PKM/PK6.cs
View file

@ -584,11 +584,11 @@ namespace PKHeX.Core
// Legality Properties
public override bool WasLink => Met_Location == 30011;
public override bool WasEgg => Legal.EggLocations.Contains(Egg_Location);
public override bool WasEgg => GenNumber < 5 ? base.WasEgg : Legal.EggLocations.Contains(Egg_Location);
public override bool WasEvent => Met_Location > 40000 && Met_Location < 50000 || FatefulEncounter && Species != 386;
public override bool WasEventEgg => ((Egg_Location > 40000 && Egg_Location < 50000) || (FatefulEncounter && Egg_Location == 30002)) && Met_Level == 1;
public override bool WasTradedEgg => Egg_Location == 30002;
public override bool WasIngameTrade => Met_Location == 30001;
public override bool WasTradedEgg => GenNumber < 5 ? base.WasEgg : Egg_Location == 30002;
public override bool WasIngameTrade => GenNumber < 5 ? base.WasEgg : Met_Location == 30001;
public PK7 convertToPK7()
{

6
PKHeX/PKM/PK7.cs
View file

@ -621,10 +621,10 @@ namespace PKHeX.Core
// Legality Properties
public override bool WasLink => Met_Location == 30011;
public override bool WasEgg => Legal.EggLocations.Contains(Egg_Location);
public override bool WasEgg => GenNumber < 5 ? base.WasEgg : Legal.EggLocations.Contains(Egg_Location);
public override bool WasEvent => Met_Location > 40000 && Met_Location < 50000 || FatefulEncounter && Species != 386;
public override bool WasEventEgg => ((Egg_Location > 40000 && Egg_Location < 50000) || (FatefulEncounter && Egg_Location == 30002)) && Met_Level == 1;
public override bool WasTradedEgg => Egg_Location == 30002;
public override bool WasIngameTrade => Met_Location == 30001;
public override bool WasTradedEgg => GenNumber < 5 ? base.WasEgg : Egg_Location == 30002;
public override bool WasIngameTrade => GenNumber < 5 ? base.WasEgg : Met_Location == 30001;
}
}