fix: Consistent naming with internal name

Author: ResurrectedTrader

CLAUDE.md

@@ -73,7 +73,7 @@ The library uses `saveVersion` to distinguish formats:
 - **Version 97+**: D2R format (Huffman-encoded item codes, 8-bit strings, compact 3-bit item format, 4-field realm data)
 - **Version 100+**: Advanced stash category data, chronicle data (item find tracking)
 - **Version 103+**: DemonSection ("lf" magic) after IronGolem
-- **Version 104+**: New header format (403 bytes), Name moved from Character to PreviewData, expanded SaveTimes/Experiences arrays, GameMode field
+- **Version 104+**: New header format (403 bytes), Name moved from Character to PreviewData, expanded SaveTimes/Experiences arrays, GameVersion field
 - **Version 105+**: Item quantity uses 1-bit presence flag for ALL items (not just stackable)
 
 ### Shared Stash Tab Format

README.md

@@ -131,7 +131,7 @@ if (version >= 104)
     // Name always lives in Preview for v104+
     Console.WriteLine($"Name: {overlay.Name}");
     Console.WriteLine($"Level: {overlay.Character.Level}");
-    Console.WriteLine($"GameMode: {overlay.Character.Preview.GameMode}");
+    Console.WriteLine($"GameVersion: {overlay.Character.Preview.GameVersion}");
 
     // v104+ exposes 6 save time slots and 6 experience slots
     Console.WriteLine($"SaveTimes[0]: {overlay.Character.Preview.SaveTimes[0]}");
