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

Misc tweaks

Browse source 
Fix g12 str set (jp/en was swapped, oops)
add more xmldoc
minor readability/short circuiting
This commit is contained in:
Kurt 2023-10-27 21:01:11 -07:00
parent 7fd1c9da1e
commit 5c7ce2c0a6
6 changed files with 40 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
PKHeX.Core/Legality/LearnSource/MoveResult.cs
View file

@ -69,6 +69,9 @@ public readonly record struct MoveResult(MoveLearnInfo Info, byte EvoStage = 0,
public static MoveResult Unobtainable(ushort expect) => new(LearnMethod.UnobtainableExpect) { Expect = expect };
public static MoveResult Unobtainable() => new(LearnMethod.Unobtainable);
/// <summary>
/// Checks if all <see cref="MoveResult"/>s in the span are <see cref="Valid"/>.
/// </summary>
public static bool AllValid(ReadOnlySpan<MoveResult> span)
{
foreach (var result in span)
@ -79,6 +82,9 @@ public readonly record struct MoveResult(MoveLearnInfo Info, byte EvoStage = 0,
return true;
}
/// <summary>
/// Checks if all <see cref="MoveResult"/>s in the span are <see cref="IsParsed"/>.
/// </summary>
public static bool AllParsed(ReadOnlySpan<MoveResult> span)
{
foreach (var result in span)

11
PKHeX.Core/Legality/RNG/CXD/LockFinder.cs
View file

@ -52,10 +52,13 @@ public static class LockFinder
/// <returns>True if the starter ID correlation is correct</returns>
public static bool IsXDStarterValid(uint seed, uint TID16, uint SID16)
{
// pidiv reversed 2x yields SID16, 3x yields TID16. shift by 7 if another PKM is generated prior
var SIDf = XDRNG.Prev2(seed);
var TIDf = XDRNG.Prev(SIDf);
return SIDf >> 16 == SID16 && TIDf >> 16 == TID16;
// pidiv is right before the IV calls; need to unroll 2x for fake calls, then unroll for the TID/SID.
// reversed 2x yields SID16, 3x yields TID16.
var TIDf = XDRNG.Prev3(seed);
if (TIDf >> 16 != TID16)
return false;
var SIDf = XDRNG.Next(TIDf);
return SIDf >> 16 == SID16;
}
/// <summary>

10
PKHeX.Core/PKM/Strings/StringConverter12.cs
View file

@ -101,6 +101,8 @@ public static class StringConverter12
/// <returns>Character count loaded.</returns>
public static int LoadString(ReadOnlySpan<byte> data, Span<char> result, bool jp)
{
if (data.Length == 0)
return 0;
if (data[0] == G1TradeOTCode) // In-game Trade
{
result[0] = G1TradeOT;
@ -139,7 +141,9 @@ public static class StringConverter12
else if (option is StringConverterOption.Clear7F)
destBuffer.Fill(G1SpaceCode);
if (value.Length != 0 && value[0] == G1TradeOT) // Handle "[TRAINER]"
if (value.Length == 0)
return 0;
if (value[0] == G1TradeOT) // Handle "[TRAINER]"
{
destBuffer[0] = G1TradeOTCode;
destBuffer[1] = G1TerminatorCode;
@ -149,7 +153,7 @@ public static class StringConverter12
if (value.Length > maxLength)
value = value[..maxLength]; // Hard cap
var dict = jp ? TableEN : TableJP;
var dict = jp ? TableJP : TableEN;
int i = 0;
for (; i < value.Length; i++)
{
@ -213,7 +217,7 @@ public static class StringConverter12
'チ', 'ツ', 'テ', 'ト', 'ナ', 'ニ', 'ヌ', 'ネ', 'ノ', 'ハ', 'ヒ', 'フ', 'ホ', 'マ', 'ミ', 'ム', // 90-9F
'メ', 'モ', 'ヤ', 'ユ', 'ヨ', 'ラ', 'ル', 'レ', 'ロ', 'ワ', 'ヲ', 'ン', 'ッ', 'ャ', 'ュ', 'ョ', // A0-AF
'ィ', 'あ', 'い', 'う', 'え', 'お', 'か', 'き', 'く', 'け', 'こ', 'さ', 'し', 'す', 'せ', 'そ', // B0-BF
'た', 'ち', 'つ', 'て', 'と', 'な', 'に', 'ぬ', 'ね', 'の', 'は', 'ひ', 'ふ', 'ヘ', 'ほ', 'ま', // C0-CF
'た', 'ち', 'つ', 'て', 'と', 'な', 'に', 'ぬ', 'ね', 'の', 'は', 'ひ', 'ふ', 'へ', 'ほ', 'ま', // C0-CF
'み', 'む', 'め', 'も', 'や', 'ゆ', 'よ', 'ら', 'リ', 'る', 'れ', 'ろ', 'わ', 'を', 'ん', 'っ', // D0-DF
'ゃ', 'ゅ', 'ょ', 'ー', 'ﾟ', 'ﾞ', '？', '！', '。', 'ァ', 'ゥ', 'ェ', NUL, NUL, NUL, '♂', // E0-EF
MNY, NUL, '．', '／', 'ォ', '♀', '０', '１', '２', '３', '４', '５', '６', '７', '８', '９', // F0-FF

7
PKHeX.Core/PKM/Strings/StringConverter2KOR.cs
View file

@ -40,6 +40,8 @@ public static class StringConverter2KOR
/// <returns>Character count loaded.</returns>
public static int LoadString(ReadOnlySpan<byte> data, Span<char> result)
{
if (data.Length == 0)
return 0;
if (data[0] == G1TradeOTCode) // In-game Trade
{
result[0] = G1TradeOT;
@ -91,7 +93,10 @@ public static class StringConverter2KOR
else if (option is StringConverterOption.Clear50)
destBuffer.Fill(G1TerminatorCode);
if (value.Length != 0 && value[0] == G1TradeOT) // Handle "[TRAINER]"
if (value.Length == 0)
return 0;
// Can't get Gen1 In-Game trades with this char, but handle it anyways since the game can handle it.
if (value[0] == G1TradeOT) // Handle "[TRAINER]"
{
destBuffer[0] = G1TradeOTCode;
destBuffer[1] = G1TerminatorCode;

24
PKHeX.Core/Saves/Substructures/Gen6/ItemInfo6.cs
View file

@ -10,16 +10,16 @@ public sealed class ItemInfo6 : SaveBlock<SAV6>
private const int BoundItemCount = 4;
private const int RecentItemCount = 12;
public int[] SelectItems
public ushort[] SelectItems
{
// UP,RIGHT,DOWN,LEFT
get
{
var span = Data.AsSpan(Offset + 10);
int[] list = new int[BoundItemCount];
for (int i = 0; i < list.Length; i++)
list[i] = ReadUInt16LittleEndian(span[(2 * i)..]);
return list;
var result = new ushort[BoundItemCount];
for (int i = 0; i < result.Length; i++)
result[i] = ReadUInt16LittleEndian(span[(2 * i)..]);
return result;
}
set
{
@ -27,20 +27,20 @@ public sealed class ItemInfo6 : SaveBlock<SAV6>
throw new ArgumentException(nameof(value));
var span = Data.AsSpan(Offset + 10);
for (int i = 0; i < value.Length; i++)
WriteUInt16LittleEndian(span[(2 * i)..], (ushort)value[i]);
WriteUInt16LittleEndian(span[(2 * i)..], value[i]);
}
}
public int[] RecentItems
public ushort[] RecentItems
{
// Items recently interacted with (Give, Use)
get
{
var span = Data.AsSpan(Offset + 20);
int[] list = new int[RecentItemCount];
for (int i = 0; i < list.Length; i++)
list[i] = ReadUInt16LittleEndian(span[(2 * i)..]);
return list;
var result = new ushort[RecentItemCount];
for (int i = 0; i < result.Length; i++)
result[i] = ReadUInt16LittleEndian(span[(2 * i)..]);
return result;
}
set
{
@ -48,7 +48,7 @@ public sealed class ItemInfo6 : SaveBlock<SAV6>
throw new ArgumentException(nameof(value));
var span = Data.AsSpan(Offset + 20);
for (int i = 0; i < value.Length; i++)
WriteUInt16LittleEndian(span[(2 * i)..], (ushort)value[i]);
WriteUInt16LittleEndian(span[(2 * i)..], value[i]);
}
}
}

4
Tests/PKHeX.Core.Tests/Legality/LegalityTests.cs
View file

@ -99,8 +99,8 @@ public class LegalityTest
var info = legality.Info;
foreach (var m in info.Moves.Where(z => !z.Valid))
yield return m.Summary(legality.Info.Entity, legality.Info.EvoChainsAllGens);
yield return m.Summary(info.Entity, info.EvoChainsAllGens);
foreach (var r in info.Relearn.Where(z => !z.Valid))
yield return r.Summary(legality.Info.Entity, legality.Info.EvoChainsAllGens);
yield return r.Summary(info.Entity, info.EvoChainsAllGens);
}
}