From 9e1d1e2dbf2c21a6bf0fa687dff5c8a2a14a2f27 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 26 Aug 2018 19:18:44 -0700 Subject: [PATCH] Update with latest pkhex property accessing telekensis, sprite flags, c#7 get/set style --- .../Structures/PersonalInfo/PersonalInfoXY.cs | 66 ++++++++++--------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/pk3DS.Core/Structures/PersonalInfo/PersonalInfoXY.cs b/pk3DS.Core/Structures/PersonalInfo/PersonalInfoXY.cs index f15523b..42c29fd 100644 --- a/pk3DS.Core/Structures/PersonalInfo/PersonalInfoXY.cs +++ b/pk3DS.Core/Structures/PersonalInfo/PersonalInfoXY.cs @@ -27,16 +27,16 @@ public override byte[] Write() return Data; } - public override int HP { get { return Data[0x00]; } set { Data[0x00] = (byte)value; } } - public override int ATK { get { return Data[0x01]; } set { Data[0x01] = (byte)value; } } - public override int DEF { get { return Data[0x02]; } set { Data[0x02] = (byte)value; } } - public override int SPE { get { return Data[0x03]; } set { Data[0x03] = (byte)value; } } - public override int SPA { get { return Data[0x04]; } set { Data[0x04] = (byte)value; } } - public override int SPD { get { return Data[0x05]; } set { Data[0x05] = (byte)value; } } + public override int HP { get => Data[0x00]; set => Data[0x00] = (byte)value; } + public override int ATK { get => Data[0x01]; set => Data[0x01] = (byte)value; } + public override int DEF { get => Data[0x02]; set => Data[0x02] = (byte)value; } + 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 { return new int[] { Data[0x06], Data[0x07] }; } + get => new int[] { Data[0x06], Data[0x07] }; set { if (value?.Length != 2) return; @@ -45,19 +45,20 @@ public override int[] Types } } - public override int CatchRate { get { return Data[0x08]; } set { Data[0x08] = (byte)value; } } - public override int EvoStage { get { return Data[0x09]; } set { Data[0x09] = (byte)value; } } - private int EVYield { get { return BitConverter.ToUInt16(Data, 0x0A); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x0A); } } - public override int EV_HP { get { return EVYield >> 0 & 0x3; } set { EVYield = (EVYield & ~(0x3 << 0)) | (value & 0x3) << 0; } } - public override int EV_ATK { get { return EVYield >> 2 & 0x3; } set { EVYield = (EVYield & ~(0x3 << 2)) | (value & 0x3) << 2; } } - public override int EV_DEF { get { return EVYield >> 4 & 0x3; } set { EVYield = (EVYield & ~(0x3 << 4)) | (value & 0x3) << 4; } } - public override int EV_SPE { get { return EVYield >> 6 & 0x3; } set { EVYield = (EVYield & ~(0x3 << 6)) | (value & 0x3) << 6; } } - public override int EV_SPA { get { return EVYield >> 8 & 0x3; } set { EVYield = (EVYield & ~(0x3 << 8)) | (value & 0x3) << 8; } } - public override int EV_SPD { get { return EVYield >> 10 & 0x3; } set { EVYield = (EVYield & ~(0x3 << 10)) | (value & 0x3) << 10; } } + 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); } + public override int EV_HP { get => EVYield >> 0 & 0x3; set => EVYield = (EVYield & ~(0x3 << 0)) | (value & 0x3) << 0; } + public override int EV_ATK { get => EVYield >> 2 & 0x3; set => EVYield = (EVYield & ~(0x3 << 2)) | (value & 0x3) << 2; } + public override int EV_DEF { get => EVYield >> 4 & 0x3; set => EVYield = (EVYield & ~(0x3 << 4)) | (value & 0x3) << 4; } + 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 bool Telekenesis { get => (EVYield >> 12 & 1) == 0; set => EVYield = (EVYield & ~(0x1 << 12)) | (value ? 1 : 0) << 12; } public override int[] Items { - get { return new int[] { BitConverter.ToInt16(Data, 0xC), BitConverter.ToInt16(Data, 0xE), BitConverter.ToInt16(Data, 0x10) }; } + get => new int[] { BitConverter.ToInt16(Data, 0xC), BitConverter.ToInt16(Data, 0xE), BitConverter.ToInt16(Data, 0x10) }; set { if (value?.Length != 3) return; @@ -67,14 +68,14 @@ public override int[] Items } } - public override int Gender { get { return Data[0x12]; } set { Data[0x12] = (byte)value; } } - public override int HatchCycles { get { return Data[0x13]; } set { Data[0x13] = (byte)value; } } - public override int BaseFriendship { get { return Data[0x14]; } set { Data[0x14] = (byte)value; } } - public override int EXPGrowth { get { return Data[0x15]; } set { Data[0x15] = (byte)value; } } + 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 { return new int[] { Data[0x16], Data[0x17] }; } + get => new int[] { Data[0x16], Data[0x17] }; set { if (value?.Length != 2) return; @@ -85,7 +86,7 @@ public override int[] EggGroups public override int[] Abilities { - get { return new int[] { Data[0x18], Data[0x19], Data[0x1A] }; } + get => new int[] { Data[0x18], Data[0x19], Data[0x1A] }; set { if (value?.Length != 3) return; @@ -95,13 +96,16 @@ public override int[] Abilities } } - public override int EscapeRate { get { return Data[0x1B]; } set { Data[0x1B] = (byte)value; } } - public override int FormStatsIndex { get { return BitConverter.ToUInt16(Data, 0x1C); } protected internal set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x1C); } } - public override int FormeSprite { get { return BitConverter.ToUInt16(Data, 0x1E); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x1E); } } - public override int FormeCount { get { return Data[0x20]; } set { Data[0x20] = (byte)value; } } - public override int Color { get { return Data[0x21]; } set { Data[0x21] = (byte)value; } } - public override int BaseEXP { get { return BitConverter.ToUInt16(Data, 0x22); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x22); } } - public override int Height { get { return BitConverter.ToUInt16(Data, 0x24); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x24); } } - public override int Weight { get { return BitConverter.ToUInt16(Data, 0x26); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x26); } } + public override int EscapeRate { get => Data[0x1B]; set => Data[0x1B] = (byte)value; } + public override int FormStatsIndex { get => BitConverter.ToUInt16(Data, 0x1C); protected internal 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); } + public override int FormeCount { get => Data[0x20]; set => Data[0x20] = (byte)value; } + public override int Color { get => Data[0x21] & 0x3F; set => Data[0x21] = (byte)((Data[0x21] & 0xC0) | (value & 0x3F)); } + public bool SpriteFlip { get => ((Data[0x21] >> 6) & 1) == 1; set => Data[0x21] = (byte)((Data[0x21] & ~0x40) | (value ? 0x40 : 0)); } + public bool SpriteForme { get => ((Data[0x21] >> 7) & 1) == 1; set => Data[0x21] = (byte)((Data[0x21] & ~0x80) | (value ? 0x80 : 0)); } + + 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); } } }