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

Minor tweaks

Browse source 
make some enums non-int (in favor of byte etc)
return current nickname if desired
clamp nature top bound too
This commit is contained in:
Kurt 2019-05-29 22:40:07 -07:00
parent 5879cc8a18
commit a9152d36a4
6 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
PKHeX.Core/Editing/CommonEdits.cs
View file

@ -33,12 +33,14 @@ namespace PKHeX.Core
/// Clears the <see cref="PKM.Nickname"/> to the default value.
/// </summary>
/// <param name="pk"></param>
public static void ClearNickname(this PKM pk)
public static string ClearNickname(this PKM pk)
{
pk.IsNicknamed = false;
pk.Nickname = PKX.GetSpeciesNameGeneration(pk.Species, pk.Language, pk.Format);
string nick = PKX.GetSpeciesNameGeneration(pk.Species, pk.Language, pk.Format);
pk.Nickname = nick;
if (pk is _K12 pk12)
pk12.SetNotNicknamed();
return nick;
}
/// <summary>
@ -158,10 +160,11 @@ namespace PKHeX.Core
/// <param name="nature">Desired <see cref="PKM.Nature"/> value to set.</param>
public static void SetNature(this PKM pk, int nature)
{
var value = Math.Min((int)Nature.Quirky, Math.Max((int)Nature.Hardy, nature));
if (pk.Format <= 4)
pk.SetPIDNature(Math.Max(0, nature));
pk.SetPIDNature(value);
else
pk.Nature = Math.Max(0, nature);
pk.Nature = value;
}
/// <summary>

2
PKHeX.Core/Game/Ball.cs
View file

@ -3,7 +3,7 @@ namespace PKHeX.Core
/// <summary>
/// Ball IDs for the corresponding English ball name.
/// </summary>
public enum Ball
public enum Ball : byte
{
None = 0,

2
PKHeX.Core/Game/GCVersion.cs
View file

@ -3,7 +3,7 @@
/// <summary>
/// <see cref="GameVersion"/> analogues used by Colosseum/XD instead of the main-series values.
/// </summary>
public enum GCVersion
public enum GCVersion : byte
{
None = 0,
FR = 1,

2
PKHeX.Core/Game/GameStrings/MemoryArgType.cs
View file

@ -1,6 +1,6 @@
namespace PKHeX.Core
{
public enum MemoryArgType
public enum MemoryArgType : byte
{
None,
GeneralLocation,

2
PKHeX.Core/Game/MoveType.cs
View file

@ -3,7 +3,7 @@
/// <summary>
/// Elemental type a move has; additionally, types a <see cref="PKM"/> can have.
/// </summary>
public enum MoveType
public enum MoveType : sbyte
{
Any = -1,
Normal,

2
PKHeX.Core/Legality/Areas/TreeEncounterAvailable.cs
View file

@ -3,7 +3,7 @@ namespace PKHeX.Core
/// <summary>
/// Indicates the Availability of the Generation 2 Headbutt Tree
/// </summary>
public enum TreeEncounterAvailable
public enum TreeEncounterAvailable : byte
{
/// <summary>
/// Encounter is possible a reachable tree