Merge origin/master into sensor-catalog-r2 (code; catalog is master's)

Conflicts: EvasionTermTests keeps the branch's EvLonginusDrive split with master's generic
design names; AetherDb Program.cs keeps both the sensor-stat-set and generic-designs cases and
lists both in the usage line. GameData/Aetheria.cc is taken from origin/master unchanged;
sensor-stat-set apply is rerun on it in the next commit. Tests that read the sensor catalog
(TheCatalogCarriesSensorStats and the roles checks) do not pass at this commit: it builds.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Assets/Scripts/ServerShared/Behaviors/ChargedWeapon.cs

@@ -54,6 +54,15 @@ public class ChargedWeaponData : InstantWeaponData
     {
         return new ChargedWeapon(this, item);
     }
+
+    // The one formula of a charged weapon's damage per second at a range (see InstantWeaponData.RangeDamagePerSecond).
+    internal static float RangeDamagePerSecond(BezierCurve damageCurve, float damage, float chargeFiringDamageMultiplier,
+        float minRange, float range, float cooldown, float chargeTime, float atRange) =>
+        damage * chargeFiringDamageMultiplier * damageCurve.Evaluate(saturate(unlerp(minRange, range, atRange))) / (cooldown + chargeTime);
+
+    public override float RatedRangeDamagePerSecond(float range) =>
+        RangeDamagePerSecond(DamageCurve, PerRound(Damage.Max, Count.Max), ChargeFiringDamageMultiplier, MinRange.Max, Range.Max,
+            Cooldown.Max, ChargeTime.Max, range);
 }
 
 public class ChargedWeapon : InstantWeapon
@@ -75,13 +84,14 @@ public class ChargedWeapon : InstantWeapon
     // authored charge-up speed IS its sustained rate of fire, not a second, disconnected number.
     protected override float RateOverride => Evaluate(_data.ChargeEnergy);
     
-    public override float DamagePerSecond => Damage * _data.ChargeFiringDamageMultiplier / (Cooldown + ChargeTime);
+    // The charge multiplier lives in the formula alone: Damage is lerped by charge for the shot itself (UpdateStats), so the
+    // live reads take the uncharged damage, and a nominal weapon reads its design's rated figure at every charge.
+    private float _unchargedDamage;
+    public override float DamagePerSecond => _unchargedDamage * _data.ChargeFiringDamageMultiplier / (Cooldown + ChargeTime);
     public override float RangeDamagePerSecond(float range)
     {
-        return Damage *
-               _data.ChargeFiringDamageMultiplier *
-               _data.DamageCurve.Evaluate(saturate(unlerp(MinRange, Range, range))) /
-               (Cooldown + ChargeTime);
+        return ChargedWeaponData.RangeDamagePerSecond(_data.DamageCurve, _unchargedDamage, _data.ChargeFiringDamageMultiplier,
+            MinRange, Range, Cooldown, ChargeTime, range);
     }
 
     public event Action OnStartCharging;
@@ -121,6 +131,7 @@ public class ChargedWeapon : InstantWeapon
         ChargeTime = Evaluate(_data.ChargeTime);
         ChargeEnergy = Evaluate(_data.ChargeEnergy);
         ChargeHeat = Evaluate(_data.ChargeHeat);
+        _unchargedDamage = Damage;
         Damage *= lerp(1, _data.ChargeFiringDamageMultiplier, saturate(_charge));
         Heat *= lerp(1, _data.ChargeFiringHeatMultiplier, saturate(_charge));
         Spread *= lerp(1, _data.ChargeFiringSpreadMultiplier, saturate(_charge));

Assets/Scripts/ServerShared/Behaviors/ConstantWeapon.cs

@@ -23,6 +23,13 @@ public class ConstantWeaponData : WeaponData
     {
         return new ConstantWeapon(this, item);
     }
+
+    // The one formula of a beam's damage per second at a range (see InstantWeaponData.RangeDamagePerSecond).
+    internal static float RangeDamagePerSecond(BezierCurve damageCurve, float damage, float minRange, float range, float atRange) =>
+        damage * damageCurve.Evaluate(saturate(unlerp(minRange, range, atRange)));
+
+    public override float RatedRangeDamagePerSecond(float range) =>
+        RangeDamagePerSecond(DamageCurve, Damage.Max, MinRange.Max, Range.Max, range);
 }
 
 public class ConstantWeapon : Weapon, IProgressBehavior, IEventBehavior, IPowerConsumer
