Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-08-22 06:57:42 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source 
little bit of simplification
This commit is contained in:
Kurt
2017-06-06 20:52:21 -07:00
parent 0b1fcbbe6d
commit eaf2fd9198
4 changed files with 50 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
PKHeX.Core/Legality/Analysis.cs
View File

@@ -30,25 +30,24 @@ private IEnumerable<int> AllSuggestedMoves
{
get
{
if (Error)
if (_allSuggestedMoves != null)
return _allSuggestedMoves;
if (Error || pkm == null || !pkm.IsOriginValid)
return new int[4];
if (_allSuggestedMoves == null)
return _allSuggestedMoves = pkm == null || !pkm.IsOriginValid ? new int[4] : getSuggestedMoves(true, true, true);
return _allSuggestedMoves;
return _allSuggestedMoves = getSuggestedMoves(true, true, true);
}
}
private IEnumerable<int> AllSuggestedRelearnMoves
{
get
{
if (Error)
if (_allSuggestedRelearnMoves != null)
return _allSuggestedRelearnMoves;
if (Error || pkm == null || !pkm.IsOriginValid)
return new int[4];
if (_allSuggestedRelearnMoves == null)
{
var inheritLvlMoves = pkm.PersonalInfo.Gender > 0 && pkm.PersonalInfo.Gender < 255 || Legal.MixedGenderBreeding.Contains(info.EncounterMatch.Species);
return _allSuggestedRelearnMoves = pkm == null || !pkm.IsOriginValid ? new int[4] : Legal.getValidRelearn(pkm, info.EncounterMatch.Species, inheritLvlMoves).ToArray();
}
return _allSuggestedRelearnMoves;
var gender = pkm.PersonalInfo.Gender;
var inheritLvlMoves = gender > 0 && gender < 255 || Legal.MixedGenderBreeding.Contains(info.EncounterMatch.Species);
return _allSuggestedRelearnMoves = Legal.getValidRelearn(pkm, info.EncounterMatch.Species, inheritLvlMoves).ToArray();
}
}
private int[] _allSuggestedMoves, _allSuggestedRelearnMoves;

71
PKHeX.Core/Legality/Core.cs
View File

