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

Replace more linq usage

Browse source
This commit is contained in:
Kurt 2021-08-05 22:39:38 -07:00
parent e18c2d8fa4
commit 0f3e5095c5
16 changed files with 77 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
PKHeX.Core/Editing/Applicators/MoveApplicator.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace PKHeX.Core
{
@ -39,8 +38,8 @@ namespace PKHeX.Core
/// <param name="maxPP">Option to maximize PP Ups</param>
public static void SetMoves(this PKM pk, int[] moves, bool maxPP = false)
{
if (moves.Any(z => z > pk.MaxMoveID))
moves = moves.Where(z => z <= pk.MaxMoveID).ToArray();
if (Array.FindIndex(moves, z => z > pk.MaxMoveID) != -1)
moves = Array.FindAll(moves, z => z <= pk.MaxMoveID);
if (moves.Length != 4)
Array.Resize(ref moves, 4);

14
PKHeX.Core/Game/GameUtil.cs
View file

@ -11,10 +11,18 @@ namespace PKHeX.Core
public static class GameUtil
{
/// <summary>
/// List of possible <see cref="GameVersion"/> values a <see cref="PKM.Version"/> can have.
/// All possible <see cref="GameVersion"/> values a <see cref="PKM.Version"/> can have.
/// </summary>
/// <remarks>Ordered roughly by most recent games first.</remarks>
public static readonly IReadOnlyList<GameVersion> GameVersions = ((GameVersion[])Enum.GetValues(typeof(GameVersion))).Where(IsValidSavedVersion).Reverse().ToArray();
public static readonly GameVersion[] GameVersions = GetValidGameVersions();
private static GameVersion[] GetValidGameVersions()
{
var all = (GameVersion[])Enum.GetValues(typeof(GameVersion));
var valid = Array.FindAll(all, IsValidSavedVersion);
Array.Reverse(valid);
return valid;
}
/// <summary>
/// Indicates if the <see cref="GameVersion"/> value is a value used by the games or is an aggregate indicator.
@ -203,7 +211,7 @@ namespace PKHeX.Core
{
if (Gen7b.Contains(pkVersion))
return new[] {GO, GP, GE};
return GameVersions.Where(z => z.GetGeneration() == generation).ToArray();
return Array.FindAll(GameVersions, z => z.GetGeneration() == generation);
}
/// <summary>

33
PKHeX.Core/Legality/Encounters/Verifiers/VerifyCurrentMoves.cs
View file

@ -85,7 +85,7 @@ namespace PKHeX.Core
var Egg = MoveEgg.GetEggMoves(pkm.PersonalInfo, e.Species, e.Form, e.Version, e.Generation);
if (info.Generation < 3 && pkm.Format >= 7 && pkm.VC1)
Egg = Egg.Where(m => m <= Legal.MaxMoveID_1).ToArray();
Egg = Array.FindAll(Egg, m => m <= Legal.MaxMoveID_1);
bool volt = (info.Generation > 3 || e.Version == GameVersion.E) && Legal.LightBall.Contains(pkm.Species);
var specialMoves = volt && notEvent ? new[] { (int)Move.VoltTackle } : Array.Empty<int>(); // Volt Tackle for bred Pichu line
@ -216,19 +216,21 @@ namespace PKHeX.Core
var required = pkm is not PK1 pk1 ? 1 : GBRestrictions.GetRequiredMoveCount(pk1, source.CurrentMoves, info, source.Base);
// Special considerations!
int reset = 0;
const int NoMinGeneration = 0;
int minGeneration = NoMinGeneration;
if (pkm is IBattleVersion {BattleVersion: not 0} v)
{
reset = ((GameVersion) v.BattleVersion).GetGeneration();
minGeneration = ((GameVersion) v.BattleVersion).GetGeneration();
source.ResetSources();
}
// Check empty moves and relearn moves before generation specific moves
for (int m = 0; m < 4; m++)
{
if (source.CurrentMoves[m] == 0)
var move = source.CurrentMoves[m];
if (move == 0)
res[m] = new CheckMoveResult(None, pkm.Format, m < required ? Fishy : Valid, LMoveSourceEmpty, CurrentMove);
else if (reset == 0 && info.EncounterMoves.Relearn.Contains(source.CurrentMoves[m]))
else if (minGeneration == NoMinGeneration && info.EncounterMoves.Relearn.Contains(move))
res[m] = new CheckMoveResult(Relearn, info.Generation, Valid, LMoveSourceRelearn, CurrentMove);
}
@ -240,16 +242,19 @@ namespace PKHeX.Core
// Check moves going backwards, marking the move valid in the most current generation when it can be learned
int[] generations = GenerationTraversal.GetVisitedGenerationOrder(pkm, info.EncounterOriginal.Generation);
if (pkm.Format <= 2)
generations = generations.Where(z => z < info.EncounterMoves.LevelUpMoves.Length).ToArray();
if (reset != 0)
generations = generations.Where(z => z >= reset).ToArray();
generations = Array.FindAll(generations, z => z < info.EncounterMoves.LevelUpMoves.Length);
if (minGeneration != NoMinGeneration)
generations = Array.FindAll(generations, z => z >= minGeneration);
int lastgen = generations.Length == 0 ? 0 : generations[^1];
foreach (var gen in generations)
if (generations.Length != 0)
{
ParseMovesByGeneration(pkm, res, gen, info, moveInfo, lastgen);
if (AllParsed())
return res;
int lastgen = generations[^1];
foreach (var gen in generations)
{
ParseMovesByGeneration(pkm, res, gen, info, moveInfo, lastgen);
if (AllParsed())
return res;
}
}
if (pkm.Species == (int)Species.Shedinja && info.Generation <= 4)
@ -459,7 +464,7 @@ namespace PKHeX.Core
{
// A pokemon could have normal egg moves and regular egg moves
// Only if all regular egg moves are event egg moves or all event egg moves are regular egg moves
var RegularEggMovesLearned = learnInfo.EggMovesLearned.Union(learnInfo.LevelUpEggMoves).ToList();
var RegularEggMovesLearned = learnInfo.EggMovesLearned.FindAll(learnInfo.LevelUpEggMoves.Contains);
if (RegularEggMovesLearned.Count != 0 && learnInfo.EventEggMoves.Count != 0)
{
// Moves that are egg moves or event egg moves but not both

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

@ -60,7 +60,7 @@ namespace PKHeX.Core
{
case GSC or GS:
// If checking back-transfer specimen (GSC->RBY), remove moves that must be deleted prior to transfer
static int[] getRBYCompatibleMoves(int format, int[] moves) => format == 1 ? moves.Where(m => m <= MaxMoveID_1).ToArray() : moves;
static int[] getRBYCompatibleMoves(int format, int[] moves) => format == 1 ? Array.FindAll(moves, m => m <= MaxMoveID_1) : moves;
if (pkm.InhabitedGeneration(2))
return getRBYCompatibleMoves(pkm.Format, LevelUpGS[species].GetMoves(lvl));
break;

11
PKHeX.Core/PKM/PK4.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace PKHeX.Core
{
@ -384,7 +383,7 @@ namespace PKHeX.Core
pk5.Form = 0;
pk5.HeldItem = 0;
}
else if(!Legal.HeldItems_BW.Contains((ushort)HeldItem))
else if (Array.IndexOf(Legal.HeldItems_BW, (ushort)HeldItem) == -1)
{
pk5.HeldItem = 0; // if valid, it's already copied
}
@ -419,10 +418,10 @@ namespace PKHeX.Core
// if has defog, remove whirlpool.
bool hasDefog = HasMove((int) Move.Defog);
var banned = hasDefog ? Legal.HM_HGSS : Legal.HM_DPPt;
if (banned.Contains(Move1)) Move1 = 0;
if (banned.Contains(Move2)) Move2 = 0;
if (banned.Contains(Move3)) Move3 = 0;
if (banned.Contains(Move4)) Move4 = 0;
if (Array.IndexOf(banned, Move1) != -1) Move1 = 0;
if (Array.IndexOf(banned, Move2) != -1) Move2 = 0;
if (Array.IndexOf(banned, Move3) != -1) Move3 = 0;
if (Array.IndexOf(banned, Move4) != -1) Move4 = 0;
pk5.FixMoves();
pk5.RefreshChecksum();

4
PKHeX.Core/PKM/Util/PKX.cs
View file

@ -198,6 +198,8 @@ namespace PKHeX.Core
_ => (pid & 0xFF) < gr ? 1 : 0
};
internal const string ExtensionPB7 = "pb7";
/// <summary>
/// Gets an array of valid <see cref="PKM"/> file extensions.
/// </summary>
@ -218,7 +220,7 @@ namespace PKHeX.Core
if (maxGeneration >= 4)
result.Add("bk4"); // battle revolution
if (maxGeneration >= 7)
result.Add("pb7"); // let's go
result.Add(ExtensionPB7); // let's go
return result.ToArray();
}

5
PKHeX.Core/Saves/SAV1.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace PKHeX.Core
{
@ -20,11 +19,11 @@ namespace PKHeX.Core
public override PersonalTable Personal { get; }
public override IReadOnlyList<ushort> HeldItems => Array.Empty<ushort>();
public override IReadOnlyList<string> PKMExtensions => PKM.Extensions.Where(f =>
public override IReadOnlyList<string> PKMExtensions => Array.FindAll(PKM.Extensions, f =>
{
int gen = f[^1] - 0x30;
return gen is 1 or 2;
}).ToArray();
});
public SAV1(GameVersion version = GameVersion.RBY, bool japanese = false) : base(SaveUtil.SIZE_G1RAW)
{

17
PKHeX.Core/Saves/SAV2.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace PKHeX.Core
{
@ -20,13 +19,13 @@ namespace PKHeX.Core
public override PersonalTable Personal { get; }
public override IReadOnlyList<ushort> HeldItems => Legal.HeldItems_GSC;
public override IReadOnlyList<string> PKMExtensions => PKM.Extensions.Where(f =>
public override IReadOnlyList<string> PKMExtensions => Array.FindAll(PKM.Extensions, f =>
{
int gen = f[^1] - 0x30;
if (Korean)
return gen == 2;
return gen is 1 or 2;
}).ToArray();
});
public SAV2(GameVersion version = GameVersion.C, LanguageID lang = LanguageID.English) : base(SaveUtil.SIZE_G2RAW_J)
{
@ -670,9 +669,15 @@ namespace PKHeX.Core
private ushort GetResetKey()
{
var val = (TID >> 8) + (TID & 0xFF) + ((Money >> 16) & 0xFF) + ((Money >> 8) & 0xFF) + (Money & 0xFF);
var ot = Data.Skip(Offsets.Trainer1 + 2).TakeWhile((z, i) => i < 5 && z != 0x50);
var tr = ot.Sum(z => z);
return (ushort)(val + tr);
var ot = Data.AsSpan(Offsets.Trainer1 + 2, 5);
var sum = 0;
foreach (var b in ot)
{
if (b == StringConverter12.G1TerminatorCode)
break;
sum += b;
}
return (ushort)(val + sum);
}
/// <summary>

3
PKHeX.Core/Saves/SAV3Colosseum.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
namespace PKHeX.Core
@ -256,7 +255,7 @@ namespace PKHeX.Core
newHC -= BigEndian.ToInt32(D, 0);
newHC -= BigEndian.ToInt32(D, 4);
byte[] chk = data.Slice(data.Length - 20, 20);
var chk = data.AsSpan(data.Length - 20, 20);
bool header = newHC == oldHC;
bool body = chk.SequenceEqual(checksum);

10
PKHeX.Core/Saves/SAV4BR.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace PKHeX.Core
{
@ -299,12 +298,19 @@ namespace PKHeX.Core
}
}
// Restore original checksums
for (int i = 0; i < storedChecksums.Length; i++)
{
BigEndian.GetBytes(storedChecksums[i]).CopyTo(input, checksum_offset + (i * 4));
}
return checksums.SequenceEqual(storedChecksums);
// Check if they match
for (int i = 0; i < storedChecksums.Length; i++)
{
if (storedChecksums[i] != checksums[i])
return false;
}
return true;
}
private static void SetChecksum(byte[] input, int offset, int len, int checksum_offset)

5
PKHeX.Core/Saves/SAV7.cs
View file

@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
namespace PKHeX.Core
{
@ -14,11 +13,11 @@ namespace PKHeX.Core
protected internal override string ShortSummary => $"{OT} ({Version}) - {Played.LastSavedTime}";
public override string Extension => string.Empty;
public override IReadOnlyList<string> PKMExtensions => PKM.Extensions.Where(f =>
public override IReadOnlyList<string> PKMExtensions => Array.FindAll(PKM.Extensions, f =>
{
int gen = f[^1] - 0x30;
return gen <= 7 && f[1] != 'b'; // ignore PB7
}).ToArray();
});
protected SAV7(byte[] data, int biOffset) : base(data, biOffset)
{

3
PKHeX.Core/Saves/SAV7b.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace PKHeX.Core
{
@ -11,7 +10,7 @@ namespace PKHeX.Core
{
protected internal override string ShortSummary => $"{OT} ({Version}) - {Blocks.Played.LastSavedTime}";
public override string Extension => ".bin";
public override IReadOnlyList<string> PKMExtensions => PKM.Extensions.Where(f => f[1] == 'b' && f[^1] == '7').ToArray();
public override IReadOnlyList<string> PKMExtensions => new[] {PKX.ExtensionPB7};
public override Type PKMType => typeof(PB7);
public override PKM BlankPKM => new PB7();

5
PKHeX.Core/Saves/SAV8.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace PKHeX.Core
{
@ -13,11 +12,11 @@ namespace PKHeX.Core
protected internal override string ShortSummary => $"{OT} ({Version}) - {Played.LastSavedTime}";
public override string Extension => string.Empty;
public override IReadOnlyList<string> PKMExtensions => PKM.Extensions.Where(f =>
public override IReadOnlyList<string> PKMExtensions => Array.FindAll(PKM.Extensions, f =>
{
int gen = f[^1] - 0x30;
return gen <= 8;
}).ToArray();
});
protected SAV8(byte[] data) : base(data) { }
protected SAV8() { }

4
PKHeX.Core/Saves/SaveFile.cs
View file

@ -48,11 +48,11 @@ namespace PKHeX.Core
public virtual string PlayTimeString => $"{PlayedHours}ː{PlayedMinutes:00}ː{PlayedSeconds:00}"; // not :
public virtual IReadOnlyList<string> PKMExtensions => PKM.Extensions.Where(f =>
public virtual IReadOnlyList<string> PKMExtensions => Array.FindAll(PKM.Extensions, f =>
{
int gen = f[^1] - 0x30;
return 3 <= gen && gen <= Generation;
}).ToArray();
});
// General SAV Properties
public byte[] Write(ExportFlags flags = ExportFlags.None)

8
PKHeX.Core/Saves/Substructures/Mail/Mail2.cs
View file

@ -1,5 +1,3 @@
using System.Linq;
namespace PKHeX.Core
{
public sealed class Mail2 : Mail
@ -22,8 +20,10 @@ namespace PKHeX.Core
{
if (US)
{
StringConverter12.SetString1(line2, 0x10, false, 0x10, 0x50).CopyTo(Data, 0x11);
StringConverter12.SetString1(line1, 0x10, false, 0x10, Data.Skip(0x11).Take(0x10).All(v => v == 0x50) ? (byte)0x50 : (byte)0x7F).CopyTo(Data, 0);
StringConverter12.SetString1(line2, 0x10, false, 0x10, StringConverter12.G1TerminatorCode).CopyTo(Data, 0x11);
bool hasLine2 = Data[0x11] != StringConverter12.G1TerminatorCode;
byte padChar = !hasLine2 ? StringConverter12.G1TerminatorCode : (byte)0x7F; // space
StringConverter12.SetString1(line1, 0x10, false, 0x10, padChar).CopyTo(Data, 0);
Data[0x10] = 0x4E;
}
}

6
PKHeX.WinForms/Subforms/Save Editors/SAV_Inventory.cs
View file

@ -177,9 +177,9 @@ namespace PKHeX.WinForms
var dgv = GetGrid(pouch.Type);
// Sanity Screen
var invalid = pouch.Items.Where(item => item.Index != 0 && !pouch.LegalItems.Contains((ushort)item.Index)).ToArray();
var outOfBounds = invalid.Where(item => item.Index >= itemlist.Length).ToArray();
var incorrectPouch = invalid.Where(item => item.Index < itemlist.Length).ToArray();
var invalid = Array.FindAll(pouch.Items, item => item.Index != 0 && !pouch.LegalItems.Contains((ushort)item.Index));
var outOfBounds = Array.FindAll(invalid, item => item.Index >= itemlist.Length);
var incorrectPouch = Array.FindAll(invalid, item => item.Index < itemlist.Length);
if (outOfBounds.Length > 0)
WinFormsUtil.Error(MsgItemPouchUnknown, $"Item ID(s): {string.Join(", ", outOfBounds.Select(item => item.Index))}");