Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-09-11 07:15:17 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactoring

Browse Source 
expose individual types, items, and abilities
This commit is contained in:
Kurt
2017-12-26 18:54:03 -08:00
parent dbe000d08e
commit 5ec99b6c1c
6 changed files with 102 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
PKHeX.Core/PersonalInfo/PersonalInfo.cs
View File

@@ -22,8 +22,10 @@ public abstract class PersonalInfo
public abstract int EV_SPE { get; set; }
public abstract int EV_SPA { get; set; }
public abstract int EV_SPD { get; set; }
public abstract int[] Types { get; set; }
public abstract int Type1 { get; set; }
public abstract int Type2 { get; set; }
public abstract int EggGroup1 { get; set; }
public abstract int EggGroup2 { get; set; }
public abstract int CatchRate { get; set; }
public virtual int EvoStage { get; set; }
public abstract int[] Items { get; set; }
@@ -31,7 +33,6 @@ public abstract class PersonalInfo
public abstract int HatchCycles { get; set; }
public abstract int BaseFriendship { get; set; }
public abstract int EXPGrowth { get; set; }
public abstract int[] EggGroups { get; set; }
public abstract int [] Abilities { get; set; }
public abstract int EscapeRate { get; set; }
public virtual int FormeCount { get; set; } = 1;
@@ -43,6 +44,27 @@ public abstract class PersonalInfo
public virtual int Height { get; set; } = 0;
public virtual int Weight { get; set; } = 0;
public int[] Types
{
get => new[] { Type1, Type2 };
set
{
if (value?.Length != 2) return;
Type1 = value[0];
Type2 = value[1];
}
}
public int[] EggGroups
{
get => new[] { EggGroup1, EggGroup2 };
set
{
if (value?.Length != 2) return;
EggGroup1 = (byte)value[0];
EggGroup2 = (byte)value[1];
}
}
/// <summary>
/// TM/HM learn compatibility flags for individual moves.
/// </summary>

75
PKHeX.Core/PersonalInfo/PersonalInfoBW.cs
View File