@@ -49,7 +56,7 @@ public class ConstantWeapon : Weapon, IProgressBehavior, IEventBehavior, IPowerC
     public override float DamagePerSecond => Damage;
     public override float RangeDamagePerSecond(float range)
     {
-        return Damage * _data.DamageCurve.Evaluate(saturate(unlerp(MinRange, Range, range)));
+        return ConstantWeaponData.RangeDamagePerSecond(_data.DamageCurve, Damage, MinRange, Range, range);
     }
 
     public event Action OnReloadBegin;

Assets/Scripts/ServerShared/Behaviors/InstantWeapon.cs

@@ -30,6 +30,17 @@ public class InstantWeaponData : WeaponData
     {
         return new InstantWeapon(this, item);
     }
+
+    // The one formula of an instant weapon's damage per second at a range; the live weapon calls it with its evaluated
+    // stats, the design with its rated ones. A burst's round carries its share of the totals: PerRound, the one divisor
+    // UpdateStats and the rated read both use.
+    internal static float PerRound(float total, float burstCount) => total / (int) burstCount;
+
+    internal static float RangeDamagePerSecond(BezierCurve damageCurve, float damage, float minRange, float range, float cooldown, float atRange) =>
+        damage * damageCurve.Evaluate(saturate(unlerp(minRange, range, atRange))) / cooldown;
+
+    public override float RatedRangeDamagePerSecond(float range) =>
+        RangeDamagePerSecond(DamageCurve, PerRound(Damage.Max, Count.Max), MinRange.Max, Range.Max, Cooldown.Max, range);
 }
 
 public class InstantWeapon : Weapon, IProgressBehavior, IEventBehavior, IPowerConsumer
@@ -61,7 +72,7 @@ public class InstantWeapon : Weapon, IProgressBehavior, IEventBehavior, IPowerCo
     public override float DamagePerSecond => Damage / Cooldown;
     public override float RangeDamagePerSecond(float range)
     {
-        return Damage * _data.DamageCurve.Evaluate(saturate(unlerp(MinRange, Range, range))) / Cooldown;
+        return InstantWeaponData.RangeDamagePerSecond(_data.DamageCurve, Damage, MinRange, Range, Cooldown, range);
     }
 
     public override int Ammo
@@ -129,9 +140,9 @@ public class InstantWeapon : Weapon, IProgressBehavior, IEventBehavior, IPowerCo
         BurstTime = Evaluate(_data.BurstTime);
         Cooldown = Evaluate(_data.Cooldown);
 
-        Damage /= (int) BurstCount;
-        Heat /= (int) BurstCount;
-        Energy /= (int) BurstCount;
+        Damage = InstantWeaponData.PerRound(Damage, BurstCount);
+        Heat = InstantWeaponData.PerRound(Heat, BurstCount);
+        Energy = InstantWeaponData.PerRound(Energy, BurstCount);
     }
 
     // Cut 4 (docs/stats-and-power-cut.md §7 Q4): capacity and rate, resolved fresh rather than off the cached

Assets/Scripts/ServerShared/Behaviors/Weapon.cs

@@ -71,6 +71,13 @@ public abstract class WeaponData : BehaviorData
     // weapon-tracking-authored). Unauthored is a mount that follows anything: FireControl.PMount reads +infinity as 1.
     [Inspectable, JsonProperty("tracking"), Key(33), RuntimeInspectable]
     public PerformanceStat Tracking = new PerformanceStat { Min = float.PositiveInfinity, Max = float.PositiveInfinity };
+
+    // What an observer who believes this is the design measures it by (aetheria-ew, ew-claim-weapon-measure-ruled): the
+    // design's rated figures, each stat's Max (what a stat with no terms resolves to), through the same formula the
+    // live weapon's RangeDamagePerSecond runs over its evaluated stats. Never the carrier's quality, heat, wear or power.
+    public abstract float RatedRangeDamagePerSecond(float range);
+    [IgnoreMember]
+    public float RatedRange => Range.Max;
 }
 
 public abstract class Weapon : Behavior, IActivatedBehavior