diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc index f29db5bbf..631801a0b 100644 Binary files a/.voidbot/state/aetheria.cc and b/.voidbot/state/aetheria.cc differ diff --git a/Aetheria.State/README.md b/Aetheria.State/README.md index a2b562638..1d4fa18c0 100644 --- a/Aetheria.State/README.md +++ b/Aetheria.State/README.md @@ -188,6 +188,9 @@ instead of retaining config subclasses. Capacitor, Shield, Thruster, MiningTool, ResourceScanner, Thermotoggle, Switch, HeatStorage, and Cockpit have also dropped runtime config retention. Thermotoggle adjustability is exposed on the live behavior instance, not through its config. +Reactor, Radiator, Sensor, and StatModifier now copy their constructor +performance stats, curves, flags, and target strings into explicit runtime +fields; those live behaviors no longer retain their config subclasses. `ItemManager` currently owns the explicit typed-payload-to-config bridge. Typed name-file documents are `aetheria.name_file.v2` records. They carry the legacy ID, display name, count, compact sample names for surfaces, and the full diff --git a/Assets/Scripts/ServerShared/Behaviors/Radiator.cs b/Assets/Scripts/ServerShared/Behaviors/Radiator.cs index d6d21edd0..626d1036a 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Radiator.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Radiator.cs @@ -46,22 +46,37 @@ public class Radiator : Behavior, IAlwaysUpdatedBehavior, IInitializableBehavior public float WasteHeat { get; private set; } public float EnergyUsage { get; private set; } - private RadiatorConfig _data; + private readonly PerformanceStat _emissivity; + private readonly PerformanceStat _pumpedHeat; + private readonly float _temperatureFloor; + private readonly PerformanceStat _wasteHeat; + private readonly PerformanceStat _energyUsage; + private readonly PerformanceStat _thermalMass; public Radiator(RadiatorConfig data, EquippedItem item) : base(data, item) { - _data = data; + _emissivity = data.Emissivity; + _pumpedHeat = data.PumpedHeat; + _temperatureFloor = data.TemperatureFloor; + _wasteHeat = data.WasteHeat; + _energyUsage = data.EnergyUsage; + _thermalMass = data.ThermalMass; } public Radiator(RadiatorConfig data, ConsumableItemEffect item) : base(data, item) { - _data = data; + _emissivity = data.Emissivity; + _pumpedHeat = data.PumpedHeat; + _temperatureFloor = data.TemperatureFloor; + _wasteHeat = data.WasteHeat; + _energyUsage = data.EnergyUsage; + _thermalMass = data.ThermalMass; } public override bool Execute(float dt) { - PumpedHeat = Evaluate(_data.PumpedHeat); - WasteHeat = Evaluate(_data.WasteHeat); - EnergyUsage = Evaluate(_data.EnergyUsage); + PumpedHeat = Evaluate(_pumpedHeat); + WasteHeat = Evaluate(_wasteHeat); + EnergyUsage = Evaluate(_energyUsage); var itemTemperature = Temperature; var tempRatio = max(RadiatorTemperature / itemTemperature, 1); @@ -71,7 +86,7 @@ public class Radiator : Behavior, IAlwaysUpdatedBehavior, IInitializableBehavior if (!Entity.TryConsumeEnergy(EnergyUsage * tempRatio * dt)) return false; - var pumpedHeat = PumpedHeat * max(itemTemperature - _data.TemperatureFloor, 0); + var pumpedHeat = PumpedHeat * max(itemTemperature - _temperatureFloor, 0); // Radiator temperature is below temperature floor, stop executing if (pumpedHeat < 0.01f) return true; @@ -79,14 +94,14 @@ public class Radiator : Behavior, IAlwaysUpdatedBehavior, IInitializableBehavior var wasteHeat = WasteHeat * tempRatio; AddHeat((wasteHeat - pumpedHeat) * dt); - RadiatorTemperature += pumpedHeat / Evaluate(_data.ThermalMass) * dt; + RadiatorTemperature += pumpedHeat / Evaluate(_thermalMass) * dt; return true; } public void Update(float delta) { - Emissivity = Evaluate(_data.Emissivity); + Emissivity = Evaluate(_emissivity); var rad = pow(RadiatorTemperature, ItemManager.GameplaySettings.HeatRadiationExponent) * ItemManager.GameplaySettings.HeatRadiationMultiplier * Emissivity; RadiatorTemperature -= rad * delta; Entity.VisibilitySources[this] = rad; @@ -96,4 +111,4 @@ public class Radiator : Behavior, IAlwaysUpdatedBehavior, IInitializableBehavior { RadiatorTemperature = Temperature; } -} \ No newline at end of file +} diff --git a/Assets/Scripts/ServerShared/Behaviors/Reactor.cs b/Assets/Scripts/ServerShared/Behaviors/Reactor.cs index 75f27ca20..03c705c5f 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Reactor.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Reactor.cs @@ -37,7 +37,10 @@ public class ReactorConfig : RuntimeBehaviorConfig public class Reactor : Behavior, IOrderedBehavior, IDisposable { - private ReactorConfig _data; + private readonly PerformanceStat _charge; + private readonly PerformanceStat _efficiency; + private readonly PerformanceStat _overloadEfficiency; + private readonly PerformanceStat _throttlingFactor; public float Draw { get; private set; } @@ -51,12 +54,18 @@ public class Reactor : Behavior, IOrderedBehavior, IDisposable public Reactor(ReactorConfig data, EquippedItem item) : base(data, item) { - _data = data; + _charge = data.Charge; + _efficiency = data.Efficiency; + _overloadEfficiency = data.OverloadEfficiency; + _throttlingFactor = data.ThrottlingFactor; FindCapacitors(); } public Reactor(ReactorConfig data, ConsumableItemEffect item) : base(data, item) { - _data = data; + _charge = data.Charge; + _efficiency = data.Efficiency; + _overloadEfficiency = data.OverloadEfficiency; + _throttlingFactor = data.ThrottlingFactor; FindCapacitors(); } @@ -82,8 +91,8 @@ public class Reactor : Behavior, IOrderedBehavior, IDisposable public override bool Execute(float dt) { - var charge = Evaluate(_data.Charge) * dt; - var efficiency = Evaluate(_data.Efficiency); + var charge = Evaluate(_charge) * dt; + var efficiency = Evaluate(_efficiency); // This behavior executes last, so any components drawing power have already done so @@ -97,7 +106,7 @@ public class Reactor : Behavior, IOrderedBehavior, IDisposable if (Draw > .01f) { CurrentLoadRatio = (Draw + charge) / max(charge, .01f); - var overloadEfficiency = Evaluate(_data.OverloadEfficiency); + var overloadEfficiency = Evaluate(_overloadEfficiency); // Generate heat using overload efficiency, usually much less efficient! heat += Draw / overloadEfficiency; @@ -130,7 +139,7 @@ public class Reactor : Behavior, IOrderedBehavior, IDisposable if (Draw < -.01f) { CurrentLoadRatio = (Draw + charge) / max(charge, .01f); - heat -= Draw / efficiency * (1 - 1 / Evaluate(_data.ThrottlingFactor)); + heat -= Draw / efficiency * (1 - 1 / Evaluate(_throttlingFactor)); Draw = 0; } else @@ -149,4 +158,4 @@ public class Reactor : Behavior, IOrderedBehavior, IDisposable foreach(var sub in _subscriptions) sub.Dispose(); } -} \ No newline at end of file +} diff --git a/Assets/Scripts/ServerShared/Behaviors/Sensor.cs b/Assets/Scripts/ServerShared/Behaviors/Sensor.cs index 8bf9b4a98..956fbfc00 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Sensor.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Sensor.cs @@ -50,7 +50,15 @@ public class SensorConfig : RuntimeBehaviorConfig public class Sensor : Behavior, IEventBehavior { - private SensorConfig _data; + private readonly PerformanceStat _sensitivity; + private readonly BezierCurve _sensitivityCurve; + private readonly PerformanceStat _pingBoost; + private readonly PerformanceStat _pingEnergy; + private readonly PerformanceStat _pingVisibility; + private readonly PerformanceStat _pingRange; + private readonly PerformanceStat _pingCooldownDuration; + private readonly float _pingDuration; + private readonly float _pingRadiusExponent; private float _pingCooldown; private float _pingLerp; private bool _pinging; @@ -70,7 +78,7 @@ public class Sensor : Behavior, IEventBehavior public bool Pinging => _pinging; public int PingedEntityCount => _pingedEntities.Count; - public float PingBrightness => pow(1 - _pingLerp, _data.PingRadiusExponent); + public float PingBrightness => pow(1 - _pingLerp, _pingRadiusExponent); public event Action OnPingStart; public event Action OnPingEnd; @@ -83,9 +91,9 @@ public class Sensor : Behavior, IEventBehavior public void Ping() { - if(_pingCooldown < 0 && Entity.TryConsumeEnergy(Evaluate(_data.PingEnergy))) + if(_pingCooldown < 0 && Entity.TryConsumeEnergy(Evaluate(_pingEnergy))) { - Entity.VisibilitySources[this] = Evaluate(_data.PingVisibility); + Entity.VisibilitySources[this] = Evaluate(_pingVisibility); _pinging = true; _pingCooldown = 1; _pingLerp = 0; @@ -97,20 +105,36 @@ public class Sensor : Behavior, IEventBehavior public Sensor(SensorConfig data, EquippedItem item) : base(data, item) { - _data = data; + _sensitivity = data.Sensitivity; + _sensitivityCurve = data.SensitivityCurve; + _pingBoost = data.PingBoost; + _pingEnergy = data.PingEnergy; + _pingVisibility = data.PingVisibility; + _pingRange = data.PingRange; + _pingCooldownDuration = data.PingCooldown; + _pingDuration = data.PingDuration; + _pingRadiusExponent = data.PingRadiusExponent; } public Sensor(SensorConfig data, ConsumableItemEffect item) : base(data, item) { - _data = data; + _sensitivity = data.Sensitivity; + _sensitivityCurve = data.SensitivityCurve; + _pingBoost = data.PingBoost; + _pingEnergy = data.PingEnergy; + _pingVisibility = data.PingVisibility; + _pingRange = data.PingRange; + _pingCooldownDuration = data.PingCooldown; + _pingDuration = data.PingDuration; + _pingRadiusExponent = data.PingRadiusExponent; } public override bool Execute(float dt) { if (_pinging) { - _pingLerp += dt / _data.PingDuration; - _pingRadius = lerp(0, Evaluate(_data.PingRange), pow(_pingLerp, _data.PingRadiusExponent)); + _pingLerp += dt / _pingDuration; + _pingRadius = lerp(0, Evaluate(_pingRange), pow(_pingLerp, _pingRadiusExponent)); if (_pingLerp > 1) { _pinging = false; @@ -118,7 +142,7 @@ public class Sensor : Behavior, IEventBehavior } } - _pingCooldown -= dt / Evaluate(_data.PingCooldown); + _pingCooldown -= dt / Evaluate(_pingCooldownDuration); // TODO: Handle Active Detection / Visibility From Reflected Radiance var forward = Direction.xz; @@ -137,8 +161,8 @@ public class Sensor : Behavior, IEventBehavior next = saturate( previous + entity.Visibility * - Evaluate(_data.Sensitivity) * - Evaluate(_data.PingBoost) * + Evaluate(_sensitivity) * + Evaluate(_pingBoost) * dist); } else @@ -146,8 +170,8 @@ public class Sensor : Behavior, IEventBehavior next = saturate( previous + entity.Visibility * - Evaluate(_data.Sensitivity) * - _data.SensitivityCurve.Evaluate(angle / PI) * + Evaluate(_sensitivity) * + _sensitivityCurve.Evaluate(angle / PI) * dt / dist); } next *= 1 - ItemManager.GameplaySettings.TargetInfoDecay * dt; diff --git a/Assets/Scripts/ServerShared/Behaviors/StatModifier.cs b/Assets/Scripts/ServerShared/Behaviors/StatModifier.cs index 93920cde4..37a8c59d0 100644 --- a/Assets/Scripts/ServerShared/Behaviors/StatModifier.cs +++ b/Assets/Scripts/ServerShared/Behaviors/StatModifier.cs @@ -34,7 +34,11 @@ public class StatModifierConfig : RuntimeBehaviorConfig [Order(-4)] public class StatModifier : Behavior, IInitializableBehavior, IDisposable, IAlwaysUpdatedBehavior { - private StatModifierConfig _data; + private readonly string _targetBehaviorKind; + private readonly string _targetStatName; + private readonly PerformanceStat _modifier; + private readonly StatModifierType _type; + private readonly string _requiredBehaviorKind; private PerformanceStat[] _stats; @@ -47,12 +51,20 @@ public class StatModifier : Behavior, IInitializableBehavior, IDisposable, IAlwa public StatModifier(StatModifierConfig data, EquippedItem item) : base(data, item) { - _data = data; + _targetBehaviorKind = data.Stat.Target; + _targetStatName = data.Stat.Stat; + _modifier = data.Modifier; + _type = data.Type; + _requiredBehaviorKind = data.RequireBehavior; } public StatModifier(StatModifierConfig data, ConsumableItemEffect item) : base(data, item) { - _data = data; + _targetBehaviorKind = data.Stat.Target; + _targetStatName = data.Stat.Stat; + _modifier = data.Modifier; + _type = data.Type; + _requiredBehaviorKind = data.RequireBehavior; } public void Initialize() @@ -60,7 +72,7 @@ public class StatModifier : Behavior, IInitializableBehavior, IDisposable, IAlwa _stats = Entity.Equipment .Where(HasRequiredBehavior) .SelectMany(gear => gear.Behaviors ?? Array.Empty()) - .Where(behavior => BehaviorKindMatches(behavior.Kind, _data.Stat.Target)) + .Where(behavior => BehaviorKindMatches(behavior.Kind, _targetBehaviorKind)) .Select(FindTargetStat) .Where(stat => stat != null) .ToArray(); @@ -68,7 +80,7 @@ public class StatModifier : Behavior, IInitializableBehavior, IDisposable, IAlwa private PerformanceStat FindTargetStat(Behavior behavior) { - return behavior.TryGetPerformanceStat(_data.Stat.Stat, out var stat) ? stat : null; + return behavior.TryGetPerformanceStat(_targetStatName, out var stat) ? stat : null; } private static bool BehaviorKindMatches(string runtimeKind, string expectedKind) @@ -93,25 +105,25 @@ public class StatModifier : Behavior, IInitializableBehavior, IDisposable, IAlwa private bool HasRequiredBehavior(EquippedItem gear) { - return string.IsNullOrWhiteSpace(_data.RequireBehavior) || + return string.IsNullOrWhiteSpace(_requiredBehaviorKind) || (gear?.Behaviors ?? Array.Empty()) - .Any(behavior => BehaviorKindMatches(behavior.Kind, _data.RequireBehavior)); + .Any(behavior => BehaviorKindMatches(behavior.Kind, _requiredBehaviorKind)); } private void ApplyModifier() { _applied = true; foreach (var stat in _stats) - (_data.Type == StatModifierType.Constant + (_type == StatModifierType.Constant ? stat.GetConstantModifiers(Entity) - : stat.GetScaleModifiers(Entity))[this] = Evaluate(_data.Modifier); + : stat.GetScaleModifiers(Entity))[this] = Evaluate(_modifier); } private void RemoveModifier() { _applied = false; foreach (var stat in _stats) - (_data.Type == StatModifierType.Constant ? stat.GetConstantModifiers(Entity) : stat.GetScaleModifiers(Entity)).Remove(this); + (_type == StatModifierType.Constant ? stat.GetConstantModifiers(Entity) : stat.GetScaleModifiers(Entity)).Remove(this); } public override bool Execute(float dt) diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md index 0c12a1add..84d741692 100644 --- a/docs/aetheria-perfect-machine-map.md +++ b/docs/aetheria-perfect-machine-map.md @@ -312,6 +312,9 @@ legacy catalog cache, and legacy UI paths should be migration-only or deleted. Capacitor, Shield, Thruster, MiningTool, ResourceScanner, Thermotoggle, Switch, HeatStorage, and Cockpit have also dropped runtime config retention; Thermotoggle adjustability is now owned by the live behavior instance. + Reactor, Radiator, Sensor, and StatModifier now copy constructor performance + stats, curves, flags, and target strings into explicit runtime fields instead + of retaining config subclasses. `StatModifier` behavior requirements and behavior-stat targets compare typed behavior kinds on the live equipped behavior instances through `AetheriaRuntimeBehaviorMetadataCatalog` instead of scanning config