Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-10-01 12:57:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Donut Timestamp Fixes + Improvements (#4681)

Browse Source 
* Place Time After Date In Donut Editor Format

* Fix Donut Millisecond Offset Being 1970 Not 1900
This commit is contained in:
Jonathan Herbert
2026-01-03 14:01:13 -04:00
committed by GitHub
parent fecd2a3ddb
commit 2ea7a60f3b
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
PKHeX.Core/Saves/Substructures/Gen9/ZA/DonutPocket9a.cs
View File

@@ -92,7 +92,7 @@ private static void ApplyTimestampNow(Donut9a entry, int bias = 0)
if (bias != 0) // some fudge factor to differentiate donuts made on the same millisecond
now = now.AddMilliseconds(bias);
var ticks = (ulong)(now - Donut9a.Epoch).TotalMilliseconds;
entry.MillisecondsSince1900 = ticks;
entry.MillisecondsSince1970 = ticks;
entry.DateTime1900.Timestamp = now;
}
@@ -576,10 +576,10 @@ public static bool TryGetFlavorName(ulong hash, [NotNullWhen(true)] out string?
public const int Size = 0x48;
public Span<byte> Data => Raw.Span;
public static DateTime Epoch => new(1900, 1, 1, 0, 0, 0, DateTimeKind.Local);
public static DateTime Epoch => new(1970, 1, 1, 0, 0, 0, DateTimeKind.Local);
/*
0x00 u64 MillisecondsSince1900
0x00 u64 MillisecondsSince1970
0x08 u8 Stars
0x09 u8 LevelBoost
@@ -604,9 +604,9 @@ public static bool TryGetFlavorName(ulong hash, [NotNullWhen(true)] out string?
*/
/// <summary>
/// Timestamp the donut was created, in milliseconds since January 1, 1900.
/// Timestamp the donut was created, in milliseconds since January 1, 1970.
/// </summary>
public ulong MillisecondsSince1900 { get => ReadUInt64LittleEndian(Data); set => WriteUInt64LittleEndian(Data, value); }
public ulong MillisecondsSince1970 { get => ReadUInt64LittleEndian(Data); set => WriteUInt64LittleEndian(Data, value); }
public byte Stars { get => Data[0x08]; set => Data[0x08] = value; }
public byte LevelBoost { get => Data[0x09]; set => Data[0x09] = value; }
@@ -638,7 +638,7 @@ public static bool TryGetFlavorName(ulong hash, [NotNullWhen(true)] out string?
/// Alternate date storage format for the donut creation time.
/// </summary>
/// <remarks>
/// <see cref="MillisecondsSince1900"/> is the source of truth; this value should be kept in sync via <see cref="UpdateDateTime"/>.
/// <see cref="MillisecondsSince1970"/> is the source of truth; this value should be kept in sync via <see cref="UpdateDateTime"/>.
/// </remarks>
public Epoch1900DateTimeValue DateTime1900 => new(Raw[0x20..0x28]);
@@ -649,17 +649,17 @@ public static bool TryGetFlavorName(ulong hash, [NotNullWhen(true)] out string?
public ulong Reserved { get => ReadUInt64LittleEndian(Data[0x40..]); set => WriteUInt64LittleEndian(Data[0x40..], value); }
/// <summary>
/// Updates the <see cref="DateTime1900"/> value based on the stored <see cref="MillisecondsSince1900"/>.
/// Updates the <see cref="DateTime1900"/> value based on the stored <see cref="MillisecondsSince1970"/>.
/// </summary>
/// <remarks>
/// The values should always mirror each other, but their storage formats differ. Treat <see cref="MillisecondsSince1900"/> as the main source of truth.
/// The values should always mirror each other, but their storage formats differ. Treat <see cref="MillisecondsSince1970"/> as the main source of truth.
/// </remarks>
public void UpdateDateTime() => DateTime1900.Timestamp = Epoch.AddMilliseconds(MillisecondsSince1900);
public void UpdateDateTime() => DateTime1900.Timestamp = Epoch.AddMilliseconds(MillisecondsSince1970);
/// <summary>
/// A non-zero <see cref="MillisecondsSince1900"/> indicates that this donut slot is occupied. A zero-value with non-zero flavors/berries is invalid (and causes display glitches in-game).
/// A non-zero <see cref="MillisecondsSince1970"/> indicates that this donut slot is occupied. A zero-value with non-zero flavors/berries is invalid (and causes display glitches in-game).
/// </summary>
public bool IsEmpty => MillisecondsSince1900 != 0;
public bool IsEmpty => MillisecondsSince1970 != 0;
/// <summary>
/// Count of flavor perks granted by this donut.

2
PKHeX.WinForms/Subforms/Save Editors/Gen9/DonutEditor9a.Designer.cs generated
View File

@@ -681,7 +681,7 @@ private void InitializeComponent()
//
// CAL_Date
//
CAL_Date.CustomFormat = "hh:mm:ss ddd MMMM dd, yyyy";
CAL_Date.CustomFormat = "ddd MMMM dd, yyyy hh:mm:ss";
CAL_Date.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
CAL_Date.Location = new System.Drawing.Point(106, 170);
CAL_Date.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);

4
PKHeX.WinForms/Subforms/Save Editors/Gen9/DonutEditor9a.cs
View File

@@ -180,7 +180,7 @@ public void LoadDonut(Donut9a donut)
CAL_Date.Value = Epoch;
}
TB_Milliseconds.Text = donut.MillisecondsSince1900.ToString();
TB_Milliseconds.Text = donut.MillisecondsSince1970.ToString();
Loading = false;
return;
@@ -231,7 +231,7 @@ public void SaveDonut()
donut.ClearDateTime();
}
}
donut.MillisecondsSince1900 = ulong.TryParse(TB_Milliseconds.Text, out var unk) ? unk : 0;
donut.MillisecondsSince1970 = ulong.TryParse(TB_Milliseconds.Text, out var unk) ? unk : 0;
}
private static void LoadDonutFlavorHash(ComboBox cb, ulong flavorHash)