@@ -33,16 +33,8 @@ public override byte[] Write()
public override int SPE { get => Data[0x03]; set => Data[0x03] = (byte)value; }
public override int SPA { get => Data[0x04]; set => Data[0x04] = (byte)value; }
public override int SPD { get => Data[0x05]; set => Data[0x05] = (byte)value; }
public override int[] Types
{
get => new int[] { Data[0x06], Data[0x07] };
set
{
if (value?.Length != 2) return;
Data[0x06] = (byte)value[0];
Data[0x07] = (byte)value[1];
}
}
public override int Type1 { get => Data[0x06]; set => Data[0x06] = (byte)value; }
public override int Type2 { get => Data[0x07]; set => Data[0x07] = (byte)value; }
public override int CatchRate { get => Data[0x08]; set => Data[0x08] = (byte)value; }
public override int EvoStage { get => Data[0x09]; set => Data[0x09] = (byte)value; }
private int EVYield { get => BitConverter.ToUInt16(Data, 0x0A); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x0A); }
@@ -52,42 +44,18 @@ public override int[] Types
public override int EV_SPE { get => EVYield >> 6 & 0x3; set => EVYield = (EVYield & ~(0x3 << 6)) | (value & 0x3) << 6; }
public override int EV_SPA { get => EVYield >> 8 & 0x3; set => EVYield = (EVYield & ~(0x3 << 8)) | (value & 0x3) << 8; }
public override int EV_SPD { get => EVYield >> 10 & 0x3; set => EVYield = (EVYield & ~(0x3 << 10)) | (value & 0x3) << 10; }
public override int[] Items
{
get => new int[] { BitConverter.ToInt16(Data, 0xC), BitConverter.ToInt16(Data, 0xE), BitConverter.ToInt16(Data, 0x10) };
set
{
if (value?.Length != 3) return;
BitConverter.GetBytes((short)value[0]).CopyTo(Data, 0xC);
BitConverter.GetBytes((short)value[1]).CopyTo(Data, 0xE);
BitConverter.GetBytes((short)value[2]).CopyTo(Data, 0x10);
}
}
public int Item1 { get => BitConverter.ToInt16(Data, 0x0C); set => BitConverter.GetBytes((short)value).CopyTo(Data, 0x0C); }
public int Item2 { get => BitConverter.ToInt16(Data, 0x0E); set => BitConverter.GetBytes((short)value).CopyTo(Data, 0x0E); }
public int Item3 { get => BitConverter.ToInt16(Data, 0x10); set => BitConverter.GetBytes((short)value).CopyTo(Data, 0x10); }
public override int Gender { get => Data[0x12]; set => Data[0x12] = (byte)value; }
public override int HatchCycles { get => Data[0x13]; set => Data[0x13] = (byte)value; }
public override int BaseFriendship { get => Data[0x14]; set => Data[0x14] = (byte)value; }
public override int EXPGrowth { get => Data[0x15]; set => Data[0x15] = (byte)value; }
public override int[] EggGroups
{
get => new int[] { Data[0x16], Data[0x17] };
set
{
if (value?.Length != 2) return;
Data[0x16] = (byte)value[0];
Data[0x17] = (byte)value[1];
}
}
public override int[] Abilities
{
get => new int[] { Data[0x18], Data[0x19], Data[0x1A] };
set
{
if (value?.Length != 3) return;
Data[0x18] = (byte)value[0];
Data[0x19] = (byte)value[1];
Data[0x1A] = (byte)value[2];
}
}
public override int EggGroup1 { get => Data[0x16]; set => Data[0x16] = (byte)value; }
public override int EggGroup2 { get => Data[0x17]; set => Data[0x17] = (byte)value; }
public int Ability1 { get => Data[0x18]; set => Data[0x18] = (byte)value; }
public int Ability2 { get => Data[0x19]; set => Data[0x19] = (byte)value; }
public int AbilityH { get => Data[0x1A]; set => Data[0x1A] = (byte)value; }
public override int EscapeRate { get => Data[0x1B]; set => Data[0x1B] = (byte)value; }
protected internal override int FormStatsIndex { get => BitConverter.ToUInt16(Data, 0x1C); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x1C); }
public override int FormeSprite { get => BitConverter.ToUInt16(Data, 0x1E); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x1E); }
@@ -96,5 +64,28 @@ public override int[] Abilities
public override int BaseEXP { get => BitConverter.ToUInt16(Data, 0x22); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x22); }
public override int Height { get => BitConverter.ToUInt16(Data, 0x24); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x24); }
public override int Weight { get => BitConverter.ToUInt16(Data, 0x26); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x26); }
public override int[] Items
{
get => new[] { Item1, Item2, Item3 };
set
{
if (value?.Length != 3) return;
Item1 = value[0];
Item2 = value[1];
Item3 = value[2];
}
}
public override int[] Abilities
{
get => new[] { Ability1, Ability2, AbilityH };
set
{
if (value?.Length != 3) return;
Ability1 = (byte)value[0];
Ability2 = (byte)value[1];
AbilityH = (byte)value[2];
}
}
}
}

26
PKHeX.Core/PersonalInfo/PersonalInfoG1.cs
View File

@@ -31,16 +31,8 @@ public override byte[] Write()
public int SPC { get => Data[0x05]; set => Data[0x05] = (byte)value; }
public override int SPA { get => SPC; set => SPC = value; }
public override int SPD { get => SPC; set => SPC = value; }
public override int[] Types
{
get => new int[] { Data[0x06], Data[0x07] };
set
{
if (value?.Length != 2) return;
Data[0x06] = (byte)value[0];
Data[0x07] = (byte)value[1];
}
}
public override int Type1 { get => Data[0x06]; set => Data[0x06] = (byte)value; }
public override int Type2 { get => Data[0x07]; set => Data[0x07] = (byte)value; }
public override int CatchRate { get => Data[0x08]; set => Data[0x08] = (byte)value; }
public override int BaseEXP { get => Data[0x09]; set => Data[0x09] = (byte)value; }
public int Move1 { get => Data[0x0F]; set => Data[0x0F] = (byte)value; }
@@ -60,18 +52,26 @@ public override int[] Types
// Future game values, unused
public override int[] Items { get => new[] { 0, 0 }; set { } }
public override int[] EggGroups { get => new[] { 0, 0 }; set { } }
public override int EggGroup1 { get => 0; set { } }
public override int EggGroup2 { get => 0; set { } }
public override int[] Abilities { get => new[] { 0, 0 }; set { } }
public override int Gender { get; set; }
public override int HatchCycles { get => 0; set { } }
public override int BaseFriendship { get => 0; set { } }
public override int EscapeRate { get => 0; set { } }
public override int Color { get => 0; set { } }
public int[] Moves
{
get => new[] { Move1, Move2, Move3, Move4 };
set { if (value?.Length != 4) return; Move1 = value[0]; Move2 = value[1]; Move3 = value[2]; Move4 = value[3]; }
set
{
if (value?.Length != 4) return;
Move1 = value[0];
Move2 = value[1];
Move3 = value[2];
Move4 = value[3];
}
}
}
}

