From 0367f9d1fd1a6a46a74d1294cf77f73252bf714c Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sat, 17 Oct 2026 19:57:39 +0200 Subject: [PATCH] Fused Rounds stages its shooter; FlightTests counts the Faction wire slots at 20 FusedRounds.StagedQuality (.6) states the shooter's quality so the Cluster Cannon's damage in TheDirectWeaponKillsTheFragileHullWhileASmokeRoundIsStillInTheAir does not ride the item stream. The Faction wire now has 20 slots (Assembly at 19); the Doctrine-at-17 rule is unchanged. LockOn is not staged here: see the question raised on the spec. Co-Authored-By: Claude Opus 5.5 --- Assets/Scripts/ServerShared/Scenarios/FusedRounds.cs | 5 ++++- tests/Aetheria.Shared.Tests/FlightTests.cs | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/ServerShared/Scenarios/FusedRounds.cs b/Assets/Scripts/ServerShared/Scenarios/FusedRounds.cs index db2e18b65..b2d70c98e 100644 --- a/Assets/Scripts/ServerShared/Scenarios/FusedRounds.cs +++ b/Assets/Scripts/ServerShared/Scenarios/FusedRounds.cs @@ -22,11 +22,14 @@ public sealed class FusedRounds : Scenario public static readonly CultMath.float2 Mid = float2(-200, 600), Ahead = float2(0, 300), Fragile = float2(80, 240), Close = float2(6.4f, 4f), Stern = float2(0, -400); + // The shooter is staged at this quality, so the damage its Cluster Cannon deals does not ride the item stream. + public const float StagedQuality = .6f; + public override Galaxy Generate(GalaxyStage stage) => stage.Prelude(DemoTerminus.Cast); public override void Stage(ScenarioStage stage) { - var shooter = stage.Fit("Smoke Test Hull", + var shooter = stage.Fit("Smoke Test Hull", StagedQuality, ("Cockpit 2x2", int2(4, 6), None), ("Large Drive", int2(3, 0), Reversed), ("Large Drive", int2(5, 0), Reversed), diff --git a/tests/Aetheria.Shared.Tests/FlightTests.cs b/tests/Aetheria.Shared.Tests/FlightTests.cs index cec6652c6..ba0a4dd82 100644 --- a/tests/Aetheria.Shared.Tests/FlightTests.cs +++ b/tests/Aetheria.Shared.Tests/FlightTests.cs @@ -919,7 +919,7 @@ public sealed class FlightTests : IDisposable var slots = MessagePack.MessagePackSerializer.Deserialize(MessagePack.MessagePackSerializer.Serialize(faction, CultDocumentMessagePackSerialization.OptionsFor(typeof(Faction).Assembly))); - Assert.Equal(21, slots.Length); + Assert.Equal(20, slots.Length); // 19 is Assembly Assert.Null(slots[16]); var doctrine = Assert.IsType(slots[17]); Assert.Equal(6f, Convert.ToSingle(doctrine[1]));