diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc index 29ba6444a..d4916e094 100644 Binary files a/.voidbot/state/aetheria.cc and b/.voidbot/state/aetheria.cc differ diff --git a/Assets/Scripts/Gameplay/ShipInstance.cs b/Assets/Scripts/Gameplay/ShipInstance.cs index 56c42425c..c83b1ab33 100644 --- a/Assets/Scripts/Gameplay/ShipInstance.cs +++ b/Assets/Scripts/Gameplay/ShipInstance.cs @@ -50,7 +50,7 @@ public class ShipInstance : EntityInstance var drive = ship.GetBehavior(); if (drive != null) { - var particles = Instantiate(UnityHelpers.LoadAsset(drive.DriveData.Particles), transform, false); + var particles = Instantiate(UnityHelpers.LoadAsset(drive.Particles), transform, false); var main = particles.main; main.customSimulationSpace = LocalSpace; _aetherDrive = new AetherDriveInstance diff --git a/Assets/Scripts/ServerShared/Behaviors/AetherDrive.cs b/Assets/Scripts/ServerShared/Behaviors/AetherDrive.cs index 625cddf96..1f7ceaa5b 100644 --- a/Assets/Scripts/ServerShared/Behaviors/AetherDrive.cs +++ b/Assets/Scripts/ServerShared/Behaviors/AetherDrive.cs @@ -67,8 +67,7 @@ public class AetherDrive : Behavior public float3 Rpm { get; private set; } public float MaximumRpm { get; private set; } public float2 ThrustDirection { get; private set; } - - public AetherDriveData DriveData => _data; + public string Particles { get; } public float3 Axis { @@ -79,11 +78,13 @@ public class AetherDrive : Behavior public AetherDrive(AetherDriveData data, EquippedItem item) : base(data, item) { _data = data; + Particles = data.Particles; } public AetherDrive(AetherDriveData data, ConsumableItemEffect item) : base(data, item) { _data = data; + Particles = data.Particles; } public override bool Execute(float dt) @@ -141,4 +142,4 @@ public class AetherDrive : Behavior return false; } -} \ No newline at end of file +} diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md index b92094452..5307852f6 100644 --- a/docs/aetheria-perfect-machine-map.md +++ b/docs/aetheria-perfect-machine-map.md @@ -1010,6 +1010,9 @@ First Aetheria surfaces to publish: - Done: move thruster particle prefab lookup off `ThrusterData`; `ShipInstance` now consumes `Thruster.ParticlesPrefab`, so the renderer reads live behavior metadata instead of the temporary config bridge. + - Done: move AetherDrive particle prefab lookup off `AetherDriveData`; + `ShipInstance` now consumes `AetherDrive.Particles`, and the public + `DriveData` escape hatch has been removed. - Done: delete the legacy `Behaviors` lists from `ConsumableItemData` and `EquippableItemData`; item DTOs can no longer carry behavior config state. - Done: move runtime blueprint price aggregation and conductivity restore