35
PKHeX.Core/PersonalInfo/PersonalInfoG2.cs
View File

@@ -30,39 +30,26 @@ public override byte[] Write()
public override int SPE { get => Data[0x04]; set => Data[0x04] = (byte)value; }
public override int SPA { get => Data[0x05]; set => Data[0x05] = (byte)value; }
public override int SPD { get => Data[0x06]; set => Data[0x06] = (byte)value; }
public override int[] Types
{
get => new int[] { Data[0x07], Data[0x08] };
set
{
if (value?.Length != 2) return;
Data[0x07] = (byte)value[0];
Data[0x08] = (byte)value[1];
}
}
public override int Type1 { get => Data[0x06]; set => Data[0x06] = (byte)value; }
public override int Type2 { get => Data[0x07]; set => Data[0x07] = (byte)value; }
public override int CatchRate { get => Data[0x09]; set => Data[0x09] = (byte)value; }
public override int BaseEXP { get => Data[0x0A]; set => Data[0x0A] = (byte)value; }
public override int[] Items
{
get => new int[] { Data[0xB], Data[0xC] };
set
{
if (value?.Length != 2) return;
Data[0xB] = (byte) value[0];
Data[0xC] = (byte) value[1];
}
}
public int Item1 { get => Data[0xB]; set => Data[0xB] = (byte)value; }
public int Item2 { get => Data[0xC]; set => Data[0xC] = (byte)value; }
public override int Gender { get => Data[0xD]; set => Data[0xD] = (byte)value; }
public override int HatchCycles { get => Data[0xF]; set => Data[0xF] = (byte)value; }
public override int EXPGrowth { get => Data[0x16]; set => Data[0x16] = (byte)value; }
public override int[] EggGroups
public override int EggGroup1 { get => Data[0x17] & 0xF; set => Data[0x17] = (byte)(Data[0x17] & 0xF0 | value); }
public override int EggGroup2 { get => Data[0x17] >> 4; set => Data[0x17] = (byte)(Data[0x17] & 0x0F | value << 4); }
public override int[] Items
{
get => new[] { Data[0x17] >> 4, Data[0x17] & 0xF };
get => new[] { Item1, Item2 };
set
{
if (value?.Length != 2) return;
Data[0x17] = (byte)(((value[0] & 0xF) << 4) | (value[1] & 0xF));
Item1 = value[0];
Item2 = value[1];
}
}

54
PKHeX.Core/PersonalInfo/PersonalInfoG3.cs
View File

