diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc index 3874d0a01..a9beac4df 100644 Binary files a/.voidbot/state/aetheria.cc and b/.voidbot/state/aetheria.cc differ diff --git a/Assets/Scripts/ServerShared/Zone.cs b/Assets/Scripts/ServerShared/Zone.cs index 062b5331b..bd23f7e6a 100644 --- a/Assets/Scripts/ServerShared/Zone.cs +++ b/Assets/Scripts/ServerShared/Zone.cs @@ -462,7 +462,6 @@ public class Planet public class GasGiant : Planet { - public GasGiantData GasGiantData; public float FirstOffsetDomainRotationSpeed { get; } public float FirstOffsetRotationSpeed { get; } public float SecondOffsetDomainRotationSpeed { get; } @@ -480,7 +479,6 @@ public class GasGiant : Planet public GasGiant(PlanetSettings settings, GasGiantData data, Orbit orbit) : base(settings, data, orbit) { - GasGiantData = data; FirstOffsetDomainRotationSpeed = data.FirstOffsetDomainRotationSpeed; FirstOffsetRotationSpeed = data.FirstOffsetRotationSpeed; SecondOffsetDomainRotationSpeed = data.SecondOffsetDomainRotationSpeed; @@ -498,15 +496,14 @@ public class GasGiant : Planet public new void CalculateProperties() { base.CalculateProperties(); - GravityWavesDepth = Settings.WaveDepth.Evaluate(Mass) * GasGiantData.WaveDepthMultiplier; - GravityWavesRadius = Settings.WaveRadius.Evaluate(Mass) * GasGiantData.WaveRadiusMultiplier; - GravityWavesSpeed = Settings.WaveSpeed.Evaluate(Mass) * GasGiantData.WaveSpeedMultiplier; + GravityWavesDepth = Settings.WaveDepth.Evaluate(Mass) * WaveDepthMultiplier; + GravityWavesRadius = Settings.WaveRadius.Evaluate(Mass) * WaveRadiusMultiplier; + GravityWavesSpeed = Settings.WaveSpeed.Evaluate(Mass) * WaveSpeedMultiplier; } } public class Sun : GasGiant { - public SunData SunData; public float3 LightColor { get; } public float3 FogTintColor { get; } public float LightRadiusMultiplier { get; } @@ -514,7 +511,6 @@ public class Sun : GasGiant public Sun(PlanetSettings settings, SunData data, Orbit orbit) : base(settings, data, orbit) { - SunData = data; LightColor = data.LightColor; FogTintColor = data.FogTintColor; LightRadiusMultiplier = data.LightRadiusMultiplier; @@ -524,7 +520,7 @@ public class Sun : GasGiant public new void CalculateProperties() { base.CalculateProperties(); - LightRadius = Settings.LightRadius.Evaluate(Mass) * SunData.LightRadiusMultiplier; + LightRadius = Settings.LightRadius.Evaluate(Mass) * LightRadiusMultiplier; } } diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md index b878e5667..ead150138 100644 --- a/docs/aetheria-perfect-machine-map.md +++ b/docs/aetheria-perfect-machine-map.md @@ -1055,6 +1055,9 @@ First Aetheria surfaces to publish: - Done: move `ZoneRenderer` body classification off `BodyData` subclasses; zone rendering now walks runtime orbits and lowers `Planet`, `GasGiant`, `Sun`, and `AsteroidBelt` wrappers directly. + - Done: remove public `GasGiantData`/`SunData` handles from runtime wrappers; + wave and light calculations now use copied wrapper fields after + construction. - 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