diff --git a/Assets/Scripts/ServerShared/Behaviors/AetherDrive.cs b/Assets/Scripts/ServerShared/Behaviors/AetherDrive.cs index 9efa1207b..5baf95eb8 100644 --- a/Assets/Scripts/ServerShared/Behaviors/AetherDrive.cs +++ b/Assets/Scripts/ServerShared/Behaviors/AetherDrive.cs @@ -159,13 +159,15 @@ public class AetherDrive : Behavior, IPowerConsumer Item.SetAudioParameter(_data.RpmAudioParameter, (Rpm.x + Rpm.y + Rpm.z) / 3 / MaximumRpm); Item.SetAudioParameter(_data.TorqueRatioAudioParameter, max(max(torqueRatio.x, torqueRatio.y), torqueRatio.z)); - if (Item.PowerSupply >= 1f) + // Cut 7 (docs/stats-and-power-target.md): actualRpmDelta already derives from Evaluate(_data.Torque) + // above, so a Torque stat carrying a PowerSupply term already shrinks the rotor's spin-up under a + // partial grant -- this no longer demands a full one, only that supply has not been cut to true zero. + if (Item.PowerSupply > 1e-4f) { Rpm += actualRpmDelta; return true; } - return false; } } \ No newline at end of file diff --git a/Assets/Scripts/ServerShared/Behaviors/ConstantWeapon.cs b/Assets/Scripts/ServerShared/Behaviors/ConstantWeapon.cs index 83fddfc52..107b6f847 100644 --- a/Assets/Scripts/ServerShared/Behaviors/ConstantWeapon.cs +++ b/Assets/Scripts/ServerShared/Behaviors/ConstantWeapon.cs @@ -92,7 +92,11 @@ public class ConstantWeapon : Weapon, IProgressBehavior, IEventBehavior, IPowerC } if (_firing) { - if (Item != null && Item.PowerSupply < 1f) + // Cut 7 (docs/stats-and-power-target.md): base.Execute(dt) above already re-read Damage through + // Evaluate(_data.Damage), so a Damage stat carrying a PowerSupply term already fires this tick for + // less under a partial grant -- the weapon no longer safes itself off (the "flicking off gear" bug + // the ruling names) just because the grant fell short of 1. Only true zero supply still stops it. + if (Item != null && Item.PowerSupply <= 1e-4f) { _firing = false; OnStopFiring?.Invoke(); diff --git a/Assets/Scripts/ServerShared/Behaviors/EnergyDraw.cs b/Assets/Scripts/ServerShared/Behaviors/EnergyDraw.cs index ceb535903..ee57853f6 100644 --- a/Assets/Scripts/ServerShared/Behaviors/EnergyDraw.cs +++ b/Assets/Scripts/ServerShared/Behaviors/EnergyDraw.cs @@ -54,6 +54,13 @@ public class EnergyDraw : Behavior, IPowerConsumer // A consumable-hosted instance (Item null) has no PowerBus entry (ยง1.2's grants are keyed by // EquippedItem); named rather than silently assumed away, it always succeeds here, the same way every // other context-dependent factor a ConsumableItemEffect answers with the identity elsewhere in this cut. - return Item == null || Item.PowerSupply >= 1f; + // + // Cut 7 (docs/stats-and-power-target.md): unlike the other four continuous consumers, EnergyDraw has no + // performance stat of its own to curve -- its Execute return value IS its whole effect, the gate that + // decides whether the rest of its BehaviorGroup runs at all (Entity.cs's per-group Execute chain). There + // is nothing here for a PowerSupply term to degrade continuously, so brownout is expressed the only way + // this behaviour can express it: a partial grant still passes (no more flicking off at 80%), and only a + // true zero grant closes the gate. + return Item == null || Item.PowerSupply > 1e-4f; } } \ No newline at end of file diff --git a/Assets/Scripts/ServerShared/Behaviors/Radiator.cs b/Assets/Scripts/ServerShared/Behaviors/Radiator.cs index 868139ef8..d7a9a7c58 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Radiator.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Radiator.cs @@ -86,8 +86,12 @@ public class Radiator : Behavior, IAlwaysUpdatedBehavior, IInitializableBehavior // Temperature ratio would cause more waste heat than pump capacity, stop executing if (tempRatio > PumpedHeat / WasteHeat) return true; - if (Item != null && Item.PowerSupply < 1f) return false; - + // Cut 7 (docs/stats-and-power-target.md): no separate power gate at all. PumpedHeat above is already a + // plain Evaluate() read, so a PumpedHeat stat carrying a PowerSupply term already pumps less under a + // partial grant -- waste heat below is unaffected by the curve, so a starved radiator falls behind and + // the ship heats up, which is the reduced-performance failure the ruling asks for instead of the pump + // simply refusing to run. At true zero supply PumpedHeat itself resolves to 0 (pow(0, exponent) == 0), + // so "produces nothing" already falls out of the curve below without a special case here. var pumpedHeat = PumpedHeat * max(itemTemperature - _data.TemperatureFloor, 0); // Radiator temperature is below temperature floor, stop executing diff --git a/Assets/Scripts/ServerShared/Behaviors/Thruster.cs b/Assets/Scripts/ServerShared/Behaviors/Thruster.cs index b11453137..7236ed5de 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Thruster.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Thruster.cs @@ -83,7 +83,12 @@ public class Thruster : Behavior, IAnalogBehavior, IPowerConsumer public override bool Execute(float dt) { Item.SetAudioParameter(SpecialAudioParameter.Intensity, _input); - if(_input > .01f && Item.PowerSupply >= 1f) + // Cut 7 (docs/stats-and-power-target.md): "continuous consumers brown out ... through a power supply + // curve on their performance stats." Thrust below is a plain Evaluate() read, so once the catalog's own + // Thrust stat carries a PowerSupply term, a partial grant already comes back reduced -- this gate no + // longer demands a full grant, only that the thruster is being asked to do anything (_input) and that it + // has not been cut to true zero supply (the epsilon PowerBus itself already treats as "nothing granted"). + if(_input > .01f && Item.PowerSupply > 1e-4f) { Thrust = Evaluate(_data.Thrust); Entity.Velocity -= Direction.xz * _input * Thrust / Entity.Mass * dt;