diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc index 30b5d7081..f6ff18c90 100644 Binary files a/.voidbot/state/aetheria.cc and b/.voidbot/state/aetheria.cc differ diff --git a/Assets/Scripts/ServerShared/PlayerSettings.cs b/Assets/Scripts/ServerShared/PlayerSettings.cs index 9e8dbf9a0..83223a70b 100644 --- a/Assets/Scripts/ServerShared/PlayerSettings.cs +++ b/Assets/Scripts/ServerShared/PlayerSettings.cs @@ -1,17 +1,15 @@ using System; using System.Collections.Generic; using System.Globalization; -using MessagePack; -[MessagePackObject] public class PlayerSettings { - [Key(0)] public string Name = "Anonymous"; - [Key(2)] public bool TutorialPassed; - [Key(3)] public Dictionary HashedStoryFiles = new Dictionary(); - [Key(4)] public PlayerGameplaySettings GameplaySettings = new PlayerGameplaySettings(); - [Key(5)] public PlayerInputSettings InputSettings = new PlayerInputSettings(); - [Key(6)] public PlayerGraphicsSettings GraphicsSettings = new PlayerGraphicsSettings(); + public string Name = "Anonymous"; + public bool TutorialPassed; + public Dictionary HashedStoryFiles = new Dictionary(); + public PlayerGameplaySettings GameplaySettings = new PlayerGameplaySettings(); + public PlayerInputSettings InputSettings = new PlayerInputSettings(); + public PlayerGraphicsSettings GraphicsSettings = new PlayerGraphicsSettings(); public string FormatTemperature(float t) { @@ -49,25 +47,22 @@ public class PlayerSettings } } -[MessagePackObject] public class PlayerGameplaySettings { - [Key(0)] public TemperatureUnit TemperatureUnit = TemperatureUnit.Celsius; - [Key(1)] public int SignificantDigits = 3; + public TemperatureUnit TemperatureUnit = TemperatureUnit.Celsius; + public int SignificantDigits = 3; } -[MessagePackObject] public class PlayerGraphicsSettings { - [Key(0)] public Quality NebulaQuality = Quality.Normal; - [Key(1)] public bool ShowAsteroidsInMinimap; + public Quality NebulaQuality = Quality.Normal; + public bool ShowAsteroidsInMinimap; } -[MessagePackObject] public class PlayerInputSettings { - [Key(0)] public Dictionary<(string action, int binding), string> InputActionMap = new Dictionary<(string action, int binding), string>(); - [Key(1)] public List ActionBarInputs = new List(); + public Dictionary<(string action, int binding), string> InputActionMap = new Dictionary<(string action, int binding), string>(); + public List ActionBarInputs = new List(); } public enum Quality diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md index 5bb0edd51..90cf12c2e 100644 --- a/docs/aetheria-perfect-machine-map.md +++ b/docs/aetheria-perfect-machine-map.md @@ -21,7 +21,8 @@ legacy catalog cache, and legacy UI paths should be migration-only or deleted. item/name catalog through `LegacyCatalogBoundary`, but `ActionGameManager` no longer owns a global legacy cache. Local run saves, loadouts, player settings files, zone files, and generated keyboard layout caches no longer write - bespoke durable files. + bespoke durable files. The legacy `PlayerSettings` runtime object is no + longer decorated as a MessagePack persistence shape. - Shared domain state is still partly built around `DatabaseEntry`, GUID identity, MessagePack attributes, and static cache references. Newtonsoft, JsonKnownTypes, RethinkDB, LiteNetLib client transport, and the broken @@ -93,9 +94,11 @@ legacy catalog cache, and legacy UI paths should be migration-only or deleted. MessagePack resolver. Resolver registration is confined to legacy catalog deserialization. Unused Unity asset formatters for GameObject, Material, Sprite, and Texture2D are deleted. Keyboard layout DTOs are plain runtime - parse/display models, not MessagePack save shapes. The global scene-load - MessagePack resolver hook is deleted. The slime compute settings path no - longer serializes its local parameter struct for change detection. + parse/display models, not MessagePack save shapes. `PlayerSettings` is a + plain session-local runtime object until typed Verse settings are imported + into Unity. The global scene-load MessagePack resolver hook is deleted. The + slime compute settings path no longer serializes its local parameter struct + for change detection. - The dead story compiled-JSON cache sketch and its SHA helper are deleted; story compilation currently reads Ink source directly until a typed Verse story/cache document exists. @@ -277,6 +280,8 @@ First Aetheria surfaces to publish: unused Unity asset MessagePack formatters. - Done: demote keyboard layout DTOs from MessagePack shapes and delete the global scene-load MessagePack resolver hook. + - Done: demote `PlayerSettings` and nested settings from MessagePack shapes + after the legacy settings writer was disabled. - Remaining: delete or quarantine old cache abstractions that no longer protect an invariant once catalog migration has a typed reader.