From d0c3fdd1adc3b9f3cb1407707ae674efadc8f16b Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sun, 21 Jun 2026 16:43:34 +0100 Subject: [PATCH] Stop patching asteroid mirror state in Unity --- Aetheria.State.Verify/Program.cs | 3 ++ Assets/Scripts/Gameplay/ActionGameManager.cs | 32 -------------------- 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index af226f046..7afdea1f5 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -7875,6 +7875,9 @@ static void RequireUnityObserverDoesNotTickLocalSimulation(string root) "Zone.Entities.Add(CurrentEntity)", "CurrentEntity.CultPositionXZ = TowingStation.CultPositionXZ", "PopulateLevel(TowingStation.Zone.GalaxyZone)", + "RestoreDaemonAsteroidRuntimeState", + "belt.Damage.Clear()", + "belt.RespawnTimers.Clear()", "AetheriaRuntimeStateCommitLog.QueueRunCheckpoint", "AetheriaRuntimeStateCommitLog.QueuePlayerSettings", "AetheriaRuntimeStateCommitLog.QueueLoadoutTemplate" diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index 185a04190..094ff9ada 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -2063,7 +2063,6 @@ public class ActionGameManager : MonoBehaviour { var constructionBlueprint = CreateDaemonZoneConstructionBlueprint(daemonZone); galaxyZone.Contents = new Zone(ItemManager, Settings.PlanetSettings, constructionBlueprint, galaxyZone, ObservedGalaxy); - RestoreDaemonAsteroidRuntimeState(galaxyZone.Contents, daemonZone); } Zone = galaxyZone.Contents; PlayMusic(MusicType.Overworld); @@ -2384,37 +2383,6 @@ public class ActionGameManager : MonoBehaviour .ToDictionary(resource => resource.ItemKey, resource => (float)resource.Amount, StringComparer.Ordinal); } - private static void RestoreDaemonAsteroidRuntimeState(Zone zone, AetheriaRuntimeZoneSnapshotCommit daemonZone) - { - if (zone == null || daemonZone == null) - return; - - foreach (var body in daemonZone.Bodies ?? Array.Empty()) - { - if (body == null || - !string.Equals(body.Kind ?? "", "asteroid_belt", StringComparison.OrdinalIgnoreCase) || - !zone.AsteroidBelts.TryGetValue(body.BodyKey ?? "", out var belt)) - { - continue; - } - - belt.Damage.Clear(); - belt.RespawnTimers.Clear(); - var asteroids = body.Asteroids ?? Array.Empty(); - for (var index = 0; index < asteroids.Count; index++) - { - var asteroid = asteroids[index]; - if (asteroid == null) - continue; - - if (asteroid.Damage > 0) - belt.Damage[index] = (float)asteroid.Damage; - if (asteroid.RespawnTimer > 0) - belt.RespawnTimers[index] = (float)asteroid.RespawnTimer; - } - } - } - private void ClearRenderedLoot() { if (ZoneRenderer?.ActiveLoot == null)