diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc index bbef38d09..7e84514f1 100644 Binary files a/.voidbot/state/aetheria.cc and b/.voidbot/state/aetheria.cc differ diff --git a/Assets/Scripts/ServerShared/Corporations.cs b/Assets/Scripts/ServerShared/Corporations.cs index 3ff34691e..166df7ea4 100644 --- a/Assets/Scripts/ServerShared/Corporations.cs +++ b/Assets/Scripts/ServerShared/Corporations.cs @@ -5,71 +5,69 @@ using System; using System.Collections; using System.Collections.Generic; -using MessagePack; using Unity.Mathematics; -[LegacyCatalogGroup("Galaxy"), Inspectable, MessagePackObject] +[LegacyCatalogGroup("Galaxy"), Inspectable] public class Faction : DatabaseEntry, INamedEntry { - [Inspectable, Key(1)] + [Inspectable] public string Name; - [Inspectable, Key(2)] + [Inspectable] public string ShortName; - [InspectableText, Key(3)] + [InspectableText] public string Description; - [InspectableTexture, Key(4)] + [InspectableTexture] public string Logo; - [InspectableDatabaseLink(typeof(PersonalityAttribute)), Key(5)] + [InspectableDatabaseLink(typeof(PersonalityAttribute))] public Dictionary Personality = new Dictionary(); - // [Inspectable, Key(6)] + // [Inspectable] // public bool PlayerHostile; - [InspectableColor, Key(7)] + [InspectableColor] public float3 PrimaryColor; - [InspectableColor, Key(8)] + [InspectableColor] public float3 SecondaryColor; - [InspectableDatabaseLink(typeof(NameFile)), Key(9)] + [InspectableDatabaseLink(typeof(NameFile))] public Guid GeonameFile; - [InspectableDatabaseLink(typeof(HullData)), Key(10)] + [InspectableDatabaseLink(typeof(HullData))] public Guid BossHull; - [Inspectable, Key(11)] + [Inspectable] public int InfluenceDistance = 4; - [InspectableDatabaseLink(typeof(Faction)), RangedFloat(0, 1), Key(12)] + [InspectableDatabaseLink(typeof(Faction)), RangedFloat(0, 1)] public Dictionary Allegiance = new Dictionary(); - [InspectableSoundBank, Key(13)] + [InspectableSoundBank] public uint OverworldMusic; - [InspectableSoundBank, Key(14)] + [InspectableSoundBank] public uint CombatMusic; - [InspectableSoundBank, Key(15)] + [InspectableSoundBank] public uint BossMusic; - [IgnoreMember] public string EntryName - { - get => Name; - set => Name = value; - } -} - -[Inspectable, MessagePackObject] -public class NameFile : DatabaseEntry, INamedEntry -{ - [Key(1)] public string Name; - [Key(2)] public string[] Names; - - [IgnoreMember] + public string EntryName + { + get => Name; + set => Name = value; + } +} + +[Inspectable] +public class NameFile : DatabaseEntry, INamedEntry +{ + public string Name; + public string[] Names; + public string EntryName { get => Name; diff --git a/Assets/Scripts/ServerShared/GlobalData.cs b/Assets/Scripts/ServerShared/GlobalData.cs index 772e00e31..7ab7583ac 100644 --- a/Assets/Scripts/ServerShared/GlobalData.cs +++ b/Assets/Scripts/ServerShared/GlobalData.cs @@ -5,55 +5,54 @@ using System; using System.Collections; using System.Collections.Generic; -using MessagePack; using Unity.Mathematics; using static Unity.Mathematics.math; using static Unity.Mathematics.noise; using static NoiseFbm; -[Inspectable, Serializable, LegacyCatalogGroup("Galaxy"), MessagePackObject] +[Inspectable, Serializable, LegacyCatalogGroup("Galaxy")] public class GalaxyMapLayerData : DatabaseEntry, INamedEntry { - [Inspectable, Key(1)] + [Inspectable] public float CoreBoost = 1.05f; - [Inspectable, Key(2)] + [Inspectable] public float CoreBoostOffset = .1f; - [Inspectable, Key(3)] + [Inspectable] public float CoreBoostPower = 2.25f; - [Inspectable, Key(4)] + [Inspectable] public float SpokeScale = 1; - [Inspectable, Key(5)] + [Inspectable] public float SpokeOffset = 0; - [Inspectable, Key(6)] + [Inspectable] public float EdgeReduction = 3; - [Inspectable, Key(7)] + [Inspectable] public float NoiseOffset = 0; - [Inspectable, Key(8)] + [Inspectable] public float NoiseAmplitude = 1.5f; - [Inspectable, Key(9)] + [Inspectable] public float NoiseGain = .7f; - [Inspectable, Key(10)] + [Inspectable] public float NoiseLacunarity = 2; - [Inspectable, Key(11)] + [Inspectable] public int NoiseOctaves = 7; - [Inspectable, Key(12)] + [Inspectable] public float NoiseFrequency = 1; - [Inspectable, Key(13)] + [Inspectable] public float NoisePosition = 1337; - [Inspectable, Key(14)] + [Inspectable] public string Name; public float Evaluate(float2 uv, GalaxyShapeSettings settings) @@ -71,7 +70,7 @@ public class GalaxyMapLayerData : DatabaseEntry, INamedEntry return gal; } - [IgnoreMember] public string EntryName + public string EntryName { get => Name; set => Name = value; diff --git a/Assets/Scripts/ServerShared/Narrative/StoryProcessor.cs b/Assets/Scripts/ServerShared/Narrative/StoryProcessor.cs index c3f9593d1..1fa16a037 100644 --- a/Assets/Scripts/ServerShared/Narrative/StoryProcessor.cs +++ b/Assets/Scripts/ServerShared/Narrative/StoryProcessor.cs @@ -5,7 +5,6 @@ using System.IO; using System.Linq; using Ink; using Ink.Parsed; -using MessagePack; using Path = System.IO.Path; using Random = Unity.Mathematics.Random; using Story = Ink.Runtime.Story; diff --git a/Assets/Scripts/ServerShared/Narrative/ZoneSelectors.cs b/Assets/Scripts/ServerShared/Narrative/ZoneSelectors.cs index 0dab2bae9..c4d2d60d3 100644 --- a/Assets/Scripts/ServerShared/Narrative/ZoneSelectors.cs +++ b/Assets/Scripts/ServerShared/Narrative/ZoneSelectors.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using MessagePack; using Random = Unity.Mathematics.Random; public abstract class ZoneSelector @@ -48,4 +47,4 @@ public class RandomSelector : ZoneSelector { return candidates[Random.NextInt(candidates.Count)]; } -} \ No newline at end of file +} diff --git a/Assets/Scripts/ServerShared/PlayerData.cs b/Assets/Scripts/ServerShared/PlayerData.cs index 2e2d52a9d..0b7e452ef 100644 --- a/Assets/Scripts/ServerShared/PlayerData.cs +++ b/Assets/Scripts/ServerShared/PlayerData.cs @@ -3,25 +3,21 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ using System; -using MessagePack; -[LegacyCatalogGroup("Users"), MessagePackObject] + +[LegacyCatalogGroup("Users")] public class PlayerData : DatabaseEntry, INamedEntry { - [Key(1)] public string Email; - [Key(2)] public string Password; - [Key(3)] public string Username; - [Key(4)] public Guid Corporation; - [IgnoreMember] public string EntryName + public string EntryName { get => Username; set => Username = value; } -} \ No newline at end of file +} diff --git a/Assets/Scripts/ServerShared/ZoneGenerator.cs b/Assets/Scripts/ServerShared/ZoneGenerator.cs index f8cd65e4a..e19657d2a 100644 --- a/Assets/Scripts/ServerShared/ZoneGenerator.cs +++ b/Assets/Scripts/ServerShared/ZoneGenerator.cs @@ -8,7 +8,6 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using GameCult.Aetheria.State.Unity; -using MessagePack; using UniRx; using Unity.Mathematics; using static Unity.Mathematics.math; diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md index 5f1f128a3..69c713957 100644 --- a/docs/aetheria-perfect-machine-map.md +++ b/docs/aetheria-perfect-machine-map.md @@ -218,6 +218,10 @@ legacy catalog cache, and legacy UI paths should be migration-only or deleted. change detection. Agent task runtime shapes no longer carry MessagePack object, union, key, or ignore metadata. They remain plain in-memory AI task DTOs until a typed Verse task document exists. +- Legacy player, faction, name-file, galaxy-map-layer, and narrative helper + DTOs no longer carry MessagePack object/key/ignore metadata. Typed + corporation/name-file/catalog documents own durable state; these classes are + inspector/runtime projections only. - 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. @@ -449,6 +453,9 @@ First Aetheria surfaces to publish: behavior map and remove all live `Union(...)` annotations. - Done: demote agent task runtime shapes from MessagePack object/key/union metadata to plain in-memory DTOs. + - Done: demote legacy player, faction, name-file, galaxy-map-layer, and + narrative helper DTOs from MessagePack metadata to plain runtime/inspector + shapes. - Convert domain references from GUID/base-class patterns to typed record refs. - Remove runtime dependency on `ItemData` DTOs as item instance owners.