@@ -16,10 +16,7 @@ public PersonalInfoG3(byte[] data)
Data = data;
}
public override byte[] Write()
{
return Data;
}
public override byte[] Write() => Data;
public override int HP { get => Data[0x00]; set => Data[0x00] = (byte)value; }
public override int ATK { get => Data[0x01]; set => Data[0x01] = (byte)value; }
@@ -27,16 +24,8 @@ public override byte[] Write()
public override int SPE { get => Data[0x03]; set => Data[0x03] = (byte)value; }
public override int SPA { get => Data[0x04]; set => Data[0x04] = (byte)value; }
public override int SPD { get => Data[0x05]; set => Data[0x05] = (byte)value; }
public override int[] Types
{
get => new int[] { Data[0x06], Data[0x07] };
set
{
if (value?.Length != 2) return;
Data[0x06] = (byte)value[0];
Data[0x07] = (byte)value[1];
}
}
public override int Type1 { get => Data[0x06]; set => Data[0x06] = (byte)value; }
public override int Type2 { get => Data[0x07]; set => Data[0x07] = (byte)value; }
public override int CatchRate { get => Data[0x08]; set => Data[0x08] = (byte)value; }
public override int BaseEXP { get => Data[0x09]; set => Data[0x09] = (byte)value; }
private int EVYield { get => BitConverter.ToUInt16(Data, 0x0A); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x0A); }
@@ -46,42 +35,39 @@ public override int[] Types
public override int EV_SPE { get => EVYield >> 6 & 0x3; set => EVYield = (EVYield & ~(0x3 << 6)) | (value & 0x3) << 6; }
public override int EV_SPA { get => EVYield >> 8 & 0x3; set => EVYield = (EVYield & ~(0x3 << 8)) | (value & 0x3) << 8; }
public override int EV_SPD { get => EVYield >> 10 & 0x3; set => EVYield = (EVYield & ~(0x3 << 10)) | (value & 0x3) << 10; }
public override int[] Items
{
get => new int[] { BitConverter.ToInt16(Data, 0xC), BitConverter.ToInt16(Data, 0xE) };
set
{
if (value?.Length != 2) return;
BitConverter.GetBytes((short)value[0]).CopyTo(Data, 0xC);
BitConverter.GetBytes((short)value[1]).CopyTo(Data, 0xE);
}
}
public int Item1 { get => BitConverter.ToInt16(Data, 0xC); set => BitConverter.GetBytes((short)value).CopyTo(Data, 0xC); }
public int Item2 { get => BitConverter.ToInt16(Data, 0xE); set => BitConverter.GetBytes((short)value).CopyTo(Data, 0xE); }
public override int Gender { get => Data[0x10]; set => Data[0x10] = (byte)value; }
public override int HatchCycles { get => Data[0x11]; set => Data[0x11] = (byte)value; }
public override int BaseFriendship { get => Data[0x12]; set => Data[0x12] = (byte)value; }
public override int EXPGrowth { get => Data[0x13]; set => Data[0x13] = (byte)value; }
public override int[] EggGroups
public override int EggGroup1 { get => Data[0x14]; set => Data[0x14] = (byte)value; }
public override int EggGroup2 { get => Data[0x15]; set => Data[0x15] = (byte)value; }
public int Ability1 { get => Data[0x16]; set => Data[0x16] = (byte)value; }
public int Ability2 { get => Data[0x17]; set => Data[0x17] = (byte)value; }
public override int EscapeRate { get => Data[0x18]; set => Data[0x18] = (byte)value; }
public override int Color { get => Data[0x19] & 0x7F; set => Data[0x19] = (byte)(Data[0x19] & 0x80 | value); }
public bool NoFlip { get => Data[0x19] >> 7 == 1; set => Data[0x19] = (byte)(Color | (value ? 0x80 : 0)); }
public override int[] Items
{
get => new int[] { Data[0x14], Data[0x15] };
get => new[] { Item1, Item2 };
set
{
if (value?.Length != 2) return;
Data[0x14] = (byte)value[0];
Data[0x15] = (byte)value[1];
Item1 = value[0];
Item2 = value[1];
}
}
public override int[] Abilities
{
get => new int[] { Data[0x16], Data[0x17] };
get => new[] { Ability1, Ability2 };
set
{
if (value?.Length != 2) return;
Data[0x16] = (byte)value[0];
Data[0x17] = (byte)value[1];
Ability1 = (byte)value[0];
Ability2 = (byte)value[1];
}
}
public override int EscapeRate { get => Data[0x18]; set => Data[0x18] = (byte)value; }
public override int Color { get => Data[0x19]; set => Data[0x19] = (byte)value; }
}
}

2
PKHeX.Core/PersonalInfo/PersonalInfoSM.cs
View File

@@ -30,8 +30,6 @@ public override byte[] Write()
SetBits(SpecialTutors[0]).CopyTo(Data, 0x3C);
return Data;
}
// No accessing for 3C-4B
public int SpecialZ_Item { get => BitConverter.ToUInt16(Data, 0x4C); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x4C); }
public int SpecialZ_BaseMove { get => BitConverter.ToUInt16(Data, 0x4E); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x4E); }