Merge pull request #53 from kwsch/master

Merge with Upstream 12 commits

Author: Xieon

PKHeX.Core/Editing/Bulk/BatchEditing.cs

@@ -432,7 +432,7 @@ private static ModifyResult SetPKMProperty(StringInstruction cmd, BatchInfo info
     private static bool IsFilterMatch(StringInstruction cmd, BatchInfo info, Dictionary<string, PropertyInfo>.AlternateLookup<ReadOnlySpan<char>> props)
     {
         var match = BatchFilters.FilterMods.Find(z => z.IsMatch(cmd.PropertyName));
-        if (match != null)
+        if (match is not null)
             return match.IsFiltered(info, cmd);
         return IsPropertyFiltered(cmd, info.Entity, props);
     }
@@ -447,7 +447,7 @@ private static bool IsFilterMatch(StringInstruction cmd, BatchInfo info, Diction
     private static bool IsFilterMatch(StringInstruction cmd, PKM pk, Dictionary<string, PropertyInfo>.AlternateLookup<ReadOnlySpan<char>> props)
     {
         var match = BatchFilters.FilterMods.Find(z => z.IsMatch(cmd.PropertyName));
-        if (match != null)
+        if (match is not null)
             return match.IsFiltered(pk, cmd);
         return IsPropertyFiltered(cmd, pk, props);
     }

PKHeX.Core/Editing/Bulk/BatchMods.cs

@@ -81,7 +81,7 @@ public static class BatchMods
     ];
 
     private static char GetOptionSuffix(ReadOnlySpan<char> str, ReadOnlySpan<char> prefix)
-        => str.Length == prefix.Length ? default : str[^1];
+        => str.Length == prefix.Length ? CommonEdits.OptionNone : str[^1];
 
     private static void SetRandomTeraType(PKM pk)
     {

PKHeX.Core/Editing/Bulk/IPropertyProvider.cs

@@ -20,7 +20,7 @@ public bool TryGetProperty(PKM pk, string prop, [NotNullWhen(true)] out string?
         {
             var value = pi.GetValue(pk);
             result = value?.ToString();
-            return result != null;
+            return result is not null;
         }
         catch
         {

PKHeX.Core/Editing/Bulk/Suggestion/BatchModifications.cs

@@ -89,7 +89,7 @@ public static ModifyResult SetSuggestedMetData(BatchInfo info)
     {
         var pk = info.Entity;
         var encounter = EncounterSuggestion.GetSuggestedMetInfo(pk);
-        if (encounter == null)
+        if (encounter is null)
             return ModifyResult.Error;
 
         var location = encounter.Location;

PKHeX.Core/Editing/CommonEdits.cs

@@ -444,18 +444,20 @@ public static string GetLocationString(this PKM pk, bool eggmet)
         return GameInfo.GetLocationName(eggmet, location, pk.Format, pk.Generation, pk.Version);
     }
 
+    public const char OptionNone = '\0';
+
     /// <summary>
     /// Gets a <see cref="PKM.EncryptionConstant"/> to match the requested option.
     /// </summary>
-    public static uint GetComplicatedEC(ISpeciesForm pk, char option = default)
+    public static uint GetComplicatedEC(ISpeciesForm pk, char option = OptionNone)
     {
         var species = pk.Species;
         var form = pk.Form;
         return GetComplicatedEC(species, form, option);
     }
 
     /// <inheritdoc cref="GetComplicatedEC(ISpeciesForm,char)"/>
-    public static uint GetComplicatedEC(ushort species, byte form, char option = default)
+    public static uint GetComplicatedEC(ushort species, byte form, char option = OptionNone)
     {
         var rng = Util.Rand;
         uint rand = rng.Rand32();

PKHeX.Core/Editing/Database/TrainerDatabase.cs

@@ -46,7 +46,7 @@ public sealed class TrainerDatabase
         if (possible.Count == 0)
             return null;
 
-        if (lang != null)
+        if (lang is not null)
         {
             possible = possible.Select(z =>
             {
@@ -70,7 +70,7 @@ public sealed class TrainerDatabase
         if (possible.Count == 0)
             return null;
 
-        if (lang != null)
+        if (lang is not null)
         {
             possible = possible.Select(z =>
             {

PKHeX.Core/Editing/PKM/QR/QRMessageUtil.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Buffers;
+using System.Diagnostics;
 
 namespace PKHeX.Core;
 
@@ -23,7 +24,7 @@ public static class QRMessageUtil
     public static PKM? GetPKM(ReadOnlySpan<char> message, EntityContext context)
     {
         var data = DecodeMessagePKM(message);
-        if (data == null)
+        if (data is null)
             return null;
         return EntityFormat.GetFromBytes(data, context);
     }
@@ -93,7 +94,7 @@ public static string GetMessageBase64(ReadOnlySpan<byte> data, string server)
         if (message.StartsWith("http", StringComparison.Ordinal)) // inject url
             return DecodeMessageDataBase64(message);
 
-        const int g7size = 0xE8;
+        const int g7size = PokeCrypto.SIZE_6STORED; // 0xE8;
         const int g7intro = 0x30;
         if (message.StartsWith("POKE", StringComparison.Ordinal) && message.Length > g7intro + g7size) // G7 data
             return GetBytesFromMessage(message[g7intro..], g7size);
@@ -118,9 +119,15 @@ public static string GetMessageBase64(ReadOnlySpan<byte> data, string server)
 
     private static byte[] GetBytesFromMessage(ReadOnlySpan<char> input, int count)
     {
-        byte[] data = new byte[count];
-        for (int i = data.Length - 1; i >= 0; i--)
-            data[i] = (byte)input[i];
-        return data;
+        byte[] result = new byte[count];
+        GetBytesFromMessage(input, result);
+        return result;
+    }
+
+    private static void GetBytesFromMessage(ReadOnlySpan<char> input, Span<byte> output)
+    {
+        Debug.Assert(input.Length >= output.Length);
+        for (int i = 0; i < output.Length; i++)
+            output[i] = (byte)input[i];
     }
 }

PKHeX.Core/Editing/Saves/Editors/EventWork/Diff/EventWorkDiff.cs

@@ -30,7 +30,7 @@ public EventBlockDiff(string f1, string f2)
             return;
         var s1 = SaveUtil.GetVariantSAV(f1);
         var s2 = SaveUtil.GetVariantSAV(f2);
-        if (s1 == null || s2 == null || s1.GetType() != s2.GetType() || GetBlock(s1) is not { } t1 || GetBlock(s2) is not { } t2)
+        if (s1 is null || s2 is null || s1.GetType() != s2.GetType() || GetBlock(s1) is not { } t1 || GetBlock(s2) is not { } t2)
         {
             Message = DifferentGameGroup;
             return;

PKHeX.Core/Editing/Saves/Editors/EventWork/Diff/EventWorkDiff7b.cs

@@ -51,7 +51,7 @@ private void Diff(SAV7b s1, SAV7b s2)
 
     public IReadOnlyList<string> Summarize()
     {
-        if (S1 == null)
+        if (S1 is null)
             return [];
         var ew = S1.Blocks.EventWork;
 

PKHeX.Core/Editing/Saves/Editors/EventWork/Diff/EventWorkDiff8b.cs

@@ -53,7 +53,7 @@ private void Diff(SAV8BS s1, SAV8BS s2)
 
     public IReadOnlyList<string> Summarize()
     {
-        if (S1 == null)
+        if (S1 is null)
             return [];
 
         var fOn = SetFlags.Select(z => new FlagSummary(z).ToString());