@@ -2000,7 +2000,7 @@ internal static bool getEvolutionValid(PKM pkm, int minSpecies = -1)
internal static bool getEvolutionWithMoveValid(PKM pkm, LegalInfo info)
{
// Exclude species that do not evolve leveling with a move
// Exclude gen 1-3 games
// Exclude gen 1-3 formats
// Exclude Mr Mime and Snorlax for gen 1-3 games
if (!SpeciesEvolutionWithMove.Contains(pkm.Species) || pkm.Format <= 3 || (BabyEvolutionWithMove.Contains(pkm.Species) && pkm.GenNumber <= 3))
return true;
@@ -2010,10 +2010,10 @@ internal static bool getEvolutionWithMoveValid(PKM pkm, LegalInfo info)
var moves = MoveEvolutionWithMove[index];
var allowegg = EggMoveEvolutionWithMove[index][pkm.GenNumber];
// Get the minimun level in any generation when the pokemon could learn the evolve move
// Get the minimum level in any generation when the pokemon could learn the evolve move
var LearnLevel = 101;
for(int g = pkm.GenNumber; g <= pkm.Format; g++)
if(pkm.InhabitedGeneration(g) && levels[g] > 0)
for (int g = pkm.GenNumber; g <= pkm.Format; g++)
if (pkm.InhabitedGeneration(g) && levels[g] > 0)
LearnLevel = Math.Min(LearnLevel, levels[g]);
// Check also if the current encounter include the evolve move as an special move
@@ -2025,35 +2025,34 @@ internal static bool getEvolutionWithMoveValid(PKM pkm, LegalInfo info)
// If the encounter is a player hatched egg check if the move could be an egg move or inherited level up move
if (info.EncounterMatch.EggEncounter && !pkm.WasGiftEgg && !pkm.WasEventEgg && allowegg)
{
var inheritmove = false;
if (pkm.GenNumber >= 6)
// 3DS games, if the move is not a relearn move that means the pokemon was hatched without the move
inheritmove = pkm.RelearnMoves.Any(m => moves.Contains(m));
else if (pkm.Moves.Any(m => moves.Contains(m)))
// Pre-3DS games, if the pokemon was an egg and it have the move and also and egg from this species could hatch with the move
// that means is a valid egg move
inheritmove = true;
else
{
// If the pokemon does not have the move it still could be an egg move that was forgotten
// But that requires for the pokemon to do not have 4 other moves identified as egg moves or inherited level up moves
var eggmoves = info.vMoves.Count(m => m.Source == MoveSource.EggMove || m.Source == MoveSource.InheritLevelUp);
inheritmove = eggmoves < 4;
}
if (inheritmove)
if (getIsMoveInherited(pkm, info, moves))
LearnLevel = Math.Min(LearnLevel, pkm.GenNumber < 4 ? 5 : 1);
}
// If has original met location the minimun evolution level is one level after met level
// Gen 3 pokemon in gen 4 games minimun level is one level after transfer to generation 4
// VC pokemon minimun level is one leve after transfer to generation 7
// Sylveon always one level after met level, for gen 4 and 5 eevees in gen 6 games minimun for evolution is one leve after transfer to generation 5
// If has original met location the minimum evolution level is one level after met level
// Gen 3 pokemon in gen 4 games: minimum level is one level after transfer to generation 4
// VC pokemon: minimum level is one level after transfer to generation 7
// Sylveon: always one level after met level, for gen 4 and 5 eevees in gen 6 games minimum for evolution is one level after transfer to generation 5
if (pkm.HasOriginalMetLocation || pkm.Format == 4 && pkm.Gen3 || pkm.VC || pkm.Species == 700)
LearnLevel = Math.Max(pkm.Met_Level, LearnLevel);
// Current level must be at leats one level after the minimun learn level
// Current level must be at least one level after the minimum learn level
return pkm.CurrentLevel > LearnLevel;
}
private static bool getIsMoveInherited(PKM pkm, LegalInfo info, int[] moves)
{
// In 3DS games, the inherited move must be in the relearn moves.
if (pkm.GenNumber >= 6)
return pkm.RelearnMoves.Any(moves.Contains);
// In Pre-3DS games, the move is inherited if it has the move and it can be hatched with the move.
if (pkm.Moves.Any(moves.Contains))
return true;
// If the pokemon does not have the move, it still could be an egg move that was forgotten.
// This requires the pokemon to not have 4 other moves identified as egg moves or inherited level up moves.
return 4 > info.vMoves.Count(m => m.Source == MoveSource.EggMove || m.Source == MoveSource.InheritLevelUp);
}
internal static bool getCanFormChange(PKM pkm, int species)
{
if (FormChange.Contains(species))
@@ -2931,28 +2930,28 @@ internal static List<int>[] GetEmptyMovesList(DexLevel[][] EvoChainsAllGens)
}
internal static bool IsTradedKadabraG1(PKM pkm)
{
if (pkm.SpecForm != 64 || pkm.Format > 1)
if (!(pkm is PK1 pk1) || pk1.Species != 64)
return false;
if (pkm.TradebackStatus == TradebackType.WasTradeback)
if (pk1.TradebackStatus == TradebackType.WasTradeback)
return true;
var IsYellow = Savegame_Version == GameVersion.Y;
if (pkm.TradebackStatus == TradebackType.Gen1_NotTradeback)
if (pk1.TradebackStatus == TradebackType.Gen1_NotTradeback)
{
// If catch rate is abra catch rate it wont trigger as invalid trade without evolution, it could be traded as Abra
var catch_rate = (pkm as PK1).Catch_Rate;
// Yellow Kadabra catch rate in Red/Blue game, must be Allakazham
if (catch_rate == PersonalTable.Y[64].CatchRate && !IsYellow)
// If catch rate is Abra catch rate it wont trigger as invalid trade without evolution, it could be traded as Abra
var catch_rate = pk1.Catch_Rate;
// Yellow Kadabra catch rate in Red/Blue game, must be Alakazam
if (!IsYellow && catch_rate == PersonalTable.Y[64].CatchRate)
return true;
// Red/Blue Kadabra catch rate in Yellow game, must be Allakazham
if (catch_rate == PersonalTable.RB[64].CatchRate && IsYellow)
// Red/Blue Kadabra catch rate in Yellow game, must be Alakazam
if (IsYellow && catch_rate == PersonalTable.RB[64].CatchRate)
return true;
}
if (IsYellow)
return false;
// Yellow only moves in Red/Blue game, must be Allakazham
if (pkm.Moves.Contains(134)) // Kinesis, yellow only move
if (pk1.Moves.Contains(134)) // Kinesis, yellow only move
return true;
if (pkm.CurrentLevel < 20 && pkm.Moves.Contains(50)) // Disable bellow level 20, yellow only move
if (pk1.CurrentLevel < 20 && pkm.Moves.Contains(50)) // Obtaining Disable below level 20 implies a yellow only move
return true;
return false;

7
PKHeX.Core/Legality/Encounters/VerifyCurrentMoves.cs
View File

@@ -61,7 +61,6 @@ private static CheckMoveResult[] parseMovesForSmeargle(PKM pkm, int[] Moves, Leg
return parseMovesSketch(pkm, Moves);
// can only know sketch as egg
var empty = ValidEncounterMoves.Empty;
info.EncounterMoves = new ValidEncounterMoves
{
validLevelUpMoves = Legal.getValidMovesAllGens(pkm, info.EvoChainsAllGens, minLvLG1: 1, Tutor: false, Machine: false, RemoveTransferHM: false)
@@ -177,11 +176,7 @@ private static CheckMoveResult[] parseMovesSpecialMoveset(PKM pkm, int[] Moves,
var mg = info.EncounterMatch as IMoveset;
int[] SpecialMoves = mg?.Moves ?? new int[0];
var emptyegg = new int[0];
CheckMoveResult[] res = parseMoves(pkm, Moves, SpecialMoves, emptyegg, emptyegg, emptyegg, new int[0], new int[0], false, info);
if (res.Any(r => !r.Valid))
return res;
return res;
return parseMoves(pkm, Moves, SpecialMoves, emptyegg, emptyegg, emptyegg, new int[0], new int[0], false, info);
}
private static CheckMoveResult[] parseMovesRelearn(PKM pkm, int[] Moves, LegalInfo info)
{

7
PKHeX.Core/Legality/Encounters/VerifyEvolution.cs
View File

@@ -1,5 +1,6 @@
using static PKHeX.Core.LegalityCheckStrings;
using System.Linq;
using System.Linq;
using static PKHeX.Core.LegalityCheckStrings;
namespace PKHeX.Core
{
public static class VerifyEvolution
@@ -18,7 +19,7 @@ private static bool isValidEvolution(PKM pkm, LegalInfo info)
return true;
if (info.EncounterMatch.EggEncounter && species == 350)
return true;
if(!Legal.getEvolutionValid(pkm, info.EncounterMatch.Species))
if (!Legal.getEvolutionValid(pkm, info.EncounterMatch.Species))
return false;
// If current species evolved with a move evolution and encounter species is not current species check if the evolution by move is valid
// Only the evolution by move is checked, if there is another evolution before the evolution by move is covered in getEvolutionValid