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

Misc updates

Browse source 
Add safari min flawless IVs to reroll (can expand if #2025 is required
for egg group15)
Use EV/IVTotal (faster, not linq array based)
Fix missing pumpkaboo form regression, Closes #2026
Relocate swapbits to appropriate class, unneeded in PKM.cs
This commit is contained in:
Kurt 2018-06-22 06:24:33 -07:00
parent 15593a2179
commit 7591f54de3
3 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
PKHeX.Core/Legality/Checks.cs
View file

@ -551,7 +551,7 @@ namespace PKHeX.Core
private void VerifyEVs()
{
var evs = pkm.EVs;
int sum = evs.Sum();
int sum = pkm.EVTotal;
if (sum > 0 && pkm.IsEgg)
AddLine(Severity.Invalid, V22, CheckIdentifier.EVs);
if (pkm.Format >= 3 && sum > 510)
@ -634,7 +634,7 @@ namespace PKHeX.Core
}
}
}
if (pkm.IVs.Sum() == 0)
if (pkm.IVTotal == 0)
AddLine(Severity.Fishy, V31, CheckIdentifier.IVs);
else if (pkm.IVs[0] < 30 && pkm.IVs.All(iv => pkm.IVs[0] == iv))
AddLine(Severity.Fishy, V32, CheckIdentifier.IVs);
@ -802,7 +802,7 @@ namespace PKHeX.Core
if (!new[] { 0, 1, 3 }.Contains(pkm.AltForm)) // 0/1/3 - RBY
AddLine(Severity.Invalid, V64, CheckIdentifier.Form);
break;
case 710: // Pumpkaboo
case 710 when pkm.AltForm != 0: // Pumpkaboo
case 711 when pkm.AltForm != 0: // Goregeist Average
AddLine(Severity.Invalid, V6, CheckIdentifier.Form);
break;

25
PKHeX.Core/PKM/PKM.cs
View file

@ -331,22 +331,6 @@ namespace PKHeX.Core
public int MarkDiamond { get => Markings[5]; set { var marks = Markings; marks[5] = value; Markings = marks; } }
public int IVTotal => IV_HP + IV_ATK + IV_DEF + IV_SPA + IV_SPD + IV_SPE;
public int EVTotal => EV_HP + EV_ATK + EV_DEF + EV_SPA + EV_SPD + EV_SPE;
/// <summary>
/// Swaps bits at a given position
/// </summary>
/// <param name="value">Value to swap bits for</param>
/// <param name="p1">Position of first bit to be swapped</param>
/// <param name="p2">Position of second bit to be swapped</param>
/// <remarks>Generation 3 marking values are swapped (Square-Triangle, instead of Triangle-Square).</remarks>
/// <returns>Swapped bits value</returns>
protected static int SwapBits(int value, int p1, int p2)
{
int bit1 = (value >> p1) & 1;
int bit2 = (value >> p2) & 1;
int x = bit1 ^ bit2;
x = (x << p1) | (x << p2);
return value ^ x;
}
public string[] QRText => this.GetQRLines();
public virtual string FileName
@ -684,7 +668,7 @@ namespace PKHeX.Core
{
get
{
int ivTotal = IVs.Sum();
int ivTotal = IVTotal;
if (ivTotal <= 90)
return 0;
if (ivTotal <= 120)
@ -749,10 +733,7 @@ namespace PKHeX.Core
/// </summary>
/// <param name="ValidArray">Items that the <see cref="PKM"/> can hold.</param>
/// <returns>True/False if the <see cref="PKM"/> can hold its <see cref="HeldItem"/>.</returns>
public virtual bool CanHoldItem(ushort[] ValidArray)
{
return ValidArray.Contains((ushort)HeldItem);
}
public virtual bool CanHoldItem(ushort[] ValidArray) => ValidArray.Contains((ushort)HeldItem);
/// <summary>
/// Deep clones the <see cref="PKM"/> object. The clone will not have any shared resources with the source.
@ -944,6 +925,8 @@ namespace PKHeX.Core
{
if (GenNumber >= 6 && (Legal.Legends.Contains(Species) || Legal.SubLegends.Contains(Species)))
return 3;
if (XY && Met_Location == 148 && Met_Level == 30)
return 2;
if (VC)
return Species == 151 || Species == 251 ? 5 : 3;
return 0;

17
PKHeX.Core/PKM/Shared/_K3.cs
View file

@ -66,6 +66,23 @@
public abstract int CNT_Tough { get; set; }
public abstract int CNT_Sheen { get; set; }
/// <summary>
/// Swaps bits at a given position
/// </summary>
/// <param name="value">Value to swap bits for</param>
/// <param name="p1">Position of first bit to be swapped</param>
/// <param name="p2">Position of second bit to be swapped</param>
/// <remarks>Generation 3 marking values are swapped (Square-Triangle, instead of Triangle-Square).</remarks>
/// <returns>Swapped bits value</returns>
protected static int SwapBits(int value, int p1, int p2)
{
int bit1 = (value >> p1) & 1;
int bit2 = (value >> p2) & 1;
int x = bit1 ^ bit2;
x = (x << p1) | (x << p2);
return value ^ x;
}
/// <summary>
/// Interconversion for Generation 3 <see cref="PKM"/> formats.
/// </summary>