@@ -179,7 +179,7 @@ The overlay API only covers the fixed-size header sections (765 bytes for v<=103
 |---------|-----------------|
 | Header | Version, FileSize, Checksum |
 | Character | Name, Level, Class, Flags, MercData, Hotkeys, Appearance |
-| Preview | PreviewItems, SaveTimes, Experiences, GameMode (v104+) |
+| Preview | PreviewItems, SaveTimes, Experiences, GameVersion (v104+) |
 | Quests | All quest flags for all difficulties |
 | Waypoints | All waypoint flags for all difficulties |
 | PlayerIntro | NPC/Quest intro flags |
@@ -195,7 +195,7 @@ The overlay API only covers the fixed-size header sections (765 bytes for v<=103
 | 98-99 | D2R 2.8 | Huffman-encoded item codes, 8-bit strings |
 | 100-102 | D2R 3.0 | Advanced stash tab types, chronicle data, item find tracking |
 | 103 | D2R 3.0 | DemonSection ("lf" magic) for summoned creature persistence |
-| 104 | D2R 3.0 | New header layout (833 bytes), Name moved to PreviewData, GameMode field |
+| 104 | D2R 3.0 | New header layout (833 bytes), Name moved to PreviewData, GameVersion field |
 | 105 | D2R 3.0 | Item quantity uses 1-bit presence flag for all items |
 
 ## Version Conversion
@@ -240,7 +240,7 @@ The library handles the following format differences automatically:
 | Field | Conversion |
 |-------|------------|
 | `Character.Name` | Removed in v104+; name is only in `Character.Preview.Name` |
-| `PreviewData` | Expands from 144 to 228 bytes: `SaveTimes[6]`, `Experiences[6]`, `GameMode` |
+| `PreviewData` | Expands from 144 to 228 bytes: `SaveTimes[6]`, `Experiences[6]`, `GameVersion` |
 | `DemonSection` | Added in v103+; initialized empty when upgrading from earlier versions |
 
 #### v<=104 ↔ v105+ (Item Format)

src/D2SSharp.Tests/IntegrationTests.cs

@@ -407,7 +407,7 @@ public void V105_DemonSection_ChaosSC()
         var data = File.ReadAllBytes(Path.Combine("Resources", "105", "ChaosSC.d2s"));
         var save = D2Save.Read(data);
 
-        Assert.Equal(Enums.GameMode.ReignOfTheWarlock, save.Character.Preview.GameMode);
+        Assert.Equal(Enums.GameVersion.ReignOfTheWarlock, save.Character.Preview.GameVersion);
         Assert.Equal(Enums.CharacterClass.Warlock, save.Character.Class);
         Assert.NotNull(save.Demon);
         Assert.True(save.Demon.HasDemon);

src/D2SSharp.Tests/OverlayTests.cs

@@ -285,7 +285,7 @@ public void Overlay_V104_MatchesParsedModel(string resourcePath)
         // Preview data - v104+ specific fields
         Assert.Equal(parsed.Character.Preview.Unk1, overlay.Character.Preview.Unk1);
         Assert.Equal((byte)parsed.Character.Preview.GuildEmblemColor, overlay.Character.Preview.GuildEmblemColor);
-        Assert.Equal(parsed.Character.Preview.GameMode, overlay.Character.Preview.GameMode);
+        Assert.Equal(parsed.Character.Preview.GameVersion, overlay.Character.Preview.GameVersion);
         Assert.Equal(parsed.Character.Preview.PreviewPadding, overlay.Character.Preview.PreviewPadding);
 
         // Save times (6 slots)
@@ -390,8 +390,8 @@ public void Overlay_V104_NewFields(string resourcePath)
         var parsed = D2Save.Read(data);
         ref var overlay = ref D2SaveLayoutV104.From(data);
 
-        // GameMode
-        Assert.Equal(parsed.Character.Preview.GameMode, overlay.Character.Preview.GameMode);
+        // GameVersion
+        Assert.Equal(parsed.Character.Preview.GameVersion, overlay.Character.Preview.GameVersion);
 
         // SaveTimes[6]
         for (int i = 0; i < 6; i++)

src/D2SSharp/Enums/GameMode.cs src/D2SSharp/Enums/GameVersion.cssrc/D2SSharp/Enums/GameMode.cs renamed to src/D2SSharp/Enums/GameVersion.cs

@@ -1,9 +1,9 @@
 namespace D2SSharp.Enums;
 
 /// <summary>
-/// Game mode for D2R version 104+ saves.
+/// Game version for D2R version 104+ saves.
 /// </summary>
-public enum GameMode : byte
+public enum GameVersion : byte
 {
     None = 0,
     Classic = 1,

src/D2SSharp/Enums/StashTabType.cs

@@ -2,7 +2,7 @@ namespace D2SSharp.Enums;
 
 /// <summary>
 /// Stash tab type (StashFormat >= 2).
-/// Determines what the tab body contains and which game mode can access it.
+/// Determines what the tab body contains and which game version can access it.
 /// </summary>
 public enum StashTabType : byte
 {

src/D2SSharp/Model/D2Save.cs

@@ -110,7 +110,7 @@ public static D2Save Read(ReadOnlySpan<byte> data, IExternalData externalData)
             save.IronGolem = IronGolemSection.Read(ref reader, externalData, save.Version);
 
             // Try to read demon section (v>=103, optional)
-            if (save.Character.Preview.GameMode == GameMode.ReignOfTheWarlock)
+            if (save.Character.Preview.GameVersion == GameVersion.ReignOfTheWarlock)
                 save.Demon = DemonSection.TryRead(ref reader, externalData, save.Version);
         }
 
@@ -177,7 +177,7 @@ public int Write(Span<byte> buffer, IExternalData externalData, uint? targetVers
             (IronGolem ?? new IronGolemSection()).Write(ref writer, externalData, Version);
 
             // Write demon section if present
-            if (Character.Preview.GameMode == GameMode.ReignOfTheWarlock)
+            if (Character.Preview.GameVersion == GameVersion.ReignOfTheWarlock)
                 Demon?.Write(ref writer, externalData, Version);
         }
 
@@ -240,7 +240,7 @@ public int EstimateSize()
             }
 
             // Demon section
-            if (Character.Preview.GameMode == GameMode.ReignOfTheWarlock && Demon != null)
+            if (Character.Preview.GameVersion == GameVersion.ReignOfTheWarlock && Demon != null)
             {
                 size += 6; // header
                 if (Demon.DemonData != null)
@@ -383,8 +383,8 @@ private void Convert103To104()
         // GuildEmblemColor: keep low byte (uint -> byte)
         Character.Preview.GuildEmblemColor = Character.Preview.GuildEmblemColor & 0xFF;
 
-        // GameMode: derive from CharacterFlags
-        Character.Preview.GameMode = Character.Flags.HasFlag(CharacterFlags.Expansion) ? GameMode.Expansion : GameMode.Classic;
+        // GameVersion: derive from CharacterFlags
+        Character.Preview.GameVersion = Character.Flags.HasFlag(CharacterFlags.Expansion) ? GameVersion.Expansion : GameVersion.Classic;
 
         // SaveTimes/Experiences: slots 0-1 already populated, 2-5 remain zero (default)
     }

src/D2SSharp/Model/D2SaveOverlay.cs

@@ -232,7 +232,7 @@ public bool IsLadder
 
 /// <summary>
 /// Preview data layout for v>=104 saves (228 bytes within Character section).
-/// v104+ expands to 6 save times, 6 experiences, GameMode byte, and 96-byte name.
+/// v104+ expands to 6 save times, 6 experiences, GameVersion byte, and 96-byte name.
 /// </summary>
 [StructLayout(LayoutKind.Explicit, Size = Size)]
 public unsafe struct PreviewDataLayoutV104
@@ -242,7 +242,7 @@ public unsafe struct PreviewDataLayoutV104
     [FieldOffset(0x00)] private fixed ulong _saveTimes[6];
     [FieldOffset(0x30)] private fixed uint _experiences[6];
     [FieldOffset(0x48)] public byte GuildEmblemColor;
-    [FieldOffset(0x49)] public GameMode GameMode;
+    [FieldOffset(0x49)] public GameVersion GameVersion;
     [FieldOffset(0x4A)] public ushort PreviewPadding;
     [FieldOffset(0x4C)] public PreviewItemLayout LeftHand;
     [FieldOffset(0x58)] public PreviewItemLayout RightHand;

src/D2SSharp/Model/PreviewData.cs

@@ -12,7 +12,7 @@ namespace D2SSharp.Model;
 /// Two layouts exist:
 /// v<=103 (144 bytes): ExpansionSaveTime(8) ClassicSaveTime(8) GuildEmblemColor(4)
 ///     ExpansionExperience(4) ClassicExperience(4) PreviewItems×4(48) Name(60) Unk1(8)
-/// v>=104 (228 bytes): SaveTimes×6(48) Experiences×6(24) GuildEmblemColor(1) GameMode(1)
+/// v>=104 (228 bytes): SaveTimes×6(48) Experiences×6(24) GuildEmblemColor(1) GameVersion(1)
 ///     Padding(2) PreviewItems×4(48) Name(96) Unk1(8)
 /// </remarks>
 public partial class PreviewData
@@ -26,10 +26,10 @@ public partial class PreviewData
     /// <summary>Guild emblem background color index.</summary>
     public uint GuildEmblemColor { get; set; }
 
-    /// <summary>Game mode (v>=104 only, serialized as byte).</summary>
-    public GameMode GameMode { get; set; }
+    /// <summary>Game version (v>=104 only, serialized as byte).</summary>
+    public GameVersion GameVersion { get; set; }
 
-    /// <summary>Padding bytes after GameMode (v>=104 only).</summary>
+    /// <summary>Padding bytes after GameVersion (v>=104 only).</summary>
     public ushort PreviewPadding { get; set; }
 
     /// <summary>Preview data for the item equipped in the left hand slot.</summary>
@@ -96,9 +96,9 @@ public static PreviewData Read(ref BitReader reader, uint saveVersion)
             for (int i = 0; i < 6; i++)
                 data.Experiences[i] = reader.ReadUInt32();
 
-            // GuildEmblemColor as byte, GameMode as byte, Padding as ushort
+            // GuildEmblemColor as byte, GameVersion as byte, Padding as ushort
             data.GuildEmblemColor = reader.ReadByte();
-            data.GameMode = (GameMode)reader.ReadByte();
+            data.GameVersion = (GameVersion)reader.ReadByte();
             data.PreviewPadding = reader.ReadUInt16();
         }
         else
@@ -136,9 +136,9 @@ public void Write(ref BitWriter writer, uint saveVersion)
             for (int i = 0; i < 6; i++)
                 writer.WriteUInt32(Experiences[i]);
 
-            // GuildEmblemColor as byte, GameMode as byte, Padding as ushort
+            // GuildEmblemColor as byte, GameVersion as byte, Padding as ushort
             writer.WriteByte((byte)GuildEmblemColor);
-            writer.WriteByte((byte)GameMode);
+            writer.WriteByte((byte)GameVersion);
             writer.WriteUInt16(PreviewPadding);
         }
         else