diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc index 860881b8d..550a6102d 100644 Binary files a/.voidbot/state/aetheria.cc and b/.voidbot/state/aetheria.cc differ diff --git a/Assets/Scripts/ServerShared/Behaviors/ResourceScanner.cs b/Assets/Scripts/ServerShared/Behaviors/ResourceScanner.cs index 3acd6078d..a9bf299f2 100644 --- a/Assets/Scripts/ServerShared/Behaviors/ResourceScanner.cs +++ b/Assets/Scripts/ServerShared/Behaviors/ResourceScanner.cs @@ -71,11 +71,11 @@ public class ResourceScanner : Behavior, IAlwaysUpdatedBehavior var planetData = Entity.Zone.Planets[ScanTarget]; if (planetData != null) { - if (planetData is AsteroidBeltData beltData) + if (Entity.Zone.AsteroidBelts.TryGetValue(ScanTarget, out var belt)) { if(Asteroid > -1 && - Asteroid < beltData.Asteroids.Length && - length(Entity.Position.xz - Entity.Zone.AsteroidBelts[ScanTarget].Transforms[Asteroid].xy) < Range) + belt.ContainsAsteroid(Asteroid) && + length(Entity.Position.xz - belt.Transforms[Asteroid].xy) < Range) { _scanTime += dt; if (_scanTime > ScanDuration) diff --git a/Assets/Scripts/ServerShared/Zone.cs b/Assets/Scripts/ServerShared/Zone.cs index c0787a006..a088a4bb6 100644 --- a/Assets/Scripts/ServerShared/Zone.cs +++ b/Assets/Scripts/ServerShared/Zone.cs @@ -196,13 +196,12 @@ public class Zone public int NearestAsteroid(Guid planetDataID, float2 position) { - var beltData = Planets[planetDataID] as AsteroidBeltData; - - var asteroidPositions = AsteroidBelts[planetDataID].Transforms; + var belt = AsteroidBelts[planetDataID]; + var asteroidPositions = belt.Transforms; int nearest = 0; float nearestDistance = Single.MaxValue; - for (int i = 0; i < beltData.Asteroids.Length; i++) + for (int i = 0; i < belt.AsteroidCount; i++) { var dist = lengthsq(asteroidPositions[i].xz - position); if (AsteroidExists(planetDataID, i) && dist < nearestDistance) @@ -215,31 +214,30 @@ public class Zone return nearest; } - public bool AsteroidExists(Guid planetDataID, int asteroid) => ((AsteroidBeltData) Planets[planetDataID]).Asteroids.Length > asteroid && asteroid >= 0; + public bool AsteroidExists(Guid planetDataID, int asteroid) => AsteroidBelts[planetDataID].ContainsAsteroid(asteroid); private void UpdateAsteroidTransforms(Guid planetDataID) { - var beltData = Planets[planetDataID] as AsteroidBeltData; - var belt = AsteroidBelts[planetDataID]; - var orbit = Orbits[beltData.Orbit]; + var orbit = Orbits[belt.Orbit]; belt.NewOrbitPosition = GetOrbitPosition(orbit.Parent); - for (var i = 0; i < beltData.Asteroids.Length; i++) + for (var i = 0; i < belt.AsteroidCount; i++) { + var asteroid = belt.GetAsteroid(i); float size; if(belt.RespawnTimers.ContainsKey(i)) size = 0; else if (belt.Damage.ContainsKey(i)) { - var asteroidHitpoints = Settings.AsteroidHitpoints.Evaluate(beltData.Asteroids[i].Size); + var asteroidHitpoints = Settings.AsteroidHitpoints.Evaluate(asteroid.Size); var damage = (asteroidHitpoints - belt.Damage[i]) / asteroidHitpoints; - size = Settings.AsteroidSize.Evaluate(damage * beltData.Asteroids[i].Size); + size = Settings.AsteroidSize.Evaluate(damage * asteroid.Size); } - else size = Settings.AsteroidSize.Evaluate(beltData.Asteroids[i].Size); + else size = Settings.AsteroidSize.Evaluate(asteroid.Size); - var rot = (float) (_time * beltData.Asteroids[i].RotationSpeed % (PI * 2)); - var pos = OrbitData.Evaluate((float) frac(_time / Settings.OrbitPeriod.Evaluate(beltData.Asteroids[i].Distance) + - beltData.Asteroids[i].Phase)) * beltData.Asteroids[i].Distance + belt.NewOrbitPosition; + var rot = (float) (_time * asteroid.RotationSpeed % (PI * 2)); + var pos = OrbitData.Evaluate((float) frac(_time / Settings.OrbitPeriod.Evaluate(asteroid.Distance) + + asteroid.Phase)) * asteroid.Distance + belt.NewOrbitPosition; //belt.NewPositions[i] = float3(pos.x, GetHeight(pos) + Settings.AsteroidVerticalOffset, pos.y); belt.NewTransforms[i] = float4(pos.x, pos.y, rot, size); } @@ -268,11 +266,10 @@ public class Zone public void MineAsteroid(Entity miner, Guid asteroidBelt, int asteroid, float damage, float efficiency, float penetration) { - var beltData = Planets[asteroidBelt] as AsteroidBeltData; var belt = AsteroidBelts[asteroidBelt]; //var asteroidTransform = belt.Transforms[asteroid]; - var size = beltData.Asteroids[asteroid].Size; + var size = belt.GetAsteroid(asteroid).Size; var asteroidHitpoints = Settings.AsteroidHitpoints.Evaluate(size); if (!belt.Damage.ContainsKey(asteroid)) @@ -291,8 +288,8 @@ public class Zone return; } - var resourceCount = beltData.Resources.Sum(x => x.Value); - var resource = beltData.Resources.MaxBy(x => pow(x.Value, 1f / penetration) * _random.NextFloat()); + var resourceCount = belt.Resources.Sum(x => x.Value); + var resource = belt.Resources.MaxBy(x => pow(x.Value, 1f / penetration) * _random.NextFloat()); if (efficiency * _random.NextFloat() * belt.MiningAccumulator[(miner, asteroid)] * resourceCount / Settings.MiningDifficulty > 1) { belt.MiningAccumulator.Remove((miner, asteroid)); @@ -473,7 +470,11 @@ public class Sun : GasGiant public class AsteroidBelt { - public AsteroidBeltData Data; + private readonly AsteroidBeltData _data; + private readonly Asteroid[] _asteroids; + public Guid ID { get; } + public Guid Orbit { get; } + public IReadOnlyDictionary Resources { get; } public float4[] Transforms; // x, y, rotation, scale public float4[] NewTransforms; // x, y, rotation, scale public float Radius { get; } @@ -485,11 +486,23 @@ public class AsteroidBelt public AsteroidBelt(AsteroidBeltData data) { - Data = data; - Transforms = new float4[data.Asteroids.Length]; - NewTransforms = new float4[data.Asteroids.Length]; - Radius = data.Asteroids.Max(a => a.Distance); + _data = data; + _asteroids = data.Asteroids; + ID = data.ID; + Orbit = data.Orbit; + Resources = data.Resources; + Transforms = new float4[_asteroids.Length]; + NewTransforms = new float4[_asteroids.Length]; + Radius = _asteroids.Max(a => a.Distance); } + + public int AsteroidCount => _asteroids.Length; + + public bool ContainsAsteroid(int asteroid) => asteroid >= 0 && asteroid < _asteroids.Length; + + public Asteroid GetAsteroid(int asteroid) => _asteroids[asteroid]; + + public AsteroidBeltData ToData() => _data; } public class Orbit diff --git a/Assets/Scripts/Zone Display/ZoneRenderer.cs b/Assets/Scripts/Zone Display/ZoneRenderer.cs index 88c17cf9d..285c518b2 100644 --- a/Assets/Scripts/Zone Display/ZoneRenderer.cs +++ b/Assets/Scripts/Zone Display/ZoneRenderer.cs @@ -348,8 +348,9 @@ public class ZoneRenderer : MonoBehaviour meshes.RemoveAt(Random.Range(0, meshes.Count)); _beltMeshes[planetData.ID] = meshes.ToArray(); _beltMatrices[planetData.ID] = new Matrix4x4[meshes.Count][]; - var count = beltData.Asteroids.Length / meshes.Count; - var remainder = beltData.Asteroids.Length - count * meshes.Count; + var runtimeBelt = Zone.AsteroidBelts[beltData.ID]; + var count = runtimeBelt.AsteroidCount / meshes.Count; + var remainder = runtimeBelt.AsteroidCount - count * meshes.Count; for (int i = 0; i < meshes.Count; i++) { _beltMatrices[planetData.ID][i] = new Matrix4x4[i < meshes.Count - 1 ? count : count + remainder]; @@ -358,7 +359,7 @@ public class ZoneRenderer : MonoBehaviour var beltObject = Instantiate(AsteroidBeltUI, ZoneRoot); var collider = beltObject.GetComponent(); var belt = new AsteroidBeltUI(Zone, - Zone.AsteroidBelts[beltData.ID], + runtimeBelt, beltObject, collider, AsteroidSpritesheetWidth, @@ -653,21 +654,22 @@ public class AsteroidBeltUI _zone = zone; Filter = meshFilter; _collider = collider; - var orbit = zone.Orbits[belt.Data.Orbit]; + var orbit = zone.Orbits[belt.Orbit]; _orbitParent = orbit.Parent; - _vertices = new Vector3[_belt.Data.Asteroids.Length * 4]; - _normals = new Vector3[_belt.Data.Asteroids.Length * 4]; - _uvs = new Vector2[_belt.Data.Asteroids.Length * 4]; - _indices = new int[_belt.Data.Asteroids.Length * 6]; + _vertices = new Vector3[_belt.AsteroidCount * 4]; + _normals = new Vector3[_belt.AsteroidCount * 4]; + _uvs = new Vector2[_belt.AsteroidCount * 4]; + _indices = new int[_belt.AsteroidCount * 6]; _scale = scale; var maxDist = 0f; var spriteSize = float2(1f / spritesheetWidth, 1f / spritesheetHeight); // vertex order: bottom left, top left, top right, bottom right - for (var i = 0; i < belt.Data.Asteroids.Length; i++) + for (var i = 0; i < belt.AsteroidCount; i++) { - if (belt.Data.Asteroids[i].Distance > maxDist) - maxDist = belt.Data.Asteroids[i].Distance; + var asteroid = belt.GetAsteroid(i); + if (asteroid.Distance > maxDist) + maxDist = asteroid.Distance; var spriteX = Random.Range(0, spritesheetWidth); var spriteY = Random.Range(0, spritesheetHeight); diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md index 48f4c97b1..7d39f3a7c 100644 --- a/docs/aetheria-perfect-machine-map.md +++ b/docs/aetheria-perfect-machine-map.md @@ -1027,6 +1027,10 @@ First Aetheria surfaces to publish: `OrbitData`; `Zone`, `ActionGameManager`, and `ZoneRenderer` consume `Orbit` runtime properties, with `Orbit.ToData()` retained only for blueprint capture. + - Done: move live asteroid-belt simulation, scanning, and mesh setup reads + off `AsteroidBeltData`; `Zone`, `ResourceScanner`, and `AsteroidBeltUI` + consume `AsteroidBelt` runtime asteroid/resource/orbit properties, with + `AsteroidBelt.ToData()` retained for future capture/migration cuts. - 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