Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-08-24 18:04:16 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual

Browse Source
This commit is contained in:
Kurt
2025-05-03 23:54:11 -05:00
parent ed67be3498
commit ae3bb75fe6
11 changed files with 21 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PKHeX.Core/PKM/HOME/GameDataCore.cs
View File

@@ -303,15 +303,13 @@ public string OriginalTrainerName
public MarkingColor GetMarking(int index)
{
if ((uint)index >= MarkingCount)
throw new ArgumentOutOfRangeException(nameof(index));
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount);
return (MarkingColor)((MarkingValue >> (index * 2)) & 3);
}
public void SetMarking(int index, MarkingColor value)
{
if ((uint)index >= MarkingCount)
throw new ArgumentOutOfRangeException(nameof(index));
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount);
var shift = index * 2;
MarkingValue = (ushort)((MarkingValue & ~(0b11 << shift)) | (((byte)value & 3) << shift));
}

6
PKHeX.Core/PKM/PA8.cs
View File

@@ -546,15 +546,13 @@ public static int GetStat(int baseStat, int level, Nature nature, int statIndex)
public MarkingColor GetMarking(int index)
{
if ((uint)index >= MarkingCount)
throw new ArgumentOutOfRangeException(nameof(index));
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount);
return (MarkingColor)((MarkingValue >> (index * 2)) & 3);
}
public void SetMarking(int index, MarkingColor value)
{
if ((uint)index >= MarkingCount)
throw new ArgumentOutOfRangeException(nameof(index));
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount);
var shift = index * 2;
MarkingValue = (ushort)((MarkingValue & ~(0b11 << shift)) | (((byte)value & 3) << shift));
}

6
PKHeX.Core/PKM/PB7.cs
View File

@@ -443,15 +443,13 @@ public override string OriginalTrainerName
public MarkingColor GetMarking(int index)
{
if ((uint)index >= MarkingCount)
throw new ArgumentOutOfRangeException(nameof(index));
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount);
return (MarkingColor)((MarkingValue >> (index * 2)) & 3);
}
public void SetMarking(int index, MarkingColor value)
{
if ((uint)index >= MarkingCount)
throw new ArgumentOutOfRangeException(nameof(index));
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount);
var shift = index * 2;
MarkingValue = (ushort)((MarkingValue & ~(0b11 << shift)) | (((byte)value & 3) << shift));
}

6
PKHeX.Core/PKM/PK5.cs
View File

@@ -343,15 +343,13 @@ public void UpdateHandler(ITrainerInfo tr)
public bool GetMarking(int index)
{
if ((uint)index >= MarkingCount)
throw new ArgumentOutOfRangeException(nameof(index));
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount);
return ((MarkingValue >> index) & 1) != 0;
}
public void SetMarking(int index, bool value)
{
if ((uint)index >= MarkingCount)
throw new ArgumentOutOfRangeException(nameof(index));
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount);
MarkingValue = (byte)((MarkingValue & ~(1 << index)) | ((value ? 1 : 0) << index));
}

6
PKHeX.Core/PKM/PK6.cs
View File

@@ -460,15 +460,13 @@ protected override void TradeHT(ITrainerInfo tr)
public bool GetMarking(int index)
{
if ((uint)index >= MarkingCount)
throw new ArgumentOutOfRangeException(nameof(index));
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount);
return ((MarkingValue >> index) & 1) != 0;
}
public void SetMarking(int index, bool value)
{
if ((uint)index >= MarkingCount)
throw new ArgumentOutOfRangeException(nameof(index));
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount);
MarkingValue = (byte)((MarkingValue & ~(1 << index)) | ((value ? 1 : 0) << index));
}

6
PKHeX.Core/PKM/PK7.cs
View File

@@ -427,15 +427,13 @@ public override string OriginalTrainerName
public MarkingColor GetMarking(int index)
{
if ((uint)index >= MarkingCount)
throw new ArgumentOutOfRangeException(nameof(index));
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount);
return (MarkingColor)((MarkingValue >> (index * 2)) & 3);
}
public void SetMarking(int index, MarkingColor value)
{
if ((uint)index >= MarkingCount)
throw new ArgumentOutOfRangeException(nameof(index));
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount);
var shift = index * 2;
MarkingValue = (ushort)((MarkingValue & ~(0b11 << shift)) | (((byte)value & 3) << shift));
}

6
PKHeX.Core/PKM/PK9.cs
View File

@@ -511,15 +511,13 @@ public void ClearMoveRecordFlags()
public MarkingColor GetMarking(int index)
{
if ((uint)index >= MarkingCount)
throw new ArgumentOutOfRangeException(nameof(index));
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount);
return (MarkingColor)((MarkingValue >> (index * 2)) & 3);
}
public void SetMarking(int index, MarkingColor value)
{
if ((uint)index >= MarkingCount)
throw new ArgumentOutOfRangeException(nameof(index));
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount);
var shift = index * 2;
MarkingValue = (ushort)((MarkingValue & ~(0b11 << shift)) | (((byte)value & 3) << shift));
}

6
PKHeX.Core/PKM/Shared/G3PKM.cs
View File

@@ -44,15 +44,13 @@ public abstract class G3PKM : PKM, IRibbonSetEvent3, IRibbonSetCommon3, IRibbonS
public bool GetMarking(int index)
{
if ((uint)index >= MarkingCount)
throw new ArgumentOutOfRangeException(nameof(index));
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount);
return ((MarkingValue >> index) & 1) != 0;
}
public void SetMarking(int index, bool value)
{
if ((uint)index >= MarkingCount)
throw new ArgumentOutOfRangeException(nameof(index));
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount);
MarkingValue = (byte)((MarkingValue & ~(1 << index)) | ((value ? 1 : 0) << index));
}

6
PKHeX.Core/PKM/Shared/G4PKM.cs
View File

@@ -172,15 +172,13 @@ public abstract class G4PKM : PKM, IHandlerUpdate,
public bool GetMarking(int index)
{
if ((uint)index >= MarkingCount)
throw new ArgumentOutOfRangeException(nameof(index));
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount);
return ((MarkingValue >> index) & 1) != 0;
}
public void SetMarking(int index, bool value)
{
if ((uint)index >= MarkingCount)
throw new ArgumentOutOfRangeException(nameof(index));
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount);
MarkingValue = (byte)((MarkingValue & ~(1 << index)) | ((value ? 1 : 0) << index));
}

6
PKHeX.Core/PKM/Shared/G8PKM.cs
View File

@@ -460,15 +460,13 @@ public ulong Tracker
public MarkingColor GetMarking(int index)
{
if ((uint)index >= MarkingCount)
throw new ArgumentOutOfRangeException(nameof(index));
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount);
return (MarkingColor)((MarkingValue >> (index * 2)) & 3);
}
public void SetMarking(int index, MarkingColor value)
{
if ((uint)index >= MarkingCount)
throw new ArgumentOutOfRangeException(nameof(index));
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount);
var shift = index * 2;
MarkingValue = (ushort)((MarkingValue & ~(0b11 << shift)) | (((byte)value & 3) << shift));
}

3
PKHeX.Core/PersonalInfo/Info/PersonalInfo4.cs
View File

@@ -111,8 +111,7 @@ public bool GetIsLearnTutorType(int index)
public void SetIsLearnTutorType(int index, bool value)
{
if ((uint)index >= CountTutor)
throw new ArgumentOutOfRangeException(nameof(index), index, null);
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)CountTutor);
TypeTutors[index] = value;
}