Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-17 05:48:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactoring

Browse source 
continued reduction in Core size, simplify/clean up usages
This commit is contained in:
Kurt 2018-06-10 14:45:25 -07:00
parent c6765fd26b
commit d94fc65367
5 changed files with 52 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX.Core/Legality/Checks.cs
View file

@ -73,7 +73,7 @@ namespace PKHeX.Core
}
private void VerifyItem()
{
if (!Legal.IsHeldItemAllowed(pkm.HeldItem, pkm.Format))
if (!Legal.IsHeldItemAllowed(pkm))
AddLine(Severity.Invalid, V204, CheckIdentifier.Form);
if (pkm.Format == 3 && pkm.HeldItem == 175)
VerifyEReaderBerry();

78
PKHeX.Core/Legality/Core.cs
View file

@ -142,8 +142,8 @@ namespace PKHeX.Core
internal static List<int>[] GetExclusiveMovesG1(int species1, int species2, IEnumerable<int> tmhm, IEnumerable<int> moves)
{
// Return from two species the exclusive moves that only one could learn and also the current pokemon have it in its current moveset
var moves1 = MoveLevelUp.AddMovesLevelUp1(species1, 1, 100);
var moves2 = MoveLevelUp.AddMovesLevelUp1(species2, 1, 100);
var moves1 = MoveLevelUp.GetMovesLevelUp1(species1, 1, 100);
var moves2 = MoveLevelUp.GetMovesLevelUp1(species2, 1, 100);
// Remove common moves and remove tmhm, remove not learned moves
var common = new HashSet<int>(moves1.Intersect(moves2).Concat(tmhm));
@ -607,7 +607,7 @@ namespace PKHeX.Core
if (minlevel > pk.CurrentLevel)
return new List<int>();
return MoveLevelUp.AddMovesLevelUp1(basespecies, maxlevel, minlevel);
return MoveLevelUp.GetMovesLevelUp1(basespecies, maxlevel, minlevel);
}
internal static bool GetWasEgg23(PKM pkm)
@ -793,23 +793,15 @@ namespace PKHeX.Core
{
switch (pkm.GenNumber)
{
case 1:
return WildPokeBalls1;
case 2:
return WildPokeBalls2;
case 3:
return WildPokeBalls3;
case 4:
return pkm.HGSS ? WildPokeBalls4_HGSS : WildPokeBalls4_DPPt;
case 5:
return WildPokeBalls5;
case 6:
return WildPokeballs6;
case 7:
return WildPokeballs7;
case 1: return WildPokeBalls1;
case 2: return WildPokeBalls2;
case 3: return WildPokeBalls3;
case 4: return pkm.HGSS ? WildPokeBalls4_HGSS : WildPokeBalls4_DPPt;
case 5: return WildPokeBalls5;
case 6: return WildPokeballs6;
case 7: return WildPokeballs7;
default:
return null;
default: return null;
}
}
internal static int GetEggHatchLevel(PKM pkm) => pkm.Format <= 3 ? 5 : 1;
@ -821,7 +813,7 @@ namespace PKHeX.Core
{
switch (generation)
{
case 1: return Empty;
case 1:
case 2: return Empty;
case 3: return SplitBreed_3;
case 4: return SplitBreed;
@ -867,8 +859,6 @@ namespace PKHeX.Core
}
internal static int GetDebutGeneration(int species)
{
if (species <= 0)
return 0;
if (species <= MaxSpeciesID_1)
return 1;
if (species <= MaxSpeciesID_2)
@ -916,7 +906,11 @@ namespace PKHeX.Core
default: return new bool[0];
}
}
internal static bool IsHeldItemAllowed(int item, int generation)
internal static bool IsHeldItemAllowed(PKM pkm)
{
return IsHeldItemAllowed(pkm.HeldItem, pkm.Format);
}
private static bool IsHeldItemAllowed(int item, int generation)
{
if (item < 0)
return false;
@ -1073,14 +1067,18 @@ namespace PKHeX.Core
switch (version)
{
case GameVersion.Any:
return GetCanBeCaptured(species, SlotsX, StaticX, XY:true)
|| GetCanBeCaptured(species, SlotsY, StaticY, XY:true)
return FriendSafari.Contains(species)
|| GetCanBeCaptured(species, SlotsX, StaticX)
|| GetCanBeCaptured(species, SlotsY, StaticY)
|| GetCanBeCaptured(species, SlotsA, StaticA)
|| GetCanBeCaptured(species, SlotsO, StaticO);
case GameVersion.X:
return GetCanBeCaptured(species, SlotsX, StaticX, XY:true);
return FriendSafari.Contains(species)
|| GetCanBeCaptured(species, SlotsX, StaticX);
case GameVersion.Y:
return GetCanBeCaptured(species, SlotsY, StaticY, XY:true);
return FriendSafari.Contains(species)
|| GetCanBeCaptured(species, SlotsY, StaticY);
case GameVersion.AS:
return GetCanBeCaptured(species, SlotsA, StaticA);
case GameVersion.OR:
@ -1090,11 +1088,8 @@ namespace PKHeX.Core
}
return false;
}
private static bool GetCanBeCaptured(int species, IEnumerable<EncounterArea> area, IEnumerable<EncounterStatic> statics, bool XY = false)
private static bool GetCanBeCaptured(int species, IEnumerable<EncounterArea> area, IEnumerable<EncounterStatic> statics)
{
if (XY && FriendSafari.Contains(species))
return true;
if (area.Any(loc => loc.Slots.Any(slot => slot.Species == species)))
return true;
if (statics.Any(enc => enc.Species == species && !enc.Gift))
@ -1103,17 +1098,17 @@ namespace PKHeX.Core
}
internal static bool GetCanLearnMachineMove(PKM pkm, int move, int generation, GameVersion version = GameVersion.Any)
{
return GetValidMoves(pkm, version, GetValidPreEvolutions(pkm).ToArray(), generation, Machine: true).Contains(move);
return GetValidMoves(pkm, version, GetValidPreEvolutions(pkm), generation, Machine: true).Contains(move);
}
internal static bool GetCanRelearnMove(PKM pkm, int move, int generation, GameVersion version = GameVersion.Any)
{
return GetValidMoves(pkm, version, GetValidPreEvolutions(pkm).ToArray(), generation, LVL: true, Relearn: true).Contains(move);
return GetValidMoves(pkm, version, GetValidPreEvolutions(pkm), generation, LVL: true, Relearn: true).Contains(move);
}
internal static bool GetCanKnowMove(PKM pkm, int move, int generation, GameVersion version = GameVersion.Any)
{
if (pkm.Species == 235 && !InvalidSketch.Contains(move))
return true;
return GetValidMoves(pkm, version, GetValidPreEvolutions(pkm).ToArray(), generation, LVL: true, Relearn: true, Tutor: true, Machine: true).Contains(move);
return GetValidMoves(pkm, version, GetValidPreEvolutions(pkm), generation, LVL: true, Relearn: true, Tutor: true, Machine: true).Contains(move);
}
internal static int GetBaseEggSpecies(PKM pkm, int skipOption = 0)
{
@ -1233,7 +1228,7 @@ namespace PKHeX.Core
internal static DexLevel[][] GetEvolutionChainsAllGens(PKM pkm, IEncounterable Encounter)
{
var CompleteEvoChain = GetEvolutionChain(pkm, Encounter).ToArray();
var CompleteEvoChain = GetEvolutionChain(pkm, Encounter);
int maxgen = pkm.Format == 1 && !pkm.Gen1_NotTradeback ? 2 : pkm.Format;
int mingen = (pkm.Format == 2 || pkm.VC2) && !pkm.Gen2_NotTradeback ? 1 : pkm.GenNumber;
DexLevel[][] GensEvoChains = new DexLevel[maxgen + 1][];
@ -1335,10 +1330,9 @@ namespace PKHeX.Core
{
return GetEvolutionChain(pkm, Encounter, pkm.Species, 100);
}
private static DexLevel[] GetEvolutionChain(PKM pkm, IEncounterable Encounter, int maxspec, int maxlevel)
{
DexLevel[] vs = GetValidPreEvolutions(pkm).ToArray();
var vs = GetValidPreEvolutions(pkm).ToArray();
// Evolution chain is in reverse order (devolution)
int minspec = Encounter.Species;
@ -1480,7 +1474,7 @@ namespace PKHeX.Core
{
List<int> r = new List<int>();
if (LVL)
r.AddRange(MoveLevelUp.GetLevelUpMoves(pkm, species, minlvlG1, minlvlG2, lvl, form, Version, MoveReminder, Generation));
r.AddRange(MoveLevelUp.GetMovesLevelUp(pkm, species, minlvlG1, minlvlG2, lvl, form, Version, MoveReminder, Generation));
if (Machine)
r.AddRange(MoveTechnicalMachine.GetTMHM(pkm, species, form, Generation, Version, RemoveTransferHM));
if (moveTutor)
@ -1491,14 +1485,6 @@ namespace PKHeX.Core
{
return MoveEgg.GetEggMoves(pkm, species, formnum, version);
}
internal static IEnumerable<int> GetTMHM(PKM pkm, int species, int form, int generation, GameVersion Version = GameVersion.Any, bool RemoveTransferHM = true)
{
return MoveTechnicalMachine.GetTMHM(pkm, species, form, generation, Version, RemoveTransferHM);
}
internal static IEnumerable<int> GetTutorMoves(PKM pkm, int species, int form, bool specialTutors, int generation)
{
return MoveTutor.GetTutorMoves(pkm, species, form, specialTutors, generation);
}
internal static bool IsTradedKadabraG1(PKM pkm)
{
if (!(pkm is PK1 pk1) || pk1.Species != 64)

4
PKHeX.Core/Legality/Evolutions/EvolutionLineage.cs
View file

@ -14,7 +14,7 @@ namespace PKHeX.Core
{
int matchChain = -1;
for (int i = 0; i < Chain.Count; i++)
if (Enumerable.Any<EvolutionMethod>(Chain[i].StageEntryMethods, e => e.Species == entry.Species))
if (Chain[i].StageEntryMethods.Any(e => e.Species == entry.Species))
matchChain = i;
if (matchChain != -1)
@ -27,7 +27,7 @@ namespace PKHeX.Core
Chain.Insert(0, evo);
}
public IList<DexLevel> GetExplicitLineage(PKM pkm, int maxLevel, bool skipChecks, int maxSpeciesTree, int maxSpeciesOrigin, int minLevel)
public List<DexLevel> GetExplicitLineage(PKM pkm, int maxLevel, bool skipChecks, int maxSpeciesTree, int maxSpeciesOrigin, int minLevel)
{
int lvl = maxLevel;
List<DexLevel> dl = new List<DexLevel> { new DexLevel { Species = pkm.Species, Level = lvl, Form = pkm.AltForm } };

4
PKHeX.Core/Legality/Moves/EggInfoSource.cs
View file

@ -21,11 +21,11 @@ namespace PKHeX.Core
? Legal.GetBaseEggMoves(pkm, e.Species, e.Version, 100).Except(Base).ToList()
: new List<int>();
Tutor = e.Version == GameVersion.C
? Legal.GetTutorMoves(pkm, pkm.Species, pkm.AltForm, false, 2).ToList()
? MoveTutor.GetTutorMoves(pkm, pkm.Species, pkm.AltForm, false, 2).ToList()
: new List<int>();
// Only TM/HM moves from the source game of the egg, not any other games from the same generation
TMHM = Legal.GetTMHM(pkm, pkm.Species, pkm.AltForm, pkm.GenNumber, e.Version, false).ToList();
TMHM = MoveTechnicalMachine.GetTMHM(pkm, pkm.Species, pkm.AltForm, pkm.GenNumber, e.Version).ToList();
// Non-Base moves that can magically appear in the regular movepool
bool volt = notSpecial && (pkm.GenNumber > 3 || e.Version == GameVersion.E) && Legal.LightBall.Contains(pkm.Species);

30
PKHeX.Core/Legality/Moves/MoveLevelUp.cs
View file

@ -256,22 +256,22 @@ namespace PKHeX.Core
}
}
public static IEnumerable<int> GetLevelUpMoves(PKM pkm, int species, int minlvlG1, int minlvlG2, int lvl, int form, GameVersion version, bool MoveReminder, int Generation)
public static IEnumerable<int> GetMovesLevelUp(PKM pkm, int species, int minlvlG1, int minlvlG2, int lvl, int form, GameVersion version, bool MoveReminder, int Generation)
{
switch (Generation)
{
case 1: return AddMovesLevelUp1(species, lvl, minlvlG1);
case 2: return AddMovesLevelUp2(species, lvl, minlvlG2, pkm.Korean, pkm.Format);
case 3: return AddMovesLevelUp3(species, lvl, form);
case 4: return AddMovesLevelUp4(species, lvl, form);
case 5: return AddMovesLevelUp5(species, lvl, form);
case 6: return AddMovesLevelUp6(species, lvl, form, version);
case 7: return AddMovesLevelUp7(species, lvl, form, version, MoveReminder);
case 1: return GetMovesLevelUp1(species, lvl, minlvlG1);
case 2: return GetMovesLevelUp2(species, lvl, minlvlG2, pkm.Korean, pkm.Format);
case 3: return GetMovesLevelUp3(species, lvl, form);
case 4: return GetMovesLevelUp4(species, lvl, form);
case 5: return GetMovesLevelUp5(species, lvl, form);
case 6: return GetMovesLevelUp6(species, lvl, form, version);
case 7: return GetMovesLevelUp7(species, lvl, form, version, MoveReminder);
}
return null;
}
internal static List<int> AddMovesLevelUp1(int species, int max, int min)
internal static List<int> GetMovesLevelUp1(int species, int max, int min)
{
List<int> moves = new List<int>();
int index = PersonalTable.RB.GetFormeIndex(species, 0);
@ -289,7 +289,7 @@ namespace PKHeX.Core
moves.AddRange(LevelUpY[index].GetMoves(max, min));
return moves;
}
private static List<int> AddMovesLevelUp2(int species, int max, int min, bool korean, int format)
private static List<int> GetMovesLevelUp2(int species, int max, int min, bool korean, int format)
{
var r = new List<int>();
int index = PersonalTable.C.GetFormeIndex(species, 0);
@ -302,7 +302,7 @@ namespace PKHeX.Core
r = r.Where(m => m <= MaxMoveID_1).ToList();
return r;
}
private static List<int> AddMovesLevelUp3(int species, int lvl, int form)
private static List<int> GetMovesLevelUp3(int species, int lvl, int form)
{
var moves = new List<int>();
if (species == 386)
@ -324,7 +324,7 @@ namespace PKHeX.Core
moves.AddRange(LevelUpLG[index].GetMoves(lvl));
return moves;
}
private static List<int> AddMovesLevelUp4(int species, int lvl, int form)
private static List<int> GetMovesLevelUp4(int species, int lvl, int form)
{
var moves = new List<int>();
int index = PersonalTable.HGSS.GetFormeIndex(species, form);
@ -336,7 +336,7 @@ namespace PKHeX.Core
moves.AddRange(LevelUpHGSS[index].GetMoves(lvl));
return moves;
}
private static List<int> AddMovesLevelUp5(int species, int lvl, int form)
private static List<int> GetMovesLevelUp5(int species, int lvl, int form)
{
var moves = new List<int>();
int index1 = PersonalTable.BW.GetFormeIndex(species, form);
@ -348,7 +348,7 @@ namespace PKHeX.Core
moves.AddRange(LevelUpB2W2[index2].GetMoves(lvl));
return moves;
}
private static List<int> AddMovesLevelUp6(int species, int lvl, int form, GameVersion ver)
private static List<int> GetMovesLevelUp6(int species, int lvl, int form, GameVersion ver)
{
var moves = new List<int>();
switch (ver)
@ -384,7 +384,7 @@ namespace PKHeX.Core
return;
moves.AddRange(LevelUpAO[index].GetMoves(lvl));
}
private static List<int> AddMovesLevelUp7(int species, int lvl, int form, GameVersion ver, bool MoveReminder)
private static List<int> GetMovesLevelUp7(int species, int lvl, int form, GameVersion ver, bool MoveReminder)
{
var moves = new List<int>();
switch (ver)