Move the ServerShared data model onto CultLib's CultCache
Cut 8b. Aetheria.Shared builds headless against GameCult.Caching and
GameCult.Caching.MessagePack at the pinned CultLib; the pin guard also
checks the Caching project exists.
Documents: [CultDocument("aetheria.<type>", "1")] with [MessagePackObject]
and integer [Key]s on the Q7 concrete types (the eight ItemData leaves,
Faction, FactionProductData, PersonalityAttribute, NameFile, OrbitData, the
four BodyData leaves, SavedZone, SavedGame, PlayerSettings, InputLayout).
SavedGame and PlayerSettings are [CultGlobal]; Name members are [CultName].
ItemData, CraftedItemData, EquippableItemData, BodyData and AgentTask lose
[MessagePackObject]; BodyData and AgentTask lose their [Union]s. InputLayout
moves into ServerShared so AetheriaStores can route it.
References: Guid and DatabaseLink<T> members become CultRecordRef<T>;
Guid-keyed maps become ref-keyed with [CultReference(..., many: true)];
ZonePack holds refs to orbit and body records. Runtime maps (Zone orbits,
bodies and belts, cargo ItemsOfType, agent targets) key by CultRecordKey.
Identity is the record key: ID comparisons become reference or key
comparisons. StatModifierData.RequireBehavior is a simple type name.
AetheriaStores.Open composes the catalog (read-only unless writable), run
and player stores, one home per type. CultRecordRefs carries IsSet, a
null-safe Get(ref), RefOf (key from TryGetHandle) and Upsert.
ItemManager.GetData is the one item resolution path. MathResolver is
declared by [assembly: CultCacheFormatterResolver].
Inspector attributes: text, range and asset path map onto CultLib's
CultInspector attributes (asset path only on string members); every
replaced Aetheria attribute keeps [Inspectable] for the runtime panel.
Builds: Aetheria.Shared. Does not build: AetherDb and the Unity project,
which follow.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
parent
b4c06b50cb
commit
a2b54889b4
50 changed files with 537 additions and 542 deletions
|
|
@ -1,10 +1,11 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using GameCult.Caching;
|
||||
using MessagePack;
|
||||
using Newtonsoft.Json;
|
||||
using UniRx;
|
||||
|
|
@ -17,14 +18,14 @@ using float3 = CultMath.float3;
|
|||
public class ZonePack
|
||||
{
|
||||
[JsonProperty("planets"), Key(0)]
|
||||
public List<BodyData> Planets = new List<BodyData>();
|
||||
|
||||
public List<CultRecordRef<BodyData>> Planets = new List<CultRecordRef<BodyData>>();
|
||||
|
||||
[JsonProperty("orbits"), Key(1)]
|
||||
public List<OrbitData> Orbits = new List<OrbitData>();
|
||||
|
||||
public List<CultRecordRef<OrbitData>> Orbits = new List<CultRecordRef<OrbitData>>();
|
||||
|
||||
[JsonProperty("entities"), Key(2)]
|
||||
public List<EntityPack> Entities = new List<EntityPack>();
|
||||
|
||||
|
||||
[JsonProperty("radius"), Key(3)]
|
||||
public float Radius = 2000;
|
||||
|
||||
|
|
@ -33,29 +34,24 @@ public class ZonePack
|
|||
|
||||
[JsonProperty("time"), Key(5)]
|
||||
public double Time;
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
[MessagePackObject,
|
||||
JsonObject(MemberSerialization.OptIn),
|
||||
Union(0, typeof(PlanetData)),
|
||||
Union(1, typeof(AsteroidBeltData)),
|
||||
Union(2, typeof(GasGiantData)),
|
||||
Union(3, typeof(SunData))]
|
||||
public abstract class BodyData : DatabaseEntry, INamedEntry
|
||||
[JsonObject(MemberSerialization.OptIn)]
|
||||
public abstract class BodyData
|
||||
{
|
||||
[JsonProperty("name"), Key(1)]
|
||||
[CultName, JsonProperty("name"), Key(1)]
|
||||
public string Name = "";
|
||||
|
||||
[JsonProperty("orbit"), Key(2)]
|
||||
public Guid Orbit;
|
||||
public CultRecordRef<OrbitData> Orbit;
|
||||
|
||||
[JsonProperty("mass"), Key(3)]
|
||||
public float Mass = 0;
|
||||
|
||||
[JsonProperty("resources"), Key(4)]
|
||||
public Dictionary<Guid, float> Resources = new Dictionary<Guid, float>();
|
||||
[CultReference(typeof(SimpleCommodityData), many: true), JsonProperty("resources"), Key(4)]
|
||||
public Dictionary<CultRecordRef<SimpleCommodityData>, float> Resources = new Dictionary<CultRecordRef<SimpleCommodityData>, float>();
|
||||
|
||||
[JsonProperty("bodyRadiusMul")] [Key(5)]
|
||||
public float BodyRadiusMultiplier = 1;
|
||||
|
|
@ -68,42 +64,36 @@ public abstract class BodyData : DatabaseEntry, INamedEntry
|
|||
|
||||
[JsonProperty("depthExp")] [Key(8)]
|
||||
public float GravityDepthExponent = 16;
|
||||
|
||||
[IgnoreMember] public string EntryName
|
||||
{
|
||||
get => Name;
|
||||
set => Name = value;
|
||||
}
|
||||
}
|
||||
|
||||
[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
|
||||
[CultDocument("aetheria.planetdata", "1"), MessagePackObject, JsonObject(MemberSerialization.OptIn)]
|
||||
public class PlanetData : BodyData
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
|
||||
[CultDocument("aetheria.asteroidbeltdata", "1"), MessagePackObject, JsonObject(MemberSerialization.OptIn)]
|
||||
public class AsteroidBeltData : BodyData
|
||||
{
|
||||
[JsonProperty("asteroids"), Key(9)]
|
||||
public Asteroid[] Asteroids;
|
||||
}
|
||||
|
||||
[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
|
||||
[CultDocument("aetheria.gasgiantdata", "1"), MessagePackObject, JsonObject(MemberSerialization.OptIn)]
|
||||
public class GasGiantData : BodyData
|
||||
{
|
||||
[JsonProperty("firstOffsetDomainRotationSpeed"), Key(9)]
|
||||
public float FirstOffsetDomainRotationSpeed = 1;
|
||||
|
||||
|
||||
[JsonProperty("firstOffsetRotationSpeed"), Key(10)]
|
||||
public float FirstOffsetRotationSpeed = 1;
|
||||
|
||||
|
||||
[JsonProperty("secondOffsetDomainRotationSpeed"), Key(11)]
|
||||
public float SecondOffsetDomainRotationSpeed = 1;
|
||||
|
||||
|
||||
[JsonProperty("secondOffsetRotationSpeed"), Key(12)]
|
||||
public float SecondOffsetRotationSpeed = 1;
|
||||
|
||||
|
||||
[JsonProperty("albedoRotationSpeed"), Key(13)]
|
||||
public float AlbedoRotationSpeed = 1;
|
||||
|
||||
|
|
@ -118,19 +108,20 @@ public class GasGiantData : BodyData
|
|||
|
||||
[JsonProperty("depthExp")] [Key(17)]
|
||||
public float WaveSpeedMultiplier = 8;
|
||||
|
||||
|
||||
[JsonProperty("materialOverrides"), Key(18)]
|
||||
public List<string> MaterialOverrides = new List<string>();
|
||||
|
||||
|
||||
[JsonProperty("colors"), Key(19)]
|
||||
public float4[] Colors = new float4[0];
|
||||
}
|
||||
|
||||
[CultDocument("aetheria.sundata", "1"), MessagePackObject, JsonObject(MemberSerialization.OptIn)]
|
||||
public class SunData : GasGiantData
|
||||
{
|
||||
[JsonProperty("lightColor"), Key(20)]
|
||||
public float3 LightColor = float3.zero;
|
||||
|
||||
|
||||
[JsonProperty("fogTintColor"), Key(21)]
|
||||
public float3 FogTintColor = float3.zero;
|
||||
|
||||
|
|
@ -143,32 +134,32 @@ public class Asteroid
|
|||
{
|
||||
[JsonProperty("distance"), Key(0)]
|
||||
public float Distance;
|
||||
|
||||
|
||||
[JsonProperty("phase"), Key(1)]
|
||||
public float Phase;
|
||||
|
||||
|
||||
[JsonProperty("size"), Key(2)]
|
||||
public float Size;
|
||||
|
||||
|
||||
[JsonProperty("rotationSpeed"), Key(3)]
|
||||
public float RotationSpeed;
|
||||
}
|
||||
|
||||
[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
|
||||
public class OrbitData : DatabaseEntry
|
||||
[CultDocument("aetheria.orbitdata", "1"), MessagePackObject, JsonObject(MemberSerialization.OptIn)]
|
||||
public class OrbitData
|
||||
{
|
||||
[JsonProperty("parent"), Key(1)]
|
||||
public Guid Parent;
|
||||
public CultRecordRef<OrbitData> Parent;
|
||||
|
||||
[JsonProperty("distance"), Key(2)]
|
||||
public float Distance;
|
||||
|
||||
[JsonProperty("phase"), Key(3)]
|
||||
public float Phase;
|
||||
|
||||
|
||||
[JsonProperty("phase"), Key(4)]
|
||||
public float2 FixedPosition = float2.zero;
|
||||
|
||||
|
||||
// [JsonProperty("period"), Key(4)]
|
||||
// public float Period;
|
||||
|
||||
|
|
@ -177,4 +168,4 @@ public class OrbitData : DatabaseEntry
|
|||
phase *= PI * 2;
|
||||
return new float2(cos(phase), sin(phase));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue