From 0ef2e8bbcb7187b50d5f06be2d77183678d8090c Mon Sep 17 00:00:00 2001
From: Meta Vens <rwvens@hotmail.com>
Date: Mon, 15 Jun 2026 18:07:51 +0100
Subject: [PATCH] Stop AetherDrive retaining config

---
 .voidbot/state/aetheria.cc                    | Bin 119790 -> 121502 bytes
 Aetheria.State/README.md                      |   3 +
 .../ServerShared/Behaviors/AetherDrive.cs     |  69 +++++++++++++-----
 docs/aetheria-perfect-machine-map.md          |   3 +
 4 files changed, 57 insertions(+), 18 deletions(-)

diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc
index 631801a0b82ceb4dc6d9b6431247944c44009c2f..a31c53f7fab7e052b58663309a10e8dd62ec9d66 100644
GIT binary patch
delta 985
zcmY+DPe@cj9LM?Tf|-VBtf>$V1(xBiySn}jB1;cJNJtQQiP`sNcc<Q)dCi-*t8_40
zs7n`lhk=a3L>IC{MPd|D7?yeR(!oQAZk@8Ob*S05Ypuum{C>ar{l4Gd%=bdggO!@6
zg{s<t;dp<vcc^D_7Q+5|)!mvh@PAex@_F@*QbHnDO4t`_uiC`<&d_RS2)a*0<Lc#6
z7|*M=C8$%c#$kVxO>8cvBbdkx5vHJ7qQ;gW9lkgckkKMRjOUQ&5?5_KgBJCB37Tgr
z!e=>4(R6gturRf^KUYMM!5vCmB)H@Pr3tr*6w_VEAtJ?vjhR7^E3tIDkWRSn5oCBG
zOS%yDOv;gi1=bZr=s0F3as)}?q{cEcgD8_6ktxTb29-z<Y;tBzBjGVgZGuviSf-0i
zPf(WDb1+v5&ybX}lW1&;7@jQ3LKbIfB7$;P_dpfHmt-NHyh;oiEl9##UA;XwQS6|a
z3(%xOYj8%TUP41$=rJ|s3{f|*OLsIh5m*va&x*9YC`YiPGg8>5mKwPS;hFp6WJ)4O
z51FC{4(c83y2#CN&oYsXo!uhJ^nR!eEHkh+!n3s6B+)(=U6ZmX^HR{D`<xbwnJk~Q
zjy=Z=7HMJz!NaWkJU6bD5{oA3J!&t?Qq=q-I0y+pp6jTq@I}qPhj9IyO5!}$&tiB1
zPN{Eq;6R-#sbwLaV=hwD3vlGPzWJa1C@H9!CQnF~nnZgvK~k=tU(kxSuc$9C;F!9(
z3@0iZ`m;N&FsN>?L!=U`kyeoE#|q5BYya!7u=?`>P`&;RebK?bp8i-op&l+mOT)l$
zY!AHf7KYlF@&5<^JQvs&DGe53dL^px5jytV<!@EDmH$>xU-9#)#tnE^CcW{1>})`G
amm~s`{{*+nBoQl;)uWrRR=bN5lYaqfE@J}#

delta 176
zcmbQYmHpjv_6^IKI1Q}~&Gbx7ETbkeicUVt)B_bTH3JLeGgrd|ASyUm<e3g{Y}RDi
zuF1lv@4zUqJ<^5IuX%d-IYzbV^2Zr@CtqZiglI7{Fa?=0{opyq1MFaH%*-c$WEP)3
j|2$(EREZ@-iSY%-CWwf+5!mAGmoG3L;)DvB8$|&Cr)M(F

diff --git a/Aetheria.State/README.md b/Aetheria.State/README.md
index 1d4fa18c0..6a5608217 100644
--- a/Aetheria.State/README.md
+++ b/Aetheria.State/README.md
@@ -191,6 +191,9 @@ 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.
+AetherDrive now follows the same rule for rotor geometry, performance stats,
+torque curve, audio parameters, and prefab path. Remaining runtime config
+retention is concentrated in the weapon family.
 `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/AetherDrive.cs b/Assets/Scripts/ServerShared/Behaviors/AetherDrive.cs
index 84954de06..e1f655666 100644
--- a/Assets/Scripts/ServerShared/Behaviors/AetherDrive.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/AetherDrive.cs
@@ -60,7 +60,18 @@ public class AetherDriveConfig : RuntimeBehaviorConfig
 
 public class AetherDrive : Behavior
 {
-    private AetherDriveConfig _data;
+    private readonly float3 _rotorDiameter;
+    private readonly float3 _rotorMass;
+    private readonly PerformanceStat _maximumRpm;
+    private readonly float3 _couplingLambda;
+    private readonly PerformanceStat _lambdaMultiplier;
+    private readonly PerformanceStat _couplingEfficiency;
+    private readonly PerformanceStat _torque;
+    private readonly BezierCurve _torqueProfile;
+    private readonly PerformanceStat _energyDraw;
+    private readonly PerformanceStat _passiveCoupling;
+    private readonly uint _rpmAudioParameter;
+    private readonly uint _torqueRatioAudioParameter;
     private float3 _axis;
 
     public float3 Thrust { get; private set; }
@@ -77,36 +88,58 @@ public class AetherDrive : Behavior
 
     public AetherDrive(AetherDriveConfig data, EquippedItem item) : base(data, item)
     {
-        _data = data;
+        _rotorDiameter = data.RotorDiameter;
+        _rotorMass = data.RotorMass;
+        _maximumRpm = data.MaximumRpm;
+        _couplingLambda = data.CouplingLambda;
+        _lambdaMultiplier = data.LambdaMultiplier;
+        _couplingEfficiency = data.CouplingEfficiency;
+        _torque = data.Torque;
+        _torqueProfile = data.TorqueProfile;
+        _energyDraw = data.EnergyDraw;
+        _passiveCoupling = data.PassiveCoupling;
+        _rpmAudioParameter = data.RpmAudioParameter;
+        _torqueRatioAudioParameter = data.TorqueRatioAudioParameter;
         Particles = data.Particles;
     }
 
     public AetherDrive(AetherDriveConfig data, ConsumableItemEffect item) : base(data, item)
     {
-        _data = data;
+        _rotorDiameter = data.RotorDiameter;
+        _rotorMass = data.RotorMass;
+        _maximumRpm = data.MaximumRpm;
+        _couplingLambda = data.CouplingLambda;
+        _lambdaMultiplier = data.LambdaMultiplier;
+        _couplingEfficiency = data.CouplingEfficiency;
+        _torque = data.Torque;
+        _torqueProfile = data.TorqueProfile;
+        _energyDraw = data.EnergyDraw;
+        _passiveCoupling = data.PassiveCoupling;
+        _rpmAudioParameter = data.RpmAudioParameter;
+        _torqueRatioAudioParameter = data.TorqueRatioAudioParameter;
         Particles = data.Particles;
     }
 
     public override bool Execute(float dt)
     {
-        var rotorSpeed = Rpm * _data.RotorDiameter / 100;
+        var rotorSpeed = Rpm * _rotorDiameter / 100;
 
         var forward = normalize(Entity.Direction);
         var right = forward.Rotate(ItemRotation.Clockwise);
 
         var speed = float2(dot(Entity.Velocity, forward), dot(Entity.Velocity, right));
-        var couplingEfficiency = Evaluate(_data.CouplingEfficiency);
+        var couplingEfficiency = Evaluate(_couplingEfficiency);
         var efficiency = float3(saturate(1 - speed / max(rotorSpeed.xy, 1) * sign(_axis.xy)) * couplingEfficiency, 1);
 
-        Thrust = (Rpm - AetheriaMath.Decay(Rpm, _data.CouplingLambda, dt)) * _data.RotorMass * efficiency;
+        Thrust = (Rpm - AetheriaMath.Decay(Rpm, _couplingLambda, dt)) * _rotorMass * efficiency;
 
-        var couplingLambda = _data.CouplingLambda * Item.Evaluate(_data.LambdaMultiplier) * max(abs(_axis), Evaluate(_data.PassiveCoupling));
+        var couplingLambda = _couplingLambda * Item.Evaluate(_lambdaMultiplier) * max(abs(_axis), Evaluate(_passiveCoupling));
         var previousRpm = Rpm;
         Rpm = AetheriaMath.Decay(Rpm, couplingLambda, dt);
         var rpmLoss = previousRpm - Rpm;
-        var force = rpmLoss * _data.RotorMass * efficiency;
+        var force = rpmLoss * _rotorMass * efficiency;
 
-        var heat = rpmLoss * _data.RotorMass * (1 - couplingEfficiency);
+        var heat = rpmLoss * _rotorMass * (1 - couplingEfficiency);
         AddHeat((heat.x + heat.y + heat.z)*ItemManager.GameplaySettings.AetherHeatMultiplier);
 
         ThrustDirection = forward * (_axis.x * force.x / Entity.Mass) + right * (_axis.y * force.y / Entity.Mass);
@@ -118,20 +151,20 @@ public class AetherDrive : Behavior
         if(float.IsNaN(Entity.Velocity.x))
             ItemManager.Log("FUCK FUCK FUCK FUCK");
 
-        MaximumRpm = Evaluate(_data.MaximumRpm);
+        MaximumRpm = Evaluate(_maximumRpm);
         var torqueProfile = float3(
-            _data.TorqueProfile.Evaluate(Rpm.x / MaximumRpm),
-            _data.TorqueProfile.Evaluate(Rpm.y / MaximumRpm),
-            _data.TorqueProfile.Evaluate(Rpm.z / MaximumRpm));
-        var potentialTorque = Evaluate(_data.Torque) * torqueProfile;
-        var potentialRpmDelta = potentialTorque / length(_data.RotorMass) * dt;
+            _torqueProfile.Evaluate(Rpm.x / MaximumRpm),
+            _torqueProfile.Evaluate(Rpm.y / MaximumRpm),
+            _torqueProfile.Evaluate(Rpm.z / MaximumRpm));
+        var potentialTorque = Evaluate(_torque) * torqueProfile;
+        var potentialRpmDelta = potentialTorque / length(_rotorMass) * dt;
         var actualRpmDelta = min(MaximumRpm - Rpm, potentialRpmDelta);
         var torqueRatio = actualRpmDelta / potentialRpmDelta;
-        var draw = torqueRatio * Evaluate(_data.EnergyDraw) / 3;
+        var draw = torqueRatio * Evaluate(_energyDraw) / 3;
 
         Item.SetAudioParameter(SpecialAudioParameter.Intensity, max(max(abs(_axis.x), abs(_axis.y)), abs(_axis.z)));
-        Item.SetAudioParameter(_data.RpmAudioParameter, (Rpm.x + Rpm.y + Rpm.z) / 3 / MaximumRpm);
-        Item.SetAudioParameter(_data.TorqueRatioAudioParameter, max(max(torqueRatio.x, torqueRatio.y), torqueRatio.z));
+        Item.SetAudioParameter(_rpmAudioParameter, (Rpm.x + Rpm.y + Rpm.z) / 3 / MaximumRpm);
+        Item.SetAudioParameter(_torqueRatioAudioParameter, max(max(torqueRatio.x, torqueRatio.y), torqueRatio.z));
 
         if (Entity.TryConsumeEnergy((draw.x + draw.y + draw.z)*dt))
         {
diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md
index 84d741692..d5aa8ee73 100644
--- a/docs/aetheria-perfect-machine-map.md
+++ b/docs/aetheria-perfect-machine-map.md
@@ -315,6 +315,9 @@ legacy catalog cache, and legacy UI paths should be migration-only or deleted.
   Reactor, Radiator, Sensor, and StatModifier now copy constructor performance
   stats, curves, flags, and target strings into explicit runtime fields instead
   of retaining config subclasses.
+  AetherDrive now copies rotor geometry, performance stats, torque curve, audio
+  parameters, and prefab path into explicit runtime fields; remaining runtime
+  config retention is concentrated in the weapon family.
   `StatModifier` behavior requirements and behavior-stat targets compare typed
   behavior kinds on the live equipped behavior instances through
   `AetheriaRuntimeBehaviorMetadataCatalog` instead of scanning config