diff --git a/Assets/Content/Prefabs/Tractor Beam.prefab b/Assets/Content/Prefabs/Tractor Beam.prefab index 9ce0d7760..c98d252a3 100644 --- a/Assets/Content/Prefabs/Tractor Beam.prefab +++ b/Assets/Content/Prefabs/Tractor Beam.prefab @@ -4818,6 +4818,3 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ParticleSystem: {fileID: 5087162364086924483} - Radius: 25 - Traction: 25 - Distance: 75 diff --git a/Assets/Scenes/FieldShieldTest.unity b/Assets/Scenes/FieldShieldTest.unity index 51c915b7f..b659bb95b 100644 --- a/Assets/Scenes/FieldShieldTest.unity +++ b/Assets/Scenes/FieldShieldTest.unity @@ -811,6 +811,9 @@ MonoBehaviour: Camera: {fileID: 1153356615} TestField: {fileID: 909026488} Properties: {fileID: 401779935} + GrabExtendTime: 1.5 + GrabEnvelopTime: 0.75 + GrabPullTime: 1.5 --- !u!4 &699508827 Transform: m_ObjectHideFlags: 0 @@ -1116,9 +1119,6 @@ MonoBehaviour: TendrilBaseDamping: 2 TendrilTipRadiusAnimationExponent: 2 TendrilFadeExponent: 2 - GrabExtendTime: 1.5 - GrabEnvelopTime: 0.75 - GrabPullTime: 1.5 RefractionAxis: 1 --- !u!114 &909026489 MonoBehaviour: diff --git a/Assets/Scripts/Editor/CapabilityPresentationSmoke.cs b/Assets/Scripts/Editor/CapabilityPresentationSmoke.cs new file mode 100644 index 000000000..75d97c63f --- /dev/null +++ b/Assets/Scripts/Editor/CapabilityPresentationSmoke.cs @@ -0,0 +1,208 @@ +using System; +using System.IO; +using System.Linq; +using System.Reflection; +using GameCult.Caching; +using UnityEditor; +using UnityEngine; +using CultMath; +using static CultMath.math; + +// Batch proof of the capability presenters' wiring, without a scene: a zone ship is bound to an EntityInstance through the +// game's own SetEntity, and impacts and grabs are published on the ship's Capabilities exactly as the simulation does. A hull absorb spawns +// one hull effect under the instance and, for the player's ship at ScreenShake 1, raises one camera impulse; ScreenShake 0 +// or another ship raises none; a shield absorb spawns no hull effect. The shield ripple itself (ShieldManager.ShowHit +// needs a shield material and a rig) is looked at in the editor, not here. Grabs: a Tractor Beam prefab under the instance +// is bound by the same SetEntity and presents a grab from events alone (emission at Power and the aim at the held point +// from Started to Completed or Cancelled, nothing otherwise, nothing for another entity's grab). +// +// Unity -batchmode -nographics -projectPath -executeMethod CapabilityPresentationSmoke.Run -logFile +// +// Do not pass -quit: Run exits the Editor itself, 0 on success and 1 on any failure. +public static class CapabilityPresentationSmoke +{ + private const BindingFlags Any = BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic; + + public static void Run() + { + var work = Path.Combine(Path.GetTempPath(), $"capability-presentation-smoke-{Guid.NewGuid():N}"); + GameObject[] objects = null; + try + { + Directory.CreateDirectory(work); + objects = Check(work); + Clean(objects, work); + EditorApplication.Exit(0); + } + catch (Exception exception) + { + Debug.LogException(exception); + Clean(objects, work); + EditorApplication.Exit(1); + } + } + + // Edit mode runs no Awake or Start; the smoke runs the ones the game's scene would have. + private static void Awaken(Component component) => component.GetType().GetMethod("Awake", Any)?.Invoke(component, null); + + private static GameObject[] Check(string work) + { + var settings = AssetDatabase.LoadAssetAtPath("Assets/Resources/Settings.asset")?.GameplaySettings + ?? throw new InvalidOperationException("No Settings.asset."); + + var shape = new Shape(5, 4); + foreach (var cell in shape.AllCoordinates) shape[cell] = true; + var hullData = new HullData + { + Name = "Smoke Hull", HullType = HullType.Ship, Shape = shape, Durability = 1000, Mass = 1000, Armor = 0 + }; + var cache = AetheriaStores.Open(Path.Combine(work, "smoke.cc"), catalogWritable: true); + cache.Upsert(new VerseGrammar { Revision = 1 }); + cache.Upsert(hullData); + cache.FlushAsync().Wait(); + var ledger = new ProvenanceLedger(); + for (var i = 1; i <= 8; i++) ledger.Lots[i] = new Lot { Origin = new Attributed(), Quality = 1 }; + var items = new ItemManager(cache, ledger, settings, _ => { }); + var zone = new Zone(items, new PlanetSettings(), new ZonePack(), new GalaxyZone { Name = "Smoke", Owner = null }, null); + var hullRef = items.ItemData.RefOf(items.ItemData.GetByName("Smoke Hull")); + var ship = new Ship(items, zone, new EquippableItem { Data = hullRef, Durability = 1000, Lot = 1 }, new EntitySettings()); + var other = new Ship(items, zone, new EquippableItem { Data = hullRef, Durability = 1000, Lot = 2 }, new EntitySettings()); + zone.Admit(ship, piloted: false); + zone.Admit(other, piloted: false); + + // The scene's side: the tuning object with a pooled effect, and the game manager that names the player's ship. + var feedbackObject = new GameObject("Smoke Impact Feedback"); + var feedback = feedbackObject.AddComponent(); + Awaken(feedback); + var effectObject = new GameObject("Smoke Hull Effect"); + feedback.HullEffect = effectObject.AddComponent(); + var managerObject = new GameObject("Smoke Game Manager"); + var manager = managerObject.AddComponent(); + typeof(ActionGameManager).GetProperty("Instance", Any).SetValue(null, manager); + manager.CurrentEntity = ship; + + var beamPrefab = AssetDatabase.LoadAssetAtPath("Assets/Content/Prefabs/Tractor Beam.prefab") + ?? throw new InvalidOperationException("No Tractor Beam prefab."); + // An entity's instance as the game builds it: the beam is a child before SetEntity on both ship paths, so the + // binder finds it as the game does. + (GameObject Object, EntityInstance Instance, TractorBeam Beam) Bound(string name, Entity entity) + { + var go = new GameObject(name); + var bound = go.AddComponent(); + Awaken(bound); + bound.HullColliders = new HullCollider[0]; + bound.RadiatorHardpoints = new RadiatorHardpoint[0]; + bound.ThrusterHardpoints = new ThrusterHardpoint[0]; + bound.WeaponHardpoints = new WeaponHardpoint[0]; + bound.ArticulationPoints = new ArticulationPoint[0]; + var tractor = ((GameObject)PrefabUtility.InstantiatePrefab(beamPrefab, go.transform)).GetComponent(); + tractor.Power = .8f; + tractor.Direction = Vector3.forward; + bound.SetEntity(null, entity); + return (go, bound, tractor); + } + var (instanceObject, instance, beam) = Bound("Smoke Entity Instance", ship); + var (otherObject, _, otherBeam) = Bound("Smoke Other Instance", other); + + int Effects() => instance.GetComponentsInChildren(true).Count(p => p != null && !p.isOriginalPrototype); + void Expect(string what, int effects, int kicks) + { + if (Effects() != effects || feedback.KicksRaised != kicks) + throw new InvalidOperationException($"{what}: {Effects()} hull effects (want {effects}), {feedback.KicksRaised} impulses (want {kicks})."); + } + AbsorbEvent Hit(AbsorbLayer layer) => new AbsorbEvent(float3(1f, 0f, 2f), float3(0f, 0f, 1f), 100f, DamageType.Kinetic, layer); + + ActionGameManager.PlayerSettings.GraphicsSettings.ScreenShake = 1f; + ship.Capabilities.PublishAbsorb(Hit(AbsorbLayer.Hull)); + Expect("player's hull hit", 1, 1); + var effect = instance.GetComponentsInChildren(true).Single(p => !p.isOriginalPrototype); + var drawn = DrawAhead.Carried(ship, float3(1f, 0f, 2f), ActionGameManager.Clock.Lead); + if (abs(effect.transform.position.x - drawn.x) > 1e-3f || abs(effect.transform.position.z - drawn.z) > 1e-3f) + throw new InvalidOperationException("The hull effect is not at the drawn impact point."); + + ActionGameManager.PlayerSettings.GraphicsSettings.ScreenShake = 0f; + ship.Capabilities.PublishAbsorb(Hit(AbsorbLayer.Hull)); + Expect("hull hit at ScreenShake 0", 2, 1); + + ActionGameManager.PlayerSettings.GraphicsSettings.ScreenShake = 1f; + manager.CurrentEntity = other; + ship.Capabilities.PublishAbsorb(Hit(AbsorbLayer.Hull)); + // An untracked ship is not drawn at (ActionGameManager.DrawsAt, since contact-hud): no hull effect, no impulse. + Expect("hull hit on an untracked ship", 2, 1); + + // Once the player's instruments track it, the same hit is drawn. + other.VisibleEntities.Add(ship); + ship.Capabilities.PublishAbsorb(Hit(AbsorbLayer.Hull)); + Expect("hull hit on a tracked ship", 3, 1); + other.VisibleEntities.Remove(ship); + + manager.CurrentEntity = ship; + ship.Capabilities.PublishAbsorb(Hit(AbsorbLayer.Shield)); + Expect("player's shield hit", 3, 2); + + // Grabs: the beam presents the simulation's events and nothing else. + float Emission() => beam.ParticleSystem.emission.rateOverTimeMultiplier; + void ExpectBeam(string what, float emission, bool towardHeld) + { + beam.Update(); + var forward = beam.transform.forward; + var aimed = towardHeld ? forward.x > .999f : forward.z > .999f; + if (abs(Emission() - emission) > 1e-4f || !aimed) + throw new InvalidOperationException($"{what}: emission {Emission()} (want {emission}), forward {forward} (want {(towardHeld ? "+x" : "+z")})."); + } + GrabEvent Grab(GrabPhase phase, float3 at) => new GrabEvent(new FloatingBodyId(7), phase, at, 1f); + + ExpectBeam("idle beam", 0f, false); + ship.Capabilities.PublishGrab(Grab(GrabPhase.Started, float3(20f, 0f, 0f))); + ExpectBeam("grab started", .8f, true); + foreach (var phase in new[] { GrabPhase.Extend, GrabPhase.Envelop, GrabPhase.Pull }) + { + ship.Capabilities.PublishGrab(Grab(phase, float3(20f, 0f, 0f))); + ExpectBeam($"grab {phase}", .8f, true); + } + ship.Capabilities.PublishGrab(Grab(GrabPhase.Completed, float3(20f, 0f, 0f))); + ExpectBeam("grab completed", 0f, false); + + // A grab cancelled after its item vanished carries no position: the beam goes dark and never turns toward it. + ship.Capabilities.PublishGrab(Grab(GrabPhase.Started, float3(20f, 0f, 0f))); + ExpectBeam("second grab started", .8f, true); + ship.Capabilities.PublishGrab(Grab(GrabPhase.Cancelled, float3(0f, 0f, 0f))); + ExpectBeam("grab cancelled", 0f, false); + + // Aim is on the ground plane: a beam above the held point does not pitch toward it. + var beamHome = beam.transform.position; + beam.transform.position = beamHome + new Vector3(0f, 10f, 0f); + ship.Capabilities.PublishGrab(Grab(GrabPhase.Started, float3(20f, 7f, 0f))); + ExpectBeam("grab from above", .8f, true); + ship.Capabilities.PublishGrab(Grab(GrabPhase.Completed, float3(20f, 7f, 0f))); + beam.transform.position = beamHome; + + // A grab held at the beam's own position has no direction to take: the beam keeps the aim it had. + beam.Direction = Vector3.right; + var atBeam = float3(beam.transform.position.x, 0f, beam.transform.position.z); + ship.Capabilities.PublishGrab(Grab(GrabPhase.Started, atBeam)); + ExpectBeam("grab at the beam", .8f, true); + ship.Capabilities.PublishGrab(Grab(GrabPhase.Completed, atBeam)); + beam.Direction = Vector3.forward; + ExpectBeam("after the grab at the beam", 0f, false); + + // The beam belongs to the ship's entity: another entity's grab, with its own beam bound, moves only that beam. + other.Capabilities.PublishGrab(Grab(GrabPhase.Started, float3(20f, 0f, 0f))); + ExpectBeam("another entity's grab", 0f, false); + otherBeam.Update(); + if (abs(otherBeam.ParticleSystem.emission.rateOverTimeMultiplier - .8f) > 1e-4f) + throw new InvalidOperationException("The other entity's own beam did not present its grab."); + + Debug.Log("CAPABILITY_PRESENTATION_SMOKE ok effects=3 impulses=2 grabs=ok"); + return new[] { feedbackObject, effectObject, managerObject, instanceObject, otherObject }; + } + + private static void Clean(GameObject[] objects, string work) + { + if (objects != null) + foreach (var go in objects) + if (go != null) UnityEngine.Object.DestroyImmediate(go); + try { if (Directory.Exists(work)) Directory.Delete(work, true); } + catch (Exception error) { Debug.LogWarning($"Impact presenter smoke left {work}: {error.Message}"); } + } +} diff --git a/Assets/Scripts/Editor/ImpactPresenterSmoke.cs.meta b/Assets/Scripts/Editor/CapabilityPresentationSmoke.cs.meta similarity index 100% rename from Assets/Scripts/Editor/ImpactPresenterSmoke.cs.meta rename to Assets/Scripts/Editor/CapabilityPresentationSmoke.cs.meta diff --git a/Assets/Scripts/Editor/FloatingItemsDrawnSmoke.cs b/Assets/Scripts/Editor/FloatingItemsDrawnSmoke.cs index f67c0db10..50f6fcb94 100644 --- a/Assets/Scripts/Editor/FloatingItemsDrawnSmoke.cs +++ b/Assets/Scripts/Editor/FloatingItemsDrawnSmoke.cs @@ -180,6 +180,32 @@ public static class FloatingItemsDrawnSmoke At(drawn, released, "step"); Require(drawn.transform.position != before, "the pickup did not move with the body."); + // A held item keeps its label lit, so a pull is read as it happens. The label is let go dark first (nothing views + // it), then the zone holds the item through its own TryHold and the label must come up. + var earlyPickup = Pickups().Single(p => p.Item == early.Item); + earlyPickup.LabelPersistDuration = 1; + earlyPickup.LabelFadeDuration = .2f; + for (var i = 0; i < 1200 && earlyPickup.ScanLabel.color.a > .05f; i++) yield return null; + Require(earlyPickup.ScanLabel.color.a <= .05f, "label: an unviewed, unheld label did not go dark."); + Require(zone.TryHold(taker, early.Id), "label: the zone refused to hold the item."); + for (var i = 0; i < 1200 && earlyPickup.ScanLabel.color.a < .95f; i++) yield return null; + Require(earlyPickup.ScanLabel.color.a >= .95f, "label: a held item's label is not lit."); + + // The test scene's stand-in sim and tendril ride the zone's own held-pose curve: its pose at each point of a grab + // is where the zone puts a held item at the same progress. + var (extend, envelop, pull) = (1.5f, .75f, 1.5f); + var holderAt = new CultMath.float3(taker.Position.x, 0f, taker.Position.z); + var claimedAt = new CultMath.float3(early.HeldFrom.x, 0f, early.HeldFrom.y); + foreach (var elapsed in new[] { 0f, extend + envelop - .01f, extend + envelop + .3f, extend + envelop + .75f, extend + envelop + pull }) + { + zone.SetHeldProgress(early.Id, Mathf.Clamp01((elapsed - extend - envelop) / pull)); // the pull starts after Extend and Envelop + zone.Update(.01f); + var want = FieldTester.PulledPosition(claimedAt, holderAt, elapsed, extend, envelop, pull); + Require(Mathf.Abs(early.Body.Position.x - want.x) < 1e-3f && Mathf.Abs(early.Body.Position.y - want.z) < 1e-3f, + $"stand-in pose at {elapsed}s is {want}, the zone holds the item at {early.Body.Position}."); + } + zone.Free(early.Id); + // Pickup destroys exactly the picked-up item's pickup. Require(zone.TryPickUp(taker, released.Id), "the station refused a one-cell stack."); yield return null; diff --git a/Assets/Scripts/Editor/ImpactPresenterSmoke.cs b/Assets/Scripts/Editor/ImpactPresenterSmoke.cs deleted file mode 100644 index b5f6f9714..000000000 --- a/Assets/Scripts/Editor/ImpactPresenterSmoke.cs +++ /dev/null @@ -1,132 +0,0 @@ -using System; -using System.IO; -using System.Linq; -using System.Reflection; -using GameCult.Caching; -using UnityEditor; -using UnityEngine; -using static CultMath.math; - -// Batch proof of ImpactPresenter's wiring, without a scene: a zone ship is bound to an EntityInstance through the game's -// own SetEntity, and impacts are published on the ship's Capabilities exactly as FireControl does. A hull absorb spawns -// one hull effect under the instance and, for the player's ship at ScreenShake 1, raises one camera impulse; ScreenShake 0 -// or another ship raises none; a shield absorb spawns no hull effect. The shield ripple itself (ShieldManager.ShowHit -// needs a shield material and a rig) is looked at in the editor, not here. -// -// Unity -batchmode -nographics -projectPath -executeMethod ImpactPresenterSmoke.Run -logFile -// -// Do not pass -quit: Run exits the Editor itself, 0 on success and 1 on any failure. -public static class ImpactPresenterSmoke -{ - private const BindingFlags Any = BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic; - - public static void Run() - { - var work = Path.Combine(Path.GetTempPath(), $"impact-presenter-smoke-{Guid.NewGuid():N}"); - GameObject[] objects = null; - try - { - Directory.CreateDirectory(work); - objects = Check(work); - Clean(objects, work); - EditorApplication.Exit(0); - } - catch (Exception exception) - { - Debug.LogException(exception); - Clean(objects, work); - EditorApplication.Exit(1); - } - } - - // Edit mode runs no Awake or Start; the smoke runs the ones the game's scene would have. - private static void Awaken(Component component) => component.GetType().GetMethod("Awake", Any)?.Invoke(component, null); - - private static GameObject[] Check(string work) - { - var settings = AssetDatabase.LoadAssetAtPath("Assets/Resources/Settings.asset")?.GameplaySettings - ?? throw new InvalidOperationException("No Settings.asset."); - - var shape = new Shape(5, 4); - foreach (var cell in shape.AllCoordinates) shape[cell] = true; - var hullData = new HullData - { - Name = "Smoke Hull", HullType = HullType.Ship, Shape = shape, Durability = 1000, Mass = 1000, Armor = 0 - }; - var cache = AetheriaStores.Open(Path.Combine(work, "smoke.cc"), catalogWritable: true); - cache.Upsert(new VerseGrammar { Revision = 1 }); - cache.Upsert(hullData); - cache.FlushAsync().Wait(); - var ledger = new ProvenanceLedger(); - for (var i = 1; i <= 8; i++) ledger.Lots[i] = new Lot { Origin = new Attributed(), Quality = 1 }; - var items = new ItemManager(cache, ledger, settings, _ => { }); - var zone = new Zone(items, new PlanetSettings(), new ZonePack(), new GalaxyZone { Name = "Smoke", Owner = null }, null); - var hullRef = items.ItemData.RefOf(items.ItemData.GetByName("Smoke Hull")); - var ship = new Ship(items, zone, new EquippableItem { Data = hullRef, Durability = 1000, Lot = 1 }, new EntitySettings()); - var other = new Ship(items, zone, new EquippableItem { Data = hullRef, Durability = 1000, Lot = 2 }, new EntitySettings()); - zone.Admit(ship, piloted: false); - zone.Admit(other, piloted: false); - - // The scene's side: the tuning object with a pooled effect, and the game manager that names the player's ship. - var feedbackObject = new GameObject("Smoke Impact Feedback"); - var feedback = feedbackObject.AddComponent(); - Awaken(feedback); - var effectObject = new GameObject("Smoke Hull Effect"); - feedback.HullEffect = effectObject.AddComponent(); - var managerObject = new GameObject("Smoke Game Manager"); - var manager = managerObject.AddComponent(); - typeof(ActionGameManager).GetProperty("Instance", Any).SetValue(null, manager); - manager.CurrentEntity = ship; - - var instanceObject = new GameObject("Smoke Entity Instance"); - var instance = instanceObject.AddComponent(); - Awaken(instance); - instance.HullColliders = new HullCollider[0]; - instance.RadiatorHardpoints = new RadiatorHardpoint[0]; - instance.ThrusterHardpoints = new ThrusterHardpoint[0]; - instance.WeaponHardpoints = new WeaponHardpoint[0]; - instance.ArticulationPoints = new ArticulationPoint[0]; - instance.SetEntity(null, ship); - - int Effects() => instance.GetComponentsInChildren(true).Count(p => p != null && !p.isOriginalPrototype); - void Expect(string what, int effects, int kicks) - { - if (Effects() != effects || feedback.KicksRaised != kicks) - throw new InvalidOperationException($"{what}: {Effects()} hull effects (want {effects}), {feedback.KicksRaised} impulses (want {kicks})."); - } - AbsorbEvent Hit(AbsorbLayer layer) => new AbsorbEvent(float3(1f, 0f, 2f), float3(0f, 0f, 1f), 100f, DamageType.Kinetic, layer); - - ActionGameManager.PlayerSettings.GraphicsSettings.ScreenShake = 1f; - ship.Capabilities.PublishAbsorb(Hit(AbsorbLayer.Hull)); - Expect("player's hull hit", 1, 1); - var effect = instance.GetComponentsInChildren(true).Single(p => !p.isOriginalPrototype); - var drawn = DrawAhead.Carried(ship, float3(1f, 0f, 2f), ActionGameManager.Clock.Lead); - if (abs(effect.transform.position.x - drawn.x) > 1e-3f || abs(effect.transform.position.z - drawn.z) > 1e-3f) - throw new InvalidOperationException("The hull effect is not at the drawn impact point."); - - ActionGameManager.PlayerSettings.GraphicsSettings.ScreenShake = 0f; - ship.Capabilities.PublishAbsorb(Hit(AbsorbLayer.Hull)); - Expect("hull hit at ScreenShake 0", 2, 1); - - ActionGameManager.PlayerSettings.GraphicsSettings.ScreenShake = 1f; - manager.CurrentEntity = other; - ship.Capabilities.PublishAbsorb(Hit(AbsorbLayer.Hull)); - Expect("hull hit on another ship", 3, 1); - - manager.CurrentEntity = ship; - ship.Capabilities.PublishAbsorb(Hit(AbsorbLayer.Shield)); - Expect("player's shield hit", 3, 2); - - Debug.Log("IMPACT_PRESENTER_SMOKE ok effects=3 impulses=2"); - return new[] { feedbackObject, effectObject, managerObject, instanceObject }; - } - - private static void Clean(GameObject[] objects, string work) - { - if (objects != null) - foreach (var go in objects) - if (go != null) UnityEngine.Object.DestroyImmediate(go); - try { if (Directory.Exists(work)) Directory.Delete(work, true); } - catch (Exception error) { Debug.LogWarning($"Impact presenter smoke left {work}: {error.Message}"); } - } -} diff --git a/Assets/Scripts/Gameplay/CapabilityPresentationBinder.cs b/Assets/Scripts/Gameplay/CapabilityPresentationBinder.cs index b72a47e3a..b9e866c20 100644 --- a/Assets/Scripts/Gameplay/CapabilityPresentationBinder.cs +++ b/Assets/Scripts/Gameplay/CapabilityPresentationBinder.cs @@ -8,27 +8,18 @@ using UnityEngine; // playground-cut.md fork L: "presentation is chosen per item, independently of capability... one // presentation... can visualize any subset of an item's capabilities"). This binder has no knowledge // of FieldDriver or any other concrete presentation, and no knowledge of what publishes events -- -// today the FieldShieldTest scene calls Bind() directly; a real capability owner will do the same -// later without this binder changing. +// EntityInstance binds every entity's events, and the FieldShieldTest scene binds its stand-in sim's the same way. public class CapabilityPresentationBinder : MonoBehaviour { private readonly List _subscriptions = new List(); - private Func _grabTargetResolver; - private Func _grabInitialVelocityResolver; // Subscribes every presenter interface implemented by components on this object or its children to - // the matching stream of `events`. `grabTargetResolver`/`grabInitialVelocityResolver` resolve a - // GrabEvent's target id to the live Transform/velocity a grab presenter needs; the owner - // of `events` supplies them (the test scene today; the real pickup capability's caller later). - public void Bind(CapabilityEvents events, Func grabTargetResolver = null, - Func grabInitialVelocityResolver = null) + // the matching stream of `events`. + public void Bind(CapabilityEvents events) { Unbind(); if (events == null) return; - _grabTargetResolver = grabTargetResolver; - _grabInitialVelocityResolver = grabInitialVelocityResolver; - foreach (var presenter in GetComponentsInChildren(true)) { var p = presenter; @@ -38,12 +29,7 @@ public class CapabilityPresentationBinder : MonoBehaviour foreach (var presenter in GetComponentsInChildren(true)) { var p = presenter; - _subscriptions.Add(events.Grab.Subscribe(e => - { - var target = _grabTargetResolver?.Invoke(e.Target); - var velocity = _grabInitialVelocityResolver?.Invoke(e.Target) ?? Vector3.zero; - p.Grab(e, target, velocity); - })); + _subscriptions.Add(events.Grab.Subscribe(e => p.Grab(e))); } foreach (var presenter in GetComponentsInChildren(true)) @@ -63,8 +49,6 @@ public class CapabilityPresentationBinder : MonoBehaviour { foreach (var s in _subscriptions) s.Dispose(); _subscriptions.Clear(); - _grabTargetResolver = null; - _grabInitialVelocityResolver = null; } private void OnDisable() => Unbind(); diff --git a/Assets/Scripts/Gameplay/CapabilityPresenters.cs b/Assets/Scripts/Gameplay/CapabilityPresenters.cs index 1bc01100e..61cc78aac 100644 --- a/Assets/Scripts/Gameplay/CapabilityPresenters.cs +++ b/Assets/Scripts/Gameplay/CapabilityPresenters.cs @@ -10,13 +10,10 @@ public interface IAbsorbPresenter void Absorb(AbsorbEvent e); } -// Grab needs a live Transform to animate, which the engine-free GrabEvent cannot carry (its -// Target is a plain identity, not a Unity reference). The binder resolves the id through a -// delegate supplied by the event source's owner and hands the presenter the result, along with the -// initial velocity the target was already moving with (also owner-supplied, for the same reason). +// Presenters read the event and the simulated pose, never a Transform the sim does not own. public interface IGrabPresenter { - void Grab(GrabEvent e, Transform target, Vector3 initialVelocity); + void Grab(GrabEvent e); } public interface IMeleePresenter diff --git a/Assets/Scripts/Gameplay/FieldDriver.cs b/Assets/Scripts/Gameplay/FieldDriver.cs index dd6b36cc3..1c5d0a352 100644 --- a/Assets/Scripts/Gameplay/FieldDriver.cs +++ b/Assets/Scripts/Gameplay/FieldDriver.cs @@ -63,11 +63,7 @@ public class FieldDriver : MonoBehaviour, IAbsorbPresenter, IGrabPresenter, IMel // public float GrabScaleAnimationExponent = .5f; [Inspectable] - public float GrabExtendTime; - [Inspectable] - public float GrabEnvelopTime; - [Inspectable] - public float GrabPullTime; + public float TendrilTipScale = 1; [Inspectable] public RectTransform.Axis RefractionAxis = RectTransform.Axis.Horizontal; @@ -81,29 +77,17 @@ public class FieldDriver : MonoBehaviour, IAbsorbPresenter, IGrabPresenter, IMel private float _meleeTime; private bool _meleeActive; private MeshCollider _collider; - private Transform _grabObject; - private Vector3 _grabObjectStartPos; - private Vector3 _grabObjectStartTendrilBasePos; - private Vector3 _grabObjectEndPos; - private Vector3 _grabObjectVelocity; - private float _grabObjectScale; + private bool _grabbing; + private GrabPhase _grabPhase; private float _grabTime; - private TendrilPhase _grabPhase; + private float _phaseDuration; + private Vector3 _grabStart; + private Vector3 _grabStartTendrilBase; private Vector3 _tendrilBasePos; private Vector3 _tendrilBendTarget; private Vector3 _tendrilTargetPos; private float _fadePoint; - // Named distinctly from the global GrabPhase (CapabilityEvents.cs): this is FieldDriver's own - // internal tendril-animation timing, still owned here until a real pickup capability exists to - // publish per-phase GrabEvent transitions (see Grab(GrabEvent, Transform, Vector3) below). - private enum TendrilPhase - { - Extend, - Envelop, - Pull - } - private struct FieldHit { public float3 Position; @@ -181,32 +165,41 @@ public class FieldDriver : MonoBehaviour, IAbsorbPresenter, IGrabPresenter, IMel _meleeTime = 0; } - public bool CanGrab => _grabObject == null; - - public void GrabObject(Transform t, Vector3 v) - { - _grabPhase = TendrilPhase.Extend; - _grabObject = t; - _grabObjectStartPos = t.position; - _grabObjectVelocity = v; - _grabObjectScale = t.localScale.x; - _tendrilBasePos = _grabObjectStartTendrilBasePos = _collider.ClosestPoint(_grabObjectStartPos); - _fadePoint = .999f; - } - // IAbsorbPresenter: delegates straight to the existing hit-buffer mechanism. e.DamageType is not // read -- the field shield has no per-damage-type visual today; it rides along in the event for // presentations that do vary by type (the mask itself is absorb-capability data, out of scope here). public void Absorb(AbsorbEvent e) => AddHit(e.Position, e.Direction, e.Magnitude); - // IGrabPresenter: only the Started phase does anything today. FieldDriver still times the - // extend/envelop/pull animation itself (TendrilPhase above, driven by GrabExtendTime/ - // GrabEnvelopTime/GrabPullTime) because no capability yet publishes those phase transitions; - // once one does, this is where FieldDriver would react to Envelop/Pull/Completed/Cancelled too. - public void Grab(GrabEvent e, Transform target, Vector3 initialVelocity) + // IGrabPresenter: the simulation owns the grab; this draws the tendril from the events alone. Started records + // where the item is held and where the tendril leaves the field; Extend, Envelop and Pull set the phase and + // restart the real-time phase clock over the event's duration (it clamps at 1 until the next event, so a + // slowed simulation stretches the wait, not the animation); Completed and Cancelled end it. + public void Grab(GrabEvent e) { - if (e.Phase == GrabPhase.Started && target != null) - GrabObject(target, initialVelocity); + switch (e.Phase) + { + case GrabPhase.Started: + _grabbing = true; + _grabPhase = GrabPhase.Started; + _grabStart = e.TargetPosition.ToUnity(); + _tendrilBasePos = _grabStartTendrilBase = _collider.ClosestPoint(_grabStart); + _tendrilTargetPos = _grabStart; + _fadePoint = .999f; + break; + case GrabPhase.Extend: + case GrabPhase.Envelop: + case GrabPhase.Pull: + if (!_grabbing) break; + _grabPhase = e.Phase; + _grabTime = 0; + _phaseDuration = e.PhaseDuration; + break; + case GrabPhase.Completed: + case GrabPhase.Cancelled: + _grabbing = false; + _field.SetFloat("_TendrilInfluence", 0); + break; + } } // IMeleePresenter: the field shield's swing shape comes from its own authored curves @@ -277,74 +270,47 @@ public class FieldDriver : MonoBehaviour, IAbsorbPresenter, IGrabPresenter, IMel } - if(_grabObject != null) + if (_grabbing && _grabPhase != GrabPhase.Started) { - _grabTime += Time.deltaTime / _grabPhase switch + _grabTime = min(1, _grabTime + Time.deltaTime / max(_phaseDuration, 1e-4f)); + _tendrilBasePos = damp(_tendrilBasePos.ToCultMath(), _tendrilTargetPos.ToCultMath(), TendrilBaseDamping, Time.deltaTime).ToUnity(); + switch (_grabPhase) { - TendrilPhase.Extend => GrabExtendTime, - TendrilPhase.Envelop => GrabEnvelopTime, - TendrilPhase.Pull => GrabPullTime, - _ => throw new ArgumentOutOfRangeException() - }; - if (_grabTime > 1) - { - _grabTime = 0; - if (_grabPhase == TendrilPhase.Envelop) - { - _grabObjectEndPos = _grabObject.position; - } - if (_grabPhase == TendrilPhase.Pull) - { - Destroy(_grabObject.gameObject); - _grabObject = null; - _field.SetFloat("_TendrilInfluence", 0); - } - else _grabPhase++; - } - - if (_grabObject != null) - { - _tendrilBasePos = damp(_tendrilBasePos.ToCultMath(), _grabObject.position.ToCultMath(), TendrilBaseDamping, Time.deltaTime).ToUnity(); - switch (_grabPhase) - { - case TendrilPhase.Extend: - _tendrilBendTarget = _grabObjectStartPos; - _grabObject.position += _grabObjectVelocity * Time.deltaTime; - _tendrilTargetPos = lerp( - lerp(_grabObjectStartTendrilBasePos.ToCultMath(), _grabObjectStartPos.ToCultMath(), _grabTime), - lerp(_grabObjectStartPos.ToCultMath(), _grabObject.position.ToCultMath(), _grabTime), - pow(_grabTime, TendrilExtensionExponent)).ToUnity(); - _field.SetFloat("_TendrilInfluence", pow(_grabTime, TendrilExtendBaseAnimationExponent)); - _field.SetFloat("_TendrilSize", lerp(TendrilBaseRadius/2,TendrilBaseRadius,pow(_grabTime, TendrilExtendBaseAnimationExponent))); - _field.SetFloat("_TendrilRadius", _grabObjectScale * pow(_grabTime, TendrilTipRadiusAnimationExponent) * TendrilTipRadius); - break; - case TendrilPhase.Envelop: - _tendrilBendTarget = _grabObjectStartPos; - _tendrilTargetPos = _grabObject.position += _grabObjectVelocity * Time.deltaTime * (1-_grabTime); - _field.SetFloat("_TendrilInfluence", 1); - _field.SetFloat("_TendrilSize", TendrilBaseRadius); - _field.SetFloat("_TendrilRadius", _grabObjectScale * TendrilTipRadius); - break; - case TendrilPhase.Pull: - _tendrilTargetPos = _grabObject.position = lerp(_grabObjectEndPos.ToCultMath(), transform.position.ToCultMath(), _grabTime*_grabTime).ToUnity(); - _tendrilBendTarget = lerp(_grabObjectStartPos.ToCultMath(), _grabObjectEndPos.ToCultMath(), _grabTime*_grabTime).ToUnity(); - if (_fadePoint > .99 && transform.InverseTransformPoint(_grabObject.position).sqrMagnitude < 1) - _fadePoint = _grabTime; - _field.SetFloat("_TendrilInfluence", pow(smoothstep(1, _fadePoint, _grabTime), TendrilFadeExponent)); - _field.SetFloat("_TendrilSize", TendrilBaseRadius); - _field.SetFloat("_TendrilRadius", _grabObjectScale * TendrilTipRadius); - break; - default: - throw new ArgumentOutOfRangeException(); - } - var tendrilRadii = EnvelopeRadiiOrFallback(); - _field.SetVector("_TendrilBase", Vector3.Scale(transform.InverseTransformPoint(_tendrilBasePos).normalized, tendrilRadii)); - _field.SetVector("_TendrilBend", Vector3.Scale(transform.InverseTransformPoint(_tendrilBendTarget), tendrilRadii)); - _field.SetVector("_TendrilTarget", Vector3.Scale(transform.InverseTransformPoint(_tendrilTargetPos), tendrilRadii)); + case GrabPhase.Extend: + _tendrilBendTarget = _grabStart; + _tendrilTargetPos = lerp( + lerp(_grabStartTendrilBase.ToCultMath(), _grabStart.ToCultMath(), _grabTime), + _grabStart.ToCultMath(), + pow(_grabTime, TendrilExtensionExponent)).ToUnity(); + _field.SetFloat("_TendrilInfluence", pow(_grabTime, TendrilExtendBaseAnimationExponent)); + _field.SetFloat("_TendrilSize", lerp(TendrilBaseRadius/2,TendrilBaseRadius,pow(_grabTime, TendrilExtendBaseAnimationExponent))); + _field.SetFloat("_TendrilRadius", TendrilTipScale * pow(_grabTime, TendrilTipRadiusAnimationExponent) * TendrilTipRadius); + break; + case GrabPhase.Envelop: + _tendrilBendTarget = _grabStart; + _tendrilTargetPos = _grabStart; + _field.SetFloat("_TendrilInfluence", 1); + _field.SetFloat("_TendrilSize", TendrilBaseRadius); + _field.SetFloat("_TendrilRadius", TendrilTipScale * TendrilTipRadius); + break; + case GrabPhase.Pull: + // The curve of Zone's held pose (Zone.HeldPull): the tip rides the item the simulation pulls in. + _tendrilTargetPos = lerp(_grabStart.ToCultMath(), transform.position.ToCultMath(), Zone.HeldPull(_grabTime)).ToUnity(); + _tendrilBendTarget = _grabStart; + if (_fadePoint > .99 && transform.InverseTransformPoint(_tendrilTargetPos).sqrMagnitude < 1) + _fadePoint = _grabTime; + _field.SetFloat("_TendrilInfluence", pow(smoothstep(1, _fadePoint, _grabTime), TendrilFadeExponent)); + _field.SetFloat("_TendrilSize", TendrilBaseRadius); + _field.SetFloat("_TendrilRadius", TendrilTipScale * TendrilTipRadius); + break; } + var tendrilRadii = EnvelopeRadiiOrFallback(); + _field.SetVector("_TendrilBase", Vector3.Scale(transform.InverseTransformPoint(_tendrilBasePos).normalized, tendrilRadii)); + _field.SetVector("_TendrilBend", Vector3.Scale(transform.InverseTransformPoint(_tendrilBendTarget), tendrilRadii)); + _field.SetVector("_TendrilTarget", Vector3.Scale(transform.InverseTransformPoint(_tendrilTargetPos), tendrilRadii)); } } - + private float almostIdentity( float x ) { return x*x*(2.0f-x); @@ -358,7 +324,7 @@ public class FieldDriver : MonoBehaviour, IAbsorbPresenter, IGrabPresenter, IMel private const int GIZMO_STEPS = 16; private void OnDrawGizmosSelected() { - if (_grabObject != null) + if (_grabbing) { Vector3 previous = _tendrilBasePos; for (int i = 1; i <= GIZMO_STEPS; i++) diff --git a/Assets/Scripts/Gameplay/ItemPickup.cs b/Assets/Scripts/Gameplay/ItemPickup.cs index 16805e7d3..157f28547 100644 --- a/Assets/Scripts/Gameplay/ItemPickup.cs +++ b/Assets/Scripts/Gameplay/ItemPickup.cs @@ -58,6 +58,7 @@ public class ItemPickup : MonoBehaviour var viewAngle = acos(dot(toThis, ViewDirection)) * Mathf.Rad2Deg; if (length(diff) < LabelDisplayMaxDistance && viewAngle < LabelDisplayAngle) _displayTime = Time.time; + if (_floating?.Holder != null) _displayTime = Time.time; var targetAlpha = Time.time - _displayTime < LabelPersistDuration ? 1 : 0; var c = ScanLabel.color; c.a = c.a + sign(targetAlpha - c.a) * (Time.deltaTime / LabelFadeDuration); diff --git a/Assets/Scripts/Gameplay/TractorBeam.cs b/Assets/Scripts/Gameplay/TractorBeam.cs index 8bb8aa294..64a6a5f1a 100644 --- a/Assets/Scripts/Gameplay/TractorBeam.cs +++ b/Assets/Scripts/Gameplay/TractorBeam.cs @@ -1,22 +1,51 @@ using System; using UnityEngine; +using CultMath.UnityBridge; -public class TractorBeam : MonoBehaviour +// Presents the ship's grab: while the simulation holds an item, the beam looks along the ground-plane vector to the +// point the item was held from and emits at Power. Zone pulls the held item along the segment from the ship to that +// point (docs/aetheria-release-map.md L11), which is why GrabEvent.TargetPosition on Started is the exact aim and no +// pose lookup is needed. Idle, the beam turns with Direction and emits nothing. The simulation decides every grab fact. +public class TractorBeam : MonoBehaviour, IGrabPresenter { public ParticleSystem ParticleSystem; - public float Radius; - public float Traction; - public float Distance; - + public float Power { get; set; } public Vector3 Direction { get; set; } + private bool _grabbing; + private Vector3 _heldPoint; + private Vector3 _heldDirection; + + // Cancelled can carry no position (a vanished item), so only Started is read for one. + public void Grab(GrabEvent e) + { + switch (e.Phase) + { + case GrabPhase.Started: + _grabbing = true; + _heldPoint = e.TargetPosition.ToUnity(); + _heldDirection = Direction; + break; + case GrabPhase.Completed: + case GrabPhase.Cancelled: + _grabbing = false; + break; + } + } + public void Update() { - transform.rotation = Quaternion.LookRotation(Direction); - // The beam draws nothing until it presents a sim grab (loot-3): no particles, and no pull; the simulation - // decides every floating item's motion. + var look = Direction; + if (_grabbing) + { + var toHeld = _heldPoint - transform.position; + toHeld.y = 0; + if (toHeld.sqrMagnitude > 1e-6f) _heldDirection = toHeld; + look = _heldDirection; + } + transform.rotation = Quaternion.LookRotation(look); var emission = ParticleSystem.emission; - emission.rateOverTimeMultiplier = 0; + emission.rateOverTimeMultiplier = _grabbing ? Power : 0; } -} \ No newline at end of file +} diff --git a/Assets/Scripts/ServerShared/Agents/States/Combat.cs b/Assets/Scripts/ServerShared/Agents/States/Combat.cs index 092c6af4c..c5197a909 100644 --- a/Assets/Scripts/ServerShared/Agents/States/Combat.cs +++ b/Assets/Scripts/ServerShared/Agents/States/Combat.cs @@ -36,18 +36,20 @@ public class CombatState : BaseState // Cut 2 (docs/fire-control-cut.md): aim at whichever revealed weapon on the target hits hardest at // this range, or clear the aim point when nothing qualifies -- the same predicate - // (FireControl.IsRevealed) and the same writer (TrySelectTargetItem) the player path uses. + // (FireControl.IsRevealed) and the same writer (TrySelectTargetItem) the player path uses. Which weapons it + // believes the target has, and how hard each hits, come from its book's claims, not the target's live gear + // (aetheria-ew, classify-from-belief; ew-claim-weapon-measure-ruled: the claimed design's rated figures); the + // reveal's Item is the aim and stays the truth. EquippedItem bestTargetItem = null; var bestTargetDps = float.MinValue; - foreach (var targetItem in target.Equipment) + foreach (var reveal in _agent.Ship.RevealedWeapons(target)) { - if (!(targetItem.Behaviors.FirstOrDefault(b => b is Weapon) is Weapon targetWeapon)) continue; - if (!FireControl.IsRevealed(_agent.Ship, targetItem)) continue; - var dps = targetWeapon.RangeDamagePerSecond(targetDistance); + if (!FireControl.IsRevealed(_agent.Ship, reveal.Item)) continue; + var dps = reveal.Claimed.Behaviors.OfType().First().RatedRangeDamagePerSecond(targetDistance); if (dps > bestTargetDps) { bestTargetDps = dps; - bestTargetItem = targetItem; + bestTargetItem = reveal.Item; } } _agent.Ship.TrySelectTargetItem(bestTargetItem); diff --git a/Assets/Scripts/ServerShared/Behaviors/ChargedWeapon.cs b/Assets/Scripts/ServerShared/Behaviors/ChargedWeapon.cs index bc80bc1e5..adca5a845 100644 --- a/Assets/Scripts/ServerShared/Behaviors/ChargedWeapon.cs +++ b/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)); diff --git a/Assets/Scripts/ServerShared/Behaviors/ConstantWeapon.cs b/Assets/Scripts/ServerShared/Behaviors/ConstantWeapon.cs index b75611031..afa4394e8 100644 --- a/Assets/Scripts/ServerShared/Behaviors/ConstantWeapon.cs +++ b/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; diff --git a/Assets/Scripts/ServerShared/Behaviors/InstantWeapon.cs b/Assets/Scripts/ServerShared/Behaviors/InstantWeapon.cs index ad93524db..862eb9c0d 100644 --- a/Assets/Scripts/ServerShared/Behaviors/InstantWeapon.cs +++ b/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 diff --git a/Assets/Scripts/ServerShared/Behaviors/Weapon.cs b/Assets/Scripts/ServerShared/Behaviors/Weapon.cs index 2093a8598..87098b78b 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Weapon.cs +++ b/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 diff --git a/Assets/Scripts/ServerShared/Entity.cs b/Assets/Scripts/ServerShared/Entity.cs index 3ece06ec7..087a69398 100644 --- a/Assets/Scripts/ServerShared/Entity.cs +++ b/Assets/Scripts/ServerShared/Entity.cs @@ -103,7 +103,27 @@ public abstract class Entity // each equipped suppressor folds the strength in equipment order and pays for what it alone removed. foreach (var suppressor in GetBehaviors()) strength = suppressor.Suppress(channel, strength); - _visibilitySources[source] = new Signature(channel, strength, item); + _visibilitySources[source] = new Signature(channel, strength, item, ClaimOf(item)); + } + + // What this ship's acts claim (aetheria-ew, lie-is-own-emission, classify-from-belief): per equipped item, the + // equippable class every act of that item is stamped with (SetSignature, Emit, ReceivePaint). The hull is the + // item EquippedHull, so its claim lives in the same slot as every other: the hull class its own acts carry and + // the profile an observer derives (ClaimedHull) are one value. The truth unless claimed otherwise. Claim is the + // one write port; its production writer is the EW behaviour of cut ew-masquerade, tests only until then. + // Deactivate clears the slots. Aim, damage and physics keep the truth. + private readonly Dictionary _itemClaims = new Dictionary(); + public HullData ClaimedHull => (ClaimOf(EquippedHull) as HullData) ?? HullData; + public EquippableItemData ClaimOf(EquippedItem item) => + item == null ? null : _itemClaims.TryGetValue(item, out var claimed) ? claimed : item.Data; + internal void Claim(HullData hull) => Claim(EquippedHull, hull); + internal void Claim(EquippedItem item, EquippableItemData claimed) + { + // One hull class in the book: a hull class is claimed by the hull and only by the hull, whichever side asks. + if (claimed != null && (item == EquippedHull) != (claimed is HullData)) + throw new ArgumentException("Only the hull claims a hull class, and the hull claims nothing else.", nameof(claimed)); + if (claimed == null) _itemClaims.Remove(item); + else _itemClaims[item] = claimed; } public readonly ReactiveDictionary EntityInfoGathered = new ReactiveDictionary(); @@ -868,6 +888,7 @@ public abstract class Entity _pingReturns.Clear(); _emissions.Clear(); _reveals.Clear(); + _itemClaims.Clear(); } // Zone.Update runs this on every entity before any entity updates, so a paint made during tick N is published @@ -880,7 +901,7 @@ public abstract class Entity foreach (var paint in _paintInbox) { _incomingPaints.Add(paint.Warning); - RecordReveal(paint.Emitter, paint.Item, SignatureChannel.Emission); + RecordReveal(paint.Emitter, paint.Item, SignatureChannel.Emission, paint.Warning.EmitterClass); } _paintInbox.Clear(); _pingReturns.Clear(); @@ -900,16 +921,17 @@ public abstract class Entity internal void Emit(EquippedItem item, float hearRange) { if (!_active) return; - _emissions.Add(new ActiveEmission(item, hearRange)); + _emissions.Add(new ActiveEmission(item, hearRange, ClaimOf(item))); } // The callers are Sensor.Execute (a Search paint, Strength 0) and LockWeapon.Execute (a Track paint, Strength - // the emitter's own Lock at that paint). The emitter's class is the item's data (null with no item: a - // consumable's effect, which has no item and so is never revealed). + // the emitter's own Lock at that paint). The emitter's class is the class its ship claims for the item (ClaimOf: the + // item's data unless claimed otherwise; null with no item: a consumable's effect, which has no item and so is never + // revealed). internal void ReceivePaint(Entity emitter, EquippedItem item, PaintMode mode, float strength) { if (!_active) return; - _paintInbox.Add(new PendingPaint(new PaintWarning(normalize((emitter.Position - Position).xz), item?.Data, mode, strength), emitter, item)); + _paintInbox.Add(new PendingPaint(new PaintWarning(normalize((emitter.Position - Position).xz), emitter.ClaimOf(item), mode, strength), emitter, item)); } // The reveal book's one way in and its one membership gate (callers: Sense and PublishInbox, both in this file): @@ -917,13 +939,14 @@ public abstract class Entity // radiation, a consumable) reveals nothing, and neither does a subject that is not in the zone: a departed // subject's entries are never created or refreshed, from any caller, and neither does an item this observer // perceives destroyed (PerceivesDestroyed). A later act of the same item replaces the - // earlier one. - internal void RecordReveal(Entity subject, EquippedItem item, SignatureChannel channel) + // earlier one. `claimed` is the class the carrier (signature, emission or paint) stamped: what this observer's + // classifying readers will believe of the act; `item` stays the aim and book key. + internal void RecordReveal(Entity subject, EquippedItem item, SignatureChannel channel, EquippableItemData claimed) { if (!_active || item == null || !Zone.Entities.Contains(subject) || PerceivesDestroyed(subject, item)) return; if (!_reveals.TryGetValue(subject, out var book)) _reveals[subject] = book = new Dictionary(); - book[item] = new Reveal(item, channel, normalize((subject.Position - Position).xz), Zone.Time); + book[item] = new Reveal(item, channel, normalize((subject.Position - Position).xz), Zone.Time, claimed); } // This observer resolves `subject`'s gear (ContactOf's Identified gate) and `item` of it is destroyed: the one rule @@ -955,6 +978,31 @@ public abstract class Entity public IEnumerable RevealsOf(Entity subject) => _reveals.TryGetValue(subject, out var book) ? book.Values : Enumerable.Empty(); + // The weapons this observer believes `subject` has: each reveal whose claimed class carries a weapon behaviour, in the + // subject's equipment order (never the book's slot order, which follows when reveals were made and ended). The one + // classifying read of the book for weapons, shared by the enemy schematic and Combat (aetheria-ew, classify-from-belief); + // a gun claimed as a non-weapon is not listed, though RevealsOf holds it for aim. + public IEnumerable RevealedWeapons(Entity subject) => + RevealsOf(subject).Where(r => r.Claimed != null && r.Claimed.Behaviors.Any(b => b is WeaponData)) + .OrderBy(r => FittedIndex(subject, r.Item)).ThenBy(r => r.Item.EquippableItem.Lot); + + // A revealed item's place in the subject's equipment; gear the subject no longer carries follows all fitted gear + // (ties among it fall to the lot, a stable id), never ahead of it. + private static int FittedIndex(Entity subject, EquippedItem item) + { + var index = subject.Equipment.IndexOf(item); + return index < 0 ? int.MaxValue : index; + } + + // The weapon rows of `subject`'s schematic as this ship reads it: its own equipment when `subject` is this ship (each + // row its own data and live range, nothing to doubt about your own ship), otherwise RevealedWeapons (each row the + // claimed class and that design's rated range). The one owner of which rows, which class and which range an + // enemy schematic shows; the Unity SchematicDisplay renders it. + public IEnumerable SchematicRows(Entity subject) => + subject == this + ? subject.Equipment.Where(i => i.Behaviors.Any(b => b.Data is WeaponData)).Select(i => new SchematicRow(i, i.Data, true)) + : RevealedWeapons(subject).Select(r => new SchematicRow(r.Item, r.Claimed, false)); + // Whether this observer's book for `subject` holds `item`: the book's membership, no live gear read. internal bool HasReveal(Entity subject, EquippedItem item) => _reveals.TryGetValue(subject, out var book) && book.ContainsKey(item); @@ -976,7 +1024,9 @@ public abstract class Entity var remembered = any && Zone.Time - freshest.Time < settings.BearingMemory; var detected = tracked || remembered; var bearing = tracked ? normalize((subject.Position - Position).xz) : remembered ? freshest.Bearing : default; - return new Contact(detected, tracked, detected && any, info >= settings.TargetGearInfoThreshold, bearing, info); + var identified = info >= settings.TargetGearInfoThreshold; + // Profile is the one derivation of the hull this observer believes (no stored belief until the judge, ew-masquerade). + return new Contact(detected, tracked, detected && any, identified, bearing, info, identified ? subject.ClaimedHull : null); } // What this observer's instruments receive of other ships' acts this tick (Zone.Update calls it once, after every @@ -1000,7 +1050,7 @@ public abstract class Entity { if (signature.Item == null) continue; if (perSignature < 0f) perSignature = PassiveInfo(other.Position.xz, 1f); - if (signature.Strength * perSignature > threshold) RecordReveal(other, signature.Item, signature.Channel); + if (signature.Strength * perSignature > threshold) RecordReveal(other, signature.Item, signature.Channel, signature.Claimed); } // Every emission this ship made this tick that reaches this observer is revealed, bearing only (ruling // sensor-stat-set), through RecordReveal's one gate. It feeds no track. @@ -1011,7 +1061,7 @@ public abstract class Entity for (var j = 0; j < other._emissions.Count; j++) { var emission = other._emissions[j]; - if (planar <= emission.HearRange * hearing * obscuration) RecordReveal(other, emission.Item, SignatureChannel.Emission); + if (planar <= emission.HearRange * hearing * obscuration) RecordReveal(other, emission.Item, SignatureChannel.Emission, emission.Claimed); } } // The observer resolves this ship's gear (PerceivesDestroyed), so it perceives an item of it destroyed and diff --git a/Assets/Scripts/ServerShared/Scenarios/AiFusedDiscipline.cs b/Assets/Scripts/ServerShared/Scenarios/AiFusedDiscipline.cs index 65f5062d5..eb8ecab18 100644 --- a/Assets/Scripts/ServerShared/Scenarios/AiFusedDiscipline.cs +++ b/Assets/Scripts/ServerShared/Scenarios/AiFusedDiscipline.cs @@ -20,13 +20,13 @@ public sealed class AiFusedDiscipline : Scenario ("Cockpit 2x2", int2(2, 6), None), ("Large Drive", int2(1, 0), Reversed), ("Large Drive", int2(3, 0), Reversed), - ("Talaria", int2(2, 14), CounterClockwise), - ("Talaria", int2(3, 14), Clockwise), - ("Core Power", int2(2, 4), None), + ("Rugged Drive", int2(2, 14), CounterClockwise), + ("Rugged Drive", int2(3, 14), Clockwise), + ("Compact Reactor", int2(2, 4), None), (weapon, int2(1, 8), None), - ("Iapyx", int2(2, 2), CounterClockwise), - ("Iapyx", int2(3, 2), Clockwise), - ("not if i see you first", int2(3, 10), None), + ("Radiator", int2(2, 2), CounterClockwise), + ("Radiator", int2(3, 2), Clockwise), + ("Compact Sensor", int2(3, 10), None), ("Fire Control Array", int2(1, 6), Clockwise)); stage.Player(stage.Generated("Djinni"), float2(0, 0)); diff --git a/Assets/Scripts/ServerShared/Scenarios/Arcs.cs b/Assets/Scripts/ServerShared/Scenarios/Arcs.cs index fcbd5dbe7..da2983267 100644 --- a/Assets/Scripts/ServerShared/Scenarios/Arcs.cs +++ b/Assets/Scripts/ServerShared/Scenarios/Arcs.cs @@ -27,27 +27,27 @@ public sealed class Arcs : Scenario ("Cockpit 2x2", int2(4, 6), None), ("Large Drive", int2(3, 0), Reversed), ("Large Drive", int2(5, 0), Reversed), - ("Talaria", int2(4, 14), CounterClockwise), - ("Talaria", int2(5, 14), Clockwise), - ("Core Power", int2(4, 4), None), - ("GT 3K", int2(2, 5), None), - ("GT 3K", int2(7, 5), None), - ("FastBlast+-", int2(3, 8), None), - ("FastBlast+-", int2(6, 8), None), - ("Iapyx", int2(4, 2), CounterClockwise), - ("Iapyx", int2(5, 2), Clockwise), - ("not if i see you first", int2(5, 10), None), + ("Rugged Drive", int2(4, 14), CounterClockwise), + ("Rugged Drive", int2(5, 14), Clockwise), + ("Compact Reactor", int2(4, 4), None), + ("Guided Missile Launcher", int2(2, 5), None), + ("Guided Missile Launcher", int2(7, 5), None), + ("Cell Blaster", int2(3, 8), None), + ("Cell Blaster", int2(6, 8), None), + ("Radiator", int2(4, 2), CounterClockwise), + ("Radiator", int2(5, 2), Clockwise), + ("Compact Sensor", int2(5, 10), None), ("Fire Control Array", int2(3, 6), Clockwise), ("Autocannon", int2(8, 4), Clockwise), - ("ChargeBlast SG", int2(0, 4), CounterClockwise)); + ("Charged Scatter Blaster", int2(0, 4), CounterClockwise)); var turret = stage.Fit("Turret", - ("ClearPath", int2(1, 2), None), - ("ClearPath", int2(5, 2), None), - ("Skiron", int2(0, 2), CounterClockwise), - ("Skiron", int2(7, 2), Clockwise), - ("Core Power", int2(3, 3), None), + ("Light Machine Gun", int2(1, 2), None), + ("Light Machine Gun", int2(5, 2), None), + ("Long Radiator", int2(0, 2), CounterClockwise), + ("Long Radiator", int2(7, 2), Clockwise), + ("Compact Reactor", int2(3, 3), None), ("Turret Control Module", int2(3, 5), None), - ("not if i see you first", int2(4, 5), None), + ("Compact Sensor", int2(4, 5), None), ("Fire Control Array", int2(3, 6), None)); stage.Player(fighter, float2(0, 0), facing: float2(0, 1)); diff --git a/Assets/Scripts/ServerShared/Scenarios/Belt.cs b/Assets/Scripts/ServerShared/Scenarios/Belt.cs index 61f2d278b..efab34db7 100644 --- a/Assets/Scripts/ServerShared/Scenarios/Belt.cs +++ b/Assets/Scripts/ServerShared/Scenarios/Belt.cs @@ -23,16 +23,16 @@ public sealed class Belt : Scenario ("Cockpit 2x2", int2(2, 6), None), ("Large Drive", int2(1, 0), Reversed), ("Large Drive", int2(3, 0), Reversed), - ("Talaria", int2(2, 14), CounterClockwise), - ("Talaria", int2(3, 14), Clockwise), - ("Core Power", int2(2, 4), None), - ("GT 3K", int2(0, 5), None), - ("GT 3K", int2(5, 5), None), - ("plight", int2(1, 8), None), - ("FastBlast+-", int2(4, 8), None), - ("Iapyx", int2(2, 2), CounterClockwise), - ("Iapyx", int2(3, 2), Clockwise), - ("not if i see you first", int2(3, 10), None), + ("Rugged Drive", int2(2, 14), CounterClockwise), + ("Rugged Drive", int2(3, 14), Clockwise), + ("Compact Reactor", int2(2, 4), None), + ("Guided Missile Launcher", int2(0, 5), None), + ("Guided Missile Launcher", int2(5, 5), None), + ("Lightning Projector", int2(1, 8), None), + ("Cell Blaster", int2(4, 8), None), + ("Radiator", int2(2, 2), CounterClockwise), + ("Radiator", int2(3, 2), Clockwise), + ("Compact Sensor", int2(3, 10), None), ("Fire Control Array", int2(1, 6), Clockwise)); // The belt is a ring about its parent's position at the belt orbit's distance. The player stands 100 m outside diff --git a/Assets/Scripts/ServerShared/Scenarios/Crossing.cs b/Assets/Scripts/ServerShared/Scenarios/Crossing.cs index 60ede6afb..b0d593704 100644 --- a/Assets/Scripts/ServerShared/Scenarios/Crossing.cs +++ b/Assets/Scripts/ServerShared/Scenarios/Crossing.cs @@ -4,8 +4,8 @@ using static ItemRotation; public sealed class Crossing : Scenario { public override string Name => "Crossing"; - public override string Brief => "plight at the starboard gun and a FastBlast+- at the port gun, a fast Djinni crossing close ahead and an " + - "unpiloted one waiting at range. The Djinni starts to port moving across the bow; the arena's gravity bends its run. Make the pass coasting: give no throttle until the Djinni has crossed the bow, then fly freely (thrusting from the start carries you past it). Verify: as the Djinni crosses close, FastBlast lands some and plight " + + public override string Brief => "A Lightning Projector at the starboard gun and a Cell Blaster at the port gun, a fast Djinni crossing close ahead and an " + + "unpiloted one waiting at range. The Djinni starts to port moving across the bow; the arena's gravity bends its run. Make the pass coasting: give no throttle until the Djinni has crossed the bow, then fly freely (thrusting from the start carries you past it). Verify: as the Djinni crosses close, FastBlast lands some and projector " + "almost none; against the Djinni at range both land. Fly it again without the Fire Control Array: " + "with it the small gun lands more."; public override uint Seed => 112; @@ -13,11 +13,11 @@ public sealed class Crossing : Scenario // Where the Djinni sit: the player is at the origin facing +z. The crosser starts ahead and to port, facing across // the bow and already moving at the Djinni's 50 m/s cap, so its run sweeps across the bow within seconds (the arena - // pulls the player to port, which brings the two together). The waiting Djinni sits inside plight's arc at 80% of + // pulls the player to port, which brings the two together). The waiting Djinni sits inside the Lightning Projector's arc at 80% of // its Range. public static readonly CultMath.float2 CrosserAt = float2(-150, 200), CrosserFacing = float2(1, 0), CrosserVelocity = float2(50, 0); - public const float PlightRange = 1216f; // plight's Range in metres, 1216.4 as the fit stands settled at rest - public static readonly CultMath.float2 Waiting = float2(0, PlightRange * .8f); + public const float ProjectorRange = 1216f; // the Lightning Projector's Range in metres, 1216.4 as the fit stands settled at rest + public static readonly CultMath.float2 Waiting = float2(0, ProjectorRange * .8f); public override Galaxy Generate(GalaxyStage stage) => stage.Prelude(DemoTerminus.Cast); @@ -27,16 +27,16 @@ public sealed class Crossing : Scenario ("Cockpit 2x2", int2(2, 6), None), ("Large Drive", int2(1, 0), Reversed), ("Large Drive", int2(3, 0), Reversed), - ("Talaria", int2(2, 14), CounterClockwise), - ("Talaria", int2(3, 14), Clockwise), - ("Core Power", int2(2, 4), None), - ("GT 3K", int2(0, 5), None), - ("GT 3K", int2(5, 5), None), - ("plight", int2(1, 8), None), - ("FastBlast+-", int2(4, 8), None), - ("Iapyx", int2(2, 2), CounterClockwise), - ("Iapyx", int2(3, 2), Clockwise), - ("not if i see you first", int2(3, 10), None), + ("Rugged Drive", int2(2, 14), CounterClockwise), + ("Rugged Drive", int2(3, 14), Clockwise), + ("Compact Reactor", int2(2, 4), None), + ("Guided Missile Launcher", int2(0, 5), None), + ("Guided Missile Launcher", int2(5, 5), None), + ("Lightning Projector", int2(1, 8), None), + ("Cell Blaster", int2(4, 8), None), + ("Radiator", int2(2, 2), CounterClockwise), + ("Radiator", int2(3, 2), Clockwise), + ("Compact Sensor", int2(3, 10), None), ("Fire Control Array", int2(1, 6), Clockwise)); stage.Player(fighter, float2(0, 0), facing: float2(0, 1)); diff --git a/Assets/Scripts/ServerShared/Scenarios/Duel.cs b/Assets/Scripts/ServerShared/Scenarios/Duel.cs index af7193c50..510d60147 100644 --- a/Assets/Scripts/ServerShared/Scenarios/Duel.cs +++ b/Assets/Scripts/ServerShared/Scenarios/Duel.cs @@ -4,7 +4,7 @@ using static ItemRotation; public sealed class Duel : Scenario { public override string Name => "Duel"; - public override string Brief => "One piloted, hostile Longinus with slow GT 3K missiles and a Spectra in its hold. Verify: rolled " + + public override string Brief => "One piloted, hostile Longinus with slow guided missiles and a Light Laser in its hold. Verify: rolled " + "hits and near-misses, subsystem aim, beam reads above bow, armour takes the missile, loot keeps its brand."; public override uint Seed => 104; public override bool Ambient => false; @@ -17,22 +17,22 @@ public sealed class Duel : Scenario ("Cockpit 2x2", int2(2, 6), None), ("Large Drive", int2(1, 0), Reversed), ("Large Drive", int2(3, 0), Reversed), - ("Talaria", int2(2, 14), CounterClockwise), - ("Talaria", int2(3, 14), Clockwise), - ("Core Power", int2(2, 4), None), - ("GT 3K", int2(0, 5), None), - ("GT 3K", int2(5, 5), None), - ("FastBlast+-", int2(1, 8), None), - ("FastBlast+-", int2(4, 8), None), - ("Iapyx", int2(2, 2), CounterClockwise), - ("Iapyx", int2(3, 2), Clockwise), - ("not if i see you first", int2(3, 10), None), - ("PotaT+-", int2(1, 5), None), + ("Rugged Drive", int2(2, 14), CounterClockwise), + ("Rugged Drive", int2(3, 14), Clockwise), + ("Compact Reactor", int2(2, 4), None), + ("Guided Missile Launcher", int2(0, 5), None), + ("Guided Missile Launcher", int2(5, 5), None), + ("Cell Blaster", int2(1, 8), None), + ("Cell Blaster", int2(4, 8), None), + ("Radiator", int2(2, 2), CounterClockwise), + ("Radiator", int2(3, 2), Clockwise), + ("Compact Sensor", int2(3, 10), None), + ("Capacitor", int2(1, 5), None), ("Fire Control Array", int2(1, 6), Clockwise), - ("Store-All Plus", int2(2, 8), None)); + ("Cargo Bay", int2(2, 8), None)); stage.Player(fighter, float2(0, 0)); var rival = stage.Place(fighter, float2(0, 900), facing: float2(0, -1), stance: ScenarioStance.Hostile, piloted: true); - stage.Cargo(rival, "Spectra"); + stage.Cargo(rival, "Light Laser"); } } diff --git a/Assets/Scripts/ServerShared/Scenarios/FusedRounds.cs b/Assets/Scripts/ServerShared/Scenarios/FusedRounds.cs index e0a8c029f..e1199997c 100644 --- a/Assets/Scripts/ServerShared/Scenarios/FusedRounds.cs +++ b/Assets/Scripts/ServerShared/Scenarios/FusedRounds.cs @@ -4,20 +4,20 @@ using static ItemRotation; public sealed class FusedRounds : Scenario { public override string Name => "Fused Rounds"; - public override string Brief => "The Smoke Test Hull with Smoke Proximity, Smoke Delayed and a DeathCluster; a hostile bare Longinus at mid range, a bare " + + public override string Brief => "The Smoke Test Hull with Smoke Proximity, Smoke Delayed and a Cluster Cannon; a hostile bare Longinus at mid range, a bare " + "hull dead ahead, a fragile one to starboard, a close one inside the proximity blast radius, and one astern. " + "Verify with nothing selected: aim past every hull and the round bursts at max range along the aim; aim at the hull " + - "ahead and it stops and bursts on it; fire at the fragile hull and kill it with the DeathCluster before the round " + + "ahead and it stops and bursts on it; fire at the fragile hull and kill it with the Cluster Cannon before the round " + "lands: no burst. Select the astern hull: the round fires and bursts at its range along the arc edge. Select the " + "close hull: the burst is pushed out to the blast radius from your centre. A Smoke Proximity burst beside the " + "Longinus damages where the model shows the blast; a Smoke Delayed round into its nose bursts inside. The HUD " + - "reads Direct, Burst at N m or Refused for the fused weapons and a percentage for the DeathCluster, and the " + + "reads Direct, Burst at N m or Refused for the fused weapons and a percentage for the Cluster Cannon, and the " + "smoke weapons show no Manufacturer row."; public override uint Seed => 108; public override bool Ambient => false; // Where everything sits: the player is at the origin facing +z. Ahead lies on the initial aim line, inside every forward - // mount's arc. Fragile is a bare Longinus inside the DeathCluster's range; Close is inside Smoke Proximity's blast radius + // mount's arc. Fragile is a bare Longinus inside the Cluster Cannon's range; Close is inside Smoke Proximity's blast radius // (8 m from the ship's centre) and beside the aim line, not across it; Stern is outside every mount's arc. public static readonly CultMath.float2 Mid = float2(-200, 600), Ahead = float2(0, 300), Fragile = float2(140, 420), Close = float2(6.4f, 4f), Stern = float2(0, -400); @@ -30,15 +30,15 @@ public sealed class FusedRounds : Scenario ("Cockpit 2x2", int2(4, 6), None), ("Large Drive", int2(3, 0), Reversed), ("Large Drive", int2(5, 0), Reversed), - ("Talaria", int2(4, 14), CounterClockwise), - ("Talaria", int2(5, 14), Clockwise), - ("Core Power", int2(4, 4), None), + ("Rugged Drive", int2(4, 14), CounterClockwise), + ("Rugged Drive", int2(5, 14), Clockwise), + ("Compact Reactor", int2(4, 4), None), ("Smoke Proximity", int2(3, 8), None), ("Smoke Delayed", int2(6, 8), None), - ("DeathCluster", int2(5, 17), None), - ("Iapyx", int2(4, 2), CounterClockwise), - ("Iapyx", int2(5, 2), Clockwise), - ("not if i see you first", int2(5, 10), None), + ("Cluster Cannon", int2(5, 17), None), + ("Radiator", int2(4, 2), CounterClockwise), + ("Radiator", int2(5, 2), Clockwise), + ("Compact Sensor", int2(5, 10), None), ("Fire Control Array", int2(3, 6), Clockwise)); stage.Player(shooter, float2(0, 0), facing: float2(0, 1)); diff --git a/Assets/Scripts/ServerShared/Scenarios/LauncherAngles.cs b/Assets/Scripts/ServerShared/Scenarios/LauncherAngles.cs index d81d7344a..7c5fc669c 100644 --- a/Assets/Scripts/ServerShared/Scenarios/LauncherAngles.cs +++ b/Assets/Scripts/ServerShared/Scenarios/LauncherAngles.cs @@ -4,8 +4,8 @@ using static ItemRotation; public sealed class LauncherAngles : Scenario { public override string Name => "Launcher Angles"; - public override string Brief => "A GT 3K, a pswarm and two FastBlasts; a hostile bare Longinus broadside on, another beside it. " + - "Verify: hits pulse only the facing edge; a pswarm round whose target dies fades unexploded."; + public override string Brief => "A Guided Missile Launcher, a Swarm Rocket Pod and two Cell Blasters; a hostile bare Longinus broadside on, another beside it. " + + "Verify: hits pulse only the facing edge; a Swarm Rocket Pod round whose target dies fades unexploded."; public override uint Seed => 105; public override bool Ambient => false; @@ -17,16 +17,16 @@ public sealed class LauncherAngles : Scenario ("Cockpit 2x2", int2(2, 6), None), ("Large Drive", int2(1, 0), Reversed), ("Large Drive", int2(3, 0), Reversed), - ("Talaria", int2(2, 14), CounterClockwise), - ("Talaria", int2(3, 14), Clockwise), - ("Core Power", int2(2, 4), None), - ("GT 3K", int2(0, 5), None), - ("pswarm", int2(5, 5), None), - ("FastBlast+-", int2(1, 8), None), - ("FastBlast+-", int2(4, 8), None), - ("Iapyx", int2(2, 2), CounterClockwise), - ("Iapyx", int2(3, 2), Clockwise), - ("not if i see you first", int2(3, 10), None), + ("Rugged Drive", int2(2, 14), CounterClockwise), + ("Rugged Drive", int2(3, 14), Clockwise), + ("Compact Reactor", int2(2, 4), None), + ("Guided Missile Launcher", int2(0, 5), None), + ("Swarm Rocket Pod", int2(5, 5), None), + ("Cell Blaster", int2(1, 8), None), + ("Cell Blaster", int2(4, 8), None), + ("Radiator", int2(2, 2), CounterClockwise), + ("Radiator", int2(3, 2), Clockwise), + ("Compact Sensor", int2(3, 10), None), ("Fire Control Array", int2(1, 6), Clockwise)); stage.Player(launcher, float2(0, 0)); diff --git a/Assets/Scripts/ServerShared/Scenarios/LockOn.cs b/Assets/Scripts/ServerShared/Scenarios/LockOn.cs new file mode 100644 index 000000000..fa669e253 --- /dev/null +++ b/Assets/Scripts/ServerShared/Scenarios/LockOn.cs @@ -0,0 +1,44 @@ +using static CultMath.math; +using static ItemRotation; + +public sealed class LockOn : Scenario +{ + public override string Name => "Lock On"; + public override string Brief => "A hostile closes from out of sight, finds you and locks. Verify: no warning at first; once it locks, one " + + "indicator appears toward it and tightens as the lock grows; break line of sight or range and it vanishes; " + + "your own ping shows no incoming paint on its side, only the lock does."; + public override uint Seed => 113; + public override bool Ambient => false; + + // The hostile starts about 4000 m off, to the side of the player's axis, facing the player. At that range its passive + // sensors hold no track of the player (the test asks the sim's own PassiveInfo against the detection threshold); the + // player sees the hostile a little sooner, at about tick 20. The hostile closes, sees the player some eight seconds in, + // and locks two ticks later. At Duel's 900 m (and at 600 m) it sees and locks within a second. + public static readonly CultMath.float2 HostileAt = float2(1500, 3700); + + public override Galaxy Generate(GalaxyStage stage) => stage.Prelude(DemoTerminus.Cast); + + public override void Stage(ScenarioStage stage) + { + var fighter = stage.Fit("Longinus", + ("Cockpit 2x2", int2(2, 6), None), + ("Large Drive", int2(1, 0), Reversed), + ("Large Drive", int2(3, 0), Reversed), + ("Rugged Drive", int2(2, 14), CounterClockwise), + ("Rugged Drive", int2(3, 14), Clockwise), + ("Compact Reactor", int2(2, 4), None), + ("Guided Missile Launcher", int2(0, 5), None), + ("Guided Missile Launcher", int2(5, 5), None), + ("Cell Blaster", int2(1, 8), None), + ("Cell Blaster", int2(4, 8), None), + ("Radiator", int2(2, 2), CounterClockwise), + ("Radiator", int2(3, 2), Clockwise), + ("Compact Sensor", int2(3, 10), None), + ("Capacitor", int2(1, 5), None), + ("Fire Control Array", int2(1, 6), Clockwise), + ("Cargo Bay", int2(2, 8), None)); + + stage.Player(fighter, float2(0, 0), facing: float2(0, 1)); + stage.Place(fighter, HostileAt, facing: normalize(-HostileAt), stance: ScenarioStance.Hostile, piloted: true); + } +} diff --git a/Assets/Scripts/ServerShared/Scenarios/LockOn.cs.meta b/Assets/Scripts/ServerShared/Scenarios/LockOn.cs.meta new file mode 100644 index 000000000..1512201c0 --- /dev/null +++ b/Assets/Scripts/ServerShared/Scenarios/LockOn.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3f0b6d2a9c7e4a1b8d5e2c6f7a9b0c14 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ServerShared/Scenarios/Pursuit.cs b/Assets/Scripts/ServerShared/Scenarios/Pursuit.cs index a175533de..75a803b18 100644 --- a/Assets/Scripts/ServerShared/Scenarios/Pursuit.cs +++ b/Assets/Scripts/ServerShared/Scenarios/Pursuit.cs @@ -23,35 +23,35 @@ public sealed class Pursuit : Scenario ("Cockpit 2x2", int2(2, 6), None), ("Large Drive", int2(1, 0), Reversed), ("Large Drive", int2(3, 0), Reversed), - ("Talaria", int2(2, 14), CounterClockwise), - ("Talaria", int2(3, 14), Clockwise), - ("Core Power", int2(2, 4), None), + ("Rugged Drive", int2(2, 14), CounterClockwise), + ("Rugged Drive", int2(3, 14), Clockwise), + ("Compact Reactor", int2(2, 4), None), ("Mine Launcher", int2(0, 5), None), - ("pswarm", int2(5, 5), None), - ("FastBlast+-", int2(1, 8), None), - ("FastBlast+-", int2(4, 8), None), - ("Iapyx", int2(2, 2), CounterClockwise), - ("Iapyx", int2(3, 2), Clockwise), - ("not if i see you first", int2(3, 10), None), + ("Swarm Rocket Pod", int2(5, 5), None), + ("Cell Blaster", int2(1, 8), None), + ("Cell Blaster", int2(4, 8), None), + ("Radiator", int2(2, 2), CounterClockwise), + ("Radiator", int2(3, 2), Clockwise), + ("Compact Sensor", int2(3, 10), None), ("Fire Control Array", int2(1, 6), Clockwise), - ("Store-All Plus", int2(2, 8), None)); + ("Cargo Bay", int2(2, 8), None)); var pursuer = stage.Fit("Longinus", ("Cockpit 2x2", int2(2, 6), None), ("Large Drive", int2(1, 0), Reversed), ("Large Drive", int2(3, 0), Reversed), - ("Talaria", int2(2, 14), CounterClockwise), - ("Talaria", int2(3, 14), Clockwise), - ("Core Power", int2(2, 4), None), - ("GT 3K", int2(0, 5), None), - ("GT 3K", int2(5, 5), None), - ("FastBlast+-", int2(1, 8), None), - ("FastBlast+-", int2(4, 8), None), - ("Iapyx", int2(2, 2), CounterClockwise), - ("Iapyx", int2(3, 2), Clockwise), - ("not if i see you first", int2(3, 10), None), - ("PotaT+-", int2(1, 5), None), + ("Rugged Drive", int2(2, 14), CounterClockwise), + ("Rugged Drive", int2(3, 14), Clockwise), + ("Compact Reactor", int2(2, 4), None), + ("Guided Missile Launcher", int2(0, 5), None), + ("Guided Missile Launcher", int2(5, 5), None), + ("Cell Blaster", int2(1, 8), None), + ("Cell Blaster", int2(4, 8), None), + ("Radiator", int2(2, 2), CounterClockwise), + ("Radiator", int2(3, 2), Clockwise), + ("Compact Sensor", int2(3, 10), None), + ("Capacitor", int2(1, 5), None), ("Fire Control Array", int2(1, 6), Clockwise), - ("Store-All Plus", int2(2, 8), None)); + ("Cargo Bay", int2(2, 8), None)); var player = stage.Player(layer, float2(0, 0), facing: float2(0, 1)); stage.Cargo(player, "Coolant Vent", "Coolant Vent", "Coolant Vent", "Thruster Overdrive", "Thruster Overdrive"); diff --git a/Assets/Scripts/ServerShared/Scenarios/RefusedRounds.cs b/Assets/Scripts/ServerShared/Scenarios/RefusedRounds.cs index 5d77cb466..557812197 100644 --- a/Assets/Scripts/ServerShared/Scenarios/RefusedRounds.cs +++ b/Assets/Scripts/ServerShared/Scenarios/RefusedRounds.cs @@ -22,16 +22,16 @@ public sealed class RefusedRounds : Scenario ("Cockpit 2x2", int2(4, 6), None), ("Large Drive", int2(3, 0), Reversed), ("Large Drive", int2(5, 0), Reversed), - ("Talaria", int2(4, 14), CounterClockwise), - ("Talaria", int2(5, 14), Clockwise), - ("Core Power", int2(4, 4), None), + ("Rugged Drive", int2(4, 14), CounterClockwise), + ("Rugged Drive", int2(5, 14), Clockwise), + ("Compact Reactor", int2(4, 4), None), ("Smoke Refused", int2(3, 8), None), ("Smoke Refused Beam", int2(6, 8), None), ("Smoke Refused Charge", int2(3, 17), None), ("Autocannon", int2(5, 17), None), - ("Iapyx", int2(4, 2), CounterClockwise), - ("Iapyx", int2(5, 2), Clockwise), - ("not if i see you first", int2(5, 10), None), + ("Radiator", int2(4, 2), CounterClockwise), + ("Radiator", int2(5, 2), Clockwise), + ("Compact Sensor", int2(5, 10), None), ("Fire Control Array", int2(3, 6), Clockwise)); stage.Player(shooter, float2(0, 0), facing: float2(0, 1)); diff --git a/Assets/Scripts/ServerShared/Scenarios/Scenarios.cs b/Assets/Scripts/ServerShared/Scenarios/Scenarios.cs index a201fc6b9..752b33e28 100644 --- a/Assets/Scripts/ServerShared/Scenarios/Scenarios.cs +++ b/Assets/Scripts/ServerShared/Scenarios/Scenarios.cs @@ -9,6 +9,6 @@ public static class Scenarios public static readonly Scenario[] Tests = { - new DjinniShakedown(), new StarvedReactor(), new Arcs(), new Duel(), new LauncherAngles(), new WeaponFeel(), new FusedRounds(), new RefusedRounds(), new AiFusedDiscipline(), new LongHaul(), new Pursuit(), new Crossing(), new Belt() + new DjinniShakedown(), new StarvedReactor(), new Arcs(), new Duel(), new LauncherAngles(), new WeaponFeel(), new FusedRounds(), new RefusedRounds(), new AiFusedDiscipline(), new LongHaul(), new Pursuit(), new Crossing(), new Belt(), new LockOn() }; } diff --git a/Assets/Scripts/ServerShared/Scenarios/StarvedReactor.cs b/Assets/Scripts/ServerShared/Scenarios/StarvedReactor.cs index 839e32c10..3a23b164a 100644 --- a/Assets/Scripts/ServerShared/Scenarios/StarvedReactor.cs +++ b/Assets/Scripts/ServerShared/Scenarios/StarvedReactor.cs @@ -4,7 +4,7 @@ using static ItemRotation; public sealed class StarvedReactor : Scenario { public override string Name => "Starved Reactor"; - public override string Brief => "Two Spectras on a MoveOnPro, which can fall to a quarter of Core Power's charge, and a bare hull " + + public override string Brief => "Two Light Lasers on a Muon Fusion Reactor, which can fall to a quarter of the Compact Reactor's charge, and a bare hull " + "to shoot. Verify: starvation reads as starvation, brownout degrades, refills stutter."; public override uint Seed => 102; public override bool Ambient => false; @@ -17,14 +17,14 @@ public sealed class StarvedReactor : Scenario ("Cockpit 2x2", int2(2, 6), None), ("Large Drive", int2(1, 0), Reversed), ("Large Drive", int2(3, 0), Reversed), - ("Talaria", int2(2, 14), CounterClockwise), - ("Talaria", int2(3, 14), Clockwise), - ("MoveOnPro", int2(2, 4), None), - ("Spectra", int2(1, 8), None), - ("Spectra", int2(4, 8), None), - ("Iapyx", int2(2, 2), CounterClockwise), - ("Iapyx", int2(3, 2), Clockwise), - ("not if i see you first", int2(3, 10), None), + ("Rugged Drive", int2(2, 14), CounterClockwise), + ("Rugged Drive", int2(3, 14), Clockwise), + ("Muon Fusion Reactor", int2(2, 4), None), + ("Light Laser", int2(1, 8), None), + ("Light Laser", int2(4, 8), None), + ("Radiator", int2(2, 2), CounterClockwise), + ("Radiator", int2(3, 2), Clockwise), + ("Compact Sensor", int2(3, 10), None), ("Fire Control Array", int2(1, 6), Clockwise)); stage.Player(starved, float2(0, 0)); stage.Place(stage.Bare("Longinus"), float2(0, 400)); diff --git a/Assets/Scripts/ServerShared/Scenarios/WeaponFeel.cs b/Assets/Scripts/ServerShared/Scenarios/WeaponFeel.cs index 95cc36123..43d4097ae 100644 --- a/Assets/Scripts/ServerShared/Scenarios/WeaponFeel.cs +++ b/Assets/Scripts/ServerShared/Scenarios/WeaponFeel.cs @@ -4,9 +4,9 @@ using static ItemRotation; public sealed class WeaponFeel : Scenario { public override string Name => "Weapon Feel"; - public override string Brief => "The Smoke Test Hull with a ChargeBlast SG, an Autocannon and a FastBlast+- burst weapon; a bare Longinus dead ahead. " + - "Verify: ChargeBlast SG and Autocannon fire with effects, particles and action-bar icons; the burst weapon's " + - "cadence is as before; a fast release-and-press on the ChargeBlast SG starts no second charge."; + public override string Brief => "The Smoke Test Hull with a Charged Scatter Blaster, an Autocannon and a Cell Blaster burst weapon; a bare Longinus dead ahead. " + + "Verify: Charged Scatter Blaster and Autocannon fire with effects, particles and action-bar icons; the burst weapon's " + + "cadence is as before; a fast release-and-press on the Charged Scatter Blaster starts no second charge."; public override uint Seed => 107; public override bool Ambient => false; @@ -21,15 +21,15 @@ public sealed class WeaponFeel : Scenario ("Cockpit 2x2", int2(4, 6), None), ("Large Drive", int2(3, 0), Reversed), ("Large Drive", int2(5, 0), Reversed), - ("Talaria", int2(4, 14), CounterClockwise), - ("Talaria", int2(5, 14), Clockwise), - ("Core Power", int2(4, 4), None), - ("ChargeBlast SG", int2(3, 17), None), + ("Rugged Drive", int2(4, 14), CounterClockwise), + ("Rugged Drive", int2(5, 14), Clockwise), + ("Compact Reactor", int2(4, 4), None), + ("Charged Scatter Blaster", int2(3, 17), None), ("Autocannon", int2(5, 17), None), - ("FastBlast+-", int2(3, 8), None), - ("Iapyx", int2(4, 2), CounterClockwise), - ("Iapyx", int2(5, 2), Clockwise), - ("not if i see you first", int2(5, 10), None), + ("Cell Blaster", int2(3, 8), None), + ("Radiator", int2(4, 2), CounterClockwise), + ("Radiator", int2(5, 2), Clockwise), + ("Compact Sensor", int2(5, 10), None), ("Fire Control Array", int2(3, 6), Clockwise)); stage.Player(shooter, float2(0, 0), facing: float2(0, 1)); diff --git a/Assets/Scripts/ServerShared/Sensing.cs b/Assets/Scripts/ServerShared/Sensing.cs index a8a11f39f..7cf119ff0 100644 --- a/Assets/Scripts/ServerShared/Sensing.cs +++ b/Assets/Scripts/ServerShared/Sensing.cs @@ -2,6 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ +using System.Linq; using CultMath; // Light signatures split by channel (ruling visibility-per-capability-reveal): an observer learns what a ship @@ -20,15 +21,19 @@ public readonly struct Signature public readonly SignatureChannel Channel; public readonly float Strength; public readonly EquippedItem Item; + // The class this act claims: the true item's Data unless its ship's EW claims otherwise (aetheria-ew, + // classify-from-belief). Stamped by Entity.SetSignature from the ship's claim. + public readonly EquippableItemData Claimed; - public Signature(SignatureChannel channel, float strength, EquippedItem item) + public Signature(SignatureChannel channel, float strength, EquippedItem item, EquippableItemData claimed) { Channel = channel; Strength = strength; Item = item; + Claimed = claimed; } - public Signature WithStrength(float strength) => new Signature(Channel, strength, Item); + public Signature WithStrength(float strength) => new Signature(Channel, strength, Item, Claimed); } // What a painted ship learns of a beam on it (ruling sensor-stat-set item 4): a Search paint is a ping sweeping @@ -64,11 +69,14 @@ public readonly struct ActiveEmission { public readonly EquippedItem Item; public readonly float HearRange; + // The class this emission claims (see Signature.Claimed); stamped by Entity.Emit. + public readonly EquippableItemData Claimed; - public ActiveEmission(EquippedItem item, float hearRange) + public ActiveEmission(EquippedItem item, float hearRange, EquippableItemData claimed) { Item = item; HearRange = hearRange; + Claimed = claimed; } } @@ -90,23 +98,53 @@ public readonly struct PaintWarning // What an observer has seen `Item` do (ruling visibility-per-capability-reveal): the channel it showed on, the // bearing at that act and the zone clock then. Held per (subject, item) in the observer's Entity; the latest act -// replaces the earlier one. Position is never carried: only the track gives it. +// replaces the earlier one. Position is never carried: only the track gives it. `Item` stays the true item: it is the +// book's key and what aim reads. `Claimed` is the class the act claimed, and is what every classifying reader reads +// (aetheria-ew, classify-from-belief). public readonly struct Reveal { public readonly EquippedItem Item; + public readonly EquippableItemData Claimed; public readonly SignatureChannel Channel; public readonly float2 Bearing; public readonly float Time; - public Reveal(EquippedItem item, SignatureChannel channel, float2 bearing, float time) + public Reveal(EquippedItem item, SignatureChannel channel, float2 bearing, float time, EquippableItemData claimed) { Item = item; + Claimed = claimed; Channel = channel; Bearing = bearing; Time = time; } } +// One weapon row of a ship's schematic as its viewer is entitled to read it (aetheria-ew, classify-from-belief; ruling +// ew-claim-weapon-measure-ruled). Made only by Entity.SchematicRows. `Item` is the true item: the selection mark's key and, +// on the viewer's own ship, the live gear. `Claimed` is the class the row shows. The range label is the live range on +// the viewer's own ship and the claimed design's rated range on any other; the viewer never sees a target weapon's +// quality, wear or power. A renderer shows these and decides nothing. +public readonly struct SchematicRow +{ + public readonly EquippedItem Item; + public readonly EquippableItemData Claimed; + private readonly bool _own; + + internal SchematicRow(EquippedItem item, EquippableItemData claimed, bool own) + { + Item = item; + Claimed = claimed; + _own = own; + } + + // What a renderer compares to know the rows changed. Range is a reading, not part of the key. + public (EquippedItem, EquippableItemData) Key => (Item, Claimed); + + public float Range => _own + ? Item.Behaviors.OfType().First().Range + : Claimed.Behaviors.OfType().First().RatedRange; +} + // A subject's removal from a zone as the zone recorded it (death, dock, warp, any removal): where it was and how // bright its light was (its Visibility at removal). Judged by each observer's Sense under the // light-act gate; notification only, one tick long, it decides nothing. @@ -127,7 +165,9 @@ public readonly struct Departure // How much an observer holds of one subject, derived on read by Entity.ContactOf from its track, its reveals and // the zone clock. Detected: tracked, or a reveal younger than GameplaySettings.BearingMemory. Tracked: exactly // membership of VisibleEntities. Classified: detected, with any reveal in the book. Identified: the track has reached -// TargetGearInfoThreshold. Bearing is the true bearing while tracked, else the freshest reveal's. +// TargetGearInfoThreshold, and holds a hull belief: Profile, the hull class this observer believes the subject is (null +// below Identified; aetheria-ew, classify-from-belief; seen-through arrives with the judge). Bearing is the true +// bearing while tracked, else the freshest reveal's. public readonly struct Contact { public readonly bool Detected; @@ -136,9 +176,11 @@ public readonly struct Contact public readonly bool Identified; public readonly float2 Bearing; public readonly float Info; + public readonly HullData Profile; - public Contact(bool detected, bool tracked, bool classified, bool identified, float2 bearing, float info) + public Contact(bool detected, bool tracked, bool classified, bool identified, float2 bearing, float info, HullData profile) { + Profile = profile; Detected = detected; Tracked = tracked; Classified = classified; diff --git a/Assets/Scripts/ServerShared/Zone.cs b/Assets/Scripts/ServerShared/Zone.cs index 869d6d9d7..16373f147 100644 --- a/Assets/Scripts/ServerShared/Zone.cs +++ b/Assets/Scripts/ServerShared/Zone.cs @@ -394,6 +394,10 @@ public class Zone // After StepClouds and before FireControl.Step: each floating item drifts as a KinematicBody on the zone's force // and is removed once its lifetime has run out. A held item is neither integrated nor expired: it is placed // between where it was claimed and its holder, now that the entities have moved. + // The curve a held item rides from where it was claimed to its holder: the one owner, which the test scene's + // stand-in sim and tendril call rather than spell again. + public static float HeldPull(float progress) => smoothstep(0f, 1f, progress); + private void StepFloatingItems(float deltaTime) { var settings = _itemManager.GameplaySettings; @@ -401,7 +405,7 @@ public class Zone { if (floating.Holder != null) { - floating.Body.Position = lerp(floating.HeldFrom, floating.Holder.Position.xz, smoothstep(0f, 1f, floating.HeldProgress)); + floating.Body.Position = lerp(floating.HeldFrom, floating.Holder.Position.xz, HeldPull(floating.HeldProgress)); continue; } floating.Body.Step(deltaTime, GetForce(floating.Body.Position), settings); diff --git a/Assets/Scripts/UI/FieldTester.cs b/Assets/Scripts/UI/FieldTester.cs index a86e970c4..493b0b60e 100644 --- a/Assets/Scripts/UI/FieldTester.cs +++ b/Assets/Scripts/UI/FieldTester.cs @@ -26,6 +26,10 @@ public class FieldTester : MonoBehaviour public Camera Camera; public FieldDriver TestField; public PropertiesPanel Properties; + // The scene's slow viewing timings for a grab, published as the events' phase durations. + public float GrabExtendTime; + public float GrabEnvelopTime; + public float GrabPullTime; private AetheriaInput _input; private bool _forceThrust; @@ -49,6 +53,14 @@ public class FieldTester : MonoBehaviour private List<(float lerp, float time, Transform transform)> _pickups = new List<(float lerp, float time, Transform transform)>(); + // This scene stands in for the simulation, so it owns its pickup's grab timeline and pose: one grab at a time. + private bool _grabbing; + private int _grabIndex; + private float _grabElapsed; + private float3 _grabStart; + private bool _envelopPublished; + private bool _pullPublished; + private void Start() { _input = new AetheriaInput(); @@ -59,10 +71,7 @@ public class FieldTester : MonoBehaviour if (binder == null) Debug.LogError("FieldTester expects a CapabilityPresentationBinder on TestField's GameObject; no capability events will reach the field."); else - binder.Bind(_capabilityEvents, - grabTargetResolver: id => (int) id.Value >= 0 && (int) id.Value < _pickups.Count ? _pickups[(int) id.Value].transform : null, - grabInitialVelocityResolver: id => Vector3.forward * - (PickupTravelDistance / lerp(PickupTravelTimeMin, PickupTravelTimeMax, _pickups[(int) id.Value].lerp))); + binder.Bind(_capabilityEvents); // Impact absorption (fork L): what used to be FieldDriver's own click handler is now this // scene's stand-in for whatever will eventually detect a hit and publish AbsorbEvent. @@ -99,12 +108,16 @@ public class FieldTester : MonoBehaviour var click = pickup.GetComponent(); click.OnClick += (collider, data, ray, hit) => { - if (!TestField.CanGrab) return; + if (_grabbing) return; click.Clear(); - var p = _pickups[i1]; - _capabilityEvents.PublishGrab(new GrabEvent(new FloatingBodyId((uint) i1), GrabPhase.Started, p.transform.position.ToCultMath(), 0)); - p.transform = null; - _pickups[i1] = p; + _grabbing = true; + _grabIndex = i1; + _grabElapsed = 0; + _envelopPublished = _pullPublished = false; + _grabStart = _pickups[i1].transform.position.ToCultMath(); + var id = new FloatingBodyId((uint) i1); + _capabilityEvents.PublishGrab(new GrabEvent(id, GrabPhase.Started, _grabStart, 0)); + _capabilityEvents.PublishGrab(new GrabEvent(id, GrabPhase.Extend, _grabStart, GrabExtendTime)); }; pickup.ScanLabelContainer.gameObject.SetActive(false); @@ -117,6 +130,45 @@ public class FieldTester : MonoBehaviour } } + // Publishes Envelop and Pull once each at their cumulative boundaries, holds the pickup still until the pull and + // then moves it along the same smoothstep as Zone's held pose, and ends with Completed and the pickup's removal. + private void AdvanceGrab() + { + _grabElapsed += Time.deltaTime; + var id = new FloatingBodyId((uint) _grabIndex); + var pullStart = GrabExtendTime + GrabEnvelopTime; + if (!_envelopPublished && _grabElapsed >= GrabExtendTime) + { + _envelopPublished = true; + _capabilityEvents.PublishGrab(new GrabEvent(id, GrabPhase.Envelop, _grabStart, GrabEnvelopTime)); + } + if (!_pullPublished && _grabElapsed >= pullStart) + { + _pullPublished = true; + _capabilityEvents.PublishGrab(new GrabEvent(id, GrabPhase.Pull, _grabStart, GrabPullTime)); + } + var pickup = _pickups[_grabIndex].transform; + pickup.position = PulledPosition(_grabStart, TestField.transform.position.ToCultMath(), _grabElapsed, + GrabExtendTime, GrabEnvelopTime, GrabPullTime).ToUnity(); + if (_pullPublished && PullProgress(_grabElapsed, GrabExtendTime, GrabEnvelopTime, GrabPullTime) >= 1) + { + _capabilityEvents.PublishGrab(new GrabEvent(id, GrabPhase.Completed, pickup.position.ToCultMath(), 0)); + Destroy(pickup.gameObject); + var p = _pickups[_grabIndex]; + p.transform = null; + _pickups[_grabIndex] = p; + _grabbing = false; + } + } + + // How far along the pull a grab is `elapsed` seconds in: 0 through Extend and Envelop, then 0..1 over the pull. + public static float PullProgress(float elapsed, float extend, float envelop, float pull) => + saturate((elapsed - extend - envelop) / max(pull, 1e-4f)); + + // Where the stand-in sim holds its pickup: still through Extend and Envelop, then along Zone's held-pose curve. + public static float3 PulledPosition(float3 start, float3 holder, float elapsed, float extend, float envelop, float pull) => + lerp(start, holder, Zone.HeldPull(PullProgress(elapsed, extend, envelop, pull))); + private void Update() { var move = _forceThrust ? float2(0,1) : _input.Player.Move.ReadValue().ToCultMath(); @@ -144,10 +196,12 @@ public class FieldTester : MonoBehaviour _capabilityEvents.PublishThrust(new ThrustEvent(_push, min(length(_push), 1), float2(_frontTwist, _rearTwist))); + if (_grabbing) AdvanceGrab(); + for (var i = 0; i < _pickups.Count; i++) { var (l, time, t) = _pickups[i]; - if (t == null) continue; + if (t == null || (_grabbing && i == _grabIndex)) continue; time = frac(time + Time.deltaTime / lerp(PickupTravelTimeMin, PickupTravelTimeMax, l)); t.localScale = Vector3.one * lerp(PickupSizeMin, PickupSizeMax, l) * Zone.PowerPulse(time - .5f, ScaleExponent); t.position = new Vector3(t.position.x, t.position.y, (time - .5f) * PickupTravelDistance); diff --git a/Assets/Scripts/UI/HUD/SchematicDisplay.cs b/Assets/Scripts/UI/HUD/SchematicDisplay.cs index b3dc8662e..dc0740cf2 100644 --- a/Assets/Scripts/UI/HUD/SchematicDisplay.cs +++ b/Assets/Scripts/UI/HUD/SchematicDisplay.cs @@ -58,7 +58,8 @@ public class SchematicDisplay : MonoBehaviour public class SchematicDisplayItem { - public EquippedItem Item; + // The row Entity.SchematicRows derived: which item, which class and which range it shows. + public SchematicRow Row; public SchematicListElement ListElement; public IProgressBehavior Cooldown; // public ItemUsage ItemUsage; @@ -93,15 +94,12 @@ public class SchematicDisplay : MonoBehaviour CargoTemperatureLabel.text = "N/A"; } - BuildRows(_enemy ? RevealedWeapons() : entity.Equipment.Where(IsWeapon)); + BuildRows(WeaponRows()); } - private static bool IsWeapon(EquippedItem item) => item.Behaviors.Any(b => b.Data is WeaponData); - - // An enemy schematic lists what `_player` has seen the ship's weapons do: the weapon items of the player's book on it, - // in book order (ruling reveal-ends-on-perception), never the ship's live gear. The player's own schematic is its - // equipment; there is nothing to reveal about your own ship. - private IEnumerable RevealedWeapons() => _player.RevealsOf(_entity).Select(r => r.Item).Where(IsWeapon); + // Which rows, which class and which range label are Entity.SchematicRows' decision (aetheria-ew, classify-from-belief); + // this display only renders them. + private IEnumerable WeaponRows() => (_player ?? _entity).SchematicRows(_entity); private void ReturnRows() { @@ -111,21 +109,21 @@ public class SchematicDisplay : MonoBehaviour _schematicItems = null; } - private void BuildRows(IEnumerable items) + private void BuildRows(IEnumerable rows) { - _schematicItems = items + _schematicItems = rows .Select(x => new SchematicDisplayItem { - Item = x, + Row = x, ListElement = ListElementPrototype.Instantiate(), - Cooldown = _enemy ? null : (IProgressBehavior) x.Behaviors.FirstOrDefault(b=> b is IProgressBehavior), + Cooldown = _enemy ? null : (IProgressBehavior) x.Item.Behaviors.FirstOrDefault(b=> b is IProgressBehavior), // ItemUsage = _enemy ? null : (ItemUsage) x.Behaviors.FirstOrDefault(b=> b is ItemUsage), - Weapon = (Weapon) x.Behaviors.FirstOrDefault(b=>b is Weapon) + Weapon = _enemy ? null : (Weapon) x.Item.Behaviors.FirstOrDefault(b=>b is Weapon) }) .ToArray(); foreach (var x in _schematicItems) { - if(x.Item.Data is WeaponItemData weaponItemData) + if(x.Row.Claimed is WeaponItemData weaponItemData) x.ListElement.ShowWeapon(weaponItemData); //x.ListElement.Label.text = x.Item.EquippableItem.Name; if (!_enemy) @@ -197,10 +195,10 @@ public class SchematicDisplay : MonoBehaviour // A reveal gained or ended after selection changes the rows with no event to hook: rebuild when the // revealed weapon set differs from the rows' items. - if (_enemy && !RevealedWeapons().SequenceEqual(_schematicItems.Select(x => x.Item))) + if (_enemy && !WeaponRows().Select(r => r.Key).SequenceEqual(_schematicItems.Select(x => x.Row.Key))) { ReturnRows(); - BuildRows(RevealedWeapons()); + BuildRows(WeaponRows()); } // Cut 2 (docs/fire-control-cut.md): marks whichever row is the player's current aim point. @@ -208,7 +206,7 @@ public class SchematicDisplay : MonoBehaviour // as info decays, with no event to hook. if (_enemy && _schematicItems != null) foreach (var x in _schematicItems) - x.ListElement.SetSelected(x.Item == _player.ResolvedTargetItem); + x.ListElement.SetSelected(x.Row.Item == _player.ResolvedTargetItem); if(VisibilityLabel && !_enemy) VisibilityLabel.text = ((int)_entity.Visibility).ToString(); @@ -226,11 +224,11 @@ public class SchematicDisplay : MonoBehaviour { if (!_enemy) { - var itemData = _entity.ItemManager.GetData(x.Item.EquippableItem); - x.ListElement.HeatFill.anchorMax = new Vector2(unlerp(itemData.MinimumTemperature, itemData.MaximumTemperature, x.Item.Temperature), 0); + var itemData = _entity.ItemManager.GetData(x.Row.Item.EquippableItem); + x.ListElement.HeatFill.anchorMax = new Vector2(unlerp(itemData.MinimumTemperature, itemData.MaximumTemperature, x.Row.Item.Temperature), 0); if (x.Cooldown != null) x.ListElement.CooldownFill.anchorMax = new Vector2(x.Cooldown.Progress, 1); - x.ListElement.DurabilityLabel.text = $"{(int)(x.Item.EquippableItem.Durability / itemData.Durability * 100)}%"; + x.ListElement.DurabilityLabel.text = $"{(int)(x.Row.Item.EquippableItem.Durability / itemData.Durability * 100)}%"; if (x.Weapon.WeaponData.AmmoType.IsSet()) { if(x.Weapon.WeaponData.MagazineSize > 1) @@ -240,11 +238,8 @@ public class SchematicDisplay : MonoBehaviour } } - if (x.Weapon.WeaponData != null) - { - if(x.ListElement.RangeLabel) - x.ListElement.RangeLabel.text = ((int) x.Weapon.Range).ToString(); - } + if (x.ListElement.RangeLabel) + x.ListElement.RangeLabel.text = ((int) x.Row.Range).ToString(); } } } diff --git a/GameData/Aetheria.cc b/GameData/Aetheria.cc index f9ac53cf6..7cf3acd8a 100644 --- a/GameData/Aetheria.cc +++ b/GameData/Aetheria.cc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a2cb55b63f77a113dea0571716994ef8311d5da572a4fc41cbd3a7d2561fb68 -size 12730143 +oid sha256:9ee82a860bc41fed142226a6bcc5ee8cb26c54ee1112d3d999feffaf1f2339ca +size 12733988 diff --git a/docs/aetheria-ew-map.md b/docs/aetheria-ew-map.md index f0c58b146..da7efa268 100644 --- a/docs/aetheria-ew-map.md +++ b/docs/aetheria-ew-map.md @@ -56,9 +56,11 @@ reveals-replace-tiers). ## Cut 1b probes at 0898725f -`ew-hide-launch-catalog` is mapped as `cut-ew-hide-launch-catalog.r1` (agent imagination-aeth-ew-catalog), blocked on -question `ew-suppressor-strength`. Probed by a scratch AetherDb command and a scratch test run on Yggdrasil at -`0898725f` (never pushed to origin; job log kept in the session scratchpad only). +`ew-hide-launch-catalog` is mapped as `cut-ew-hide-launch-catalog.r2` (agent imagination-aeth-ew-catalog-r2; r1 is +superseded). Question `ew-suppressor-strength` is ruled both-as-two-designs (kitchen-sink direction): a strong +Launch Suppressor (NiteLife, Finch, DME, R&D) and a mild sustained one (Lightsail, Alakrita, defaulted). K1-K8 were probed by +a scratch AetherDb command and a scratch test run on Yggdrasil at `0898725f`; K9-K11 by a scratch test on Yggdrasil at +`1746e8bd` (code identical at `1e219e96`). Nothing was pushed to origin; job logs stay in session scratchpads. | # | Question | Result | |---|---|---| @@ -70,10 +72,13 @@ question `ew-suppressor-strength`. Probed by a scratch AetherDb command and a sc | K6 | Does a 1x1 Tool suppressor fit and work on shipped hulls? | Yes. Built like `BuildThrustedShip` with only the reactor, then the suppressor at `UnoccupiedSpace` via `Shape.FitsWithin` and `TryEquip` before `Admit`: Djinni 104 free cells, Longinus 20. Active at once; at lot quality .5 a draft with Factor .4-.2 evaluated .3 and each `SetSignature(LaunchFlash, 400)` stored 120. | | K7 | Do new Tool products reach generation? | `HasHome` is true for any Tool design (LoadoutGenerator.cs:240-242), so stations stock it and `FillInterior` may fit it on generated ships by the existing availability rule. Nothing else to wire. | | K8 | Does adding a Tool design and four products disturb existing tests? | No. The full `Aetheria.Shared.Tests` suite (1665 tests, about 16 minutes) ran green before and after a draft design and four products (NiteLife, Finch, DME, R&D) were applied to the catalog in the same job. CB-R1 (`ShippedCatalogRolesAreLive`) held with two roles, each read by a Quality term of exponent 1. | +| K9 | How far does a flash reach on a shipped observer? (corrects K3's reach) | A Longinus with its first shipped Sensors-hardpoint sensor at lot quality .5 has `PassiveInfo(position, 1)` of 1.89e-3 at 500, 6.31e-4 at 1500, 3.16e-4 at 3000, 1.58e-4 at 6000, 9.5e-5 at 10000: about 0.95 / distance. A flash is revealed while strength x that exceeds .1, so reach is about 9.5 x strength, not K3's 20 x (K3's gain range of .7-1.35 is high for this sensor). Unsuppressed 1000: seen to 9,500, hidden at 10,000. Mild mid (300): seen at 1500 (.19), hidden at 3000 (.095) and 6000. Strong mid (55): hidden at 1500 (.035). | +| K10 | How long does a suppressor last under fire, with the hull ticking? | Probed as a draft design on a shipped Longinus and Djinni with reactor and radiator, one launch per second for 120 s, four .25 s zone updates between launches, from rest at 280 K. Cell thermal mass 97.9 / 105.2. Strong (Factor .08-.03, HeatPerUnit 1.4-.8, rated 310-330) at mid quality, 1000 flash: Longinus 4 suppressed launches (stored 55) then bright, Djinni 5; 300 flash: 14 / 14. After that the cell cools through the rated line and flickers: 10 of 120 launches suppressed (Longinus), 6 (Djinni) at 1000. Mild (Factor .4-.2, HeatPerUnit .8-.5, rated 310-330) at mid, 1000 flash (stored 300): first 10 suppressed on both hulls, 22 / 13 of 120 in all; 300 flash (stored 90): first 36 (Longinus) and 33 (Djinni), 68 / 41 of 120. Quality moves it: mild at quality 1 and 300 flash lasts 60 / 48 launches, strong at quality 0 and 1000 flash only 3. So the mild design is sustained for light weapons (about half a minute at one launch a second) and a dozen autocannon-class launches, not for ever: a hot cell holds the rated line and lets a flash through about every fifth to tenth launch. | +| K11 | Does an opening volley stop for good without cooling? | Direct `SetSignature` calls with no zone update between them (r1's test shape): the cell never cools, so once past the rated temperature every later call is unsuppressed. Strong mid, 1000 flash: removed 945 x 1.1 = 1039 heat per call = 10.6 K (Longinus) / 9.9 K (Djinni); the fifth call on a Longinus (321.7 K > 320) and the sixth on a Djinni are the first bright ones. Margin on the Djinni is under 1 K (319.4 after four calls against a rated 320), so a test must derive its expected count from `ThermalMass` and the authored figures rather than assert a literal. | ## Cut sequence (not yet mapped; cuts 1, 1b and 2 are mapped as specs) Cut 1 is split in two by size: `ew-hide-launch` is the behaviour, the one hook in `SetSignature` and their tests; -the catalog authoring follows it as 1b, mapped above. +the catalog authoring follows it as 1b (two designs, six products), mapped above. Cut 2 `ew-claims-in-the-book` is mapped (above). It differs from the target line in one place: `SeenThrough` and the stored belief move to cut 4 with the judge (C5). Cut 4 also takes the drawn hull model (C7) and needs the target panel settled (C3). The remaining cuts are the target doc's cut sequence (3, 4, 4a `ew-jammer`, 5-10). diff --git a/docs/aetheria-release-map.md b/docs/aetheria-release-map.md index b107cf1f2..2ea520ad4 100644 --- a/docs/aetheria-release-map.md +++ b/docs/aetheria-release-map.md @@ -38,25 +38,24 @@ Cuts without a `cut_spec`, withdrawn 2026-10-12 under map-only-what-runs: a spec - autofire-threshold: Missiles 3 (r5): autofire in the sim. Each autofire gun picks its subject through ChooseSubject (munitions first) and. Waits on: munition-shots (blocked on munition-shots). - boss-hull-derived: A faction's boss hull is derived (r2): HullData.Boss on a hull the faction makes a product of, set by its own. Waits on: boss-gate, pirates-record, package-product (blocked on package-product). - autofire-controls: Missiles 3b (r2): the player sets autofire; the HUD marks munitions and autofire groups; the Point Defense scenario. Waits on: autofire-threshold, controls-hud, pd-gear (blocked on autofire-threshold and controls-hud). -- generic-design-names: Designs get generic names and branding moves to products: 43 gear and weapon designs renamed, brand text moved to their. Waits on: lot-product, product-titles, pd-gear (refresh needed; after the visibility chain by ruling catalog-breadth-after-visibility). - broadside-gunboat: Broadside returns on a real gunboat: the operator's Zhestokost line-gunboat package (side-rotated Ballistic hardpoints). Waits on: mods-in-tree, package-product (blocked on package-product and the operator package). - demo-cast-hulls: Demo cast hulls land (r3): the operator's five packages under GameData/Mods, each its maker's ship under its own name. Waits on: mods-in-tree, pirates-record, package-product, boss-hull-derived (blocked on package-product, boss-hull-derived and operator packages). -- minor-power-makers: Aya Collective, Megiddo and Orbital Forge in the catalog: an AetherDb one-shot authors three manufacturer-only. Waits on: maker-only-faction, pd-gear, pirates-record, gear-without-presence, generic-design-names (blocked on maker-only-faction merge and generic-design-names; ruling catalog-breadth-after-visibility). +- minor-power-makers: Aya Collective, Megiddo and Orbital Forge in the catalog: an AetherDb one-shot authors three manufacturer-only. Waits on: maker-only-faction, pd-gear, pirates-record, gear-without-presence, generic-design-names (blocked on maker-only-faction merge and generic-design-names; ruling catalog-breadth-now (superseded catalog-breadth-after-visibility 2026-10-13): runs now, refresh against master first). - ships-addon-mesh-mounts: Blender thruster and radiator mounts (from mounts r3): meshes from selected faces or a tagged mesh, each with its row. Waits on: ships-addon-mounts (blocked on ships-addon-mounts). - ships-addon-mask-bakes: Blender mask helpers (from paint r2): Suggest Regions by weighted k-means in CIELAB, Bake Starting Mask, Bake Wear from. Waits on: ships-addon-paint (blocked on ships-addon-paint). - ships-addon-paint: Blender hull mask record (r3): mask slot, New Mask, factory livery, Package UV0 and mask checks, ship.mask.png, region. Waits on: ships-hull-material, ships-addon-frame, ships-addon-guards (blocked on ships-hull-material (premise obsolete under mask-channels-place-materials)). -- matrix-coilguns: Weapon matrix, EMPS row: Light Coilgun, Coilgun, Railgun and Heavy Railgun at Small to ExtraLarge, with roles and two. Waits on: nothing in the mind (refresh needed; ruling catalog-breadth-after-visibility). -- matrix-beams: Weapon matrix, Laser and PPC rows: Medium and Large Beam Lasers, Heavy Ion Cannon and Ion Lance, with roles and two. Waits on: nothing in the mind (refresh needed; ruling catalog-breadth-after-visibility). -- matrix-cannons: Weapon matrix, XPS row: Heavy Autocannon (Large) and Siege Cannon (ExtraLarge), with roles and two makers each. Waits on: nothing in the mind (refresh needed; ruling catalog-breadth-after-visibility). -- matrix-lightning: Weapon matrix, ESD row: Arc Thrower (Small), Storm Projector (Medium) and Tempest Projector (ExtraLarge) beside plight. Waits on: nothing in the mind (refresh needed; ruling catalog-breadth-after-visibility). -- matrix-missiles: Weapon matrix, Missile and MicroMissile rows: Light and Heavy Missile Launchers, Torpedo Launcher and Micromissile. Waits on: nothing in the mind (refresh needed; ruling catalog-breadth-after-visibility). -- caliber-bands: Caliber is the size: five records recalibered, every weapon footprint held in its caliber's band, and every matrix cell. Waits on: matrix-coilguns, matrix-cannons, matrix-beams, matrix-lightning, matrix-missiles, matrix-mines, matrix-flamers (blocked on the seven matrix cuts; ruling catalog-breadth-after-visibility). -- matrix-flamers: Weapon matrix, Jet row: Light Flamethrower, Flamethrower, Heavy Flamethrower and Inferno Projector, thermal pellet guns. Waits on: nothing in the mind (refresh needed; ruling catalog-breadth-after-visibility). -- matrix-mines: Weapon matrix, Mine row: Mine Rack, Heavy Mine Layer and Minefield Projector beside the Mine Launcher, with warhead and. Waits on: roles-backfill (refresh needed; ruling catalog-breadth-after-visibility). -- product-lines-gear: Gear product lines: the twenty-two second-maker products of follow-up gear-product-lines, with role quality from maker. Waits on: generic-design-names, roles-backfill (blocked on generic-design-names; ruling catalog-breadth-after-visibility). -- product-lines-weapons: Weapon product lines (r2): r1's nineteen products plus a second maker for the Mine Launcher, authored after. Waits on: generic-design-names, lot-product, roles-backfill (blocked on generic-design-names; ruling catalog-breadth-after-visibility). -- boost-gear-combat: Stat boosters, combat, tiered by size: a modest 1x1 and a strong 2x2 each for Damage and Range on every gun through. Waits on: boost-gear-systems (blocked on boost-gear-systems; ruling catalog-breadth-after-visibility). -- boost-gear-systems: Stat boosters, systems, tiered by size: a modest 1x1 and a strong 2x2 each for Thrust, Signal, Emissivity and Reactor. Waits on: nothing in the mind (refresh needed; ruling catalog-breadth-after-visibility). +- matrix-coilguns: Weapon matrix, EMPS row: Light Coilgun, Coilgun, Railgun and Heavy Railgun at Small to ExtraLarge, with roles and two. Waits on: nothing in the mind (refresh needed; ruling catalog-breadth-now (superseded catalog-breadth-after-visibility 2026-10-13): runs now, refresh against master first). +- matrix-beams: Weapon matrix, Laser and PPC rows: Medium and Large Beam Lasers, Heavy Ion Cannon and Ion Lance, with roles and two. Waits on: nothing in the mind (refresh needed; ruling catalog-breadth-now (superseded catalog-breadth-after-visibility 2026-10-13): runs now, refresh against master first). +- matrix-cannons: Weapon matrix, XPS row: Heavy Autocannon (Large) and Siege Cannon (ExtraLarge), with roles and two makers each. Waits on: nothing in the mind (refresh needed; ruling catalog-breadth-now (superseded catalog-breadth-after-visibility 2026-10-13): runs now, refresh against master first). +- matrix-lightning: Weapon matrix, ESD row: Arc Thrower (Small), Storm Projector (Medium) and Tempest Projector (ExtraLarge) beside plight. Waits on: nothing in the mind (refresh needed; ruling catalog-breadth-now (superseded catalog-breadth-after-visibility 2026-10-13): runs now, refresh against master first). +- matrix-missiles: Weapon matrix, Missile and MicroMissile rows: Light and Heavy Missile Launchers, Torpedo Launcher and Micromissile. Waits on: nothing in the mind (refresh needed; ruling catalog-breadth-now (superseded catalog-breadth-after-visibility 2026-10-13): runs now, refresh against master first). +- caliber-bands: Caliber is the size: five records recalibered, every weapon footprint held in its caliber's band, and every matrix cell. Waits on: matrix-coilguns, matrix-cannons, matrix-beams, matrix-lightning, matrix-missiles, matrix-mines, matrix-flamers (blocked on the seven matrix cuts; ruling catalog-breadth-now (superseded catalog-breadth-after-visibility 2026-10-13): runs now, refresh against master first). +- matrix-flamers: Weapon matrix, Jet row: Light Flamethrower, Flamethrower, Heavy Flamethrower and Inferno Projector, thermal pellet guns. Waits on: nothing in the mind (refresh needed; ruling catalog-breadth-now (superseded catalog-breadth-after-visibility 2026-10-13): runs now, refresh against master first). +- matrix-mines: Weapon matrix, Mine row: Mine Rack, Heavy Mine Layer and Minefield Projector beside the Mine Launcher, with warhead and. Waits on: roles-backfill (refresh needed; ruling catalog-breadth-now (superseded catalog-breadth-after-visibility 2026-10-13): runs now, refresh against master first). +- product-lines-gear: Gear product lines: the twenty-two second-maker products of follow-up gear-product-lines, with role quality from maker. Waits on: generic-design-names, roles-backfill (blocked on generic-design-names; ruling catalog-breadth-now (superseded catalog-breadth-after-visibility 2026-10-13): runs now, refresh against master first). +- product-lines-weapons: Weapon product lines (r2): r1's nineteen products plus a second maker for the Mine Launcher, authored after. Waits on: generic-design-names, lot-product, roles-backfill (blocked on generic-design-names; ruling catalog-breadth-now (superseded catalog-breadth-after-visibility 2026-10-13): runs now, refresh against master first). +- boost-gear-combat: Stat boosters, combat, tiered by size: a modest 1x1 and a strong 2x2 each for Damage and Range on every gun through. Waits on: boost-gear-systems (blocked on boost-gear-systems; ruling catalog-breadth-now (superseded catalog-breadth-after-visibility 2026-10-13): runs now, refresh against master first). After damage-falloff: a Range Extender multiplies Range only, so it lengthens the falloff ramp and leaves EffectiveRange where it was; the cut decides whether it also targets EffectiveRange (section "Damage falloff at fire time", DF8). +- boost-gear-systems: Stat boosters, systems, tiered by size: a modest 1x1 and a strong 2x2 each for Thrust, Signal, Emissivity and Reactor. Waits on: nothing in the mind (refresh needed; ruling catalog-breadth-now (superseded catalog-breadth-after-visibility 2026-10-13): runs now, refresh against master first). - ships-player: S3, agent side: a player built by AetheriaBuild composes and preloads mod ships with Aetheria materials only, radiators. Waits on: ships-mounts, ships-hull-material, player-build (blocked on ships-hull-material). - ships-addon-gizmos: Blender Ship Mounts tool (r6): gizmos select and drag mounts snapped to cells in Ship Root's frame; arc fans from the. Waits on: ships-addon-mesh-mounts (blocked on ships-addon-mesh-mounts). - link-rig-presenter: Unity drives each driven joint's chain (r2): a MountRig aims its lead muzzle along the sim's solution, slewed at the. Waits on: link-rig-record, ships-addon-link-package (blocked on ships-addon-link-package). @@ -74,6 +73,8 @@ Cuts without a `cut_spec`, withdrawn 2026-10-12 under map-only-what-runs: a spec - radiator-geonodes: a Geometry Nodes setup molds radiator panels over a region marked on the model under the radiator hardpoint's name, in the live hull stack. Waits on: Ruling: radiator-panels-molded-by-geonodes. HELD for the operator walkthrough on Starfire (ruling hardpoint-work-held-for-walkthrough). Schematic and model are separate spaces linked only by mount name (ruling schematic-and-model-are-separate-spaces). - floating-greeble-library: operator seed pieces, model-written parametric families, placements as hull-local data (never a GN scatter on the live mesh), merged into the ship mesh at export, kept out of socket clearance. Waits on: operator seed set. Research: GameCult.Geometry.Csg docs/research/greebles-prior-art.md (4877300). +- sensor-bearing-shape: SensorData.SensitivityCurve (gain over bearing angle / PI, read in the sim by Sensor.cs:229,262 and bounded by HullRange at :271) becomes authored scalars or is replaced by the beam width ruling sensor-stat-set already names. Waits on: the sensor-catalog chain; decide with it, not before. +- consumable-effectiveness: ConsumableItemData.Effectiveness (a BezierCurve over progress through duration, read by Entity.cs:1921 ConsumableProgressFactor) is null on both shipped consumables, so any stat that declares a ConsumableProgress term throws; delete it or give it a validated shape. Waits on: nothing in the mind. ## Body facts **B1. No impact event carries a world point.** @@ -5724,6 +5725,135 @@ to 400-750 m, energy-limited at 6-10 a shot, 2 to 4 hits a missile. Flak Gun is shotgun at small calibre, 1x2: 6-8 pellets sharing 30-70 damage a volley, 350-800 m, Tracking 20 (between PD and ClearPath, because pellets cover what tracking misses). +### Refresh at 1746e8bd (generic-design-names r3, 2026-10-13) + +Re-probe of this section against `origin/master` `1746e8bdc8c86f142ab0ea8952dbccdc851c3dc2` by +`imagination-aeth-generic-names` (session self-2026-10-13-ag2), after ruling `catalog-breadth-now` +lifted the hold. Catalog decode: `cultcache_py` `SingleFileMessagePackBackingStore.pull_all()` over +`GameData/Aetheria.cc` at that head, payloads by MessagePack key (the CG1 method); literal census: a +script counting each quoted old name (`""`, fixed string) over `git ls-files '*.cs'`. Scratch +scripts were not committed. The rename table above ("Generic design names", 43 rows) stands unchanged: +every old name is present exactly once and no generic name is taken by any record or product. + +- **GN1. Census at 1746e8bd.** 86 FactionProductData, 51 CompoundCommodityData, 31 GearData, + 27 WeaponItemData, 13 SimpleCommodityData, 13 Faction (Pirates added), 12 NameFile, 5 HullData + (Djinni, Longinus, Turret, Zenith, Smoke Test Hull), 4 CargoBayData, 3 PersonalityAttribute, 2 ConsumableItemData, + 1 DockingBayData, 1 FieldKindData, 1 InputLayout, 1 verse_grammar, 7 verse_verb. Traction is gone + (retire-longinusx). Landed since CG1: product-titles (`ItemManager.Title`, ItemManager.cs:228-229, + the one title owner; no `DisplayName`), lot-product (`Lot.Product`, Provenance.cs:73), pd-gear, + pirates-record (8 emoji rebrands), mine-launcher, roles-backfill, consumables-first-set. +- **GN2. Designs whose product shares their name: 43 non-hull designs** (CG2 counted 49 at + 4d664b53). 35 are rows of the rename table; the other 8 keep a generic design name and need a + brand: Autocannon (Zhestokost), Cockpit 2x2, Industrial Thermostatic Heater, Medium Drive, + Small Drive (Lightsail), Turret Control Module, Medium Docking Bay (AU), and the new one, + **Mine Launcher (DME)**, whose product `Mine Launcher` was authored by `mine-launcher` + (Program.cs:1779) with the design's functional line as its text and an empty design description. + Pirates products sit on Store-All Plus, Small Drive, Targeting Computer, 6k Shooter, Autocannon, + Earp, FastBlast+- and scorched void policy; none is touched (ruling `pirates-record-content`). +- **GN3. Description classes for the 43 rows.** 40 products carry exactly the design's text or + both are empty or `[TODO]`; 3 differ: plight/DragOnBreath (the product's text is an authoring + note, "The subsidiary plight's own description already namechecks..."), pswarm/Leonid (the design's + text is DME's "let's set the stars on fire" lyric, a duplicate of scorched void policy's) and + Core Power/Steadfast. Empty or `[TODO]` on both sides: LRMM72, SRMM72, Iapyx, Skiron, + RevvITup 2.0, Talaria, The Bat, not if i see you first, PotaT+-. The five station reactor + designs share the functional line "A reactor sized for a station's core." and their products + (Steadfast Station, Manhattan Station, Notorious Station, Vulcan Station, MoveOnPro Station) are + empty. Victoire's product is empty under a flavour design text. +- **GN4. Authoring notes shipped as player text.** Eight product descriptions end in " (new text)": + Panopticon, Panopticon Prime, ClapBack, ClapBack Ultra, LockOn, LockOn Pro, Steadfast, True North. + Their source literals are in TargetingCatalog (Program.cs:1177, 1180, 1200, 1203) and + TargetingCatalog6c (:1315, 1318, 1321, 1324); DragOnBreath's note is Program.cs:1194. +- **GN5. Old-name literals in C#: 232 on 202 lines in 30 files** (CG10 counted 61 in 12). Every + hit resolves a design by `Name` (scenario fits, `GetByName`, `Data.Name ==`, AetherDb templates and + name-keyed maps) or is a comment; none names a product. By file: EvasionTermTests 28, + tools/AetherDb/Program.cs 26 (lines 236, 408, 1193, 1196, 1199, 1530, 1538, 1545, 1716-1720, + 1890-1891, 2055-2058, 2061), Pursuit 22, Arcs 17, MunitionPartsTests 14, Duel 13, Belt 10, + Crossing 10, LauncherAngles 10, StarvedReactor 8, WeaponFeel 8, RolesBackfillCommandTests 8, + FusedRounds 7, CatalogRoleTests 7, AiFusedDiscipline 6, RefusedRounds 6, EvasionTrackingTests 5, + PiratesFactionCommandTests 5, RestoredHullsTests 4, RunStartTests 4, SmokeRoundsSteppedTests 3, + CrossingScenarioTests 2, SmokeRoundsCommandTests 2, and one each in BrownoutTests (comment), + PowerCurveTests (comment), ScenarioTests, SmokeHullCommandTests, SmokeHullScenarioTests, + SmokeRoundsScenarioTests, ThrustAllocationTests. No non-C# file in the tree names them except docs. +- **GN6. Name-keyed authority in AetherDb.** `ToolRolesByDesign` (Program.cs:229-241) is keyed by + design name and feeds `HasRoleMap`, which CatalogRoleTests reads: its `"PotaT+-"` key (:236) must + become `"Capacitor"` or the capacitor silently loses its role map. `BackfillDesigns` + (:1890-1891), the roles-migrate Arctica special case (:408), and the templates of pd-gear + (:1530-1545), smoke-rounds (:1716-1720) and pirates-faction (:2055-2061) resolve by name; the + command tests for roles-backfill, smoke-rounds, smoke-hull and pirates-faction run those commands + on a scratch copy of the shipped catalog, so after the rename they find designs only by the + generic names. +- **GN7. Order-sensitive pin.** `RunStartTests.TheSoldHardpointGearWithNoHomeToday` + (RunStartTests.cs:450-460) orders names ordinally; after the rename the list is + Charged Blaster, Charged Scatter Blaster, Heat Pump, Heavy Beam Laser (not a positional swap). +- **GN8. In-flight branches that add old-name literals** (diff against master, 2026-10-13): + `eureka/aetheria-release-scenarios-lock-on-r3` (LockOn.cs, 9 literals: the scenario hull fit) and + `eureka/aetheria-release-sensor-catalog-r2` (its sensor-stat-set table names "The Bat" and + "not if i see you first" for four new products: Floodlight and Beacon by Lucent, Pinion and + Kestrel by Finch). It also adds `["Passive Array"]` to `ToolRolesByDesign`, the dictionary GN6 + edits. `aetheria-ew` ew-hide-launch-catalog names only "Targeting Computer" and its own new design. + +### Content: brands, flavour and functional text (generic-design-names r3) + +Ruling `kitchen-sink-content` applied where r2 chose narrowly: r2 left nine products with no text, +moved the station reactors' functional line into their products as if it were flavour, dropped +three design texts, and branded seven same-named products. r3 brands all eight (GN2), gives every +product of the touched designs its own text (except Miss Terri's, ruling +`miss-terris-belongs-to-emily-r3`), strips the eight authoring notes (GN4), and keeps every old +brand verbatim as a product name (ruling `setting-permits-necrotech`: names are not trimmed for +tone). Names and lines are drafts the operator may rename. + +**Brands for same-named products** (product renamed; its text set as below): + +| Design (unchanged name) | Maker | Old product name | Brand | Product text | +|---|---|---|---|---| +| Autocannon | Zhestokost | Autocannon | Hammerfall | The rounds fall steadily, and they do not stop until the work is done. | +| Cockpit 2x2 | Lightsail | Cockpit 2x2 | Wheelhouse | Every Lightsail captain's favourite chair. The view comes standard. | +| Industrial Thermostatic Heater | Lightsail | Industrial Thermostatic Heater | Hearth | A warm hold, a warm crew, and a warm welcome at the cold end of the run. | +| Medium Drive | Lightsail | Medium Drive | Steady Haul | Keeps you going and going and going... (the design's old text, moved) | +| Small Drive | Lightsail | Small Drive | Short Hop | Dock to dock, and not a metre further than the manifest says. | +| Turret Control Module | AU | Turret Control Module | Watchtower | Point it at the dark and get back to work. It keeps watch. | +| Medium Docking Bay | AU | Medium Docking Bay | Open Berth | Room for a friend, a customer or a tug. We don't ask which. | +| Mine Launcher | DME | Mine Launcher | parting gift | we were never here/ but we left you something/ it's waiting where we were | + +**Functional design text for those eight** (the design's Description; flavour lives in the product): +Autocannon "Belt-fed cannon: a steady stream of rounds at long reach."; Cockpit 2x2 "Two-by-two crew +cockpit."; Industrial Thermostatic Heater "Turns reactor power into heat to keep the hull warm."; +Medium Drive "Mid-sized working drive."; Small Drive "Small working drive."; Turret Control Module +"Control module for a station turret."; Medium Docking Bay "Docking bay for mid-sized ships."; +Mine Launcher "Lays a drifting proximity mine that arms after two seconds." (moved from its product). + +**Product text set explicitly** (by product name and maker; every other product of a renamed +design keeps its text, which GN3 shows equals the design's old text): + +| Product (maker) | Design after rename | Text | +|---|---|---| +| Victoire (Alakrita) | Racing Drive | The most responsive thruster on the market, for the most irresponsible of racing pilots. (moved from the design) | +| DragOnBreath (Lucent) | Lightning Projector | plight's old design text, verbatim (moved; replaces the authoring note) | +| Steadfast (R&D) | Compact Reactor | It gets the job done, but that's all. Rated for continuous operation. "Continuous" does not imply "uninterrupted." | +| Steadfast Station (R&D) | Station Reactor | Rated for continuous operation at station scale. The fine print scales too. | +| Manhattan Station (Zhestokost) | Heavy Station Reactor | A fortress needs a furnace. This is the furnace. | +| Notorious Station (Lucent) | High-Yield Station Reactor | The biggest reaction in the system, and everyone docked here will hear about it. | +| Vulcan Station (AU) | Ring Station Reactor | Keeps the lights on and the forges hot. | +| MoveOnPro Station (NiteLife) | Muon Fusion Station Reactor | The club never closes. Neither does the reactor. | +| LRMM72 (R&D) | Long-Range Missile Rack | Engages targets at up to seventy-two kilometres!* *In a vacuum, against a cooperative target. | +| SRMM72 (DME) | Short-Range Missile Rack | seventy-two reasons/ to keep your distance/ all of them leaving at once | +| Iapyx (AU) | Radiator | Two cells of honest fin. Bolt it on and forget it's there. | +| Skiron (AU) | Long Radiator | When the job runs hot, run a bigger fin. | +| Talaria (AU) | Rugged Drive | Takes a knock, keeps pushing. Built for crews who work for a living. | +| RevvITup 2.0 (NiteLife) | High-Thrust Drive | Floor it. The bass drops when you do. | +| PotaT+- (NiteLife) | Capacitor | Holds the charge until the drop, then lets it all go at once. | +| not if i see you first (DME) | Compact Sensor | eyes in the dark/ you were seen before you looked/ say goodnight | + +Leonid keeps its own text; pswarm's dropped lyric survives on scorched void policy (GN3). The Bat's +product (Miss Terri's) is not touched. The eight " (new text)" suffixes (GN4) are removed from the +shipped products and from their source literals; Steadfast's full text is the row above. + +**Concurrency.** Every catalog cut writes `GameData/Aetheria.cc` through an idempotent AetherDb +command; whoever merges second takes master's `.cc` and reruns its own apply (ruling +`catalog-breadth-now`), never a hand merge. Because this cut renames the names other commands look +up, a cut that merges after it must spell the generic names; one that merges before it is swept by +this cut's final pass (GN8). + ## Retiring the LonginusX and parking the aether drive Ruling `retire-longinusx`, in the operator's words: "I want to retire the LonginusX, the aether @@ -8286,16 +8416,16 @@ Aimed across 8 test files; FireControlCut12Tests pins ResolveAimPoint's cell ave |---|---|---|---| | Signature channel (`SignatureChannel`: Thermal, Reflection, DrivePlume, LaunchFlash, Emission) | A closed enum, the five channels of ruling visibility-per-capability-reveal. Saved only as `VisibilityData.Channel` (catalog, by value; append-only, a value is never reused). | Fixed set; a new channel is a code change and a ruling. | The ruling. Code names each writer's channel; the catalog names a Visibility gear's. | | Light signature (`Signature {Channel, Strength, Item}` in `Entity.VisibilitySources`) | (emitting entity, source object). The source is the writing behaviour, or the entity for hull radiation; the key is a reference, so injective. `Item` is derived from the behaviour's `Item` (null for hull radiation and consumable effects). Channel Emission is never a light signature (after cut emissions-heard). | Written each tick its source acts (thermal, radiator, reflector, visibility gear continuously; weapon fire and plume when they act). Decayed by VisibilityDecay in the owner's Update and removed below 0.1. Runtime only, never saved. | One writer per entry: its source, through `Entity.SetSignature`. Entity.Update the only decayer. Forbidden: another entity, any presenter, a direct dictionary write. `Visibility` (the sum) stays the track input. | -| Active emission (`ActiveEmission {Item, HearRange, Mode}` in `Entity.ActiveEmissions`) | (emitting entity, emitting item, tick). No persistent id. | Posted to the emitter's inbox each tick it emits (a ping wavefront in flight: Search; a lock paint inside LockAngle: Track); published in the zone's pre-phase with paints; lives exactly one tick. Never saved. | Sensor.Execute (search) and LockWeapon.Execute (track) through `Entity.Emit`; Entity publishes. HearRange = the emitter's range / its InterceptFactor, fixed at the emit. | -| Paint warning (`PaintWarning {Bearing, EmitterClass, Mode, Strength}` in `Entity.IncomingPaints`; was LockWarning / IncomingLocks) | (painted entity, tick, painter beam). No id. | One tick after its last paint (unchanged from lock-warning). Search paints carry Strength 0. | LockWeapon.Execute (Track) and a ping wavefront crossing (Search, Sensor.Execute) call ReceivePaint; Entity publishes. Painted targets are always warned (sensor-stat-set 4). | +| Active emission (`ActiveEmission {Item, HearRange, Claimed}` in the emitter's private `_emissions`) | (emitting entity, emitting item, tick). No persistent id. | Written by `Entity.Emit` during the emitter's Update each tick it emits (a ping wavefront in flight, a lock paint inside LockAngle, a held scan after inspection-scanner); read only by other entities' Sense in the same tick; cleared by the emitter's next PublishInbox and by Deactivate. No mode. Never saved. | Sensor.Execute, LockWeapon.Execute and (inspection-scanner) Scanner.Execute through `Entity.Emit`, which stamps `Claimed = ClaimOf(item)`. HearRange = the emitter's range / its InterceptFactor, fixed at the emit. (Body at b836af48: IS3.) | +| Paint warning (`PaintWarning {Bearing, EmitterClass, Mode, Strength}` in `Entity.IncomingPaints`; was LockWarning / IncomingLocks) | (painted entity, tick, painter beam). No id. | One tick after its last paint (unchanged from lock-warning). Search paints carry Strength 0; Scan paints (inspection-scanner) carry the scan's progress. | LockWeapon.Execute (Track), a ping wavefront crossing (Search, Sensor.Execute) and a held scan (Scan, Scanner.Execute) call ReceivePaint; Entity publishes, and PublishInbox records the painter's item as an Emission reveal. Painted targets are always warned (sensor-stat-set 4, scan-is-an-act). | | Track (`EntityInfoGathered[subject]`) | (observer, subject entity). | Seeded 0 on zone entry, revised each tick by each active sensor (passive gain, decay), plus one monostatic gain on the tick its own ping crosses the subject and one bistatic gain per published ping return (R2); removed when the subject leaves; cleared on Deactivate. Runtime only. | Sensor.Execute only, reading the observer's own receivers and its own published returns. Forbidden: shared-track writes (ruling shared-track-bearing-only), presenters, other ships, any read of another ship's Sensor state. | | Ping sweep (`Sensor._reached`, per pinging sensor) | (pinging sensor, ping). The set of subjects the wavefront has reached this ping, in the beam or not. | Cleared at Ping(); a subject joins on the first sweeping tick it lies inside the radius, and that is its one crossing (credited and painted only if inside the beam then); nothing joins after the ping's last step; emptied when the sensor is idle. Runtime only. | The pinging Sensor.Execute alone decides "this ping crossed this subject, once". Forbidden: another sensor or ship reading its radii; an interval sample standing in for it. | | Ping return (`PingReturn {Subject, IlluminatedRange, IlluminatedObscuration, MaxRange}` in the ally's `PingReturns`) | (receiving entity, pinging sensor, subject, tick). No id. | Posted by the pinger to each ally's inbox on the crossing tick; published in the zone pre-phase with paints (`PublishInbox`); lives exactly one tick. Never saved. | The pinger posts (it owns the illuminated leg and its own range); the receiving Sensor credits from its own Sensitivity, PingBoost, distance and sight line (it owns the receive leg). Forbidden: the pinger writing the ally's track; the ally reading the pinger. | -| Reveal (`Reveal {Item, Channel, Bearing, Time}` in the observer's reveal book, keyed (subject, item)) | (observer, subject entity, revealed item), by reference. Channel is null for a reveal by inspection (cut inspection-scanner). | Created on the first act the observer's instruments receive, or for every live item when the observer's scanner completes a scan; Channel, Bearing and Time refreshed by each later act; ended for an item when the observer perceives its destruction, and for all of a subject's items when the observer perceives the subject's death or departure (acts received through the observer's own Sense step, never a subscription to the subject); a subject leaving the zone does not by itself empty any book: its entries stay unrefreshed and are pruned once the freshest is older than BearingMemory; Contact never reads the subject's live equipment or Durability, and only the aiming read (IsRevealed, IsLocated) filters on the live item (Durability < .01 or off the subject) (Defaulted ruling reveal-ends-on-perception); RecordReveal and its one removal counterpart are the book's only writers and its one membership gate; cleared on Deactivate. Not decayed: memory of the sitting. Never saved. | `Entity.Sense` (once per Entity.Update) for light acts and heard emissions; `ReceivePaint` for paints; `Entity.RecordInspection` (called by the observer's own Scanner) for scans. Forbidden: Sensor's track loop, presenters, another ship, shared tracks. | +| Reveal (`Reveal {Item, Channel, Bearing, Time}` in the observer's reveal book, keyed (subject, item)) | (observer, subject entity, revealed item), by reference. Channel is null for a reveal by inspection (cut inspection-scanner). | Created on the first act the observer's instruments receive, or for every fitted, non-destroyed, non-hull item when the observer's scanner completes a scan (Channel null, Claimed the subject's `ClaimOf(item)`, as any act records the claim it carries: aetheria-ew one-judge; a scan creates and refreshes entries and ends none); Channel, Bearing and Time refreshed by each later act; ended for an item when the observer perceives its destruction, and for all of a subject's items when the observer perceives the subject's death or departure (acts received through the observer's own Sense step, never a subscription to the subject); a subject leaving the zone does not by itself empty any book: its entries stay unrefreshed and are pruned once the freshest is older than BearingMemory; Contact never reads the subject's live equipment or Durability, and only the aiming read (IsRevealed, IsLocated) filters on the live item (Durability < .01 or off the subject) (Defaulted ruling reveal-ends-on-perception); RecordReveal and its one removal counterpart are the book's only writers and its one membership gate; cleared on Deactivate. Not decayed: memory of the sitting. Never saved. | `Entity.Sense` (once per Entity.Update) for light acts and heard emissions; `ReceivePaint` for paints; `Entity.RecordInspection` (called by the observer's own Scanner) for scans. Forbidden: Sensor's track loop, presenters, another ship, shared tracks. | | Hull layout knowledge (derived by `Entity.LayoutOf(subject)`) | (observer, subject hull class). The class is the subject's HullData; the layout is its Hardpoints (type, position, shape). | Derived on read: the subject's HullData.Hardpoints while ContactOf(subject).Identified, else empty. Stored nowhere; never says what is fitted. | `Entity.LayoutOf` is the one derivation (ruling quiet-gear-identifiable-hull-layout-known). Readers: IsLocated, the target schematic, the player's cycle. | | Contact (`Contact`, derived by `Entity.ContactOf(subject)`) | (observer, subject). | Derived on read from track, reveals, the zone clock and `BearingMemory`; stored nowhere. Flags: Detected (tracked, or a reveal younger than BearingMemory), Tracked (track > TargetDetectionInfoThreshold, which is VisibleEntities), Classified (detected and any reveal), Identified (track >= TargetGearInfoThreshold, name kept, now the identify threshold). Bearing: the true bearing while tracked, else the freshest reveal's. | `Entity.ContactOf` is the one derivation. HUD and AI read it; VisibleEntities stays the tracked set. | | Located item (`FireControl.IsLocated(observer, item)`) and aim point | (observer, subject item). | Derived on every read: revealed, or on a hardpoint of a layout the observer holds. The aim point is the item's own cells when revealed, else its hardpoint's cells; the choice is frozen into the shot with Aimed. | FireControl (R10). TrySelectTargetItem and ResolvedTargetItem gate on IsLocated; anything that reads an item's stats or class (AI weapon choice, schematic weapon rows) gates on IsRevealed. | -| Scan (`Scanner` behaviour; progress per (scanner, target)) | (scanning item, the ship's Target). | Progress builds while the Target is tracked and within Range, at 1/ScanTime per second; falls at the same rate otherwise; reset on target change; at 1 the scan completes (RecordInspection) and progress restarts. Runtime only. | The Scanner behaviour; RecordInspection in Entity.cs writes the reveals. While scanning: a Scan paint (Strength = progress) on the target and an Emit(Item, Range / InterceptFactor, Scan) (question scanner-reveals-its-user, recommended). | +| Scan (`Scanner` behaviour; progress per (scanner, target)) | (scanning item, the ship's Target entity). | Progress builds in Execute while the item is Active and its Target is tracked (VisibleEntities) and within Range (TargetRange), at 1/ScanTime per second; falls at the same rate in the behaviour's always-run Update on any tick it was not held (out of range, untracked, no target, or the item inactive: ruling scan-held-beam); reset on a target change; at 1 the scan completes (RecordInspection) and progress restarts. Runtime only. No hostility gate (a scan reads no true faction: classify-from-belief). | The Scanner behaviour owns progress; RecordInspection in Entity.cs writes the reveals through RecordReveal's gate. While held: a Scan paint (Strength = progress) on the target and Emit(Item, Range / InterceptFactor) (ruling scan-is-an-act). | | Sensor stats (SensorData Sensitivity key 3 = detection power, BeamWidth key 12, InterceptFactor key 13; LockWeaponData.InterceptFactor key 26; ListenerData.Multiple key 1; ScannerData Range 1, ScanTime 2, InterceptFactor 3) | Fields of a catalog design; brand flavour through product role quality. | Authored by AetherDb (cut sensor-catalog); resolved per item through StatResolver. PingVisibility (key 7) is retired, never reused. | The catalog. Readers: Sensor (BeamWidth, InterceptFactor), LockWeapon (InterceptFactor), Entity.HearingMultiple (ListenerData). | No empty cell. Two decisions are defaults, not rulings: reveals never decay within a sitting (a ship @@ -9316,3 +9446,202 @@ Sizes (Hands calls, budget / cap): scenarios-lock-on 55/75, sensor-catalog 75/90 - mind-commit-7be0c784...: cut-scenarios-lock-on.r3, resolution cut_spec.cut-scenarios-lock-on.r2.n1 (Superseded); cut-sensor-catalog.r2, resolution cut_spec.cut-sensor-catalog.r1.n1 (Superseded). No question raised. + +## Weapon damage over range (imagination-aeth-range-ramps, 2026-10-13) + +Asked by operator ruling range-ramps-not-curve ("Is range still a curve?"), then by her follow-up: if the generic form is the same data structure with linear segments, is it still worth changing? This section answers that from the Body. Probes ran at master 1746e8bd. + +### Body facts + +**R1. No hit applies range falloff.** `FireControl.Fire` (`FireControl.cs:679`) freezes the payload with `Damage = damageOverride ?? weapon.Damage` (`:725`; the mine path `:787` the same). InstantWeapon fires `FireControl.Fire(this, Item, Entity)` (`InstantWeapon.cs:271`); ConstantWeapon passes `Damage * interval` (`ConstantWeapon.cs:188`); ChargedWeapon scales `Damage` by charge only (`ChargedWeapon.cs:124`). Every resolution path reads `shot.Damage` unscaled (`FireControl.cs:960, 1108, 1145-1146, 1183, 1259`). Range only gates: a shot outside `[MinRange, Range]` is not taken (`FireControl.cs:274`; `LockWeapon.cs:62`). + +**R2. Who reads `DamageCurve`.** Only estimates and UI: `RangeDamagePerSecond` in `InstantWeapon.cs:64`, `ConstantWeapon.cs:52`, `ChargedWeapon.cs:83`, read by the AI's threat and fit sums (`Agents/States/Combat.cs:46, 71, 155`), and the properties panel's "Damage Range" chart (`UI/Properties Panel/PropertiesPanel.cs:426`). On `eureka/aetheria-ew-ew-claims-in-the-book` (adb632fe) the same curve also feeds the static rated formulas (`InstantWeapon.cs:43`, `ConstantWeapon.cs:32`, `ChargedWeapon.cs:64`) behind `RatedRangeDamagePerSecond`, read by `Combat.cs:48` for a claimed hull. So the AI and the panel price a falloff that the sim never applies. + +**R3. Census of every shipped authored curve** (scratch AetherDb command over `GameData/Aetheria.cc` at 1746e8bd, run on Yggdrasil; keys are Unity keyframes `time,value,inTangent,outTangent`; the scratch clone is deleted): + +| Field | Records | Distinct shapes | Shape | +|---|---|---|---| +| `WeaponData.DamageCurve` | 27 (13 Auto, 5 Charged, 3 Guided, 2 Instant, 2 Launcher, 1 Constant, 1 MineLayer) | 2 | 26 share one default: `0,1,0,0; 1,0,-1.7656,-1.7656`, 1 at MinRange easing down to 0 at Range (0.72 at the midpoint, 0.33 at 0.8, 0.09 at 0.95; close to `1 - t^2`). Mine Launcher is flat 1. | +| `SensorData.SensitivityCurve` | 2 (not if i see you first, The Bat) | 1 | The same default template, over bearing. | +| `ConsumableItemData.Effectiveness` | 2 (Coolant Vent, Thruster Overdrive) | 1 | null on both. | +| Launcher / GuidedWeapon `guidance`, `thrustCurve`, `liftCurve` (`float4[]`) | 2 launchers, 3 guided | 4 | Hand-authored multi-key shapes (GT 3K's guidance has 11 keys); read only by presentation flight (`GuidedProjectileManager.cs:54-76`), which ruling projectile-flight-is-presentation leaves to Unity. | + +MinRange is 0 on 25 of 27 weapons; LRMM72 has 500..500 and GT 3K has 500..50 (Min above Max). + +No weapon's falloff was ever authored: 26 weapons carry one copied template, and the shape is not applied to damage. + +### Options, with cost + +- **Delete the curve (recommended).** Damage is flat inside `[MinRange, Range]`, which is what the sim already does; the AI and the panel then read the truth. Cost: one small cut (line damage-curve-delete), estimated under 60 Hands calls. It deletes a field, three formula reads (plus the claims cut's rated copies) and a UI chart, and re-saves the catalog. Behaviour change: none in combat. The AI rates far targets higher than today; at 0.95 of Range it now discounts real damage about 11x, and to zero at Range itself. +- **Make falloff real.** Apply a range factor in `FireControl.Fire`'s payload, so the AI, the panel and the hit read one function. Cost: a hit-path change with fire-control tests, a balance shift on all 26 weapons at once (today's template would take about 67% off a shot at 0.8 of Range), and an authoring pass, because the census holds no shape anyone chose. Only worth it if falloff is wanted as a weapon-identity lever (for example shotgun against rail), and then the shape is decided per family at that time. Linear keyframes or two ramps both fit it. +- **Leave it.** Zero cost now. The AI's threat estimates and the panel keep describing a falloff that does not exist. + +### Is the linear-keyframe type still worth building + +Not for range: the deletion removes the only weapon use. Of the other BezierCurve uses, one is live in the sim (sensor bearing gain, on 2 records with the default template), one is null on every record (consumable effectiveness), and the launcher curves are `float4[]` Unity keyframes used only in presentation. A piecewise-linear keyframe type would be the same data with straight segments. Its real gains over BezierCurve are small: `HullRange` becomes exact (the extremes sit at the keys), and the mutable `_cachedIndices` search cache goes from shared sim data. That does not earn a new type or a CultMath change now: CultMath's `lerp` and `unlerp` already are the segment math, and CultMath holds no keyed or serialized curve. Decide it when the sensor line is mapped. R-heat's four scalars stay: they are the controls the operator asked for ("Same shape, more intuitive controls"). + + +# Inspection-scanner refresh at b836af48 + +Imagination imagination-aeth-inspection-scanner, session self-2026-10-14-ag, 2026-10-14. Pinned to Aetheria +origin/master b836af48 (contact-hud, emissions-heard, reveals-replace-tiers, scenarios-lock-on, aetheria-ew +ew-hide-launch and ew-claims-in-the-book, loot-3 merged). Refreshes cut_spec inspection-scanner (r2 -> r3) only; +bearing-markers, layout-aim and scanner-catalog stay lines in the cut sequence. Paths under +Assets/Scripts/ServerShared unless noted. Source reads at b836af48. + +## Body facts + +IS1. r2's anchors at b836af48 (context-pack): PaintMode moved to Sensing.cs:42-46 (comment 39-41); Reveal is +Sensing.cs:104-120 (comment 99-103) and gained `Claimed` (ew-claims-in-the-book); RecordReveal is Entity.cs:944-950 +(comment 937-943) and takes `(subject, item, channel, claimed)`. `Reveal.Channel` is still a non-null +`SignatureChannel`. The only `new Reveal(` is Entity.cs:949. + +IS2. No production code reads `Reveal.Channel`: its readers are tests only (ContactRevealTests 321, 410, 413, 437, +1000; EmissionTests 62, 103, 111; LaunchSuppressorTests 61), each `Assert.Equal(SignatureChannel.X, reveal.Channel)`, +which infers `T = SignatureChannel?` once Channel is nullable and so needs no edit. + +IS3. Claims (aetheria-ew ew-claims-in-the-book): `Entity.ClaimOf(item)` (Entity.cs:117-118) is the item's data +unless claimed otherwise; `Claim` is the one write port, tests only until ew-masquerade (109-127). Every act stamps +it: SetSignature (106), Emit (921-925: `ActiveEmission(item, hearRange, ClaimOf(item))`, two arguments, no mode), +ReceivePaint (931-935: `PaintWarning(bearing, emitter.ClaimOf(item), mode, strength)`). PublishInbox (897-911) +records each painter's item as an Emission reveal with the paint's EmitterClass. Classifying readers read +`Reveal.Claimed` (RevealedWeapons 985-987, SchematicRows 1000-1003); ContactOf derives Profile from +`subject.ClaimedHull` at Identified (1011-1030). + +IS4. The hull is an equipped item: `EquippedHull` is added to `Equipment` (Entity.cs:1217-1218), and Claim refuses a +hull class on any other item and any other class on the hull (123-124). A scan that walks Equipment must skip +`subject.EquippedHull` explicitly. + +IS5. Behaviour execution (EquippedItem.Update, Entity.cs:2299-2320): Execute runs per behaviour group only while +`Active.Value` (Enabled && Online, 2126-2127); every `IAlwaysUpdatedBehavior.Update` runs after it on every tick, +active or not. A behaviour whose Execute alone decays progress therefore freezes while its item is inactive. +`TargetRange` is computed in Entity.Update (1704-1706) before the equipment updates. + +IS6. Aim gate: `FireControl.IsRevealed(observer, item)` is book AND live (FireControl.cs:160-161); +`TrySelectTargetItem` and `ResolvedTargetItem` read it (Entity.cs:410-432). A scan reveal therefore makes quiet gear +selectable with no change to aim. `IsLocated` does not exist at b836af48 (layout-aim is unmapped). + +IS7. BehaviorData union ends at `Union(49, LaunchSuppressorData)` (Behaviors/Behaviors.cs:193). Sensor-catalog's +branch (eureka/aetheria-release-sensor-catalog-r2, head 068adf0d) takes 50 for ListenerData at the same place. +ResourceScanner (Union 28, Behaviors/ResourceScanner.cs) is a parked mining behaviour with its own data keys; the +new `ScannerData` is a separate type. + +IS8. Paint readers: the incoming-lock indicator takes the strongest Track paint (Gameplay/ActionGameManager.cs: +1478-1491), so a Scan paint never shows as a lock; the combat flag is `VisibleEnemies.Count > 0 || +IncomingPaints.Count > 0` (1270), so a ship being scanned enters the combat state, as it does when pinged. + +IS9. Negative-check baselines: `Emit(` in Assets/Scripts/ServerShared appears in Entity.cs, Sensor.cs and +LockWeapon.cs (Editor/ShipModPreview.cs is a particle Emit); `ReceivePaint(` in Entity.cs, Sensor.cs and +LockWeapon.cs; `RecordReveal(` and `EndReveals(` only in Entity.cs. + +IS10. Test fixture: ContactRevealTests is a partial class (EmissionTests, ClaimTests are partials); its constructor +writes the fixture catalog (37-110), `Tool(name, behavior)` (236-241) makes a Tool gear, and `Add(position, mounts, +tools)` (250-271) places tools by TryFindSpace on the five-by-five "Rack" hull. + +## Shared sites with sensor-catalog (branch head 068adf0d) + +Read as `git diff b836af48...068adf0d` (merge-base e99cfbed); line numbers below are b836af48's. + +- Behaviors/Behaviors.cs union list: both insert after `Union(49, ...)` (193). Sensor-catalog takes 50; this cut + takes 51 whichever merges first. A textual conflict only: keep both lines. +- tests/Aetheria.Shared.Tests/ContactRevealTests.cs constructor: sensor-catalog inserts 18 lines after the Roar + upsert (61) and edits `Make` (243-246). This cut inserts its scanner designs after `Locker("Hushed")` (98), a + different hunk. +- Entity.cs: sensor-catalog rewrites HearingMultiple (716-718 at b836af48), which this cut does not edit; every hunk of this cut + in Entity.cs (SetSignature is untouched; RecordReveal 937-950) lies below it and shifts by +15 if sensor-catalog + merges first. Semantics shared: a third party hears the scanner at HearRange times its HearingMultiple, which a + listener raises above 1. This cut's hearing test uses a sensor-only observer, so it holds under either order. +- No other shared file (sensor-catalog's Listener.cs, AetherDb, CatalogRoleTests, ListenerTests, EvasionTermTests + and the catalog blob are untouched here). + +Order: either; neither waits on the other. Running beside each other costs the two one-line merges above. + +## Rationale + +- A scan records the claim, not the truth. Every act stamps the class its ship claims (IS3), and the aetheria-ew + target's one-judge invariant puts every see-through in one function (illumination-burns-through names paints + among what burns through). A scan that recorded `item.Data` would be a second see-through path outside the judge, + and would read the true item's data to classify (classify-from-belief). RecordInspection therefore records + `subject.ClaimOf(item)`. While no production code writes a claim (IS3) this equals the truth, so ruling + quiet-gear-identifiable-hull-layout-known is met today; whether a Scan paint burns through a lie is cut + ew-burn-through's, which reads paints already. +- Aim under a hull lie stays ew-masquerade's. Ruling ew-aim-under-hull-lie-ruled closes gear aim while a hull lie is + believed. That gate will sit on the aim read (IsRevealed), which governs scan reveals and act reveals alike, so + this cut adds nothing for it. +- No hostility gate. LockWeapon requires `IsHostileTo` (LockWeapon.cs:98), which reads the true faction. A scanner + inspects whatever its ship targets, and its gate reads only the track and range (ruling + ew-hostility-from-belief-ruled moves allegiance to belief). +- Decay in one place. r2 decayed in Execute, which freezes while the item is inactive (IS5), so a powered-down + scanner held its progress: a broken beam that does not decay, against ruling scan-held-beam. r3 decays in the + behaviour's IAlwaysUpdatedBehavior.Update on any tick Execute did not hold the scan, the one decay site for every + way a scan breaks. +- Channel stays `SignatureChannel?` (null = inspection), r2's design. A new SignatureChannel member would be a new + channel, which the model page reserves for a ruling (row Signature channel), and nothing in production reads the + channel (IS2). +- The AI test is dropped. The Scanner reads only its ship's Target, so an AI ship scans through the same path by + construction (ruling same-ship-same-inputs); a negative check that Scanner.cs reads no Agents or input type + carries the claim instead of an agent fixture. +- Size: 65/80 Hands calls, as r2; one pass. + +## Cut order (amends 'Visibility refresh at efee2a2a') + +emissions-heard, reveals-replace-tiers, contact-hud and ew-claims-in-the-book (all merged) -> inspection-scanner r3 +(runs now, beside sensor-catalog r2); inspection-scanner + sensor-catalog + bearing-markers -> scanner-catalog +(unchanged line). bearing-markers and layout-aim are unchanged lines, mapped when they are about to run. + +## Admitted (imagination-aeth-inspection-scanner, 2026-10-14) + +- mind-commit-6e261b55...: cut-inspection-scanner.r3 (base b836af48), resolution cut_spec.cut-inspection-scanner.r2.n1 + (Superseded). context-pack on r3: all six anchors SAME. No question raised. + +## Damage falloff at fire time (imagination-aeth-damage-falloff, 2026-10-14) + +Operator ruling damage-curve-fate-ruled (make-falloff-real): "Simplify weapon range to minimum, effective and maximum, one lerp." The BezierCurve DamageCurve goes; hits, the AI and the panel read one function. Probes ran at origin/master b836af48 (worktree `C:\aeth-wt\map-damage-falloff`). + +### Body facts + +**DF1. The census at 1746e8bd still holds at b836af48.** `git log 1746e8bd..b836af48 -- GameData/Aetheria.cc` lists only launch-suppressor's two applies, which add gear, not weapons. Re-probed on Yggdrasil (scratch console over `AetheriaStores.Open`, job `imagination-aeth-damage-falloff/probe1.log`, 2026-10-14): 27 weapon designs carry a DamageCurve, 26 the copied default `(0,1,0,0) (1,0,-1.77,-1.77)`, Mine Launcher flat `(0,1) (1,1)`. By behaviour: Instant 2, Auto 13, Charged 5, Constant 1 (21 guns and beams, three of them the Smoke Refused rounds at Range 20); Guided 3 and Launcher 2 (5 missiles); MineLayer 1. No gear in the catalog carries a StatModifier on any Range stat. + +**DF2. Range stats as authored.** MinRange is 0..0 on 25 weapons (terms `Heat:1`, inert at 0); LRMM72 500..500 and GT 3K 500..50 (follow-up gt3k-minrange-inverted). Range is quality-ranged on every weapon but the three Smoke Refused (20..20): for example Autocannon 800..1200 `[Heat:1, Quality:barrel:2]`, CShot RainbowLite 1000..3000 `[Heat:.5, Durability:.25, Quality:focusing array:2]`, Mine Launcher 1600..2400 `[Quality:dispenser:2]`. Each Range reads one declared role, so a stat with Range's terms copied reads the same role, and CB-R1 (`CatalogRoleTests.ShippedCatalogRolesAreLive`) holds. + +**DF3. Where the curve is read at b836af48** (aetheria-ew ew-claims-in-the-book has merged, so the rated copies are live): +- `WeaponData.DamageCurve` key 7 (`Weapon.cs:40-41`). The highest key in the WeaponData hierarchy is 34 (`LockWeapon.cs`); 35 and 36 are free. +- Three shared formulas: `InstantWeaponData.RangeDamagePerSecond` (`InstantWeapon.cs:39-40`), `ConstantWeaponData` (`ConstantWeapon.cs:28-29`), `ChargedWeaponData` (`ChargedWeapon.cs:59-61`), each `curve.Evaluate(saturate(unlerp(minRange, range, at)))`. Each has a rated caller (`:42-43`, `:31-32`, `:63-65`) and a live caller (`:73-76`, `:57-60`, `:91-95`). +- AI: `Combat.cs:48` (claimed design, rated), `:73` (own groups, live), `:157` (SampleDps, live). +- Panel: `PropertiesPanel.cs:423-427` draws the curve through `CurveField.Show(string, BezierCurve, ...)` (`CurveField.cs:39-73`); that is CurveField's only caller, and its `showMax` path is unused. +- Tools: AetherDb `smoke-rounds` copies it (`Program.cs:1741`), `mine-launcher` authors a flat one (`:1831`). +- Tests: 30 fixture lines in 21 files set a curve, all flat but `ContactRevealTests.cs:170`, which sets `ClaimTests`' falling `Falloff()` (`ClaimTests.cs:22`) through `ContactRevealTests.Spanned` (`:165-175`); `FireControlTests.ClaimedDesign` takes a curve (`:289-299`) and `TheAIRanksClaimsAtTheTargetsDistance` passes a falling one (`:361-364`); `RunStartTests.EverySoldWeaponHasADamageCurve` (`:463-473`) requires one on every sold weapon. +- Not readers: `BezierCurve` itself stays (SensorData.SensitivityCurve, `Sensor.cs`); the Unity weapon presenters read `Range` only. + +**DF4. Who decides range today.** One gate, `FireControl.Designated` (`FireControl.cs:270-276`): planar range, inclusive `[MinRange, Range]`, read by PFire, Solve, the agents' trigger and Combat's group test (`Combat.cs:65`). `LockWeapon.CanFire` (`LockWeapon.cs:62`) keeps its own strict `(MinRange, Range)` test. The AI's distance is 3D (`Combat.cs:35`, `length(toTarget)`) while the gate is planar (FireControl R7). SampleDps (`Combat.cs:136-168`) samples only between the shortest and longest weapon **Range**, so a ship whose guns share one Range samples one point, its maximum: with falloff to zero there, that ship's optimum stays at its initial 0 and it closes to point blank. + +**DF5. Where damage is decided at fire time.** `FireControl.Fire` freezes `Damage = damageOverride ?? weapon.Damage` into the PendingShot (`FireControl.cs:725`); a beam passes `Damage * interval` as the override (`ConstantWeapon.cs:188`), and a charged gun's Damage is already lerped by charge. Every resolution path reads the frozen `shot.Damage`. `Solve` already computes the distance the payload is delivered at: `BurstReach = length((burstPosition - origin).xz)` (`:654`), where `burstPosition` is the engaged target for a direct round, the armed burst point for a fused one (bomb fishing at Range included), and the origin (0) for an untargeted direct round. Its comments (`:587`, `:2040-2041`) say it is read for Burst only. Mines are laid by `Lay` (`:787`) with no range from the shooter. + +**DF6. The AI's range bias.** `Settings.AgentRangeExponent` defaults to .25 (`Settings.cs:255`); SampleDps multiplies dps by `range^.25`. For a gun flat to E and ramping linearly to 0 at M, `d/dr ln(dps) = .25/r - 1/(M - r)` just past E is negative whenever E > M/5, so the optimum is E itself: the AI holds at its effective range. + +**DF7. Prior art for the unruled numbers** (short search, 2026-10-14; community sources, not publisher documentation). MechWarrior Online: damage falls linearly from a weapon's optimal range to zero at its maximum, about 2x optimal for energy weapons and 3x for autocannons; LRMs instead ramp up below their minimum range ([MWO forum](https://mwomercs.com/forums/topic/155906-ac2-range-change-was-great-now-do-it-for-all-the-autocannons/), [MWO wiki, C-LRM 10](https://mwo.fandom.com/wiki/C-LRM_10)). Elite Dangerous: lasers fall off linearly from about 500 m to zero at their 3 km maximum; cannons and missiles do not fall off ([Steam discussion](https://steamcommunity.com/app/359320/discussions/0/2653115771069188807)). Shooters with a damage floor (Battlefield, Destiny) have no hard range gate to meet. Both games with a min/effective/max triple end at zero, and both exempt missiles. + +**DF8. Range boosters.** A StatModifier targets one stat by reference (`StatModifier.cs:229`). The boost-gear-combat line's Range Extender (section "Catalog breadth", design tables) targets `WeaponData.Range`; after this cut it lengthens the ramp and leaves EffectiveRange. No shipped gear modifies a range today (DF1), so nothing changes now. + +### The design + +One function, `WeaponData.RangeFactor(min, effective, max, damageAtMax, at)`: 0 outside the gate's inclusive `[min, max]`; with `e = clamp(effective, min, max)`, 1 on `[min, e]`, then `lerp(1, damageAtMax, unlerp(e, max, at))` up to `max`; 1 everywhere inside the gate when `e >= max`. EffectiveRange is a PerformanceStat (key 35) defaulting to +infinity, as Tracking does (key 33), so an unauthored weapon is flat and every fixture keeps its damage. `DamageAtMaxRange` is a plain float (key 36, default 0): quality does not vary it, so it needs no role. Callers: +- the hit: `Fire` multiplies the frozen Damage by the factor at `solution.BurstReach`; +- the AI: the three DPS formulas take the factor in place of the curve (live through `Weapon.RangeFactor`, rated through `WeaponData.RatedRangeFactor` over each stat's Max); Combat reads planar range and samples from the shortest MinRange; +- the panel: CurveField plots any `Func`, and the panel passes the factor over `[min, max]`. + +Missiles and mines get no EffectiveRange (flat): DF7's games exempt missiles, and a mine's damage happens where the mine is, not at a range from its layer. + +### Model page rows + +| Kind | Identity | Lifecycle | Authority | +|---|---|---|---| +| Weapon range shape (`WeaponData` MinRange key 5, Range key 6, EffectiveRange key 35, DamageAtMaxRange key 36; DamageCurve key 7 retired, never reused) | Fields of a catalog weapon design; ranges resolved per item through StatResolver. | Authored by AetherDb `range-falloff` (cut damage-falloff); an unauthored EffectiveRange means no falloff. | The catalog. One reader, `WeaponData.RangeFactor`: FireControl.Fire (the hit), the DPS formulas (Combat's choices) and PropertiesPanel (the chart). | + +### Rationale + +- BurstReach, not FireRange: FireRange is the target's distance or 0, so a fused round fished to Range would land at full damage. BurstReach is where the payload is delivered for every outcome, and Solve already computes it. +- EffectiveRange is a stat, not a fraction of Range: the ruling names three authored ranges. A copied stat moves with quality, heat and wear as Range does (DF2); only a booster on Range alone moves one without the other (DF8). +- +infinity as the unauthored value: it is Tracking's precedent, it keeps every fixture's damage, and "no falloff" becomes a value the function already handles rather than a flag. +- Size: one Hands pass (about 110 calls, cap 150), with a declared stop point before the catalog apply. +- The two numbers the operator has not ruled (the end multiplier and how effective ranges are authored) are authored data with defaults from DF7, so they do not block Hands; a different answer is a rerun of `range-falloff` with other arguments. diff --git a/tests/Aetheria.Shared.Tests/BrownoutTests.cs b/tests/Aetheria.Shared.Tests/BrownoutTests.cs index 3fe4bfb51..c901648e7 100644 --- a/tests/Aetheria.Shared.Tests/BrownoutTests.cs +++ b/tests/Aetheria.Shared.Tests/BrownoutTests.cs @@ -24,7 +24,7 @@ using static CultMath.math; // (to decide whether the pump can keep up this tick). Cut 7 asks for the brownout curve to live on exactly // the stats the behaviour actually curves (PumpedHeat), but F6 forbade a PowerSupply term on any // stat a request reads at all, on pain of the exact oscillation Soul measured against the shipped catalog's own -// "OK Disperser" radiator (SOUL_RadiatorRequestDependsOnItsOwnGrantAndOscillates, docs/stats-and-power-cut.md). +// "Heat Pump" radiator (SOUL_RadiatorRequestDependsOnItsOwnGrantAndOscillates, docs/stats-and-power-cut.md). // The six tests below that authored one were marked Skip rather than deleted or silently reworked to hide the // gap, naming the conflict as real, scoped work for a future pass rather than a fix a registry correction should // smuggle in. diff --git a/tests/Aetheria.Shared.Tests/CatalogRoleTests.cs b/tests/Aetheria.Shared.Tests/CatalogRoleTests.cs index 9978f081d..4c7e70cc0 100644 --- a/tests/Aetheria.Shared.Tests/CatalogRoleTests.cs +++ b/tests/Aetheria.Shared.Tests/CatalogRoleTests.cs @@ -95,6 +95,106 @@ public sealed class CatalogRoleTests Assert.True(makerless.Length == 0, "products with no maker: " + string.Join(", ", makerless)); } + // A design is named like a node on a tech tree and the brand lives in the product it sells (rulings + // catalog-grows-generic-designs-branded-products, designs-are-tech-nodes): no design's product bears the design's name. + [Fact] + public void EveryProductCarriesABrand() + { + using var cache = RestoredHullsTests.OpenCatalog(); + var products = cache.GetAll().ToArray(); + var unbranded = cache.GetAll().Where(design => design is not HullData) + .Where(design => products.Any(p => p.Design.Key.Equals(cache.RefOf(design).Key) && p.Name == design.Name)) + .Select(design => design.Name).OrderBy(n => n, StringComparer.Ordinal).ToArray(); + Assert.True(unbranded.Length == 0, "designs sold under their own name: " + string.Join(", ", unbranded)); + } + + // The Capacitor is the one Tool design with a role map by name; a key that falls out of step with the design's name leaves + // roles-backfill finding no map for it. + [Fact] + public void TheCapacitorDesignCarriesItsRoleMap() + { + using var cache = RestoredHullsTests.OpenCatalog(); + var capacitor = cache.GetAll().Single(design => design.Name == "Capacitor"); + Assert.True(Program.HasRoleMap(capacitor), "roles-backfill finds no role map for the Capacitor design"); + } + + // A design is a tech node: its text may not name a product the catalog sells (the brand lives on the product). + [Fact] + public void NoDesignTextNamesAProduct() + { + using var cache = RestoredHullsTests.OpenCatalog(); + var productNames = cache.GetAll().Select(p => p.Name).Where(n => n.Length > 3).ToHashSet(); + var branded = cache.GetAll().Where(design => design is not HullData && design.Description != null) + .Where(design => productNames.Any(n => design.Description.Contains(n))) + .Select(design => design.Name).OrderBy(n => n, StringComparer.Ordinal).ToArray(); + Assert.True(branded.Length == 0, "designs whose text names a product: " + string.Join(", ", branded)); + } + + // Authoring notes are not player text, and every product of a design this cut renamed or branded speaks in its own + // voice (Miss Terri's and the Pirates' records are other passes'). + [Fact] + public void NoProductTextIsAnAuthoringNote() + { + using var cache = RestoredHullsTests.OpenCatalog(); + var products = cache.GetAll().ToArray(); + string[] notes = { Program.AuthoringNote.Trim(), "[TODO]", "subsidiary plight" }; + var noted = products.Where(p => p.Description != null && notes.Any(n => p.Description.Contains(n))).Select(p => p.Name).OrderBy(n => n, StringComparer.Ordinal).ToArray(); + Assert.True(noted.Length == 0, "products whose text is an authoring note: " + string.Join(", ", noted)); + + var touched = Program.Renames.Select(r => r.Generic).Concat(Program.Brands.Select(b => b.Design)).ToHashSet(); + var designs = cache.GetAll().Where(d => touched.Contains(d.Name)).ToArray(); + Assert.Equal(touched.Count, designs.Length); + var silent = products + .Where(p => designs.Any(d => p.Design.Key.Equals(cache.RefOf(d).Key))) + .Where(p => cache.Get(p.Manufacturer)?.ShortName is not ("Miss Terri's" or "Pirates")) + .Where(p => string.IsNullOrWhiteSpace(p.Description)) + .Select(p => p.Name).OrderBy(n => n, StringComparer.Ordinal).ToArray(); + Assert.True(silent.Length == 0, "products with no text of their own: " + string.Join(", ", silent)); + } + + // A rename changes Name and Description and nothing else: the design and its products keep their keys and makers, and the + // flavour that moved lives on the product. + [Fact] + public void RenamedDesignsKeepTheirKeysAndProducts() + { + using var cache = RestoredHullsTests.OpenCatalog(); + var expected = new (string DesignKey, string Generic, (string Key, string Name, string Maker)[] Products)[] + { + ("0271bb97-4ce8-4d64-97c3-8bfd3f76b2c6", "Light Machine Gun", new[] { ("7a1f63b0-68de-4976-a338-bc779db3386a", "ClearPath", "Lightsail") }), + ("3baa2c43-b389-4438-94cb-fbb04489cd77", "Heavy Reactor", new[] { ("1edd87f7-2592-4744-a9ba-618f403f91ce", "Manhattan", "Zhestokost") }), + ("49b4c15a-c10b-49c0-9dad-31dfb9b3a9b9", "Cargo Bay", new[] { ("4ecc97af-c1fa-4563-902e-72a094ad8322", "Store-All Plus", "Lightsail"), ("ed3c70eb23814d5181d99fa84f6194d4", null, "Pirates") }), + ("88e81a2b-45fd-49de-830f-c896adae8d5b", "Racing Drive", new[] { ("9ccc095374d64fde94dd8d04bdc97c2a", "Victoire", "Alakrita") }), + ("632420a6-4419-4647-a92b-5e22ea289025", "Lightning Projector", new[] { ("f0f8389f9dd64228b02a68392fcf4007", "DragOnBreath", "Lucent") }), + }; + foreach (var (designKey, generic, sold) in expected) + { + var design = Assert.Single(cache.GetAll(), d => cache.RefOf(d).Key.Value == designKey); + Assert.Equal(generic, design.Name); + Assert.Equal(Program.Renames.Single(r => r.Generic == generic).Functional, design.Description); + var products = cache.GetAll().Where(p => p.Design.Key.Equals(cache.RefOf(design).Key)).ToArray(); + Assert.Equal(sold.Select(p => p.Key).OrderBy(k => k, StringComparer.Ordinal), products.Select(p => cache.RefOf(p).Key.Value).OrderBy(k => k, StringComparer.Ordinal)); + foreach (var (key, name, maker) in sold) + { + var product = products.Single(p => cache.RefOf(p).Key.Value == key); + if (name != null) Assert.Equal(name, product.Name); + Assert.Equal(maker, cache.Get(product.Manufacturer).ShortName); + } + } + + // The text that moved: Victoire carries the racing drive's old line, DragOnBreath plight's old one. + string TextOf(string productKey) => cache.GetAll().Single(p => cache.RefOf(p).Key.Value == productKey).Description; + Assert.Equal("The most responsive thruster on the market, for the most irresponsible of racing pilots.", TextOf("9ccc095374d64fde94dd8d04bdc97c2a")); + Assert.StartsWith("Chain lightning has your enemies chain smoking", TextOf("f0f8389f9dd64228b02a68392fcf4007")); + + // The mine launcher: the design takes the functional line its product used to carry; the product is the brand. + var mine = Assert.Single(cache.GetAll(), d => cache.RefOf(d).Key.Value == "1b4a2bb358eb432eb1cfc0ccf3317303"); + Assert.Equal("Mine Launcher", mine.Name); + Assert.Equal("Lays a drifting proximity mine that arms after two seconds.", mine.Description); + var brand = Assert.Single(cache.GetAll(), p => p.Design.Key.Equals(cache.RefOf(mine).Key)); + Assert.Equal("parting gift", brand.Name); + Assert.Equal("DME", cache.Get(brand.Manufacturer).ShortName); + } + // A benefit rises with quality across 0.8x to 1.2x of its authored value (Max/Min 1.5), a cost falls across 1.2x to 0.8x // (Max/Min 2/3). The ratio and the role are pinned, not the value, so an operator retune of a design stays green. private static void AssertRange(EquippableItemData design, string field, bool cost, string role) @@ -121,13 +221,13 @@ public sealed class CatalogRoleTests AssertRange(autocannon, "Range", false, "barrel"); AssertRange(autocannon, "Penetration", false, "barrel"); - var lrm = Design("LRMM72"); + var lrm = Design("Long-Range Missile Rack"); Assert.Equal(new[] { "guidance system", "thruster", "warhead" }, Roles(lrm)); AssertRange(lrm, "Damage", false, "warhead"); AssertRange(lrm, "Cooldown", true, "guidance system"); AssertRange(lrm, "LockAngle", false, "guidance system"); - var srm = Design("SRMM72"); + var srm = Design("Short-Range Missile Rack"); Assert.Equal(new[] { "guidance system", "thruster", "warhead" }, Roles(srm)); AssertRange(srm, "Damage", false, "warhead"); AssertRange(srm, "Cooldown", true, "guidance system"); @@ -152,12 +252,12 @@ public sealed class CatalogRoleTests AssertRange(Design("Small Drive"), "Thrust", false, "nozzle"); // Designs whose non-flat stats named no role are pointed at the role their kind's map gives them. - AssertNamed(Design("DeathCluster"), "Count", "feed mechanism"); + AssertNamed(Design("Cluster Cannon"), "Count", "feed mechanism"); AssertNamed(Design("Flak Gun"), "Count", "feed mechanism"); - AssertNamed(Design("GT 3K"), "MinRange", "guidance system"); - AssertNamed(Design("plight"), "DamageSpread", "focusing array"); - AssertNamed(Design("MoveOnPro"), "Modifier", "core"); - AssertNamed(Design("MoveOnPro Station Reactor"), "Modifier", "core"); + AssertNamed(Design("Guided Missile Launcher"), "MinRange", "guidance system"); + AssertNamed(Design("Lightning Projector"), "DamageSpread", "focusing array"); + AssertNamed(Design("Muon Fusion Reactor"), "Modifier", "core"); + AssertNamed(Design("Muon Fusion Station Reactor"), "Modifier", "core"); // Each seller's means come from its maker's profile; the Pirates are middling and inconsistent. var profiles = new Dictionary diff --git a/tests/Aetheria.Shared.Tests/ClaimTests.cs b/tests/Aetheria.Shared.Tests/ClaimTests.cs new file mode 100644 index 000000000..274650018 --- /dev/null +++ b/tests/Aetheria.Shared.Tests/ClaimTests.cs @@ -0,0 +1,464 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using CultMath; +using GameCult.Caching; +using Xunit; +using static CultMath.math; +using float3 = CultMath.float3; + +// Cut ew-claims-in-the-book (aetheria-ew, classify-from-belief, lie-is-own-emission, belief-one-writer): every act a ship +// makes is stamped with the class its ship claims for the item (the true item's data unless claimed otherwise), the +// observer's book keeps that claim beside the true item, and every classifying read takes the claim while aim keeps the +// truth. The fixtures drive the production path: real ships fire, ping and lock inside Zone.Update. +public sealed partial class ContactRevealTests +{ + private EquippableItemData DataOf(string name) => (EquippableItemData) _items.ItemData.GetByName(name); + + private static PerformanceStat Span(float min, float max) => new PerformanceStat { Min = min, Max = max }; + + // A damage curve that falls from 1 to .2 over the range span, so every range argument lands on a different factor. + private static BezierCurve Falloff() => new BezierCurve { Keys = new[] { float4(0, 1, 0, 0), float4(1, .2f, 0, 0) } }; + + private static BezierCurve Flat() => new BezierCurve { Keys = new[] { float4(0, 1, 0, 0), float4(1, 1, 0, 0) } }; + + // ---- ClaimsDefaultToTheTruth ---- + + [Fact] + public void ClaimsDefaultToTheTruth() + { + var e = Add(float3(30, 0, 40), new[] { "Gun" }); + var o = Add(float3(0, 0, 0), new[] { "Eye" }); + var gun = Guns(e)[0]; + Fire(e, gun); + Assert.Same(gun.Data, Assert.Single(o.RevealsOf(e)).Claimed); // a fired gun claims its own design + + // The hull belief: none below the gear threshold, the true hull at it (TargetGearInfoThreshold .8). + o.EntityInfoGathered[e] = .79f; + Assert.Null(o.ContactOf(e).Profile); + o.EntityInfoGathered[e] = .8f; + Assert.Same(e.HullData, o.ContactOf(e).Profile); + } + + [Fact] + public void AHeardPingDefaultsToTheTruth() + { + var p = Add(float3(0, 0, 0), new[] { "Shout" }); + var hearer = Add(float3(149, 0, 0), new[] { "Eye" }); // off the beam: heard, never painted + PingAt(p); + Assert.Same(SensorItemOf(p).Data, Assert.Single(hearer.RevealsOf(p)).Claimed); + } + + [Fact] + public void APaintDefaultsToTheTruth() + { + var (locker, target) = LockOn("Locker"); + Tick(.5f); + Tick(.5f); + var lockItem = locker.Equipment.Single(i => i.Behaviors.Any(b => b is LockWeapon)); + Assert.Same(lockItem.Data, Assert.Single(target.IncomingPaints).EmitterClass); + Assert.Same(lockItem.Data, Assert.Single(target.RevealsOf(locker)).Claimed); + } + + // ---- AnItemClaimIsWhatTheBookSays ---- + + // The book keeps the true item as its key and the claim beside it; RevealedWeapons lists it by the claim, and aim + // still opens on the true item. Mutation: stamp item.Data in SetSignature, or have RecordReveal store the true data. + [Fact] + public void AnItemClaimIsWhatTheBookSays() + { + var e = Add(float3(30, 0, 40), new[] { "Gun" }); + var o = Add(float3(0, 0, 0), new[] { "Eye" }); + var gun = Guns(e)[0]; + var other = DataOf("Beam"); + e.Claim(gun, other); + + Fire(e, gun); + + var reveal = Assert.Single(o.RevealsOf(e)); + Assert.Same(gun, reveal.Item); + Assert.Same(other, reveal.Claimed); + Assert.Same(gun, Assert.Single(o.RevealedWeapons(e)).Item); + Assert.True(FireControl.IsRevealed(o, gun)); + } + + // ---- AGunClaimedAsNonWeaponIsNotListed ---- + + [Fact] + public void AGunClaimedAsNonWeaponIsNotListed() + { + var e = Add(float3(30, 0, 40), new[] { "Gun" }); + var o = Add(float3(0, 0, 0), new[] { "Eye" }); + var gun = Guns(e)[0]; + e.Claim(gun, DataOf("Eye")); + + Fire(e, gun); + + Assert.Empty(o.RevealedWeapons(e)); + Assert.Single(o.RevealsOf(e)); // the book still holds the gun, for aim + Assert.True(FireControl.IsRevealed(o, gun)); + } + + // ---- AHullClaimIsTheProfile ---- + + // Mutation: ContactOf reads subject.HullData, or reads the claim below the gear threshold. + [Fact] + public void AHullClaimIsTheProfile() + { + var e = Add(float3(30, 0, 40), new[] { "Gun" }); + var o = Add(float3(0, 0, 0), new[] { "Eye" }); + var truth = e.HullData; + var hull = e.Hull; + var decoy = new HullData { Name = "Decoy" }; + e.Claim(decoy); + Fire(e, Guns(e)[0]); + + o.EntityInfoGathered[e] = .79f; + Assert.Null(o.ContactOf(e).Profile); + o.EntityInfoGathered[e] = .8f; + Assert.Same(decoy, o.ContactOf(e).Profile); + Assert.Same(truth, e.HullData); // the truth is untouched: damage, shape and physics keep it + Assert.Same(hull, e.Hull); + } + + // ---- APaintCarriesTheClaim ---- + + [Fact] + public void APaintCarriesTheClaim() + { + var locker = Add(float3(0, 0, 0), new[] { "Locker" }); + var target = Add(float3(0, 0, 200)); + var lockItem = locker.Equipment.Single(i => i.Behaviors.Any(b => b is LockWeapon)); + var claimed = DataOf("Eye"); + locker.Claim(lockItem, claimed); + locker.SetIff(target, true); + locker.EntityInfoGathered[target] = 1f; + locker.SetTarget(target); + locker.Aim = normalize(target.Position - locker.Position); + + Tick(.5f); + Tick(.5f); + + Assert.Same(claimed, Assert.Single(target.IncomingPaints).EmitterClass); + var reveal = Assert.Single(target.RevealsOf(locker)); + Assert.Same(lockItem, reveal.Item); + Assert.Same(claimed, reveal.Claimed); + } + + // The emission a ping makes is stamped by the ship that makes it. Mutation: Emit stamps item.Data. + [Fact] + public void AHeardPingCarriesTheClaim() + { + var p = Add(float3(0, 0, 0), new[] { "Shout" }); + var hearer = Add(float3(149, 0, 0), new[] { "Eye" }); // off the beam: heard, never painted + var claimed = DataOf("Ear"); + p.Claim(SensorItemOf(p), claimed); + + PingAt(p); + + Assert.Same(claimed, Assert.Single(hearer.RevealsOf(p)).Claimed); + } + + // ---- AClaimEndsWithItsShip ---- + + [Fact] + public void AClaimEndsWithItsShip() + { + var e = Add(float3(30, 0, 40), new[] { "Gun" }); + var gun = Guns(e)[0]; + e.Claim(new HullData { Name = "Decoy" }); + e.Claim(gun, DataOf("Eye")); + + e.Deactivate(); + + Assert.Same(e.HullData, e.ClaimedHull); + Assert.Same(gun.Data, e.ClaimOf(gun)); + } + + // ---- Rated figures (ruling ew-claim-weapon-measure-ruled) ---- + + // A hull's claim is its own item's claim: the hull's acts (a Reflector's reflection, a launch flash, the hull as the + // item of any signature) carry the class the profile reports, so the book never holds the true hull beside a decoy. + // Mutation: ClaimedHull reads a slot of its own, or Claim(HullData) writes one. + [Fact] + public void AHullClaimReachesTheHullsOwnReveal() + { + var e = Add(float3(30, 0, 40), new[] { "Gun" }); + var o = Add(float3(0, 0, 0), new[] { "Eye" }); + var decoy = new HullData { Name = "Decoy" }; + e.Claim(decoy); + Assert.Same(decoy, e.ClaimOf(e.EquippedHull)); + Assert.Same(decoy, e.ClaimedHull); + + e.SetSignature(new object(), SignatureChannel.LaunchFlash, 1000000f, e.EquippedHull); + Tick(.1f); + + var reveal = Assert.Single(o.RevealsOf(e), r => r.Item == e.EquippedHull); + Assert.Same(decoy, reveal.Claimed); + o.EntityInfoGathered[e] = .8f; + Assert.Same(reveal.Claimed, o.ContactOf(e).Profile); + + e.Claim(null); + Assert.Same(e.HullData, e.ClaimedHull); + Assert.Same(e.HullData, e.ClaimOf(e.EquippedHull)); + } + + [Fact] + public void TheHullCanOnlyClaimToBeAHull() + { + var e = Add(float3(30, 0, 40), new[] { "Gun" }); + Assert.Throws(() => e.Claim(e.EquippedHull, DataOf("Eye"))); + Assert.Same(e.HullData, e.ClaimedHull); + } + + // ---- Rated figures (ruling ew-claim-weapon-measure-ruled) ---- + + // A design's rated figure is each stat's Max through the live weapon's own formula. Every stat is authored with + // Min below Max, a falling curve and a MinRange above 0, so reading a Min, scaling the range argument, the wrong + // stat or the wrong operator changes the answer. At 70 the range factor is (70 - 20) / (120 - 20) = .5. + // Mutation: any rated override reads Range.Min or MinRange.Min or a Min, drops the burst divisor, the charge + // multiplier or the charge time; the shared formula scales its range argument. + [Fact] + public void ARatedFigureIsTheDesignsMaxThroughTheSharedFormula() + { + var curve = Falloff(); + var half = curve.Evaluate(.5f); + Assert.NotEqual(half, curve.Evaluate(1f)); // the Range.Min and halved-range mutants land elsewhere on the curve + Assert.NotEqual(half, curve.Evaluate(.15f)); + Assert.NotEqual(half, curve.Evaluate(70f / 120f)); + + var instant = Spanned(new InstantWeaponData()); + Assert.Equal(100f / 2 * half / 2, instant.RatedRangeDamagePerSecond(70f), 4); // 100 / 2 rounds, curve, / 2 s + Assert.Equal(120f, instant.RatedRange); + + var charged = (ChargedWeaponData) Spanned(new ChargedWeaponData + { + ChargeTime = Span(1, 3), ChargeFiringDamageMultiplier = 2f + }); + Assert.Equal(100f / 2 * 2 * half / (2 + 3), charged.RatedRangeDamagePerSecond(70f), 4); + + var beam = Spanned(new ConstantWeaponData()); + Assert.Equal(100f * half, beam.RatedRangeDamagePerSecond(70f), 4); + Assert.Equal(120f, beam.RatedRange); + } + + // The rated read and the live read are one formula: a nominal weapon's live figure is its design's rated figure, + // for each kind, at ranges before, inside and past the falloff span, and equals the hand arithmetic. + // Mutation: a rated override with its own arithmetic, or a live read that drifts from the shared formula (the + // charged read's ChargeTime, the range, the curve). + [Fact] + public void ARatedFigureIsTheLiveFigureOfANominalWeapon() + { + var e = Add(float3(0, 0, 0), new[] { "SpanGun", "SpanCharged", "SpanBeam" }); + Tick(.1f); + var curve = Falloff(); + var expected = new Dictionary> + { + ["SpanGun"] = at => 100f / 2 * curve.Evaluate(Math.Clamp((at - 20f) / 100f, 0f, 1f)) / 2, + ["SpanCharged"] = at => 100f / 2 * 2 * curve.Evaluate(Math.Clamp((at - 20f) / 100f, 0f, 1f)) / (2 + 3), + ["SpanBeam"] = at => 100f * curve.Evaluate(Math.Clamp((at - 20f) / 100f, 0f, 1f)) + }; + foreach (var item in e.Equipment.Where(i => i.Behaviors.Any(b => b is Weapon))) + { + var live = item.Behaviors.OfType().Single(); + var rated = item.Data.Behaviors.OfType().Single(); + foreach (var at in new[] { 10f, 70f, 110f, 500f }) + { + Assert.Equal(expected[item.Data.Name](at), live.RangeDamagePerSecond(at), 3); + Assert.Equal(live.RangeDamagePerSecond(at), rated.RatedRangeDamagePerSecond(at), 3); + } + } + } + // A charged weapon at full charge reads the same rated figure: the charge multiplier is applied once, in the formula + // (UpdateStats lerps the shot's damage by charge, so the live reads start from the uncharged damage). At range 10 the + // curve factor is 1: 100 / 2 rounds x 2 / (2 + 3) = 20. Mutation: the live reads pass the charge-lerped Damage. + [Fact] + public void AFullyChargedWeaponReadsItsRatedFigure() + { + var e = Add(float3(0, 0, 0), new[] { "SpanCharged" }); + Tick(.1f); + var item = e.Equipment.Single(i => i.Data.Name == "SpanCharged"); + var live = (ChargedWeapon) item.Behaviors.Single(b => b is ChargedWeapon); + var rated = item.Data.Behaviors.OfType().Single(); + typeof(ChargedWeapon).GetField("_charge", BindingFlags.Instance | BindingFlags.NonPublic).SetValue(live, 1f); + typeof(Weapon).GetMethod("UpdateStats", BindingFlags.Instance | BindingFlags.NonPublic).Invoke(live, null); + + foreach (var at in new[] { 10f, 70f, 110f }) + Assert.Equal(rated.RatedRangeDamagePerSecond(at), live.RangeDamagePerSecond(at), 3); + Assert.Equal(20f, live.DamagePerSecond, 3); + Assert.Equal(20f, live.RangeDamagePerSecond(10f), 3); + } + + // ---- The schematic's rows (ruling ew-claim-weapon-measure-ruled; finding schematic-unreached) ---- + + // Wears a gun's Range to 95% (a shorter one is under the fuse arming distance and the gun is refused) so that, once it ticks, its live range (38) is not its design's rated range (40). + private void WearRange(Entity ship, EquippedItem gun) + { + var data = (InstantWeaponData) gun.Data.Behaviors.Single(b => b is InstantWeaponData); + ship.Resolver.AttachModifier(gun, data.Range, "worn", StatModifierType.Multiplier, .95f); + } + + // The fixture's guard, read once the gun has ticked: its live range is not its design's rated range. + private static void AssertWorn(EquippedItem gun) => + Assert.Equal(38f, gun.Behaviors.OfType().Single().Range, 2); + + // The unclaimed enemy row is the true gun, with the gun's own rated range (Gun: 40) though the gun is worn to a live + // 38. Mutation: the row's Item.Data or the true live range stands in for the claim (also when Claimed == Data). + [Fact] + public void AnEnemySchematicRowDefaultsToTheTruth() + { + var e = Add(float3(30, 0, 40), new[] { "Gun" }); + var o = Add(float3(0, 0, 0), new[] { "Eye" }); + var gun = Guns(e)[0]; + WearRange(e, gun); + Fire(e, gun); + AssertWorn(gun); + + var row = Assert.Single(o.SchematicRows(e)); + Assert.Same(gun, row.Item); + Assert.Same(gun.Data, row.Claimed); + Assert.Equal(40f, row.Range); + Assert.NotEqual(gun.Behaviors.OfType().Single().Range, row.Range); + } + + // A weapon claimed as another weapon shows the claimed design's rated range (SpanGun: Range.Max 120), not the true + // gun's 40. Mutation: Range reads the true item, or the claimed stat's Min (50), or scales the figure. + [Fact] + public void AWeaponClaimedAsAnotherWeaponShowsTheClaimedRatedRange() + { + var e = Add(float3(30, 0, 40), new[] { "Gun" }); + var o = Add(float3(0, 0, 0), new[] { "Eye" }); + var gun = Guns(e)[0]; + var other = DataOf("SpanGun"); + e.Claim(gun, other); + Fire(e, gun); + + var row = Assert.Single(o.SchematicRows(e)); + Assert.Same(gun, row.Item); + Assert.Same(other, row.Claimed); + Assert.Equal(120f, row.Range); + } + + // Mutation: the rows are the book's reveals (RevealsOf) or the subject's equipment. + [Fact] + public void AWeaponClaimedAsANonWeaponHasNoSchematicRow() + { + var e = Add(float3(30, 0, 40), new[] { "Gun" }); + var o = Add(float3(0, 0, 0), new[] { "Eye" }); + var gun = Guns(e)[0]; + e.Claim(gun, DataOf("Eye")); + Fire(e, gun); + + Assert.Empty(o.SchematicRows(e)); + Assert.Single(o.RevealsOf(e)); + } + + // Unrevealed gear never appears on an enemy schematic: a ship that has not fired shows no row. + [Fact] + public void AnArmedShipThatNeverFiredHasNoEnemySchematicRow() + { + var e = Add(float3(30, 0, 40), new[] { "Gun" }); + var o = Add(float3(0, 0, 0), new[] { "Eye" }); + Tick(.1f); + Assert.Empty(o.SchematicRows(e)); + } + + // Your own schematic is your own gear whatever you claim: the true data, the live range, weapons only. + // Mutation: own rows read ClaimOf, the rated range of the claim (SpanGun 120) or of the own design (40), or list non-weapons. + [Fact] + public void OwnSchematicRowsShowOwnTruth() + { + var e = Add(float3(30, 0, 40), new[] { "Gun" }); + var gun = Guns(e)[0]; + WearRange(e, gun); + e.Claim(gun, DataOf("SpanGun")); + Tick(.1f); + AssertWorn(gun); + + var row = Assert.Single(e.SchematicRows(e)); + Assert.Same(gun, row.Item); + Assert.Same(gun.Data, row.Claimed); + Assert.Equal(38f, row.Range, 2); // the live range of the worn gun, below its rated 40 + Assert.Equal(gun.Behaviors.OfType().Single().Range, row.Range); + Assert.NotEqual(((WeaponData) gun.Data.Behaviors.Single(b => b is WeaponData)).RatedRange, row.Range); + } + + // The renderer rebuilds when the key differs: a claim that changes between two acts changes the key, and an + // unchanged claim does not. Mutation: Key drops Claimed. + [Fact] + public void TheRebuildKeyChangesWhenAClaimChanges() + { + var e = Add(float3(30, 0, 40), new[] { "Gun" }); + var o = Add(float3(0, 0, 0), new[] { "Eye" }); + var gun = Guns(e)[0]; + Fire(e, gun); + var before = o.SchematicRows(e).Select(r => r.Key).ToArray(); + Assert.Equal(before, o.SchematicRows(e).Select(r => r.Key).ToArray()); + + e.Claim(gun, DataOf("SpanGun")); + e.SetSignature(new object(), SignatureChannel.LaunchFlash, 1000000f, gun); + Tick(.1f); + + var after = o.SchematicRows(e).Select(r => r.Key).ToArray(); + Assert.Single(after); + Assert.NotEqual(before, after); + Assert.Same(DataOf("SpanGun"), after[0].Item2); + } + + // Two guns of one claimed design are told apart by the key: a row set that swaps one gun for the other keeps the count and + // the claims and changes only the item, and the renderer must still rebuild (the selection mark follows the item). + // Mutation: Key drops Item. + [Fact] + public void TheRebuildKeyChangesWhenOnlyTheItemChanges() + { + var e = Add(float3(30, 0, 40), new[] { "Gun", "Gun" }); + var a = Add(float3(0, 0, 0), new[] { "Eye" }); + var b = Add(float3(0, 0, 5), new[] { "Eye" }); + var guns = Guns(e); + var design = DataOf("SpanGun"); + e.Claim(guns[0], design); + e.Claim(guns[1], design); + a.RecordReveal(e, guns[0], SignatureChannel.LaunchFlash, e.ClaimOf(guns[0])); + b.RecordReveal(e, guns[1], SignatureChannel.LaunchFlash, e.ClaimOf(guns[1])); + + var first = Assert.Single(a.SchematicRows(e)); + var second = Assert.Single(b.SchematicRows(e)); + Assert.Same(first.Claimed, second.Claimed); + Assert.NotEqual(first.Key, second.Key); + } + + // ---- One hull class in the book ---- + + // The guard runs both ways: a hull class can be claimed only by the hull, so no item's reveal carries a hull class that + // disagrees with Contact.Profile. Mutation: the guard checks the hull side only. + [Fact] + public void OnlyTheHullClaimsAHullClass() + { + var e = Add(float3(30, 0, 40), new[] { "Gun" }); + var gun = Guns(e)[0]; + Assert.Throws(() => e.Claim(gun, e.HullData)); + Assert.Same(gun.Data, e.ClaimOf(gun)); + } + + // ---- Gear the subject no longer carries ---- + + // A reveal of gear the subject does not carry follows every fitted weapon, and stale gear is ordered by lot whatever + // order the observer saw it in. Mutation: the missing index sorts first (-1), or stale ties follow the book's slot order. + [Fact] + public void RevealsOfGearNoLongerCarriedFollowFittedGear() + { + var e = Add(float3(30, 0, 40), new[] { "Gun" }); + var gone = Add(float3(60, 0, 40), new[] { "Gun", "Gun" }); + var o = Add(float3(0, 0, 0), new[] { "Eye" }); + var fitted = Guns(e)[0]; + var stale = Guns(gone); + Assert.True(stale[0].EquippableItem.Lot < stale[1].EquippableItem.Lot); + + o.RecordReveal(e, stale[1], SignatureChannel.LaunchFlash, stale[1].Data); + o.RecordReveal(e, stale[0], SignatureChannel.LaunchFlash, stale[0].Data); + o.RecordReveal(e, fitted, SignatureChannel.LaunchFlash, fitted.Data); + + Assert.Equal(new[] { fitted, stale[0], stale[1] }, o.RevealedWeapons(e).Select(r => r.Item).ToArray()); + } +} diff --git a/tests/Aetheria.Shared.Tests/ContactRevealTests.cs b/tests/Aetheria.Shared.Tests/ContactRevealTests.cs index ba5029101..49f371fc0 100644 --- a/tests/Aetheria.Shared.Tests/ContactRevealTests.cs +++ b/tests/Aetheria.Shared.Tests/ContactRevealTests.cs @@ -89,6 +89,14 @@ public sealed partial class ContactRevealTests : IDisposable Fuse = WeaponFuse.Proximity, BlastRadius = 30f, Behaviors = { Armed(new ConstantWeaponData(), 0) } }); + // Weapons authored so the rated figure is a function of every stat: a falling damage curve, a Range span, a + // MinRange above 0, burst and charge spans (a stat with no terms resolves to its Max live). + cache.Upsert(SpannedWeapon("SpanGun", Spanned(new InstantWeaponData { BurstTime = Const(0) }))); + cache.Upsert(SpannedWeapon("SpanCharged", Spanned(new ChargedWeaponData + { + BurstTime = Const(0), ChargeTime = Span(1, 3), ChargeEnergy = Const(1), ChargeHeat = Const(0), ChargeFiringDamageMultiplier = 2f + }))); + cache.Upsert(SpannedWeapon("SpanBeam", Spanned(new ConstantWeaponData()))); cache.Upsert(Locker("Locker", interceptFactor: null)); cache.Upsert(Locker("Hushed", interceptFactor: 4f)); cache.Upsert(new ConsumableItemData @@ -153,6 +161,29 @@ public sealed partial class ContactRevealTests : IDisposable return weapon; } + private static WeaponData Spanned(WeaponData weapon) + { + Armed(weapon, 5); + weapon.Damage = Span(10, 100); + weapon.MinRange = Span(0, 20); + weapon.Range = Span(50, 120); + weapon.DamageCurve = Falloff(); + if (weapon is InstantWeaponData instant) + { + instant.Count = Span(1, 2); + instant.Cooldown = Span(8, 2); + } + return weapon; + } + + private static WeaponItemData SpannedWeapon(string name, WeaponData weapon) => new WeaponItemData + { + Name = name, Hardpoint = HardpointType.Sensors, Shape = new Shape(), Durability = 1, + MinimumTemperature = -1000, MaximumTemperature = 1000, OptimalTemperature = 0, PlateauWidth = 2000, + Fuse = WeaponFuse.Proximity, BlastRadius = 30f, + Behaviors = { weapon } + }; + private static GearData Suppressor(string name, float factor, float heatPerUnit) { var cell = new Shape(1, 1); diff --git a/tests/Aetheria.Shared.Tests/CrossingScenarioTests.cs b/tests/Aetheria.Shared.Tests/CrossingScenarioTests.cs index 1ac80e455..8b5dfe019 100644 --- a/tests/Aetheria.Shared.Tests/CrossingScenarioTests.cs +++ b/tests/Aetheria.Shared.Tests/CrossingScenarioTests.cs @@ -9,8 +9,8 @@ using float3 = CultMath.float3; // staging what its brief claims fails here. public sealed partial class RunStartTests { - // Crossing: the demo's cast; plight and FastBlast+- fitted in separate weapon groups with the Fire Control Array - // aboard; a piloted hostile Djinni that crosses the bow inside 400 m; and an unpiloted neutral one inside plight's + // Crossing: the demo's cast; projector and Cell Blaster fitted in separate weapon groups with the Fire Control Array + // aboard; a piloted hostile Djinni that crosses the bow inside 400 m; and an unpiloted neutral one inside the Lightning Projector's // arc, short of its Range and beyond three quarters of it. [Fact] public void CrossingConditions() @@ -21,12 +21,12 @@ public sealed partial class RunStartTests Assert.Equal(4, galaxy.HomeZones.Count); var player = staged.Player; - var plight = player.Equipment.Single(item => item.Data.Name == "plight"); - var small = player.Equipment.Single(item => item.Data.Name == "FastBlast+-"); + var projector = player.Equipment.Single(item => item.Data.Name == "Lightning Projector"); + var small = player.Equipment.Single(item => item.Data.Name == "Cell Blaster"); Assert.Contains(player.Equipment, item => item.Data.Name == "Fire Control Array"); var groupOf = new System.Func(item => System.Array.FindIndex(player.WeaponGroups, group => group.items.Contains(item))); - Assert.True(groupOf(plight) >= 0 && groupOf(small) >= 0, "both guns are in a weapon group"); - Assert.NotEqual(groupOf(plight), groupOf(small)); + Assert.True(groupOf(projector) >= 0 && groupOf(small) >= 0, "both guns are in a weapon group"); + Assert.NotEqual(groupOf(projector), groupOf(small)); Assert.Equal(2, staged.Entities.Count); var crosser = staged.Entities[0]; @@ -54,10 +54,10 @@ public sealed partial class RunStartTests Assert.Equal(0, AgentsOf(arena, waiting)); var toWaiting = waiting.Position - player.Position; EvSettle(player); // a weapon's Range is read once the ship's stats have settled; the geometry above is as staged - var range = plight.Behaviors.OfType().Single().Range; - Assert.True(FireControl.InArc(plight, toWaiting), "the waiting Djinni is inside plight's arc"); - Assert.True(length(toWaiting) <= range, "the waiting Djinni is inside plight's Range"); - Assert.True(length(toWaiting) > .75f * range, "the waiting Djinni is beyond three quarters of plight's Range"); + var range = projector.Behaviors.OfType().Single().Range; + Assert.True(FireControl.InArc(projector, toWaiting), "the waiting Djinni is inside the Lightning Projector's arc"); + Assert.True(length(toWaiting) <= range, "the waiting Djinni is inside the Lightning Projector's Range"); + Assert.True(length(toWaiting) > .75f * range, "the waiting Djinni is beyond three quarters of the Lightning Projector's Range"); // The crossing is what the sim does with that staging, read in the player's frame: the arena's gravity and the // crosser's pilot act from the first tick, so the t=0 facing proves nothing. Within CrossingSeconds the crosser's @@ -79,8 +79,8 @@ public sealed partial class RunStartTests crossedMetres = length(after); Assert.True(after.z > 0, "the crosser passes the bow line ahead of the player, not astern"); Assert.True(length(after) < CrossingMetres, "the crosser passes inside the stated distance"); - Assert.True(FireControl.InArc(small, after), "FastBlast+- bears on the crosser as it crosses"); - Assert.True(dot(FireControl.MountDirection(small), float3(player.Direction.x, 0, player.Direction.y)) > 0, "FastBlast+- mounts forward"); + Assert.True(FireControl.InArc(small, after), "Cell Blaster bears on the crosser as it crosses"); + Assert.True(dot(FireControl.MountDirection(small), float3(player.Direction.x, 0, player.Direction.y)) > 0, "Cell Blaster mounts forward"); } } Assert.True(swept, $"the crosser's bearing never swept across the bow within {CrossingSeconds} s"); diff --git a/tests/Aetheria.Shared.Tests/EvasionTermTests.cs b/tests/Aetheria.Shared.Tests/EvasionTermTests.cs index 00996179c..4e670fce0 100644 --- a/tests/Aetheria.Shared.Tests/EvasionTermTests.cs +++ b/tests/Aetheria.Shared.Tests/EvasionTermTests.cs @@ -22,16 +22,16 @@ public sealed partial class RunStartTests { private const float EvDt = 1f / 60f; - // The Duel's guns on a Longinus: the generated Longinus's thrusters (two Large Drive forward, two Talaria on the + // The Duel's guns on a Longinus: the generated Longinus's thrusters (two Large Drive forward, two Rugged Drive on the // flanks) and power, its Targeting Computer, and the Duel's cockpit, guns, launchers and sensor. - private static ScenarioFit EvLonginus(ScenarioStage stage, string gun = "FastBlast+-", string second = null) => stage.Fit("Longinus", - ("Cockpit 2x2", int2(2, 6), ItemRotation.None), ("Core Power", int2(2, 4), ItemRotation.None), + private static ScenarioFit EvLonginus(ScenarioStage stage, string gun = "Cell Blaster", string second = null) => stage.Fit("Longinus", + ("Cockpit 2x2", int2(2, 6), ItemRotation.None), ("Compact Reactor", int2(2, 4), ItemRotation.None), ("Large Drive", int2(1, 0), ItemRotation.Reversed), ("Large Drive", int2(3, 0), ItemRotation.Reversed), - ("Talaria", int2(2, 14), ItemRotation.CounterClockwise), ("Talaria", int2(3, 14), ItemRotation.Clockwise), - ("GT 3K", int2(0, 5), ItemRotation.None), ("GT 3K", int2(5, 5), ItemRotation.None), (gun, int2(1, 8), ItemRotation.None), - (second ?? gun, int2(4, 8), ItemRotation.None), ("Iapyx", int2(2, 2), ItemRotation.CounterClockwise), ("Iapyx", int2(3, 2), ItemRotation.Clockwise), - ("not if i see you first", int2(3, 10), ItemRotation.None), ("PotaT+-", int2(1, 6), ItemRotation.None), - ("Targeting Computer", int2(1, 7), ItemRotation.None), ("Store-All Plus", int2(2, 8), ItemRotation.None)); + ("Rugged Drive", int2(2, 14), ItemRotation.CounterClockwise), ("Rugged Drive", int2(3, 14), ItemRotation.Clockwise), + ("Guided Missile Launcher", int2(0, 5), ItemRotation.None), ("Guided Missile Launcher", int2(5, 5), ItemRotation.None), (gun, int2(1, 8), ItemRotation.None), + (second ?? gun, int2(4, 8), ItemRotation.None), ("Radiator", int2(2, 2), ItemRotation.CounterClockwise), ("Radiator", int2(3, 2), ItemRotation.Clockwise), + ("Compact Sensor", int2(3, 10), ItemRotation.None), ("Capacitor", int2(1, 6), ItemRotation.None), + ("Targeting Computer", int2(1, 7), ItemRotation.None), ("Cargo Bay", int2(2, 8), ItemRotation.None)); // The catalog's two generated ships, far apart in the fixture arena, at the fixture seed. private (Zone arena, Ship longinus, Ship djinni) EvFleet() @@ -349,7 +349,7 @@ public sealed partial class RunStartTests var settings = _items.GameplaySettings; var thrusters = longinus.GetBehaviors().Where(t => t.Item.Active.Value).ToList(); var largeDrives = thrusters.Where(t => t.Item.Data.Name == "Large Drive").ToList(); - var flanks = thrusters.Where(t => t.Item.Data.Name == "Talaria").ToList(); + var flanks = thrusters.Where(t => t.Item.Data.Name == "Rugged Drive").ToList(); Assert.Equal(2, largeDrives.Count); Assert.Equal(2, flanks.Count); @@ -362,7 +362,7 @@ public sealed partial class RunStartTests var forward = largeDrives.Sum(t => t.Thrust) / mass; Assert.InRange(envelope.Forward, forward * .99f, forward * 1.01f); Assert.Equal(0f, envelope.Reverse); - // One Talaria pushes each way, and each has its own lot's thrust: the sides are the two flanks' accelerations. + // One Rugged Drive pushes each way, and each has its own lot's thrust: the sides are the two flanks' accelerations. var flankAccelerations = flanks.Select(t => t.Thrust / mass).OrderBy(a => a).ToArray(); var sides = new[] { envelope.Left, envelope.Right }.OrderBy(a => a).ToArray(); Assert.InRange(sides[0], flankAccelerations[0] * .99f, flankAccelerations[0] * 1.01f); @@ -580,17 +580,17 @@ public sealed partial class RunStartTests public Weapon Gun, Laser, GunnerLaser; } - // The target's fit, written out: the Djinni's own hardpoints filled with the Talaria it is generated with, its + // The target's fit, written out: the Djinni's own hardpoints filled with the Rugged Drive it is generated with, its // reactor, cockpit and radiators. What the evasion tests price is this ship's strafing, not whatever the generator // rolls for it from the galaxy. private static ScenarioFit EvDjinni(ScenarioStage stage) => stage.Fit("Djinni", - ("Cockpit 2x2", int2(6, 3), ItemRotation.None), ("Core Power", int2(6, 11), ItemRotation.None), - ("Talaria", int2(6, 0), ItemRotation.Reversed), ("Talaria", int2(5, 1), ItemRotation.Reversed), ("Talaria", int2(7, 1), ItemRotation.Reversed), - ("Talaria", int2(4, 4), ItemRotation.CounterClockwise), ("Talaria", int2(4, 11), ItemRotation.CounterClockwise), - ("Talaria", int2(9, 4), ItemRotation.Clockwise), ("Talaria", int2(9, 11), ItemRotation.Clockwise), - ("Talaria", int2(6, 14), ItemRotation.None), - ("Iapyx", int2(1, 4), ItemRotation.Reversed), ("Iapyx", int2(3, 1), ItemRotation.Reversed), - ("Iapyx", int2(9, 1), ItemRotation.Reversed), ("Iapyx", int2(11, 4), ItemRotation.Reversed)); + ("Cockpit 2x2", int2(6, 3), ItemRotation.None), ("Compact Reactor", int2(6, 11), ItemRotation.None), + ("Rugged Drive", int2(6, 0), ItemRotation.Reversed), ("Rugged Drive", int2(5, 1), ItemRotation.Reversed), ("Rugged Drive", int2(7, 1), ItemRotation.Reversed), + ("Rugged Drive", int2(4, 4), ItemRotation.CounterClockwise), ("Rugged Drive", int2(4, 11), ItemRotation.CounterClockwise), + ("Rugged Drive", int2(9, 4), ItemRotation.Clockwise), ("Rugged Drive", int2(9, 11), ItemRotation.Clockwise), + ("Rugged Drive", int2(6, 14), ItemRotation.None), + ("Radiator", int2(1, 4), ItemRotation.Reversed), ("Radiator", int2(3, 1), ItemRotation.Reversed), + ("Radiator", int2(9, 1), ItemRotation.Reversed), ("Radiator", int2(11, 4), ItemRotation.Reversed)); private EvRange EvRangeLaunch() { @@ -598,9 +598,9 @@ public sealed partial class RunStartTests var scenario = new Scripted(false, stage => { stage.Player(stage.Bare("Djinni"), float2(-50000, -50000)); - gunner = stage.Place(EvLonginus(stage, "FastBlast+-", "ColdFire"), float2(0, 0), facing: float2(0, 1)) as Ship; + gunner = stage.Place(EvLonginus(stage, "Cell Blaster", "Long Laser"), float2(0, 0), facing: float2(0, 1)) as Ship; target = stage.Place(EvDjinni(stage), float2(0, 200), facing: float2(0, 1)) as Ship; - lasing = stage.Place(EvLonginus(stage, "ColdFire"), float2(0, 400), facing: float2(0, -1)) as Ship; + lasing = stage.Place(EvLonginus(stage, "Long Laser"), float2(0, 400), facing: float2(0, -1)) as Ship; }); var (_, arena, _, failures) = Launch(scenario, Inputs(() => GalaxySeed)); Assert.True(failures.Count == 0, string.Join("; ", failures)); diff --git a/tests/Aetheria.Shared.Tests/EvasionTrackingTests.cs b/tests/Aetheria.Shared.Tests/EvasionTrackingTests.cs index b7690d7c0..f6c461aab 100644 --- a/tests/Aetheria.Shared.Tests/EvasionTrackingTests.cs +++ b/tests/Aetheria.Shared.Tests/EvasionTrackingTests.cs @@ -367,8 +367,8 @@ public sealed partial class RunStartTests { ("Point Defense Gun", 40f, 80000, 60f, WeaponModifiers.RapidFire, (1.5f, 4f), (1f, 1f), (300f, 550f), (.06f, .025f), (1f, .3f), (1100f, 1600f), (.4f, .2f), (40f, 15f), (400f, 150f), true, 250, 3f), - ("Point Defense Laser", 30f, 110000, 30f, PdDesign("Spectra").WeaponModifiers, (5f, 12f), (1f, 1f), (400f, 750f), (.2f, .1f), (.05f, 0f), - (0f, 0f), (6f, 10f), (300f, 150f), (300f, 100f), false, PdDesign("Spectra").Behaviors.OfType().Single().MagazineSize, PdDesign("Spectra").Behaviors.OfType().Single().ReloadTime), + ("Point Defense Laser", 30f, 110000, 30f, PdDesign("Light Laser").WeaponModifiers, (5f, 12f), (1f, 1f), (400f, 750f), (.2f, .1f), (.05f, 0f), + (0f, 0f), (6f, 10f), (300f, 150f), (300f, 100f), false, PdDesign("Light Laser").Behaviors.OfType().Single().MagazineSize, PdDesign("Light Laser").Behaviors.OfType().Single().ReloadTime), ("Flak Gun", 120f, 180000, 80f, WeaponModifiers.Cluster, (30f, 70f), (6f, 8f), (350f, 800f), (.6f, .35f), (4f, 2f), (900f, 1300f), (1f, .5f), (300f, 150f), (800f, 300f), true, 40, 4f), }; @@ -449,20 +449,20 @@ public sealed partial class RunStartTests return FireControl.TrackingRate(range.Gun, range.Gunner); } var pd = FireControl.PMount(omega, RateOf("Point Defense Gun")); - var clearPath = FireControl.PMount(omega, RateOf("ClearPath")); + var clearPath = FireControl.PMount(omega, RateOf("Light Machine Gun")); Assert.True(pd >= .75f, $"the PD gun follows a speed demon: {pd}"); Assert.True(clearPath <= .25f, $"the machine gun does not: {clearPath}"); } - // Data check, not a behaviour test: ruling plight-shape, plight is one wide, two high and fits a Longinus Energy hardpoint. + // Data check, not a behaviour test: ruling plight-shape, the Lightning Projector is one wide, two high and fits a Longinus Energy hardpoint. [Fact] public void PlightHasItsRuledShape() { - var plight = _cache.GetAll().Single(w => w.Name == "plight"); - Assert.Equal(1, plight.Shape.Width); - Assert.Equal(2, plight.Shape.Height); - Assert.True(plight.Shape.Cells[0, 0] && plight.Shape.Cells[0, 1], "both cells are occupied"); + var projector = _cache.GetAll().Single(w => w.Name == "Lightning Projector"); + Assert.Equal(1, projector.Shape.Width); + Assert.Equal(2, projector.Shape.Height); + Assert.True(projector.Shape.Cells[0, 0] && projector.Shape.Cells[0, 1], "both cells are occupied"); var longinus = _cache.GetAll().Single(h => h.Name == "Longinus"); - Assert.Contains(longinus.Hardpoints, hardpoint => hardpoint.Type == HardpointType.Energy && hardpoint.Takes(plight)); + Assert.Contains(longinus.Hardpoints, hardpoint => hardpoint.Type == HardpointType.Energy && hardpoint.Takes(projector)); } } diff --git a/tests/Aetheria.Shared.Tests/FireAuthorityTests.cs b/tests/Aetheria.Shared.Tests/FireAuthorityTests.cs index 6f1f3b7b4..efe79b116 100644 --- a/tests/Aetheria.Shared.Tests/FireAuthorityTests.cs +++ b/tests/Aetheria.Shared.Tests/FireAuthorityTests.cs @@ -478,7 +478,7 @@ public sealed class FireAuthorityTests : IDisposable var aimedItem = e.Target.Equipment.Single(x => x.EquippableItem == aimedGear); e.Shooter.EntityInfoGathered[e.Target] = 1f; // fully tracked - e.Shooter.RecordReveal(e.Target, aimedItem, SignatureChannel.LaunchFlash); + e.Shooter.RecordReveal(e.Target, aimedItem, SignatureChannel.LaunchFlash, aimedItem.Data); Assert.True(e.Shooter.TrySelectTargetItem(aimedItem)); FireControl.Fire(e.Weapon, e.WeaponItem, e.Shooter); diff --git a/tests/Aetheria.Shared.Tests/FireControlCut12Tests.cs b/tests/Aetheria.Shared.Tests/FireControlCut12Tests.cs index 44aa2d90d..b93df8281 100644 --- a/tests/Aetheria.Shared.Tests/FireControlCut12Tests.cs +++ b/tests/Aetheria.Shared.Tests/FireControlCut12Tests.cs @@ -519,7 +519,7 @@ public sealed class FireControlCut12Tests : IDisposable var aim = new int2(2, 2); var e = Build(TestSettings(), SolidShape(6, 6), precision: 1000f, markerCells: new[] { aim }); var aimed = e.Markers[0]; - e.Shooter.RecordReveal(e.Target, aimed, SignatureChannel.LaunchFlash); + e.Shooter.RecordReveal(e.Target, aimed, SignatureChannel.LaunchFlash, aimed.Data); Assert.True(e.Shooter.TrySelectTargetItem(aimed)); // The aimed item is still equipped (Entity.TryUnequip refuses on an active entity, and reveal/aim @@ -546,7 +546,7 @@ public sealed class FireControlCut12Tests : IDisposable public void AimingAtAnItemBiggerThanOneCellCentresOnItsCentroid() { var e = Build(TestSettings(), SolidShape(9, 9), precision: 1f, targetFacing: float2(1, 0), equipBigMarker: true); - e.Shooter.RecordReveal(e.Target, e.BigMarker, SignatureChannel.LaunchFlash); + e.Shooter.RecordReveal(e.Target, e.BigMarker, SignatureChannel.LaunchFlash, e.BigMarker.Data); Assert.True(e.Shooter.TrySelectTargetItem(e.BigMarker)); var travelDirection = FireControl.TravelDirection(e.Weapon, e.Shooter, e.Target); @@ -584,7 +584,7 @@ public sealed class FireControlCut12Tests : IDisposable // the bounding-box centre along the diagonal, not along either grid axis -- fully onto the lateral // axis, instead of losing most of it to the axis a purely axis-aligned facing would leave unmeasured. var e = Build(TestSettings(), SolidShape(9, 9), precision: 1f, targetFacing: normalize(float2(1, 1)), equipLMarker: true); - e.Shooter.RecordReveal(e.Target, e.LMarker, SignatureChannel.LaunchFlash); + e.Shooter.RecordReveal(e.Target, e.LMarker, SignatureChannel.LaunchFlash, e.LMarker.Data); Assert.True(e.Shooter.TrySelectTargetItem(e.LMarker)); var travelDirection = FireControl.TravelDirection(e.Weapon, e.Shooter, e.Target); @@ -975,7 +975,7 @@ public sealed class FireControlCut12Tests : IDisposable var aim = new int2(1, 1); var e = Build(settings, hullShape, precision, spread: 0, targetFacing: normalize(float2(1f, 1f)), markerCells: new[] { aim }); - e.Shooter.RecordReveal(e.Target, e.Markers[0], SignatureChannel.LaunchFlash); + e.Shooter.RecordReveal(e.Target, e.Markers[0], SignatureChannel.LaunchFlash, e.Markers[0].Data); Assert.True(e.Shooter.TrySelectTargetItem(e.Markers[0])); var shotId = FireControl.Fire(e.Weapon, e.WeaponItem, e.Shooter); @@ -1158,7 +1158,7 @@ public sealed class FireControlCut12Tests : IDisposable var aim = new int2(1, 1); var e = Build(TestSettings(), shape, precision: .3f, targetFacing: normalize(float2(.8f, .6f)), markerCells: new[] { aim }); - e.Shooter.RecordReveal(e.Target, e.Markers[0], SignatureChannel.LaunchFlash); + e.Shooter.RecordReveal(e.Target, e.Markers[0], SignatureChannel.LaunchFlash, e.Markers[0].Data); Assert.True(e.Shooter.TrySelectTargetItem(e.Markers[0])); var outcomes = FireMany(e, 1500); @@ -1192,7 +1192,7 @@ public sealed class FireControlCut12Tests : IDisposable { var e = Build(settings, hullShape, precision: .6f, targetFacing: facing, markerCells: new[] { aimCell }); var aimed = e.Markers[0]; - e.Shooter.RecordReveal(e.Target, aimed, SignatureChannel.LaunchFlash); + e.Shooter.RecordReveal(e.Target, aimed, SignatureChannel.LaunchFlash, aimed.Data); Assert.True(e.Shooter.TrySelectTargetItem(aimed)); Assert.Same(aimed, e.Shooter.ResolvedTargetItem); diff --git a/tests/Aetheria.Shared.Tests/FireControlCut5Tests.cs b/tests/Aetheria.Shared.Tests/FireControlCut5Tests.cs index 8c18523fd..406a5d66b 100644 --- a/tests/Aetheria.Shared.Tests/FireControlCut5Tests.cs +++ b/tests/Aetheria.Shared.Tests/FireControlCut5Tests.cs @@ -587,8 +587,8 @@ public sealed class FireControlCut5Tests : IDisposable target.Zone.Admit(observer, piloted: false); observer.SetTarget(target); - observer.RecordReveal(target, big, SignatureChannel.LaunchFlash); - observer.RecordReveal(target, medium, SignatureChannel.LaunchFlash); + observer.RecordReveal(target, big, SignatureChannel.LaunchFlash, big.Data); + observer.RecordReveal(target, medium, SignatureChannel.LaunchFlash, medium.Data); Assert.True(FireControl.IsRevealed(observer, big)); Assert.True(FireControl.IsRevealed(observer, medium)); Assert.True(observer.TrySelectTargetItem(big)); diff --git a/tests/Aetheria.Shared.Tests/FireControlCut6dTests.cs b/tests/Aetheria.Shared.Tests/FireControlCut6dTests.cs index b41ea8ad2..c11438266 100644 --- a/tests/Aetheria.Shared.Tests/FireControlCut6dTests.cs +++ b/tests/Aetheria.Shared.Tests/FireControlCut6dTests.cs @@ -169,7 +169,7 @@ public sealed class FireControlCut6dTests : IDisposable if (marker != null) { var markerItem = target.Equipment.Single(x => x.EquippableItem == marker); - shooter.RecordReveal(target, markerItem, SignatureChannel.LaunchFlash); + shooter.RecordReveal(target, markerItem, SignatureChannel.LaunchFlash, markerItem.Data); Assert.True(shooter.TrySelectTargetItem(markerItem)); Assert.Same(markerItem, shooter.ResolvedTargetItem); } diff --git a/tests/Aetheria.Shared.Tests/FireControlCut7Tests.cs b/tests/Aetheria.Shared.Tests/FireControlCut7Tests.cs index 953dd0a37..a35a836b6 100644 --- a/tests/Aetheria.Shared.Tests/FireControlCut7Tests.cs +++ b/tests/Aetheria.Shared.Tests/FireControlCut7Tests.cs @@ -167,7 +167,7 @@ public sealed class FireControlCut7Tests : IDisposable // The shooter tracks the target fully and has seen the interior item act; it selects it as the aim point. e.Shooter.EntityInfoGathered[e.Target] = 1f; - e.Shooter.RecordReveal(e.Target, aimedItem, SignatureChannel.LaunchFlash); + e.Shooter.RecordReveal(e.Target, aimedItem, SignatureChannel.LaunchFlash, aimedItem.Data); Assert.True(e.Shooter.TrySelectTargetItem(aimedItem)); Assert.Same(aimedItem, e.Shooter.ResolvedTargetItem); diff --git a/tests/Aetheria.Shared.Tests/FireControlTests.cs b/tests/Aetheria.Shared.Tests/FireControlTests.cs index 749923547..839f64034 100644 --- a/tests/Aetheria.Shared.Tests/FireControlTests.cs +++ b/tests/Aetheria.Shared.Tests/FireControlTests.cs @@ -68,6 +68,13 @@ public sealed class FireControlTests : IDisposable MinimumTemperature = -1000, MaximumTemperature = 1000, OptimalTemperature = 0, PlateauWidth = 2000, Behaviors = { new InstantWeaponData() } }); + // A second design, so a target can carry two guns whose true figures differ (claim tests). + buildCache.Upsert(new GearData + { + Name = "WeakGun", Hardpoint = HardpointType.Sensors, Shape = new Shape(), Durability = 1, + MinimumTemperature = -1000, MaximumTemperature = 1000, OptimalTemperature = 0, PlateauWidth = 2000, + Behaviors = { new InstantWeaponData() } + }); buildCache.FlushAsync().Wait(); } @@ -175,9 +182,10 @@ public sealed class FireControlTests : IDisposable } // A shooter with one in-range, in-arc gun, a detected target at `targetPosition`, and a Minion driving the shooter. - private (Ship shooter, Ship target, Zone zone) BuildCombatEncounter(float3 targetPosition, float projectileSpeed = 0f) + private (Ship shooter, Ship target, Zone zone) BuildCombatEncounter(float3 targetPosition, float projectileSpeed = 0f, bool twoTargetGuns = false) { - var (items, shooter, weapons) = BuildShipWithHardpoints((ItemRotation.None, 0f)); + var mounts = twoTargetGuns ? new[] { (ItemRotation.None, 0f), (ItemRotation.None, 0f) } : new[] { (ItemRotation.None, 0f) }; + var (items, shooter, weapons) = BuildShipWithHardpoints(mounts); var weaponData = (InstantWeaponData) weapons[0].Data.Behaviors.Single(b => b is InstantWeaponData); weaponData.Damage = new PerformanceStat { Min = 10, Max = 10 }; weaponData.Cooldown = new PerformanceStat { Min = 1, Max = 1 }; @@ -194,6 +202,20 @@ public sealed class FireControlTests : IDisposable // gun so the target is a real, ordinarily-constructed ship rather than a workaround-shaped one. var targetGunRef = items.ItemData.RefOf(items.ItemData.GetByName("Gun")); Assert.True(target.TryEquip(new EquippableItem { Data = targetGunRef, Durability = 1, Lot = 1 }, new int2(0, 0))); + if (twoTargetGuns) + { + // Both true guns are finite, authored figures: the strong one rates 10, the weak one 1. + weaponData.Count = new PerformanceStat { Min = 1, Max = 1 }; + var weakRef = items.ItemData.RefOf(items.ItemData.GetByName("WeakGun")); + var weakData = (InstantWeaponData) items.ItemData.GetByName("WeakGun").Behaviors.Single(); + weakData.Damage = new PerformanceStat { Min = 1, Max = 1 }; + weakData.Count = new PerformanceStat { Min = 1, Max = 1 }; + weakData.Cooldown = new PerformanceStat { Min = 1, Max = 1 }; + weakData.Range = new PerformanceStat { Min = 1000, Max = 1000 }; + weakData.MinRange = new PerformanceStat { Min = 0, Max = 0 }; + weakData.DamageCurve = new BezierCurve { Keys = new[] { float4(0, 1, 0, 0), float4(1, 1, 0, 0) } }; + Assert.True(target.TryEquip(new EquippableItem { Data = weakRef, Durability = 1, Lot = 2 }, new int2(1, 0))); + } zone.Admit(target, piloted: false); shooter.Position = float3.zero; @@ -249,7 +271,7 @@ public sealed class FireControlTests : IDisposable zone.Update(1f); Assert.Null(shooter.TargetItem.Value); - shooter.RecordReveal(target, targetGun, SignatureChannel.LaunchFlash); + shooter.RecordReveal(target, targetGun, SignatureChannel.LaunchFlash, targetGun.Data); zone.Update(1f); Assert.Same(targetGun, shooter.TargetItem.Value); @@ -262,6 +284,139 @@ public sealed class FireControlTests : IDisposable Assert.Null(shooter.TargetItem.Value); } + // A design as an observer might be told it is: an instant weapon with rated figures, held in memory (a claim is data, + // not a catalog item). Rated damage per second at any range is damage / cooldown (one round, flat curve). + private static GearData ClaimedDesign(string name, float damage, float range = 1000f, BezierCurve curve = null) => new GearData + { + Name = name, + Behaviors = + { + new InstantWeaponData + { + Damage = new PerformanceStat { Min = 0, Max = damage }, Count = new PerformanceStat { Min = 1, Max = 1 }, + Cooldown = new PerformanceStat { Min = 1, Max = 1 }, Range = new PerformanceStat { Min = 0, Max = range }, + MinRange = new PerformanceStat { Min = 0, Max = 0 }, + DamageCurve = curve ?? new BezierCurve { Keys = new[] { float4(0, 1, 0, 0), float4(1, 1, 0, 0) } } + } + } + }; + + // Ruling ew-aim: the AI classifies from its book, not the target's gear (aetheria-ew, classify-from-belief). A gun + // the target claims is not a weapon is not something Combat picks as a weapon, though the gun is truly one and + // the shooter has seen it act; clearing the claim and seeing it act again restores the choice. Mutation: Combat + // walks target.Equipment (or reveal.Item's true behaviours) instead of RevealedWeapons. + [Fact] + public void TheAIChoosesFromWhatItBelieves() + { + var (shooter, target, zone) = BuildCombatEncounter(float3(0, 0, 10)); + var targetGun = target.Equipment.Single(x => x.Behaviors.Any(b => b is Weapon)); + + target.Claim(targetGun, new GearData { Name = "NotAGun" }); + shooter.RecordReveal(target, targetGun, SignatureChannel.LaunchFlash, target.ClaimOf(targetGun)); + zone.Update(1f); + zone.Update(1f); + Assert.Null(shooter.TargetItem.Value); + + target.Claim(targetGun, null); + shooter.RecordReveal(target, targetGun, SignatureChannel.LaunchFlash, target.ClaimOf(targetGun)); + zone.Update(1f); + Assert.Same(targetGun, shooter.TargetItem.Value); + } + + // Ruling ew-claim-weapon-measure-ruled (rated-design): the AI ranks revealed weapons by their claimed design's + // rated figures, so the truly weaker gun claimed as the stronger design is the one chosen, and the unclaimed pair + // picks the truly stronger. Mutation: rank by the true weapon's live figure, or by the carrier's stats. + [Fact] + public void AWeakerGunClaimedAsAStrongerDesignIsChosen() + { + var (shooter, target, zone) = BuildCombatEncounter(float3(0, 0, 10), twoTargetGuns: true); + var strong = target.Equipment.Single(x => x.Data.Name == "Gun"); + var weak = target.Equipment.Single(x => x.Data.Name == "WeakGun"); + + void See() + { + shooter.RecordReveal(target, strong, SignatureChannel.LaunchFlash, target.ClaimOf(strong)); + shooter.RecordReveal(target, weak, SignatureChannel.LaunchFlash, target.ClaimOf(weak)); + zone.Update(1f); + zone.Update(1f); + } + + See(); + Assert.Same(strong, shooter.TargetItem.Value); // unclaimed: the truly stronger gun (rated 10 against 1) + + target.Claim(strong, ClaimedDesign("Pea", 2f)); + target.Claim(weak, ClaimedDesign("Cannon", 90f)); + See(); + Assert.Same(weak, shooter.TargetItem.Value); + } + + // The ranking reads the claimed design at the distance to the target: a short-range design that out-damages a flat one + // up close is worthless at 10 when its Range is 12, and the weaker flat design is chosen. Mutation: Combat halves + // targetDistance (the short design then rates 6.2 at 5 and wins), or the rated read ignores the range. + [Fact] + public void TheAIRanksClaimsAtTheTargetsDistance() + { + var (shooter, target, zone) = BuildCombatEncounter(float3(0, 0, 10), twoTargetGuns: true); + var strong = target.Equipment.Single(x => x.Data.Name == "Gun"); + var weak = target.Equipment.Single(x => x.Data.Name == "WeakGun"); + var falling = new BezierCurve { Keys = new[] { float4(0, 1, 0, 0), float4(1, 0, 0, 0) } }; + + target.Claim(strong, ClaimedDesign("Dart", 10f, range: 12f, curve: falling)); // ~.7 at 10, ~6.2 at 5 + target.Claim(weak, ClaimedDesign("Slug", 5f)); // 5 at any range + shooter.RecordReveal(target, strong, SignatureChannel.LaunchFlash, target.ClaimOf(strong)); + shooter.RecordReveal(target, weak, SignatureChannel.LaunchFlash, target.ClaimOf(weak)); + zone.Update(1f); + zone.Update(1f); + + Assert.Same(weak, shooter.TargetItem.Value); + } + + // Ruling ew-claim-weapon-measure-ruled: no observer reads a target weapon's live state. Two unclaimed guns whose + // rated order (10 against 1) is the reverse of their live order (the strong one worn down to a hundredth) are + // ranked by the design, so the aim stays on the rated stronger gun. Mutation: rank an unclaimed reveal by the + // true weapon's live RangeDamagePerSecond. + [Fact] + public void TheAIRanksByTheDesignNotTheTargetsLiveGun() + { + var (shooter, target, zone) = BuildCombatEncounter(float3(0, 0, 10), twoTargetGuns: true); + var strong = target.Equipment.Single(x => x.Data.Name == "Gun"); + var weak = target.Equipment.Single(x => x.Data.Name == "WeakGun"); + var strongData = (InstantWeaponData) strong.Data.Behaviors.Single(b => b is InstantWeaponData); + target.Resolver.AttachModifier(strong, strongData.Damage, "worn", StatModifierType.Multiplier, .01f); + + shooter.RecordReveal(target, strong, SignatureChannel.LaunchFlash, target.ClaimOf(strong)); + shooter.RecordReveal(target, weak, SignatureChannel.LaunchFlash, target.ClaimOf(weak)); + zone.Update(1f); + zone.Update(1f); + + var liveStrong = strong.Behaviors.OfType().Single().RangeDamagePerSecond(10f); + var liveWeak = weak.Behaviors.OfType().Single().RangeDamagePerSecond(10f); + Assert.True(liveStrong < liveWeak); // the fixture: live and rated disagree + Assert.Same(strong, shooter.TargetItem.Value); + } + + // Ties are explicit: two revealed weapons of equal rated figure are taken in the subject's equipment order, whatever + // order the shooter saw them in. Mutation: ties go to the last (>=), or the walk follows the book's slot order. + [Fact] + public void EqualClaimsAreTakenInTheTargetsEquipmentOrder() + { + var (shooter, target, zone) = BuildCombatEncounter(float3(0, 0, 10), twoTargetGuns: true); + var first = target.Equipment.Single(x => x.Data.Name == "Gun"); + var second = target.Equipment.Single(x => x.Data.Name == "WeakGun"); + Assert.True(target.Equipment.IndexOf(first) < target.Equipment.IndexOf(second)); + var design = ClaimedDesign("Twin", 5f); + target.Claim(first, design); + target.Claim(second, design); + + shooter.RecordReveal(target, second, SignatureChannel.LaunchFlash, target.ClaimOf(second)); // seen first + shooter.RecordReveal(target, first, SignatureChannel.LaunchFlash, target.ClaimOf(first)); + zone.Update(1f); + zone.Update(1f); + + Assert.Equal(new[] { first, second }, shooter.RevealedWeapons(target).Select(r => r.Item).ToArray()); + Assert.Same(first, shooter.TargetItem.Value); + } + // Controls cut (helm split): Combat aims the shooter at the intercept (Aim) and commands the hull toward it // through the one steering law (Turn); it never turns the hull by writing Aim. [Fact] diff --git a/tests/Aetheria.Shared.Tests/GenericDesignsCommandTests.cs b/tests/Aetheria.Shared.Tests/GenericDesignsCommandTests.cs new file mode 100644 index 000000000..87d5ed74c --- /dev/null +++ b/tests/Aetheria.Shared.Tests/GenericDesignsCommandTests.cs @@ -0,0 +1,240 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using GameCult.Caching; +using GameCult.Caching.MessagePack; +using Xunit; + +// AetherDb's generic-designs command (aetheria-release, cut generic-design-names), run on a scratch copy of the shipped +// catalog, which already carries the applied result: each case first puts a few records back to their old shape. +public sealed class GenericDesignsCommandTests : IDisposable +{ + private readonly string _root = Path.Combine(Path.GetTempPath(), "generic-designs-command-" + Guid.NewGuid().ToString("N")); + private string CatalogPath => Path.Combine(_root, "GameData", "Aetheria.cc"); + + public GenericDesignsCommandTests() + { + Directory.CreateDirectory(Path.Combine(_root, "GameData")); + Directory.CreateDirectory(Path.Combine(_root, "Assets", "Resources")); + var shipped = AetherDb.FindRoot(); + File.Copy(Path.Combine(shipped, "GameData", "Aetheria.cc"), CatalogPath); + File.Copy(Path.Combine(shipped, "Assets", "Resources", "Settings.asset"), Path.Combine(_root, "Assets", "Resources", "Settings.asset")); + } + + public void Dispose() => Directory.Delete(_root, true); + + private void Edit(Action edit) + { + var db = AetherDb.Open(catalogWritable: true, root: _root); + try { edit(db); } + finally { db.Cache.Dispose(); } + } + + private T Read(Func read) + { + var db = AetherDb.Open(root: _root); + try { return read(db); } + finally { db.Cache.Dispose(); } + } + + private static void Save(AetherDb db, EquippableItemData design) => + db.Cache.Commit(batch => batch.Upsert(design.GetType(), design, db.Cache.RefOf(design).Key)); + + private static void Save(AetherDb db, FactionProductData product) => + db.Cache.Commit(batch => batch.Upsert(typeof(FactionProductData), product, db.Cache.RefOf(product).Key)); + + private static EquippableItemData DesignNamed(AetherDb db, string name) => + db.Cache.GetAll().Single(d => d.Name == name); + + private static FactionProductData ProductNamed(AetherDb db, string name) => + db.Cache.GetAll().Single(p => p.Name == name); + + [Fact] + public void An_applied_catalog_is_left_alone_by_a_dry_run_and_by_apply() + { + var before = File.ReadAllBytes(CatalogPath); + Assert.Equal(0, Program.GenericDesigns(apply: false, root: _root)); + Assert.Equal(before, File.ReadAllBytes(CatalogPath)); + Assert.Equal(0, Program.GenericDesigns(apply: true, root: _root)); + Assert.Equal(before, File.ReadAllBytes(CatalogPath)); + } + + [Fact] + public void A_dry_run_writes_nothing_and_apply_restores_both_records() + { + var (designText, productText, brandedDesignText, rowText) = Read(db => (DesignNamed(db, "Light Machine Gun").Description, + ProductNamed(db, "Hammerfall").Description, DesignNamed(db, "Autocannon").Description, ProductNamed(db, "Skiron").Description)); + Edit(db => + { + var design = DesignNamed(db, "Light Machine Gun"); + design.Name = "ClearPath"; + design.Description = "Defend your precious cargo."; + Save(db, design); + var product = ProductNamed(db, "Hammerfall"); + product.Name = "Autocannon"; + product.Description = ""; + Save(db, product); + var branded = DesignNamed(db, "Autocannon"); + branded.Description = ""; + Save(db, branded); + var row = ProductNamed(db, "Skiron"); + row.Description = ""; + Save(db, row); + }); + var reverted = File.ReadAllBytes(CatalogPath); + + Assert.Equal(0, Program.GenericDesigns(apply: false, root: _root)); + Assert.Equal(reverted, File.ReadAllBytes(CatalogPath)); + + Assert.Equal(0, Program.GenericDesigns(apply: true, root: _root)); + Read(db => + { + Assert.Equal(designText, DesignNamed(db, "Light Machine Gun").Description); + Assert.DoesNotContain(db.Cache.GetAll(), d => d.Name == "ClearPath"); + Assert.Equal(productText, ProductNamed(db, "Hammerfall").Description); + Assert.Equal(brandedDesignText, DesignNamed(db, "Autocannon").Description); + Assert.Equal(rowText, ProductNamed(db, "Skiron").Description); + Assert.DoesNotContain(db.Cache.GetAll(), p => p.Name == "Autocannon" && db.Cache.Get(p.Manufacturer)?.ShortName == "Zhestokost"); + return 0; + }); + } + + // Re-spell every record's payload in a longer, equally valid MessagePack form (an array16 header for the fixarray one). The + // catalog then holds bytes no re-encode through the current types would reproduce, so a write that re-encodes records it did + // not author shows as changed bytes; a write that lands onto the file as it is leaves them alone. + private int WidenEveryPayload() + { + var snapshot = CultDocumentMessagePackSerialization.DeserializeSnapshot(File.ReadAllBytes(CatalogPath)); + var widened = 0; + foreach (var record in snapshot.Records) + { + var payload = record.Payload; + if (payload.Length == 0 || (payload[0] & 0xF0) != 0x90) continue; + record.Payload = new byte[] { 0xDC, 0x00, (byte)(payload[0] & 0x0F) }.Concat(payload.Skip(1)).ToArray(); + widened++; + } + File.WriteAllBytes(CatalogPath, CultDocumentMessagePackSerialization.SerializeSnapshot(snapshot)); + return widened; + } + + private Dictionary Records() => + CultDocumentMessagePackSerialization.DeserializeSnapshot(File.ReadAllBytes(CatalogPath)).Records.ToDictionary(r => r.Key, StringComparer.Ordinal); + + [Fact] + public void Apply_writes_only_the_records_it_authors_and_restores_the_rewritten_design_texts() + { + var (largeDriveText, tractorText, smokeText, tractorProductText) = Read(db => (DesignNamed(db, "Large Drive").Description, DesignNamed(db, "Tractor Beam").Description, + DesignNamed(db, "Smoke Proximity").Description, ProductNamed(db, "Space Tractor").Description)); + Edit(db => + { + var drive = DesignNamed(db, "Large Drive"); + drive.Description = "Keeps you going and going and going..."; + Save(db, drive); + var smoke = DesignNamed(db, "Smoke Proximity"); + smoke.Description = "A Spectra that bursts by proximity, blast 8. For scenarios; no one builds it."; + Save(db, smoke); + var tractor = ProductNamed(db, "Space Tractor"); + tractor.Description = "It's a tractor. In space."; + Save(db, tractor); + }); + Assert.True(WidenEveryPayload() > 100, "the scratch catalog should hold many records in the widened spelling"); + var before = Records(); + + Assert.Equal(0, Program.GenericDesigns(apply: true, root: _root)); + + var after = Records(); + Assert.Equal(before.Count, after.Count); + var changed = before.Keys.Where(key => !before[key].Payload.AsSpan().SequenceEqual(after[key].Payload)).ToArray(); + Assert.Equal(3, changed.Length); + foreach (var (key, record) in before.Where(pair => !changed.Contains(pair.Key))) + Assert.True(record.Payload.AsSpan().SequenceEqual(after[key].Payload), "a record the command did not author has changed bytes"); + Read(db => + { + Assert.Equal(largeDriveText, DesignNamed(db, "Large Drive").Description); + Assert.Equal(tractorText, DesignNamed(db, "Tractor Beam").Description); + Assert.Equal(smokeText, DesignNamed(db, "Smoke Proximity").Description); + Assert.Equal(tractorProductText, ProductNamed(db, "Space Tractor").Description); + return 0; + }); + } + + [Fact] + public void A_generic_name_held_by_another_design_is_refused_and_nothing_is_written() + { + Edit(db => + { + var cargo = DesignNamed(db, "Cargo Bay"); + cargo.Name = "Store-All Plus"; + Save(db, cargo); + var flak = DesignNamed(db, "Flak Gun"); + flak.Name = "Cargo Bay"; + Save(db, flak); + }); + var before = File.ReadAllBytes(CatalogPath); + Assert.Throws(() => Program.GenericDesigns(apply: true, root: _root)); + Assert.Equal(before, File.ReadAllBytes(CatalogPath)); + } + + [Fact] + public void A_brand_already_held_by_another_product_is_refused() + { + Edit(db => + { + var product = ProductNamed(db, "Hammerfall"); + product.Name = "Autocannon"; + Save(db, product); + var other = ProductNamed(db, "Wren"); + other.Name = "Hammerfall"; + Save(db, other); + }); + var before = File.ReadAllBytes(CatalogPath); + Assert.Throws(() => Program.GenericDesigns(apply: true, root: _root)); + Assert.Equal(before, File.ReadAllBytes(CatalogPath)); + } + + [Fact] + public void A_row_whose_old_and_generic_names_are_both_absent_is_refused() + { + Edit(db => + { + var gun = DesignNamed(db, "Light Machine Gun"); + gun.Name = "Neither Name"; + Save(db, gun); + }); + var before = File.ReadAllBytes(CatalogPath); + Assert.Throws(() => Program.GenericDesigns(apply: true, root: _root)); + Assert.Equal(before, File.ReadAllBytes(CatalogPath)); + } + + [Fact] + public void A_brand_row_whose_maker_sells_no_product_of_the_design_under_either_name_is_refused() + { + Edit(db => + { + var product = ProductNamed(db, "Hammerfall"); + product.Name = "Neither Name"; + Save(db, product); + }); + var before = File.ReadAllBytes(CatalogPath); + Assert.Throws(() => Program.GenericDesigns(apply: true, root: _root)); + Assert.Equal(before, File.ReadAllBytes(CatalogPath)); + } + + [Fact] + public void A_shipped_authoring_note_is_stripped_from_a_product_the_tables_do_not_name() + { + Edit(db => + { + var product = ProductNamed(db, "LockOn"); + product.Description += Program.AuthoringNote; + Save(db, product); + }); + Assert.Equal(0, Program.GenericDesigns(apply: true, root: _root)); + Read(db => + { + Assert.EndsWith("target.", ProductNamed(db, "LockOn").Description); + return 0; + }); + } +} diff --git a/tests/Aetheria.Shared.Tests/ImpactFeedbackTests.cs b/tests/Aetheria.Shared.Tests/ImpactFeedbackTests.cs index a968cec7e..d735b68a8 100644 --- a/tests/Aetheria.Shared.Tests/ImpactFeedbackTests.cs +++ b/tests/Aetheria.Shared.Tests/ImpactFeedbackTests.cs @@ -43,7 +43,7 @@ public sealed partial class FireControlCut124Tests // Fires until a shot lands; returns that outcome and the absorbs the target published for that shot alone. private static (ShotOutcome Outcome, List Absorbs) FireAtTheMarker(Engagement e, List subs) { - e.Shooter.RecordReveal(e.Target, e.Custom["Marker"], SignatureChannel.LaunchFlash); // the book must hold the item: aiming is earned by seeing it act + e.Shooter.RecordReveal(e.Target, e.Custom["Marker"], SignatureChannel.LaunchFlash, e.Custom["Marker"].Data); // the book must hold the item: aiming is earned by seeing it act Assert.True(e.Shooter.TrySelectTargetItem(e.Custom["Marker"]), "fixture: the marker is aimable"); var absorbs = Collect(e.Target, subs); ShotOutcome landed = null; diff --git a/tests/Aetheria.Shared.Tests/LaunchSuppressorCatalogTests.cs b/tests/Aetheria.Shared.Tests/LaunchSuppressorCatalogTests.cs new file mode 100644 index 000000000..2f5a2a99b --- /dev/null +++ b/tests/Aetheria.Shared.Tests/LaunchSuppressorCatalogTests.cs @@ -0,0 +1,376 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using CultMath; +using GameCult.Caching; +using Xunit; + +// The two launch suppressors the catalog sells (campaign aetheria-ew, cut ew-hide-launch-catalog; rulings +// ew-suppressor-strength-ruled, ew-suppressor-makers-ruled, ew-mild-suppressor-makers-defaulted), read from the shipped catalog and +// fitted to shipped hulls: what the designs say, that quality moves only the stat it is authored on, and what a player feels. The +// strong Launch Suppressor hides a launch from the target it is fired at and gives out after an opening volley; the mild Launch +// Baffle leaves the target its sight, hides the launch from the crowd and lasts a fight. The entity-level mechanism belongs to +// ContactRevealTests; this file owns the catalog's figures. +public sealed class LaunchSuppressorCatalogTests +{ + internal const string StrongName = "Launch Suppressor"; + internal const string MildName = "Launch Baffle"; + // The observer's sensor, named: the reveal readings below are this design's PassiveInfo, so a catalog that gains an earlier + // sensor must not change which one the observer fits. + private const string SensorName = "Compact Sensor"; + private const float Flash = 1000f; + private const float Tick = .25f; // exact in floats: four ticks are one second + + private static GearData Design(CultCache cache, string name) => Assert.Single(cache.GetAll(), g => g.Name == name); + + private static LaunchSuppressorData Data(GearData design) => Assert.Single(design.Behaviors.OfType()); + + private static void AssertStat(PerformanceStat stat, float min, float max, string role) + { + Assert.Equal(min, stat.Min, 4); + Assert.Equal(max, stat.Max, 4); + var term = Assert.Single(stat.Terms); + Assert.Equal(StatSource.Quality, term.Source); + Assert.Equal(role, term.Role); + Assert.Equal(1f, term.Exponent); // linear in the role's quality: the design's range is the whole of what quality changes + } + + [Fact] + public void LaunchSuppressorDesignsAreAuthored() + { + using var cache = RestoredHullsTests.OpenCatalog(); + var computer = Design(cache, "Targeting Computer"); + var designs = new[] + { + (Design: Design(cache, StrongName), Price: 40000, Factor: (.08f, .03f), Heat: (1.4f, .8f), Rated: (310f, 330f)), + (Design: Design(cache, MildName), Price: 25000, Factor: (.4f, .2f), Heat: (.8f, .5f), Rated: (310f, 330f)), + }; + foreach (var (design, price, factor, heat, rated) in designs) + { + Assert.Equal(HardpointType.Tool, design.Hardpoint); + Assert.Equal((1, 1), (design.Shape.Width, design.Shape.Height)); + Assert.True(design.Shape.Cells[0, 0], "the one cell is solid"); + Assert.Equal(60f, design.Mass); + Assert.Equal(50f, design.Durability); + Assert.Equal(price, design.Price); + Assert.False(string.IsNullOrWhiteSpace(design.Description)); + Assert.Equal(new[] { "baffles", "heat sink" }, design.Roles.Select(r => r.Name).ToArray()); + // The thermal constants and temperatures are the Targeting Computer's, the catalog's 1x1 tool. + Assert.Equal( + (computer.SpecificHeat, computer.Conductivity, computer.MinimumTemperature, computer.MaximumTemperature, computer.OptimalTemperature, computer.PlateauWidth, computer.ThermalResilience), + (design.SpecificHeat, design.Conductivity, design.MinimumTemperature, design.MaximumTemperature, design.OptimalTemperature, design.PlateauWidth, design.ThermalResilience)); + var data = Data(design); + AssertStat(data.Factor, factor.Item1, factor.Item2, "baffles"); + AssertStat(data.HeatPerUnit, heat.Item1, heat.Item2, "heat sink"); + AssertStat(data.RatedTemperature, rated.Item1, rated.Item2, "heat sink"); + CultRecordRefs.Validate(design); + } + + // Exactly these six products and these makers, each authoring both roles at its maker's own mean and deviation. + var profiles = new Dictionary + { + ["NiteLife"] = (.55f, .12f), ["Finch"] = (.65f, .20f), ["DME"] = (.55f, .20f), ["R&D"] = (.60f, .15f), + ["Lightsail"] = (.55f, .10f), ["Alakrita"] = (.60f, .14f), + }; + foreach (var (name, makers) in new[] + { + (StrongName, new[] { "DME", "Finch", "NiteLife", "R&D" }), + (MildName, new[] { "Alakrita", "Lightsail" }), + }) + { + var key = cache.RefOf(Design(cache, name)).Key; + var products = cache.GetAll().Where(p => p.Design.Key.Equals(key)).ToArray(); + Assert.Equal(makers, products.Select(p => cache.Get(p.Manufacturer).ShortName).OrderBy(m => m, StringComparer.Ordinal).ToArray()); + Assert.Equal(products.Length, products.Select(p => p.Name).Distinct().Count()); + Assert.All(products, product => + { + var (mean, dev) = profiles[cache.Get(product.Manufacturer).ShortName]; + Assert.Equal(new[] { "baffles", "heat sink" }, product.Roles.Select(r => r.Role).OrderBy(r => r, StringComparer.Ordinal).ToArray()); + Assert.All(product.Roles, r => + { + Assert.Equal(mean, r.Mean, 3); + Assert.Equal(dev, r.StandardDeviation, 3); + }); + Assert.False(string.IsNullOrWhiteSpace(product.Description)); + }); + } + } + + // A shipped hull with its drives, a reactor, a radiator and the named suppressor fitted before the ship goes live (a ship + // cannot be equipped once active), minted through the production lot path with a quality for each of the suppressor's roles. + // The recipe is RestoredHullsTests.BuildThrustedShip's; the suppressor takes the first free interior space, as generation does. + internal sealed class Rig : IDisposable + { + public readonly CultCache Cache = RestoredHullsTests.OpenCatalog(); + public readonly Ship Ship; + public readonly EquippedItem Suppressor; + public readonly LaunchSuppressorData Data; + public readonly int2 Cell; + + public Rig(string hullName, string designName, float baffles = .5f, float sink = .5f, string sensorName = null) + { + var hull = Cache.GetByName(hullName); + var design = Design(Cache, designName); + Data = LaunchSuppressorCatalogTests.Data(design); + var settings = RestoredHullsTests.Settings(); + var ledger = new ProvenanceLedger(); + var suppressorLot = hull.Hardpoints.Count + 2; + for (var i = 1; i <= suppressorLot; i++) ledger.Lots[i] = new Lot { Origin = new Attributed(), Quality = .5f }; + ledger.Lots[suppressorLot] = new Lot + { + Origin = new Attributed(), Quality = .5f, + Roles = new List { new RoleFill { Role = "baffles", Quality = baffles }, new RoleFill { Role = "heat sink", Quality = sink } }, + }; + var items = new ItemManager(Cache, ledger, settings, _ => { }); + var zone = new Zone(items, new PlanetSettings(), new ZonePack(), new GalaxyZone { Name = "Test", Owner = null }, null); + Ship = new Ship(items, zone, new EquippableItem { Data = Cache.RefOf(hull), Durability = hull.Durability, Lot = 1 }, settings.DefaultEntitySettings); + + var lot = 2; + var thrusters = Cache.GetAll().Where(g => g.Hardpoint == HardpointType.Thruster).ToArray(); + foreach (var hardpoint in hull.Hardpoints.Where(h => h.Type == HardpointType.Thruster)) + { + var thruster = thrusters.First(hardpoint.IsFilledBy); + Assert.True(Ship.TryEquip(new EquippableItem { Data = Cache.RefOf(thruster), Durability = thruster.Durability, Lot = lot++ }, hardpoint.Position)); + } + foreach (var type in new[] { HardpointType.Reactor, HardpointType.Radiator }) + { + var hardpoint = hull.Hardpoints.First(h => h.Type == type); + var filler = Cache.GetAll().First(hardpoint.IsFilledBy); + Assert.True(Ship.TryEquip(new EquippableItem { Data = Cache.RefOf(filler), Durability = filler.Durability, Lot = lot++ }, hardpoint.Position)); + } + if (sensorName != null) + { + var sensor = Design(Cache, sensorName); + var hardpoint = hull.Hardpoints.First(h => h.Type == HardpointType.Sensors && h.IsFilledBy(sensor)); + Assert.True(Ship.TryEquip(new EquippableItem { Data = Cache.RefOf(sensor), Durability = sensor.Durability, Lot = lot++ }, hardpoint.Position)); + } + Assert.True(Ship.TryEquip(new EquippableItem { Data = Cache.RefOf(design), Durability = design.Durability, Lot = suppressorLot })); + + zone.Admit(Ship, piloted: false); + Ship.Position = float3.zero; + zone.Update(0f); + Suppressor = Ship.Equipment.Single(e => e.Data.Name == designName); + Cell = Suppressor.InsetShape.Coordinates.Single(); + } + + public void Dispose() => Cache.Dispose(); + + // Write one launch flash (a direct call: no update, so nothing cools between calls) and read back what was stored. + public float Launch(float strength) + { + var source = new object(); + Ship.SetSignature(source, SignatureChannel.LaunchFlash, strength, Suppressor); + return Ship.VisibilitySources[source].Strength; + } + + public float Reading(PerformanceStat stat) => Suppressor.Evaluate(stat); + + public float Temperature => Ship.Temperature[Cell.x, Cell.y]; + + // The temperature the cell reaches after n direct launches of a flash while the suppressor is working: each removed unit + // costs HeatPerUnit, spread over the cell's thermal mass. Counts the launches made while the cell is at or under its rating. + public int OpeningVolley(float strength) + { + var factor = Math.Clamp(Reading(Data.Factor), 0f, 1f); + var perCall = (strength - strength * factor) * Reading(Data.HeatPerUnit) / Ship.ThermalMass[Cell.x, Cell.y]; + var rated = Reading(Data.RatedTemperature); + var count = 0; + for (double t = Temperature; t <= rated; t += perCall) count++; + return count; + } + } + + // One launch of a fight: what was stored, how far the suppressor's cell rose, and the rise the authored figures predict for the + // light removed (removed x HeatPerUnit / the cell's thermal mass). + internal readonly record struct Launched(float Stored, float Rise, float Predicted); + + // A fight of one launch a second with the hull ticking between them (four quarter-second updates). + internal static Launched[] Fight(string hull, string design, float strength, int launches = 60) + { + using var rig = new Rig(hull, design); + var perUnit = rig.Reading(rig.Data.HeatPerUnit); + var mass = rig.Ship.ThermalMass[rig.Cell.x, rig.Cell.y]; + var fight = new Launched[launches]; + for (var i = 0; i < launches; i++) + { + var before = rig.Temperature; + var stored = rig.Launch(strength); + fight[i] = new Launched(stored, rig.Temperature - before, (strength - stored) * perUnit / mass); + for (var t = 0; t < 4; t++) rig.Ship.Zone.Update(Tick); + } + return fight; + } + + // The number of launches that are suppressed before the first that is not. + internal static int LeadingSuppressed(string hull, string design, float strength, int launches = 60) => + Fight(hull, design, strength, launches).TakeWhile(l => l.Stored < strength).Count(); + + // A sensor ship at the origin: the observer. What it reveals is Entity.Sense's own test, a stored strength times its + // passive information at the emitter's position over the settings' threshold. + private sealed class Observer : IDisposable + { + private readonly Rig _rig; + private readonly float _threshold = RestoredHullsTests.Settings().TargetDetectionInfoThreshold; + + public Observer() => _rig = new Rig("Longinus", MildName, sensorName: SensorName); + + public void Dispose() => _rig.Dispose(); + + public bool Sees(float stored, float distance) => stored * _rig.Ship.PassiveInfo(new float2(distance, 0f), 1f) > _threshold; + } + + public static IEnumerable QualityGrid() => + from design in new[] { StrongName, MildName } + from role in new[] { "baffles", "heat sink" } + from quality in new[] { 0f, .5f, 1f } + select new object[] { design, role, quality }; + + // The role under test takes the quality; the other role sits at a quality no row uses, so a stat read from the wrong role + // lands somewhere else. + [Theory] + [MemberData(nameof(QualityGrid))] + public void ShippedSuppressorQualityMovesItsStats(string designName, string role, float quality) + { + const float Decoy = .25f; + var baffles = role == "baffles" ? quality : Decoy; + var sink = role == "heat sink" ? quality : Decoy; + using var rig = new Rig("Longinus", designName, baffles, sink); + float Lerp(PerformanceStat stat, float q) => stat.Min + (stat.Max - stat.Min) * q; + + var factor = rig.Reading(rig.Data.Factor); + var perUnit = rig.Reading(rig.Data.HeatPerUnit); + Assert.Equal(Lerp(rig.Data.Factor, baffles), factor, 4); + Assert.Equal(Lerp(rig.Data.HeatPerUnit, sink), perUnit, 4); + Assert.Equal(Lerp(rig.Data.RatedTemperature, sink), rig.Reading(rig.Data.RatedTemperature), 4); + + var before = rig.Temperature; + var stored = rig.Launch(Flash); + Assert.Equal(Flash * factor, stored, 2); + var expected = (Flash - stored) * perUnit / rig.Ship.ThermalMass[rig.Cell.x, rig.Cell.y]; + Assert.InRange(rig.Temperature - before, expected * .999f, expected * 1.001f); + } + + [Theory] + [InlineData("Longinus")] + [InlineData("Djinni")] + public void StrongSuppressorHidesFromItsTargetAndStopsAfterAnOpeningVolley(string hull) + { + // From rest with no cooling: each call pays heat into one cell, so a few calls in the rating is crossed and every later + // call is bright. The count is derived from the cell's thermal mass and the authored figures; the Djinni's margin is + // under a kelvin, so it is never a literal. + using var rig = new Rig(hull, StrongName); + var expectedSuppressed = rig.OpeningVolley(Flash); + Assert.InRange(expectedSuppressed, 2, 8); + var stored = Enumerable.Range(0, 12).Select(_ => rig.Launch(Flash)).ToArray(); + var hidden = rig.Reading(rig.Data.Factor) * Flash; + Assert.All(stored.Take(expectedSuppressed), s => Assert.Equal(hidden, s, 2)); + Assert.All(stored.Skip(expectedSuppressed), s => Assert.Equal(Flash, s)); + + // With the hull ticking, one launch a second, a light flash still gets hidden for a dozen launches. + Assert.True(LeadingSuppressed(hull, StrongName, 300f) >= 12); + } + + [Fact] + public void StrongSuppressorHidesALaunchFromTheObserverAtTheTarget() + { + using var rig = new Rig("Longinus", StrongName); + using var observer = new Observer(); + var hidden = rig.Launch(Flash); + Assert.False(observer.Sees(hidden, 1500f)); // the shot leaves unseen + Assert.True(observer.Sees(Flash, 1500f)); // the same shot with no suppressor is seen + } + + [Fact] + public void MildSuppressorLeavesTheTargetItsSightAndHidesFromTheCrowd() + { + using var mild = new Rig("Longinus", MildName); + using var strong = new Rig("Longinus", StrongName); + using var observer = new Observer(); + var dimmed = mild.Launch(Flash); + Assert.Equal(300f, dimmed, 1); // mid quality: Factor .3 + Assert.True(observer.Sees(dimmed, 1500f)); // the target still sees the launch + Assert.False(observer.Sees(dimmed, 6000f)); // a far observer loses it... + Assert.True(observer.Sees(Flash, 6000f)); // ...and would have seen it unsuppressed + Assert.False(observer.Sees(strong.Launch(Flash), 1500f)); // the strong design hides it from the target too + } + + // What the ruled figures make of a flash at mid quality: Factor lerp(.08, .03, .5) and lerp(.4, .2, .5). + private static float MidFactor(string design) => design == StrongName ? .055f : .3f; + + // The suppressor's one cell starts at rest (280 K) and a direct launch is made at each of these temperatures around the + // rating, a fraction of a kelvin either side: the rating alone decides whether the flash is hidden. No launch step is + // involved, so the line is pinned to the kelvin, not to however far a launch happens to move the cell. + [Theory] + [InlineData(StrongName, 0f, -.5f, true)] + [InlineData(StrongName, 0f, 0f, true)] + [InlineData(StrongName, 0f, .5f, false)] + [InlineData(StrongName, 1f, -.5f, true)] + [InlineData(StrongName, 1f, .5f, false)] + [InlineData(MildName, 0f, -.5f, true)] + [InlineData(MildName, 0f, .5f, false)] + [InlineData(MildName, .5f, 0f, true)] + [InlineData(MildName, 1f, -.5f, true)] + [InlineData(MildName, 1f, .5f, false)] + public void TheRatedTemperatureIsTheLineBetweenHidingAndNot(string design, float sink, float offset, bool hidden) + { + using var rig = new Rig("Longinus", design, sink: sink); + var rated = rig.Reading(rig.Data.RatedTemperature); + Assert.Equal(310f + 20f * sink, rated, 3); // the authored 310..330 on the heat sink + rig.Ship.Temperature[rig.Cell.x, rig.Cell.y] = rated + offset; + Assert.Equal(hidden ? Flash * MidFactor(design) : Flash, rig.Launch(Flash), 2); + } + + // Hiding is linear in the flash at every strength, and so is the heat it costs: a rule that treats weak flashes differently + // (or scales heat with strength) moves a row. Both designs at mid quality, a first launch from rest. + public static IEnumerable FlashGrid() => + from design in new[] { StrongName, MildName } + from strength in new[] { 40f, 200f, 499f, 501f, 1000f, 2400f } + select new object[] { design, strength }; + + [Theory] + [MemberData(nameof(FlashGrid))] + public void SuppressionAndItsHeatAreLinearInTheFlash(string design, float strength) + { + using var rig = new Rig("Longinus", design); + var before = rig.Temperature; + var stored = rig.Launch(strength); + Assert.Equal(strength * MidFactor(design), stored, 2); + var expected = (strength - stored) * rig.Reading(rig.Data.HeatPerUnit) / rig.Ship.ThermalMass[rig.Cell.x, rig.Cell.y]; + Assert.InRange(rig.Temperature - before, expected * .999f, expected * 1.001f); + } + + // "A long fight" for the mild design is launches at one launch a second: 30 of a 300 flash (a light weapon) or 8 of a 1000 + // flash (a heavy launch), on either hull (probed 36 and 33, and 10 and 10). Every one of those must store exactly the flash + // times the authored Factor and cost exactly the heat its removed light predicts, so a design that stops hiding late, or + // whose Factor or heat drifts as the cell warms, fails here. Past that the sink sits on its rating and the design flickers: + // each launch is either fully hidden or fully bright, never in between. That flicker is the ruled design at its rating. + [Theory] + [InlineData("Longinus", 300f, 30)] + [InlineData("Djinni", 300f, 30)] + [InlineData("Longinus", Flash, 8)] + [InlineData("Djinni", Flash, 8)] + public void MildSuppressorKeepsHidingThroughALongFight(string hull, float flash, int hold) + { + var fight = Fight(hull, MildName, flash); + var hidden = flash * MidFactor(MildName); + for (var i = 0; i < hold; i++) + { + Assert.True(Math.Abs(fight[i].Stored - hidden) < .01f, $"{hull}: launch {i} of {flash} stored {fight[i].Stored}, not the authored {hidden}"); + Assert.InRange(fight[i].Rise, fight[i].Predicted * .999f, fight[i].Predicted * 1.001f); + } + Assert.All(fight.Skip(hold), l => Assert.True(Math.Abs(l.Stored - hidden) < .01f || l.Stored == flash, $"{hull}: a launch stored {l.Stored}, neither hidden nor bright")); + } + + [Theory] + [InlineData("Longinus")] + [InlineData("Djinni")] + public void MildSuppressorSurvivesALongerFightThanStrong(string hull) + { + foreach (var flash in new[] { 300f, Flash }) + { + var mild = LeadingSuppressed(hull, MildName, flash); + var strong = LeadingSuppressed(hull, StrongName, flash); + Assert.True(mild > strong, $"{hull}: mild {mild} did not outlast strong {strong} at {flash}"); + } + } +} diff --git a/tests/Aetheria.Shared.Tests/LaunchSuppressorCommandTests.cs b/tests/Aetheria.Shared.Tests/LaunchSuppressorCommandTests.cs new file mode 100644 index 000000000..90c1d3873 --- /dev/null +++ b/tests/Aetheria.Shared.Tests/LaunchSuppressorCommandTests.cs @@ -0,0 +1,171 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using GameCult.Caching; +using GameCult.Caching.MessagePack; +using MessagePack; +using Xunit; + +// AetherDb's launch-suppressor command (aetheria-ew, cut ew-hide-launch-catalog), run on a scratch copy of the shipped catalog with +// the two designs and their six products removed from it. Apply must write what the shipped catalog holds, and a catalog that is +// neither untouched nor fully authored is refused rather than completed. +public sealed class LaunchSuppressorCommandTests : IDisposable +{ + private static readonly string[] DesignNames = { LaunchSuppressorCatalogTests.StrongName, LaunchSuppressorCatalogTests.MildName }; + + private readonly string _root = Path.Combine(Path.GetTempPath(), "launch-suppressor-command-" + Guid.NewGuid().ToString("N")); + private string CatalogPath => Path.Combine(_root, "GameData", "Aetheria.cc"); + + // The designs and products as the shipped catalog holds them, taken before they are removed from the scratch copy. + private readonly (string Name, byte[] Bytes)[] _shippedDesigns; + private readonly string[] _shippedProducts; + + private static byte[] Pack(GearData design) => + MessagePackSerializer.Serialize(design, CultDocumentMessagePackSerialization.OptionsFor(typeof(GearData).Assembly)); + + private static string Describe(CultCache cache, FactionProductData product) => + $"{cache.Get(product.Design).Name} | {product.Name} | {cache.Get(product.Manufacturer).ShortName} | {product.Description} | " + + string.Join(",", product.Roles.OrderBy(r => r.Role, StringComparer.Ordinal).Select(r => $"{r.Role}:{r.Mean}:{r.StandardDeviation}")); + + public LaunchSuppressorCommandTests() + { + Directory.CreateDirectory(Path.Combine(_root, "GameData")); + Directory.CreateDirectory(Path.Combine(_root, "Assets", "Resources")); + var shipped = AetherDb.FindRoot(); + File.Copy(Path.Combine(shipped, "GameData", "Aetheria.cc"), CatalogPath); + File.Copy(Path.Combine(shipped, "Assets", "Resources", "Settings.asset"), Path.Combine(_root, "Assets", "Resources", "Settings.asset")); + using var cache = new CultCache(TestCatalog.Registry()); + cache.AddBackingStore(new SingleFileMessagePackBackingStore(CatalogPath), AetheriaStores.CatalogTypes); + var designs = cache.GetAll().Where(g => DesignNames.Contains(g.Name)).ToArray(); + Assert.Equal(DesignNames.Length, designs.Length); + _shippedDesigns = designs.Select(d => (d.Name, Pack(d))).ToArray(); + var keys = designs.Select(d => cache.RefOf(d).Key).ToArray(); + var products = cache.GetAll().Where(p => keys.Any(k => p.Design.Key.Equals(k))).ToArray(); + _shippedProducts = products.Select(p => Describe(cache, p)).OrderBy(x => x, StringComparer.Ordinal).ToArray(); + Assert.Equal(6, products.Length); + foreach (var product in products) Assert.True(cache.Remove(cache.RefOf(product).Key)); + foreach (var key in keys) Assert.True(cache.Remove(key)); + cache.FlushAsync().Wait(); + } + + public void Dispose() => Directory.Delete(_root, true); + + private (GearData[] Designs, string[] Products) Read() + { + var db = AetherDb.Open(root: _root); + try + { + var designs = db.Cache.GetAll().Where(g => DesignNames.Contains(g.Name)).ToArray(); + var keys = designs.Select(d => db.Cache.RefOf(d).Key).ToArray(); + var products = db.Cache.GetAll().Where(p => keys.Any(k => p.Design.Key.Equals(k))).ToArray(); + return (designs, products.Select(p => Describe(db.Cache, p)).OrderBy(x => x, StringComparer.Ordinal).ToArray()); + } + finally { db.Cache.Dispose(); } + } + + // Remove from the scratch catalog what the predicate picks: products by name, designs by name. + private void Remove(Func products, Func designs) + { + using var cache = new CultCache(TestCatalog.Registry()); + cache.AddBackingStore(new SingleFileMessagePackBackingStore(CatalogPath), AetheriaStores.CatalogTypes); + foreach (var product in cache.GetAll().Where(products).ToArray()) Assert.True(cache.Remove(cache.RefOf(product).Key)); + foreach (var design in cache.GetAll().Where(designs).ToArray()) Assert.True(cache.Remove(cache.RefOf(design).Key)); + cache.FlushAsync().Wait(); + } + + [Fact] + public void A_dry_run_writes_nothing_and_apply_lands_the_shipped_designs_once() + { + var before = File.ReadAllBytes(CatalogPath); + Assert.Empty(Read().Designs); + + Assert.Equal(0, Program.LaunchSuppressorCatalog(apply: false, root: _root)); + Assert.Equal(before, File.ReadAllBytes(CatalogPath)); + Assert.Empty(Read().Designs); + + Assert.Equal(0, Program.LaunchSuppressorCatalog(apply: true, root: _root)); + var landed = File.ReadAllBytes(CatalogPath); + Assert.NotEqual(before, landed); + var (designs, products) = Read(); + // The record keys are CultCache's to mint and differ run to run; the designs and products do not. + foreach (var (name, bytes) in _shippedDesigns) + Assert.True(bytes.AsSpan().SequenceEqual(Pack(designs.Single(d => d.Name == name))), $"{name} differs from the shipped catalog's record"); + Assert.Equal(_shippedProducts, products); + + // A second apply finds everything authored and writes nothing; so does a dry run. + Assert.Equal(0, Program.LaunchSuppressorCatalog(apply: true, root: _root)); + Assert.Equal(landed, File.ReadAllBytes(CatalogPath)); + Assert.Equal(0, Program.LaunchSuppressorCatalog(apply: false, root: _root)); + Assert.Equal(landed, File.ReadAllBytes(CatalogPath)); + } + + // Re-spell every record's payload in a longer, equally valid MessagePack form (an array16 header for the fixarray one). The + // catalog then holds bytes no re-encode through the current types would reproduce, so a write that re-encodes records it did + // not author shows as changed bytes; a write that lands onto the file as it is leaves them alone. + private int WidenEveryPayload() + { + var snapshot = CultDocumentMessagePackSerialization.DeserializeSnapshot(File.ReadAllBytes(CatalogPath)); + var widened = 0; + foreach (var record in snapshot.Records) + { + var payload = record.Payload; + if (payload.Length == 0 || (payload[0] & 0xF0) != 0x90) continue; + record.Payload = new byte[] { 0xDC, 0x00, (byte)(payload[0] & 0x0F) }.Concat(payload.Skip(1)).ToArray(); + widened++; + } + File.WriteAllBytes(CatalogPath, CultDocumentMessagePackSerialization.SerializeSnapshot(snapshot)); + return widened; + } + + private Dictionary Records() => + CultDocumentMessagePackSerialization.DeserializeSnapshot(File.ReadAllBytes(CatalogPath)).Records.ToDictionary(r => r.Key, StringComparer.Ordinal); + + [Fact] + public void Apply_writes_only_the_records_it_authors() + { + Assert.True(WidenEveryPayload() > 100, "the scratch catalog should hold many records in the widened spelling"); + var before = Records(); + + Assert.Equal(0, Program.LaunchSuppressorCatalog(apply: true, root: _root)); + + var after = Records(); + Assert.Equal(before.Count + DesignNames.Length + _shippedProducts.Length, after.Count); + foreach (var (key, record) in before) + { + Assert.True(after.TryGetValue(key, out var kept), "a record the command did not author is gone"); + Assert.Equal(record.SchemaId, kept.SchemaId); + Assert.Equal(record.StoredAt, kept.StoredAt); + Assert.True(record.Payload.AsSpan().SequenceEqual(kept.Payload), "a record the command did not author has changed bytes"); + } + } + + public enum PartialState { OneDesignOnly, DesignWithSomeProducts, ProductsWithoutTheirDesign } + + [Theory] + [InlineData(PartialState.OneDesignOnly)] + [InlineData(PartialState.DesignWithSomeProducts)] + [InlineData(PartialState.ProductsWithoutTheirDesign)] + public void Apply_refuses_a_partly_authored_catalog_and_writes_nothing(PartialState state) + { + Assert.Equal(0, Program.LaunchSuppressorCatalog(apply: true, root: _root)); + switch (state) + { + case PartialState.OneDesignOnly: + Remove(p => DesignOf(p) == DesignNames[1], g => g.Name == DesignNames[1]); + break; + case PartialState.DesignWithSomeProducts: + Remove(p => p.Name == "Hush" || p.Name == "Low Profile", g => false); + break; + case PartialState.ProductsWithoutTheirDesign: + Remove(p => false, g => g.Name == DesignNames[0]); + break; + } + var partial = File.ReadAllBytes(CatalogPath); + + Assert.Throws(() => Program.LaunchSuppressorCatalog(apply: true, root: _root)); + Assert.Equal(partial, File.ReadAllBytes(CatalogPath)); + } + + private string DesignOf(FactionProductData p) => p.Name is "Low Profile" or "Fast Pass Dim" ? DesignNames[1] : DesignNames[0]; +} diff --git a/tests/Aetheria.Shared.Tests/LockOnScenarioTests.cs b/tests/Aetheria.Shared.Tests/LockOnScenarioTests.cs new file mode 100644 index 000000000..995e25af8 --- /dev/null +++ b/tests/Aetheria.Shared.Tests/LockOnScenarioTests.cs @@ -0,0 +1,56 @@ +using System.Collections.Generic; +using System.Linq; +using Xunit; +using static CultMath.math; + +// The arena the operator flies to check the incoming-lock warning (map: Scenarios for operator checks, SC5 and SC14). The +// test launches the scenario the way New Game does and steps what it staged. +public sealed partial class RunStartTests +{ + // Lock On: the hostile starts piloted, facing the player, beyond its own sight of the player, and the player has no + // incoming paint. Stepped at .1 s, it closes, finds the player and locks: a Track paint reaches the player bearing + // toward the hostile, and its Strength rises from nothing as the lock tightens. + [Fact] + public void LockOnSituation() + { + var (_, arena, staged, failures) = Launch(new LockOn(), Inputs(() => GalaxySeed)); + Assert.True(failures.Count == 0, string.Join("; ", failures)); + var player = staged.Player; + var hostile = Assert.Single(staged.Entities); + Assert.True(player.IsHostileTo(hostile) && hostile.IsHostileTo(player), "the hostile is hostile both ways"); + Assert.Equal(1, AgentsOf(arena, hostile)); + + var toPlayer = normalize(player.Position.xz - hostile.Position.xz); + Assert.True(dot(normalize(hostile.Direction), toPlayer) >= cos(radians(5f)), "the hostile faces the player"); + + // The first real sensing tick: the hostile holds no track of the player, and the sim's own passive sensing, asked for + // the player's signature at the staged place, settles below the detection threshold: the staging is out of its sight. + arena.Update(.1f); + Assert.DoesNotContain(player, hostile.VisibleEnemies); + Assert.DoesNotContain(player.IncomingPaints, paint => paint.Mode == PaintMode.Track); + Assert.True(player.Visibility > 0f, "the player shows a signature to be seen by"); + var threshold = player.ItemManager.GameplaySettings.TargetDetectionInfoThreshold; + var settled = hostile.PassiveInfo(player.Position.xz, player.Visibility); + Assert.True(settled <= threshold, $"the hostile would settle at {settled} on the player, above the detection threshold {threshold}: staged inside its sight"); + + var lockedAt = -1; + var bearingDot = 0f; + var strengths = new List(); + for (var tick = 0; tick < 600 && (lockedAt < 0 || tick < lockedAt + 40); tick++) + { + arena.Update(.1f); + foreach (var paint in player.IncomingPaints.Where(paint => paint.Mode == PaintMode.Track)) + { + if (lockedAt < 0) + { + lockedAt = tick; + bearingDot = dot(normalize(paint.Bearing), toPlayer * -1f); + } + strengths.Add(paint.Strength); + } + } + Assert.True(lockedAt >= 0, "the hostile never locked the player within 600 ticks of .1 s"); + Assert.True(bearingDot >= cos(radians(5f)), "the warning points at the hostile"); + Assert.True(strengths.First() < strengths.Last(), $"the lock tightens: Strength went {strengths.First()} to {strengths.Last()}"); + } +} diff --git a/tests/Aetheria.Shared.Tests/MunitionPartsTests.cs b/tests/Aetheria.Shared.Tests/MunitionPartsTests.cs index 5f79e2664..0c7f60bd2 100644 --- a/tests/Aetheria.Shared.Tests/MunitionPartsTests.cs +++ b/tests/Aetheria.Shared.Tests/MunitionPartsTests.cs @@ -23,11 +23,11 @@ public sealed class MunitionPartsTests : IDisposable // both ranged stats. The column names are the retired fields'. private static readonly (string Design, float ThrustMin, float ThrustMax, float MissileVelocityMin, float MissileVelocityMax, float DodgeFrequency)[] Golden = { - ("GT 3K", 135, 325, 150, 300, 0.25f), - ("LRMM72", 400, 600, 200, 300, 0.25f), - ("SRMM72", 1600, 2400, 400, 600, 1f), - ("pswarm", 500, 2000, 400, 600, 1f), - ("scorched void policy", 500, 2000, 400, 600, 1f), + ("Guided Missile Launcher", 135, 325, 150, 300, 0.25f), + ("Long-Range Missile Rack", 400, 600, 200, 300, 0.25f), + ("Short-Range Missile Rack", 1600, 2400, 400, 600, 1f), + ("Swarm Rocket Pod", 500, 2000, 400, 600, 1f), + ("Incendiary Rocket Pod", 500, 2000, 400, 600, 1f), }; private static PerformanceStat Flat(float value) => new PerformanceStat { Min = value, Max = value }; @@ -208,13 +208,13 @@ public sealed class MunitionPartsTests : IDisposable [Fact] public void CatalogLoadRefusesAnIncompleteOrStrayMunitionPart() { - using (AetheriaStores.Open(Forged(d => d.Name == "GT 3K", _ => { }), registry: TestCatalog.Registry())) { } + using (AetheriaStores.Open(Forged(d => d.Name == "Guided Missile Launcher", _ => { }), registry: TestCatalog.Registry())) { } foreach (var part in AllParts) { - var path = Forged(d => d.Name == "GT 3K", d => d.Behaviors.RemoveAll(b => b.GetType() == part)); + var path = Forged(d => d.Name == "Guided Missile Launcher", d => d.Behaviors.RemoveAll(b => b.GetType() == part)); var refusal = Assert.ThrowsAny(() => AetheriaStores.Open(path, registry: TestCatalog.Registry())); - Assert.Contains("GT 3K", refusal.ToString()); + Assert.Contains("Guided Missile Launcher", refusal.ToString()); Assert.Contains(part.Name, refusal.ToString()); } @@ -245,13 +245,13 @@ public sealed class MunitionPartsTests : IDisposable // The Longinus's own gear: two drives, a core, a cockpit and a sensor, so the ship has thrusters, a sensor and a plume // for any munition contribution to be seen against. private static readonly (string Name, int X, int Y)[] ShipGear = - { ("Large Drive", 1, 0), ("Large Drive", 3, 0), ("Core Power", 2, 4), ("Cockpit 2x2", 2, 6), ("not if i see you first", 3, 10) }; + { ("Large Drive", 1, 0), ("Large Drive", 3, 0), ("Compact Reactor", 2, 4), ("Cockpit 2x2", 2, 6), ("Compact Sensor", 3, 10) }; - // A GT 3K fitted to a Longinus launcher hardpoint beside that gear, its lot's thruster role at the given quality. + // A Guided Missile Launcher fitted to a Longinus launcher hardpoint beside that gear, its lot's thruster role at the given quality. private static EquippedItem Fit(CultCache cache, float thrusterQuality, out Ship ship) { var hull = cache.GetByName("Longinus"); - var gt = cache.GetByName("GT 3K"); + var gt = cache.GetByName("Guided Missile Launcher"); var hardpoint = hull.Hardpoints.First(h => h.Type == HardpointType.Launcher && h.IsFilledBy(gt)); var settings = RestoredHullsTests.Settings(); var ledger = new ProvenanceLedger(); @@ -269,7 +269,7 @@ public sealed class MunitionPartsTests : IDisposable zone.Admit(ship, piloted: false); // Settle at the item's optimal temperature, as ConditionRatioTests does, so heat and wear read their identity and only // the role's quality moves a stat. - var item = ship.Equipment.Single(e => e.Data.Name == "GT 3K"); + var item = ship.Equipment.Single(e => e.Data.Name == "Guided Missile Launcher"); foreach (var cell in item.InsetShape.Coordinates) ship.Temperature[cell.x, cell.y] = gt.OptimalTemperature; item.UpdatePerformance(); item.UpdatePerformance(); @@ -280,7 +280,7 @@ public sealed class MunitionPartsTests : IDisposable public void PartsReadThroughTheItem() { using var cache = RestoredHullsTests.OpenCatalog(); - var design = cache.GetByName("GT 3K"); + var design = cache.GetByName("Guided Missile Launcher"); var poor = Fit(cache, .2f, out var poorShip); var good = Fit(cache, .9f, out _); @@ -324,7 +324,7 @@ public sealed class MunitionPartsTests : IDisposable public void ShipSumsIgnoreTheFittedMunitionParts() { using var cache = RestoredHullsTests.OpenCatalog(); - var design = cache.GetByName("GT 3K"); + var design = cache.GetByName("Guided Missile Launcher"); var part = Part(design); var item = Fit(cache, .5f, out var ship); for (var i = 0; i < 5; i++) ship.Update(.1f); diff --git a/tests/Aetheria.Shared.Tests/PickupTests.cs b/tests/Aetheria.Shared.Tests/PickupTests.cs index 61f590c51..d88ed5e53 100644 --- a/tests/Aetheria.Shared.Tests/PickupTests.cs +++ b/tests/Aetheria.Shared.Tests/PickupTests.cs @@ -107,14 +107,13 @@ public sealed class PickupTests : IDisposable return new Lab { Items = items, Zone = zone }; } - // A ship with a cargo bay, aimed along +x and (unless told otherwise) carrying the tractor beam. - private static Ship Spawn(Lab lab, float3 at, bool beam = true) + // A ship with `bays` cargo bays (bays are equipped before the zone admits the ship), aimed along +x and + // (unless told otherwise) carrying the tractor beam. + private static Ship Spawn(Lab lab, float3 at, bool beam = true, int bays = 1) { var hull = lab.Items.ItemData.RefOf(lab.Items.ItemData.GetByName("Skiff")); var ship = new Ship(lab.Items, lab.Zone, new EquippableItem { Data = hull, Durability = 1000000, Lot = lab.Lot++ }, new EntitySettings()); - var crate = lab.Make("Crate"); - Assert.True(ship.TryFindSpace(crate, out var cratePos)); - Assert.True(ship.TryEquip(crate, cratePos)); + for (var i = 0; i < bays; i++) Equip(ship, lab.Make("Crate")); if (beam) Equip(ship, lab.Make("Tractor")); lab.Zone.Admit(ship, piloted: false); ship.Position = at; @@ -404,6 +403,29 @@ public sealed class PickupTests : IDisposable Assert.True(block.Holder == null, "block is held"); } + // Either bay may be the full one: a selection that read only the first bay, or only the last, fails one orientation. + [Theory] + [InlineData(0)] + [InlineData(1)] + public void TheBeamTakesFromWhicheverBayCanStore(int fullBay) + { + using var bag = new CompositeDisposable(); + var lab = Build(Beam()); + var ship = Spawn(lab, float3(0, 0, 0), bays: 2); + Assert.Equal(2, ship.CargoBays.Count); + var freeBay = 1 - fullBay; + for (var i = 0; i < 16; i++) Assert.True(ship.CargoBays[fullBay].TryStore(lab.Make("Spare"))); + var ore = Drift(lab, 40, 0); + var events = Watch(ship, bag); + ship.TractorCommand = 1; + Tick(lab, 300, 1 / 60f); + Assert.Contains(events, e => e.Phase == GrabPhase.Started && e.Target.Equals(ore.Id)); + Assert.Contains(events, e => e.Phase == GrabPhase.Completed); + Assert.False(lab.Zone.FloatingItems.Contains(ore), "ore is still in the zone"); + Assert.Equal(16, ship.CargoBays[fullBay].Cargo.Count); + Assert.Single(ship.CargoBays[freeBay].Cargo); + } + [Fact] public void AnItemInTheBeamsFarCornerIsCollected() { diff --git a/tests/Aetheria.Shared.Tests/PiratesFactionCommandTests.cs b/tests/Aetheria.Shared.Tests/PiratesFactionCommandTests.cs index 1449973bd..7ccce7cc8 100644 --- a/tests/Aetheria.Shared.Tests/PiratesFactionCommandTests.cs +++ b/tests/Aetheria.Shared.Tests/PiratesFactionCommandTests.cs @@ -79,13 +79,13 @@ public sealed class PiratesFactionCommandTests : IDisposable var expected = new (string Design, string Name, string Description)[] { ("Autocannon", "๐Ÿซณ๐Ÿ”ซ", "Serial number filed off. Still shoots."), - ("Earp", "๐Ÿชฆ๐Ÿค ", "The previous owner had no further use for it."), - ("FastBlast+-", "๐Ÿงพ๐Ÿšซ", "Warranty void where prohibited, which is everywhere."), - ("6k Shooter", "๐ŸŽจ๐Ÿ™ˆ", "The logo underneath is somebody else's problem."), - ("scorched void policy", "๐Ÿ”ฅ", "Turns out we did start the fire after all."), + ("Long Slug Rifle", "๐Ÿชฆ๐Ÿค ", "The previous owner had no further use for it."), + ("Cell Blaster", "๐Ÿงพ๐Ÿšซ", "Warranty void where prohibited, which is everywhere."), + ("Slug Rifle", "๐ŸŽจ๐Ÿ™ˆ", "The logo underneath is somebody else's problem."), + ("Incendiary Rocket Pod", "๐Ÿ”ฅ", "Turns out we did start the fire after all."), ("Targeting Computer", "๐Ÿ‘€๐ŸŽฏ", "Somebody else's eyes. They still work."), ("Small Drive", "๐Ÿ”‘๐Ÿƒ๐Ÿ’จ", "Hotwired. Do not ask about the ignition."), - ("Store-All Plus", "๐Ÿ“ฆ๐Ÿคซ", "Contents not as declared."), + ("Cargo Bay", "๐Ÿ“ฆ๐Ÿคซ", "Contents not as declared."), }; Assert.Equal(expected.Select(e => e.Name).OrderBy(n => n, StringComparer.Ordinal), products.Select(p => p.Name).OrderBy(n => n, StringComparer.Ordinal)); foreach (var (designName, name, description) in expected) diff --git a/tests/Aetheria.Shared.Tests/PowerCurveTests.cs b/tests/Aetheria.Shared.Tests/PowerCurveTests.cs index e0e03b4ea..4a747dcaf 100644 --- a/tests/Aetheria.Shared.Tests/PowerCurveTests.cs +++ b/tests/Aetheria.Shared.Tests/PowerCurveTests.cs @@ -306,7 +306,7 @@ public sealed class PowerCurveTests : IDisposable // --- F6 (docs/stats-and-power-cut.md, Soul pass 2026-09-19) named PumpedHeat as a Radiator request field // --- (PowerRequest's own early-out gate reads it, the exact shape Soul reproduced against the shipped - // --- catalog's "OK Disperser": SOUL_RadiatorRequestDependsOnItsOwnGrantAndOscillates) and, at the time, + // --- catalog's "Heat Pump": SOUL_RadiatorRequestDependsOnItsOwnGrantAndOscillates) and, at the time, // --- refused a PowerSupply term there for exactly that reason. The nominal-request ruling above is what // --- actually fixes the oscillation (the request no longer reads the live grant at all), so this shape is // --- accepted now -- the six shipped records this ruling exists to make legal again include exactly this diff --git a/tests/Aetheria.Shared.Tests/RestoredHullsTests.cs b/tests/Aetheria.Shared.Tests/RestoredHullsTests.cs index 7bca4194a..217be696a 100644 --- a/tests/Aetheria.Shared.Tests/RestoredHullsTests.cs +++ b/tests/Aetheria.Shared.Tests/RestoredHullsTests.cs @@ -298,7 +298,7 @@ public sealed class RestoredHullsTests Assert.True(ship.TryEquip(gearItem, hardpoint.Position)); } - // A reactor: Victoire (one of Cut 1's own restored thrusters, docs/locomotion-cut.md's own note on it) + // A reactor: Racing Drive (one of Cut 1's own restored thrusters, docs/locomotion-cut.md's own note on it) // carries a real EnergyUsage draw unlike its four siblings, so an unpowered ship reads as though only // some fitting thrusters produce thrust -- an artifact of which design TryEquip's own hardpoint search // happens to land on, not of the restored content. Every hull here also has a Reactor hardpoint; a real @@ -952,7 +952,7 @@ public sealed class RestoredHullsTests // Every restored thruster's particle effect is Thruster 1.prefab, by the legacy record (soul-dump.txt). var thruster1Guid = GuidOf("Assets/Content/Prefabs/Thrusters/Thruster 1.prefab"); - var restoredThrusterNames = new[] { "deep space burnout", "Large Drive", "Victoire", "Small Drive", "Talaria", "RevvITup 2.0", "Medium Drive" }; + var restoredThrusterNames = new[] { "Burn Drive", "Large Drive", "Racing Drive", "Small Drive", "Rugged Drive", "High-Thrust Drive", "Medium Drive" }; foreach (var name in restoredThrusterNames) { var design = cache.GetAll().First(g => g.Name == name); diff --git a/tests/Aetheria.Shared.Tests/RolesBackfillCommandTests.cs b/tests/Aetheria.Shared.Tests/RolesBackfillCommandTests.cs index d2870112b..1f276c639 100644 --- a/tests/Aetheria.Shared.Tests/RolesBackfillCommandTests.cs +++ b/tests/Aetheria.Shared.Tests/RolesBackfillCommandTests.cs @@ -13,13 +13,13 @@ using Xunit; // oracle, since the command produced it. public sealed class RolesBackfillCommandTests : IDisposable { - private static readonly string[] Flattened = { "Autocannon", "LRMM72", "SRMM72", "Mine Launcher", "Large Drive", "Small Drive" }; + private static readonly string[] Flattened = { "Autocannon", "Long-Range Missile Rack", "Short-Range Missile Rack", "Mine Launcher", "Large Drive", "Small Drive" }; // Designs that shipped with non-flat stats whose Quality term named no role; the field is the stat to unname. private static readonly (string Design, string Field)[] Unnamed = { - ("DeathCluster", "Count"), ("Flak Gun", "Count"), ("GT 3K", "MinRange"), ("plight", "DamageSpread"), - ("MoveOnPro", "Modifier"), ("MoveOnPro Station Reactor", "Modifier"), + ("Cluster Cannon", "Count"), ("Flak Gun", "Count"), ("Guided Missile Launcher", "MinRange"), ("Lightning Projector", "DamageSpread"), + ("Muon Fusion Reactor", "Modifier"), ("Muon Fusion Station Reactor", "Modifier"), }; private readonly string _root = Path.Combine(Path.GetTempPath(), "roles-backfill-" + Guid.NewGuid().ToString("N")); @@ -165,7 +165,7 @@ public sealed class RolesBackfillCommandTests : IDisposable static Dictionary Exponents(EquippableItemData d) => CatalogRoleTests.StatsOf(d) .SelectMany(s => s.Stat.Terms.Where(t => t.Source == StatSource.Quality && !string.IsNullOrEmpty(t.Role)).Select(t => (s.Name, t.Exponent))) .ToDictionary(x => x.Name, x => x.Exponent); - var designs = new[] { "Autocannon", "LRMM72" }; + var designs = new[] { "Autocannon", "Long-Range Missile Rack" }; Dictionary> shipped; Dictionary> Read(EquippableItemData[] all) => all.Where(d => designs.Contains(d.Name)).ToDictionary(d => d.Name, Exponents); using (var catalog = RestoredHullsTests.OpenCatalog()) shipped = Read(catalog.GetAll().ToArray()); diff --git a/tests/Aetheria.Shared.Tests/RunStartTests.cs b/tests/Aetheria.Shared.Tests/RunStartTests.cs index 5edaa035b..0add09cf4 100644 --- a/tests/Aetheria.Shared.Tests/RunStartTests.cs +++ b/tests/Aetheria.Shared.Tests/RunStartTests.cs @@ -445,7 +445,7 @@ public sealed partial class RunStartTests : IDisposable } // The sold hardpoint gear the generator gives no home today: the production rule (LoadoutGenerator.HasHome over the hulls a - // product sells). The Smoke Test Hull, which no product sells, gives ChargeBlast SG and ChargeBlast+- no home; authoring a + // product sells). The Smoke Test Hull, which no product sells, gives Charged Scatter Blaster and Charged Blaster no home; authoring a // sold hull that takes one shows up here as a changed list. [Fact] public void TheSoldHardpointGearWithNoHomeToday() @@ -456,7 +456,7 @@ public sealed partial class RunStartTests : IDisposable .Where(design => sold.Contains(_cache.RefOf(design).Key) && design.Price > 0) .Where(design => !LoadoutGenerator.HasHome(design, hulls)) .Select(design => design.Name).OrderBy(name => name, StringComparer.Ordinal).ToArray(); - Assert.Equal(new[] { "CShot RainbowLite Lazer", "ChargeBlast SG", "ChargeBlast+-", "OK Disperser" }, homeless); + Assert.Equal(new[] { "Charged Blaster", "Charged Scatter Blaster", "Heat Pump", "Heavy Beam Laser" }, homeless); } // A sold weapon can be generated onto an NPC, whose combat state samples its damage at range, so every weapon a diff --git a/tests/Aetheria.Shared.Tests/ScenarioTests.cs b/tests/Aetheria.Shared.Tests/ScenarioTests.cs index 73097e9ab..11ce2ddf2 100644 --- a/tests/Aetheria.Shared.Tests/ScenarioTests.cs +++ b/tests/Aetheria.Shared.Tests/ScenarioTests.cs @@ -537,7 +537,7 @@ public sealed partial class RunStartTests runs.Add(Stage(Arena(false), new Scripted(false, stage => { - var ship = stage.Player(stage.Fit("Djinni", ("Census Fitted", int2(1, 6), ItemRotation.None), ("Store-All Plus", int2(3, 6), ItemRotation.None)), float2(0, 0)); + var ship = stage.Player(stage.Fit("Djinni", ("Census Fitted", int2(1, 6), ItemRotation.None), ("Cargo Bay", int2(3, 6), ItemRotation.None)), float2(0, 0)); stage.Cargo(ship, "Census Carried"); }))); Assert.Empty(UnsoldAndUnplaced(runs)); @@ -580,4 +580,19 @@ public sealed partial class RunStartTests Assert.Equal("/1", Assert.Single(settings.InputSettings.ActionBarInputs)); Assert.Equal((Quality.High, true), (settings.GraphicsSettings.NebulaQuality, settings.GraphicsSettings.ShowAsteroidsInMinimap)); } + + // A scenario's Brief is player text (the menu shows it): it names gear by what the catalog sells today. A name a rename retired, + // that no design or product carries any more, would send the player looking for gear that is gone. + [Fact] + public void NoScenarioBriefNamesRetiredGear() + { + var current = _cache.GetAll().Select(design => design.Name) + .Concat(_cache.GetAll().Select(product => product.Name)).ToHashSet(StringComparer.Ordinal); + var stale = new List(); + foreach (var scenario in EveryScenario) + foreach (var retired in Program.Renames.Select(row => row.Old).Where(name => !current.Contains(name))) + if (System.Text.RegularExpressions.Regex.IsMatch(scenario.Brief, @"(?); Assert.True(ReferenceEquals(view, r.Ship.VisibilitySources), "one view object per entity"); // not Assert.Same: its failure message formats the entity graph and aborts the test host - Assert.Throws(() => ((IDictionary) view)[r.Ship] = new Signature(SignatureChannel.Thermal, 1f, null)); + Assert.Throws(() => ((IDictionary) view)[r.Ship] = new Signature(SignatureChannel.Thermal, 1f, null, null)); } // ---- APlumeKeepsTheLargerBurn ---- diff --git a/tests/Aetheria.Shared.Tests/SmokeHullCommandTests.cs b/tests/Aetheria.Shared.Tests/SmokeHullCommandTests.cs index fdf3f9526..4084f377b 100644 --- a/tests/Aetheria.Shared.Tests/SmokeHullCommandTests.cs +++ b/tests/Aetheria.Shared.Tests/SmokeHullCommandTests.cs @@ -37,7 +37,7 @@ public sealed class SmokeHullCommandTests : IDisposable var hulls = db.Cache.GetAll().Where(h => h.Name == HullName).ToArray(); var keys = hulls.Select(h => db.Cache.RefOf(h).Key).ToArray(); var products = db.Cache.GetAll().Count(p => keys.Any(k => p.Design.Key.Equals(k))); - var fitted = new[] { "ChargeBlast SG", "Autocannon" } + var fitted = new[] { "Charged Scatter Blaster", "Autocannon" } .Select(name => db.Cache.GetAll().Single(d => d.Name == name)).ToArray(); return (hulls, db.Cache.GetAll().Single(h => h.Name == "Longinus"), fitted, products); } diff --git a/tests/Aetheria.Shared.Tests/SmokeHullScenarioTests.cs b/tests/Aetheria.Shared.Tests/SmokeHullScenarioTests.cs index 7cc2ef469..7425d4de3 100644 --- a/tests/Aetheria.Shared.Tests/SmokeHullScenarioTests.cs +++ b/tests/Aetheria.Shared.Tests/SmokeHullScenarioTests.cs @@ -12,7 +12,7 @@ public sealed partial class RunStartTests private static List WeaponMounts(Entity ship) => ship.Equipment.Where(item => item.Behaviors.OfType().Any()).ToList(); - // Weapon Feel: the player flies the Smoke Test Hull with ChargeBlast SG on the 2x2 Energy hardpoint, Autocannon + // Weapon Feel: the player flies the Smoke Test Hull with Charged Scatter Blaster on the 2x2 Energy hardpoint, Autocannon // on the 2x2 Ballistic hardpoint and a burst weapon; the bare hull ahead lies in every mount's arc. [Fact] public void WeaponFeelConditions() @@ -23,7 +23,7 @@ public sealed partial class RunStartTests Assert.Equal("Smoke Test Hull", _items.GetData(player.EquippedHull.EquippableItem).Name); EquippedItem Mount(string design) => Assert.Single(WeaponMounts(player), item => _items.GetData(item.EquippableItem).Name == design); - var charge = Mount("ChargeBlast SG"); + var charge = Mount("Charged Scatter Blaster"); var autocannon = Mount("Autocannon"); Assert.Equal((HardpointType.Energy, 2, 2), (charge.Hardpoint.Type, charge.Hardpoint.Shape.Width, charge.Hardpoint.Shape.Height)); Assert.Equal((HardpointType.Ballistic, 2, 2), (autocannon.Hardpoint.Type, autocannon.Hardpoint.Shape.Width, autocannon.Hardpoint.Shape.Height)); diff --git a/tests/Aetheria.Shared.Tests/SmokeRoundsCommandTests.cs b/tests/Aetheria.Shared.Tests/SmokeRoundsCommandTests.cs index 7dd04c2f1..40a47eec6 100644 --- a/tests/Aetheria.Shared.Tests/SmokeRoundsCommandTests.cs +++ b/tests/Aetheria.Shared.Tests/SmokeRoundsCommandTests.cs @@ -43,7 +43,7 @@ public sealed class SmokeRoundsCommandTests : IDisposable public void Dispose() => Directory.Delete(_root, true); - private (WeaponItemData[] Smoke, WeaponItemData Spectra, WeaponItemData ChargeBlast, int Products) Read() + private (WeaponItemData[] Smoke, WeaponItemData LightLaser, WeaponItemData ChargedScatterBlaster, int Products) Read() { var db = AetherDb.Open(root: _root); try @@ -51,7 +51,7 @@ public sealed class SmokeRoundsCommandTests : IDisposable var smoke = db.Cache.GetAll().Where(w => Names.Contains(w.Name)).ToArray(); var keys = smoke.Select(w => db.Cache.RefOf(w).Key).ToArray(); var products = db.Cache.GetAll().Count(p => keys.Any(k => p.Design.Key.Equals(k))); - return (smoke, db.Cache.GetAll().Single(w => w.Name == "Spectra"), db.Cache.GetAll().Single(w => w.Name == "ChargeBlast SG"), products); + return (smoke, db.Cache.GetAll().Single(w => w.Name == "Light Laser"), db.Cache.GetAll().Single(w => w.Name == "Charged Scatter Blaster"), products); } finally { db.Cache.Dispose(); } } @@ -85,7 +85,7 @@ public sealed class SmokeRoundsCommandTests : IDisposable Assert.Equal((WeaponFuse.Delayed, 4f, 2f, 2f), (Design("Smoke Delayed").Fuse.Value, Design("Smoke Delayed").BlastRadius.Value, Data("Smoke Delayed").Penetration.Min, Data("Smoke Delayed").Penetration.Max)); Assert.Equal((WeaponFuse.Proximity, 30f, 20f, 20f), (Design("Smoke Refused").Fuse.Value, Design("Smoke Refused").BlastRadius.Value, Data("Smoke Refused").Range.Min, Data("Smoke Refused").Range.Max)); - // Spectra clones are energy, 1x2, with the Spectra's own gear; the charged one is a ChargeBlast SG clone on its 2x2 energy mount. + // Light Laser clones are energy, 1x2, with the Light Laser's own gear; the charged one is a Charged Scatter Blaster clone on its 2x2 energy mount. foreach (var name in new[] { "Smoke Proximity", "Smoke Delayed", "Smoke Refused", "Smoke Refused Beam" }) Assert.Equal((spectra.Hardpoint, spectra.Shape.Width, spectra.Shape.Height, spectra.Mass), (Design(name).Hardpoint, Design(name).Shape.Width, Design(name).Shape.Height, Design(name).Mass)); Assert.Equal((chargeBlast.Hardpoint, chargeBlast.Shape.Width, chargeBlast.Shape.Height), (Design("Smoke Refused Charge").Hardpoint, 2, 2)); diff --git a/tests/Aetheria.Shared.Tests/SmokeRoundsScenarioTests.cs b/tests/Aetheria.Shared.Tests/SmokeRoundsScenarioTests.cs index bfd412452..234cd8e28 100644 --- a/tests/Aetheria.Shared.Tests/SmokeRoundsScenarioTests.cs +++ b/tests/Aetheria.Shared.Tests/SmokeRoundsScenarioTests.cs @@ -34,7 +34,7 @@ public sealed partial class RunStartTests var proximity = Carried(player, "Smoke Proximity"); var delayed = Carried(player, "Smoke Delayed"); - var direct = Carried(player, "DeathCluster"); + var direct = Carried(player, "Cluster Cannon"); Assert.Null(player.Target.Value.Entity); // The bare hull is on the initial aim line, ahead, and inside every weapon mount's arc. diff --git a/tests/Aetheria.Shared.Tests/SmokeRoundsSteppedTests.cs b/tests/Aetheria.Shared.Tests/SmokeRoundsSteppedTests.cs index fcacfd43d..e883c738d 100644 --- a/tests/Aetheria.Shared.Tests/SmokeRoundsSteppedTests.cs +++ b/tests/Aetheria.Shared.Tests/SmokeRoundsSteppedTests.cs @@ -20,11 +20,11 @@ public sealed partial class RunStartTests return (arena, staged); } - // Fused Rounds, nothing selected, the player aiming down the bare hull ahead. The DeathCluster is the control: it fires + // Fused Rounds, nothing selected, the player aiming down the bare hull ahead. The Cluster Cannon is the control: it fires // in this arena, so a fused weapon that does not is not a harness that cannot fire. A fused round flies slowly enough // to be in the air when the direct weapon kills the fragile hull (check A.3) and bursts on the first hull on the aim line. [Theory] - [InlineData("DeathCluster")] + [InlineData("Cluster Cannon")] [InlineData("Smoke Proximity")] [InlineData("Smoke Delayed")] public void EveryWeaponAboardFiresInTheSteppedFusedRoundsArena(string design) @@ -42,7 +42,7 @@ public sealed partial class RunStartTests for (var i = 0; i < 60; i++) arena.Update(SteppedDt); Assert.True(fired.Count > 0, $"{design} fired nothing in 3 s; the ship's reactor is {(player.PowerBus.TotalGeneration > 0f ? "running" : "down")}"); - if (design == "DeathCluster") return; + if (design == "Cluster Cannon") return; var (at, burst) = committed.First(); Assert.Equal(ShotResult.Burst, burst.Result); Assert.True(burst.HasBurstPoint); @@ -51,7 +51,7 @@ public sealed partial class RunStartTests Assert.InRange(at + burst.ArrivalIn - fired[0], 1f, 5f); // in the air for seconds: not resolved in its firing tick, not minutes of flight } - // Check A.3 flown: the fragile hull is selected, a Smoke Proximity round is fired at it and the DeathCluster kills it + // Check A.3 flown: the fragile hull is selected, a Smoke Proximity round is fired at it and the Cluster Cannon kills it // before the round lands, so the round never bursts. [Fact] public void TheDirectWeaponKillsTheFragileHullWhileASmokeRoundIsStillInTheAir() @@ -71,7 +71,7 @@ public sealed partial class RunStartTests }); WeaponOf(proximity).Activate(); - WeaponOf(Carried(player, "DeathCluster")).Activate(); + WeaponOf(Carried(player, "Cluster Cannon")).Activate(); float? deadAt = null; for (var i = 0; i < 120 && landed == null; i++) { diff --git a/tests/Aetheria.Shared.Tests/TargetingSystemTests.cs b/tests/Aetheria.Shared.Tests/TargetingSystemTests.cs index 603d5a138..3415014c3 100644 --- a/tests/Aetheria.Shared.Tests/TargetingSystemTests.cs +++ b/tests/Aetheria.Shared.Tests/TargetingSystemTests.cs @@ -168,7 +168,7 @@ public sealed class TargetingSystemTests : IDisposable Assert.False(observer.TrySelectTargetItem(weapon)); // nothing seen yet Assert.Null(observer.TargetItem.Value); - observer.RecordReveal(target, weapon, SignatureChannel.LaunchFlash); + observer.RecordReveal(target, weapon, SignatureChannel.LaunchFlash, weapon.Data); Assert.True(observer.TrySelectTargetItem(weapon)); Assert.Same(weapon, observer.TargetItem.Value); Assert.Same(weapon, observer.ResolvedTargetItem); @@ -196,7 +196,7 @@ public sealed class TargetingSystemTests : IDisposable var observer = BuildObserver(items, target.Zone); observer.SetTarget(target); - observer.RecordReveal(target, weapon, SignatureChannel.LaunchFlash); + observer.RecordReveal(target, weapon, SignatureChannel.LaunchFlash, weapon.Data); Assert.True(FireControl.IsRevealed(observer, weapon)); Assert.False(FireControl.IsRevealed(observer, wideItem)); @@ -230,8 +230,8 @@ public sealed class TargetingSystemTests : IDisposable var (items, target, weapon, wideItem, _, _) = BuildTarget(TestSettings()); var observer = BuildObserver(items, target.Zone); observer.SetTarget(target); - observer.RecordReveal(target, weapon, SignatureChannel.LaunchFlash); - observer.RecordReveal(target, wideItem, SignatureChannel.LaunchFlash); + observer.RecordReveal(target, weapon, SignatureChannel.LaunchFlash, weapon.Data); + observer.RecordReveal(target, wideItem, SignatureChannel.LaunchFlash, wideItem.Data); Assert.True(observer.TrySelectTargetItem(weapon)); weapon.EquippableItem.Durability = 0f; @@ -250,7 +250,7 @@ public sealed class TargetingSystemTests : IDisposable var (items, target, weapon, _, _, _) = BuildTarget(TestSettings()); var observer = BuildObserver(items, target.Zone); observer.SetTarget(target); - observer.RecordReveal(target, weapon, SignatureChannel.LaunchFlash); + observer.RecordReveal(target, weapon, SignatureChannel.LaunchFlash, weapon.Data); Assert.True(FireControl.IsRevealed(observer, weapon)); target.Deactivate(); // an active ship refuses to unequip @@ -269,7 +269,7 @@ public sealed class TargetingSystemTests : IDisposable var (items, target, weapon, _, _, _) = BuildTarget(TestSettings()); var observer = BuildObserver(items, target.Zone); observer.EntityInfoGathered[target] = .5f; // below TargetGearInfoThreshold (.9) - observer.RecordReveal(target, weapon, SignatureChannel.LaunchFlash); + observer.RecordReveal(target, weapon, SignatureChannel.LaunchFlash, weapon.Data); Assert.True(FireControl.IsRevealed(observer, weapon)); weapon.EquippableItem.Durability = 0f; diff --git a/tests/Aetheria.Shared.Tests/ThrustAllocationTests.cs b/tests/Aetheria.Shared.Tests/ThrustAllocationTests.cs index e888b869e..068ec2f40 100644 --- a/tests/Aetheria.Shared.Tests/ThrustAllocationTests.cs +++ b/tests/Aetheria.Shared.Tests/ThrustAllocationTests.cs @@ -14,7 +14,7 @@ using float3 = CultMath.float3; // Flight control allocates thrust (ruling flight-control-allocates-thrust): Ship.Update hands the intent and every // thruster's live column to one ThrustAllocator, and a ship flies on what that answers. These tests fly the Duel's -// Longinus (two mismatched Large Drives forward, a Talaria on each flank) through the real Ship.Update; a test that reads +// Longinus (two mismatched Large Drives forward, a Rugged Drive on each flank) through the real Ship.Update; a test that reads // velocity steps the arena, because the zone places the orbits that Ship.Update alone leaves stacked at the spawn. public sealed partial class RunStartTests { @@ -307,7 +307,7 @@ public sealed partial class RunStartTests // Rulings evasion-is-unpredictability and turn-authority-full: the Longinus's Large Drives count toward its turn, // because the envelope is summed over every live column. Its clockwise is the sum of the positive yaw of its columns - // at live thrust, and exceeds the Talaria's own by the drives'. + // at live thrust, and exceeds the Rugged Drive's own by the drives'. [Fact] public void TheEnvelopeCountsTheMains() { @@ -317,7 +317,7 @@ public sealed partial class RunStartTests for (var tick = 0; tick < 10; tick++) player.Update(AllocDt); var thrusters = player.GetBehaviors().Where(t => t.Item.Active.Value).ToArray(); var drives = thrusters.Where(t => t.Item.Data.Name == "Large Drive").ToArray(); - var flanks = thrusters.Where(t => t.Item.Data.Name == "Talaria").ToArray(); + var flanks = thrusters.Where(t => t.Item.Data.Name == "Rugged Drive").ToArray(); Assert.Equal(2, drives.Length); Assert.Equal(2, flanks.Length); float Clockwise(IEnumerable of) => of.Sum(t => max(t.Column(t.Thrust).z, 0f)); diff --git a/tests/Aetheria.Shared.Tests/ThrustAllocatorTests.cs b/tests/Aetheria.Shared.Tests/ThrustAllocatorTests.cs index 228b2e630..8dae60444 100644 --- a/tests/Aetheria.Shared.Tests/ThrustAllocatorTests.cs +++ b/tests/Aetheria.Shared.Tests/ThrustAllocatorTests.cs @@ -18,13 +18,13 @@ public class ThrustAllocatorTests static float3 Col(float starboard, float forward, float yawDeg) => new(starboard, forward, yawDeg * Deg); - // TA3, the Duel Longinus: two mismatched drives (0, 1) and two Talarias (2 clockwise, 3 counter-clockwise). + // TA3, the Duel Longinus: two mismatched drives (0, 1) and two Rugged Drives (2 clockwise, 3 counter-clockwise). static float3[] Duel() => new[] { Col(0, 53.94f, 49.24f), Col(0, 61.19f, -55.86f), Col(29.08f, 0, 166.26f), Col(-21.80f, 0, -124.63f), }; - // The clockwise Talaria lost. + // The clockwise Rugged Drive lost. static float3[] DamagedDuel() => new[] { Col(0, 53.94f, 49.24f), Col(0, 61.19f, -55.86f), default, Col(-21.80f, 0, -124.63f), @@ -137,7 +137,7 @@ public class ThrustAllocatorTests [Fact] public void TheOnsetMovesWithTheColumns() { - // Clockwise Talaria lost: the drive serves a clockwise turn from the first touch. + // Clockwise Rugged Drive lost: the drive serves a clockwise turn from the first touch. var damaged = DamagedDuel(); var small = Solve(damaged, 0, 0, .01f); Assert.True(small[0] > 0, $"drive {small[0]}"); @@ -145,7 +145,7 @@ public class ThrustAllocatorTests var full = Solve(damaged, 0, 0, 1f); Assert.True(MathF.Abs(YawDeg(damaged, full) - 49.24f) <= 49.24f * 1e-3f, $"yaw {YawDeg(damaged, full)}"); - // Clockwise Talaria halved: the onset is its new share of the clockwise extreme. + // Clockwise Rugged Drive halved: the onset is its new share of the clockwise extreme. var halved = Duel(); halved[2] = halved[2] * .5f; var onset = halved[2].z / Extremes(halved, 2).plus; diff --git a/tools/AetherDb/Program.cs b/tools/AetherDb/Program.cs index fec27f55f..c69f247c5 100644 --- a/tools/AetherDb/Program.cs +++ b/tools/AetherDb/Program.cs @@ -46,12 +46,14 @@ public static class Program case "smoke-rounds": return SmokeRoundsCatalog(args.Contains("apply")); case "roles-backfill": return RolesBackfill(args.Contains("apply")); case "consumables-first-set": return ConsumablesFirstSetCatalog(args.Contains("apply")); + case "launch-suppressor": return LaunchSuppressorCatalog(args.Contains("apply")); case "pirates-faction": Console.OutputEncoding = new System.Text.UTF8Encoding(false); return PiratesFaction(args.Contains("apply")); case "verse-grammar": return VerseGrammarCommand.Run(args.Contains("apply")); + case "generic-designs": return GenericDesigns(args.Contains("apply")); default: - Console.WriteLine("commands: census, factions, station-fit, hardpoint-fit, loadout [seed], save, settings, settings-dump, dangling [clear ]... [apply], shield-migrate [apply], brownout-migrate [apply], roles-migrate [apply], firing-arc-migrate [apply], targeting-catalog [apply], targeting-catalog-6c [apply], targeting-catalog-6d [apply], ship-authoring create|inspect|validate|compose, field-kinds [apply], mine-launcher [apply], smoke-hull [apply], smoke-rounds [apply], roles-backfill [apply], pd-gear [apply], consumables-first-set [apply], pirates-faction [apply], verse-grammar [apply]"); + Console.WriteLine("commands: census, factions, station-fit, hardpoint-fit, loadout [seed], save, settings, settings-dump, dangling [clear ]... [apply], shield-migrate [apply], brownout-migrate [apply], roles-migrate [apply], firing-arc-migrate [apply], targeting-catalog [apply], targeting-catalog-6c [apply], targeting-catalog-6d [apply], ship-authoring create|inspect|validate|compose, field-kinds [apply], mine-launcher [apply], smoke-hull [apply], smoke-rounds [apply], roles-backfill [apply], pd-gear [apply], consumables-first-set [apply], launch-suppressor [apply], pirates-faction [apply], verse-grammar [apply], generic-designs [apply]"); return 1; } } @@ -233,7 +235,7 @@ public static class Program { ["EnergyDraw"] = "heating element", ["Heat"] = "heating element", }, - ["PotaT+-"] = new Dictionary + ["Capacitor"] = new Dictionary { ["Capacity"] = "storage cell", ["Efficiency"] = "converter", }, @@ -405,7 +407,7 @@ public static class Program private static (float Mean, float Dev, string Basis) AuthorProductRole(AetherDb db, FactionProductData product, string designName, string role) { var maker = db.Cache.Get(product.Manufacturer)?.Name; - if (designName == "Arctica" && maker == "Alakrita" && role == "fins") + if (designName == "Adaptive Radiator" && maker == "Alakrita" && role == "fins") return (.78f, .07f, "lore: Alakrita brands on heat efficiency (item-provenance-target.md)"); var hash = StableHash($"{product.Name}|{role}"); @@ -1174,10 +1176,10 @@ public static class Program var newDesigns = new (GearData Design, string ProductName, Faction Maker, string ProductDescription, (string Role, float Mean, float Dev)[] Roles)[] { (targetingComputer, "LockOn", FactionByShortName("NiteLife"), - "Keeps the lights on your target. (new text)", + "Keeps the lights on your target.", new[] { ("processor", .55f, .15f), ("array", .5f, .16f) }), (fireControlArray, "LockOn Pro", FactionByShortName("NiteLife"), - "Same promise, sharper lock. (new text)", + "Same promise, sharper lock.", new[] { ("processor", .72f, .12f), ("array", .68f, .13f) }), }; @@ -1190,17 +1192,17 @@ public static class Program // outside this cut's brief). var existingDesigns = new (string DesignName, string ProductName, Faction Maker, string ProductDescription, (string Role, float Mean, float Dev)[] Roles)[] { - ("plight", "DragOnBreath", FactionByShortName("Lucent"), - "The subsidiary plight's own description already namechecks: DragOnBreath, a Lucent Media property.", + ("Lightning Projector", "DragOnBreath", FactionByShortName("Lucent"), + "Chain lightning has your enemies chain smoking while you enjoy a relaxing DragOnBreath vapepop, now available in 17! flavours (manufactured by DragOnBreath, a subsidary of Lucent Media)", new[] { ("focusing array", .7f, .13f), ("power coupling", .55f, .15f) }), - ("pswarm", "Leonid", FactionByShortName("AU"), + ("Swarm Rocket Pod", "Leonid", FactionByShortName("AU"), "A rain of pain that falls mainly on space planes.", new[] { ("guidance system", .65f, .14f), ("thruster", .63f, .15f), ("warhead", .7f, .13f) }), - ("Core Power", "Steadfast", FactionByShortName("R&D"), - "Rated for continuous operation. \"Continuous\" does not imply \"uninterrupted.\" (new text)", + ("Compact Reactor", "Steadfast", FactionByShortName("R&D"), + "It gets the job done, but that's all. Rated for continuous operation. \"Continuous\" does not imply \"uninterrupted.\"", new[] { ("core", .5f, .12f), ("regulator", .5f, .12f) }), ("Large Drive", "True North", FactionByShortName("Lightsail"), - "Gets your cargo there. Getting you there is your problem. (new text)", + "Gets your cargo there. Getting you there is your problem.", Array.Empty<(string, float, float)>()), }; @@ -1312,16 +1314,16 @@ public static class Program var newProducts = new (GearData Design, string ProductName, Faction Maker, string ProductDescription, (string Role, float Mean, float Dev)[] Roles)[] { (targetingComputer, "Panopticon", FactionByShortName("Finch"), - "Sees everything, judges nothing. Well, mostly nothing. (new text)", + "Sees everything, judges nothing. Well, mostly nothing.", new[] { ("processor", .5f, .13f), ("array", .58f, .12f) }), (fireControlArray, "Panopticon Prime", FactionByShortName("Finch"), - "The upgrade nobody at Finch will admit they needed until they had it. (new text)", + "The upgrade nobody at Finch will admit they needed until they had it.", new[] { ("processor", .68f, .11f), ("array", .75f, .10f) }), (targetingComputer, "ClapBack", FactionByShortName("Lucent"), - "Your target won't clock it until the killcam. (new text)", + "Your target won't clock it until the killcam.", new[] { ("processor", .6f, .16f), ("array", .48f, .15f) }), (fireControlArray, "ClapBack Ultra", FactionByShortName("Lucent"), - "Now with main-character energy built in. (new text)", + "Now with main-character energy built in.", new[] { ("processor", .78f, .14f), ("array", .65f, .13f) }), }; @@ -1527,7 +1529,7 @@ public static class Program static void Set(PerformanceStat stat, float min, float max) { stat.Min = min; stat.Max = max; } static void Track(WeaponData data, float rate) => data.Tracking = new PerformanceStat { Min = rate, Max = rate, Terms = new List() }; - var gun = Copy(Template("ClearPath"), designNames[0], "Close-in defence gun: a hose of light rounds.", 40f, 80000, 60f, 1, 1, WeaponModifiers.RapidFire); + var gun = Copy(Template("Light Machine Gun"), designNames[0], "Close-in defence gun: a hose of light rounds.", 40f, 80000, 60f, 1, 1, WeaponModifiers.RapidFire); var gunData = gun.Behaviors.OfType().Single(); Set(gunData.Damage, 1.5f, 4f); Set(gunData.Range, 300f, 550f); Set(gunData.MinRange, 0f, 0f); Set(gunData.Cooldown, .06f, .025f); Set(gunData.Count, 1f, 1f); Set(gunData.Spread, 1f, .3f); @@ -1535,14 +1537,14 @@ public static class Program gunData.AmmoType = db.Cache.RefOf(ammunition); gunData.MagazineSize = 250; gunData.ReloadTime = 3f; Track(gunData, 40f); - var laser = Copy(Template("Spectra"), designNames[1], "Close-in defence beam: quick, light, instant.", 30f, 110000, 30f, 1, 1, Template("Spectra").WeaponModifiers); + var laser = Copy(Template("Light Laser"), designNames[1], "Close-in defence beam: quick, light, instant.", 30f, 110000, 30f, 1, 1, Template("Light Laser").WeaponModifiers); var laserData = laser.Behaviors.OfType().Single(); Set(laserData.Damage, 5f, 12f); Set(laserData.Range, 400f, 750f); Set(laserData.MinRange, 0f, 0f); Set(laserData.Cooldown, .2f, .1f); Set(laserData.Count, 1f, 1f); Set(laserData.Spread, .05f, 0f); Set(laserData.Velocity, 0f, 0f); Set(laserData.Energy, 6f, 10f); Set(laserData.Heat, 300f, 150f); Set(laserData.Visibility, 300f, 100f); Track(laserData, 40f); - var flak = Copy(Template("DeathCluster"), designNames[2], "Small flak gun: a short-range pellet volley.", 120f, 180000, 80f, 1, 2, WeaponModifiers.Cluster); + var flak = Copy(Template("Cluster Cannon"), designNames[2], "Small flak gun: a short-range pellet volley.", 120f, 180000, 80f, 1, 2, WeaponModifiers.Cluster); var flakData = flak.Behaviors.OfType().Single(); Set(flakData.Damage, 30f, 70f); Set(flakData.Count, 6f, 8f); Set(flakData.Range, 350f, 800f); Set(flakData.MinRange, 0f, 0f); Set(flakData.Cooldown, .6f, .35f); Set(flakData.Spread, 4f, 2f); Set(flakData.Velocity, 900f, 1300f); @@ -1713,11 +1715,11 @@ public static class Program } static PerformanceStat Fixed(float value) => new PerformanceStat { Min = value, Max = value, Terms = new List() }; - var proximity = Copy("Spectra", names[0], "A Spectra that bursts by proximity, blast 8. For scenarios; no one builds it.", WeaponFuse.Proximity, 8f); - var delayed = Copy("Spectra", names[1], "A Spectra that bursts after two cells of metal, blast 4. For scenarios; no one builds it.", WeaponFuse.Delayed, 4f); - var refused = Copy("Spectra", names[2], "A Spectra whose blast is wider than its reach, so it never fires. For scenarios; no one builds it.", WeaponFuse.Proximity, 30f); - var charge = Copy("ChargeBlast SG", names[4], "A ChargeBlast SG whose blast is wider than its reach, so it never charges. For scenarios; no one builds it.", WeaponFuse.Proximity, 30f); - var beam = Copy("Spectra", names[3], "A constant beam whose blast is wider than its reach, so it never starts. For scenarios; no one builds it.", WeaponFuse.Proximity, 30f); + var proximity = Copy("Light Laser", names[0], "A Light Laser that bursts by proximity, blast 8. For scenarios; no one builds it.", WeaponFuse.Proximity, 8f); + var delayed = Copy("Light Laser", names[1], "A Light Laser that bursts after two cells of metal, blast 4. For scenarios; no one builds it.", WeaponFuse.Delayed, 4f); + var refused = Copy("Light Laser", names[2], "A Light Laser whose blast is wider than its reach, so it never fires. For scenarios; no one builds it.", WeaponFuse.Proximity, 30f); + var charge = Copy("Charged Scatter Blaster", names[4], "A Charged Scatter Blaster whose blast is wider than its reach, so it never charges. For scenarios; no one builds it.", WeaponFuse.Proximity, 30f); + var beam = Copy("Light Laser", names[3], "A constant beam whose blast is wider than its reach, so it never starts. For scenarios; no one builds it.", WeaponFuse.Proximity, 30f); // The Smoke Test Hull carries one 2x2 reactor. A Spectra's 20-40 energy a shot at its cadence is more than that reactor makes, // so two of them overload it, it overheats and shuts down within a second, and nothing aboard fires again (Fused Rounds, @@ -1887,8 +1889,8 @@ public static class Program // no non-flat stat reads; DeathCluster, Flak Gun, GT 3K, plight and the two MoveOnPros because each had a non-flat stat // whose Quality term named no role (CB-R1: each non-flat stat reads exactly one declared role). Idempotent: a design with // no flat mapped stat and no unnamed one is left alone, a product with a role is left alone. Dry run unless passed "apply". - private static readonly string[] BackfillDesigns = { "Autocannon", "LRMM72", "SRMM72", "Mine Launcher", "Large Drive", "Small Drive", - "DeathCluster", "Flak Gun", "GT 3K", "plight", "MoveOnPro", "MoveOnPro Station Reactor" }; + private static readonly string[] BackfillDesigns = { "Autocannon", "Long-Range Missile Rack", "Short-Range Missile Rack", "Mine Launcher", "Large Drive", "Small Drive", + "Cluster Cannon", "Flak Gun", "Guided Missile Launcher", "Lightning Projector", "Muon Fusion Reactor", "Muon Fusion Station Reactor" }; // Stats the backfill names but never ranges: a shot count is whole, and which way a launcher's MinRange should fall is // each design's own call (GT 3K authors it as a cost already). @@ -2052,13 +2054,13 @@ public static class Program var rebrands = new (string Design, string Name, string Description)[] { ("Autocannon", "\U0001FAF3\U0001F52B", "Serial number filed off. Still shoots."), - ("Earp", "\U0001FAA6\U0001F920", "The previous owner had no further use for it."), - ("FastBlast+-", "\U0001F9FE\U0001F6AB", "Warranty void where prohibited, which is everywhere."), - ("6k Shooter", "\U0001F3A8\U0001F648", "The logo underneath is somebody else's problem."), - ("scorched void policy", "\U0001F525", "Turns out we did start the fire after all."), + ("Long Slug Rifle", "\U0001FAA6\U0001F920", "The previous owner had no further use for it."), + ("Cell Blaster", "\U0001F9FE\U0001F6AB", "Warranty void where prohibited, which is everywhere."), + ("Slug Rifle", "\U0001F3A8\U0001F648", "The logo underneath is somebody else's problem."), + ("Incendiary Rocket Pod", "\U0001F525", "Turns out we did start the fire after all."), ("Targeting Computer", "\U0001F440\U0001F3AF", "Somebody else's eyes. They still work."), ("Small Drive", "\U0001F511\U0001F3C3\U0001F4A8", "Hotwired. Do not ask about the ignition."), - ("Store-All Plus", "\U0001F4E6\U0001F92B", "Contents not as declared."), + ("Cargo Bay", "\U0001F4E6\U0001F92B", "Contents not as declared."), }; var products = rebrands.Select(r => @@ -2247,4 +2249,371 @@ public static class Program return 0; } + // generic-designs: the rename, brand and product-text tables (map: "Generic design names", "Content: brands, flavour and + // functional text"). Public so the command test reads the same rows the command writes. + public const string AuthoringNote = " (new text)"; + + public static readonly (string Old, string Generic, string Functional)[] Renames = + { + ("ClearPath", "Light Machine Gun", "Light ballistic hose: many small rounds at short range."), + ("6k Shooter", "Slug Rifle", "Single heavy slugs, fired as fast as the trigger."), + ("Earp", "Long Slug Rifle", "A lighter slug rifle with the longest ballistic reach."), + ("DeathCluster", "Cluster Cannon", "Medium shotgun: a heavy volley of pellets."), + ("pretty pretty bang bang", "Charged Scattergun", "Ballistic shotgun that charges for a heavier volley."), + ("Spectra", "Light Laser", "The lightest beam: low damage, quick cycle, long reach."), + ("FastBlast+-", "Cell Blaster", "Rapid energy bursts fed by cells that cut its reactor draw."), + ("ColdFire", "Long Laser", "Heavy small beam: slow, hard-hitting, long reach."), + ("CShot RainbowLite Lazer", "Heavy Beam Laser", "The heaviest beam: nine cells, enormous damage and reach."), + ("ChargeBlast+-", "Charged Blaster", "One charged knockout shot."), + ("ChargeBlast SG", "Charged Scatter Blaster", "Charged energy shotgun."), + ("plight", "Lightning Projector", "Charged chain lightning."), + ("GT 3K", "Guided Missile Launcher", "Fires guided missiles."), + ("LRMM72", "Long-Range Missile Rack", "Large missile rack for long engagements."), + ("SRMM72", "Short-Range Missile Rack", "Extra-large rack of short-range missiles."), + ("pswarm", "Swarm Rocket Pod", "Dumbfire rockets in a swarm."), + ("scorched void policy", "Incendiary Rocket Pod", "Incendiary dumbfire rockets."), + ("Arctica", "Adaptive Radiator", "Radiator whose output scales widely with conditions."), + ("Iapyx", "Radiator", "Standard two-cell radiator."), + ("Skiron", "Long Radiator", "Four-cell radiator with a large surface."), + ("OK Disperser", "Heat Pump", "Moves heat to where it can be shed."), + ("cold like my heart", "Cryogenic Heat Pump", "Heavy heat pump that drives temperatures far down."), + ("Core Power", "Compact Reactor", "Small reactor."), + ("Manhattan", "Heavy Reactor", "Large three-by-three reactor."), + ("Notorious", "High-Yield Reactor", "Large reactor with a wide output range."), + ("Vulcan", "Ring Reactor", "Ring-shaped reactor, four by four."), + ("MoveOnPro", "Muon Fusion Reactor", "Compact fusion reactor that draws a reservoir."), + ("Core Power Station Reactor", "Station Reactor", "A reactor sized for a station's core."), + ("Manhattan Station Reactor", "Heavy Station Reactor", "A heavy reactor sized for a station's core."), + ("Notorious Station Reactor", "High-Yield Station Reactor", "A high-yield reactor sized for a station's core."), + ("Vulcan Station Reactor", "Ring Station Reactor", "A ring reactor sized for a station's core."), + ("MoveOnPro Station Reactor", "Muon Fusion Station Reactor", "A muon fusion reactor sized for a station's core."), + ("RevvITup 2.0", "High-Thrust Drive", "Large drive: huge thrust, little torque."), + ("deep space burnout", "Burn Drive", "Large drive that runs very hot."), + ("Talaria", "Rugged Drive", "Two-cell working drive."), + ("Victoire", "Racing Drive", "Feather-light two-cell drive with extreme response."), + ("The Bat", "Sensor Array", "Two-by-two long-range sensor array."), + ("not if i see you first", "Compact Sensor", "One-cell sensor."), + ("PotaT+-", "Capacitor", "Stores charge for burst draw."), + ("SafeStuff II", "Secure Cargo Bay", "Three-by-three secured hold."), + ("Store-All Enterprise Edition", "Large Cargo Bay", "Six-by-six hold."), + ("Store-All Plus", "Cargo Bay", "Two-by-two hold."), + ("Store-All Plus Mini", "Small Cargo Bay", "One-cell hold."), + }; + + public static readonly (string Design, string Maker, string OldProduct, string Brand, string Text, string DesignText)[] Brands = + { + ("Autocannon", "Zhestokost", "Autocannon", "Hammerfall", + "The rounds fall steadily, and they do not stop until the work is done.", + "Belt-fed cannon: a steady stream of rounds at long reach."), + ("Cockpit 2x2", "Lightsail", "Cockpit 2x2", "Wheelhouse", + "Every Lightsail captain's favourite chair. The view comes standard.", + "Two-by-two crew cockpit."), + ("Industrial Thermostatic Heater", "Lightsail", "Industrial Thermostatic Heater", "Hearth", + "A warm hold, a warm crew, and a warm welcome at the cold end of the run.", + "Turns reactor power into heat to keep the hull warm."), + ("Medium Drive", "Lightsail", "Medium Drive", "Steady Haul", + "Keeps you going and going and going...", + "Mid-sized working drive."), + ("Small Drive", "Lightsail", "Small Drive", "Short Hop", + "Dock to dock, and not a metre further than the manifest says.", + "Small working drive."), + ("Turret Control Module", "AU", "Turret Control Module", "Watchtower", + "Point it at the dark and get back to work. It keeps watch.", + "Control module for a station turret."), + ("Medium Docking Bay", "AU", "Medium Docking Bay", "Open Berth", + "Room for a friend, a customer or a tug. We don't ask which.", + "Docking bay for mid-sized ships."), + ("Mine Launcher", "DME", "Mine Launcher", "parting gift", + "we were never here/ but we left you something/ it's waiting where we were", + "Lays a drifting proximity mine that arms after two seconds."), + }; + + public static readonly (string Product, string Maker, string Text)[] ProductTexts = + { + ("Victoire", "Alakrita", + "The most responsive thruster on the market, for the most irresponsible of racing pilots."), + ("DragOnBreath", "Lucent", + "Chain lightning has your enemies chain smoking while you enjoy a relaxing DragOnBreath vapepop, now available in 17! flavours (manufactured by DragOnBreath, a subsidary of Lucent Media)"), + ("Steadfast", "R&D", + "It gets the job done, but that's all. Rated for continuous operation. \"Continuous\" does not imply \"uninterrupted.\""), + ("Steadfast Station", "R&D", + "Rated for continuous operation at station scale. The fine print scales too."), + ("Manhattan Station", "Zhestokost", + "A fortress needs a furnace. This is the furnace."), + ("Notorious Station", "Lucent", + "The biggest reaction in the system, and everyone docked here will hear about it."), + ("Vulcan Station", "AU", + "Keeps the lights on and the forges hot."), + ("MoveOnPro Station", "NiteLife", + "The club never closes. Neither does the reactor."), + ("LRMM72", "R&D", + "Engages targets at up to seventy-two kilometres!* *In a vacuum, against a cooperative target."), + ("SRMM72", "DME", + "seventy-two reasons/ to keep your distance/ all of them leaving at once"), + ("Iapyx", "AU", + "Two cells of honest fin. Bolt it on and forget it's there."), + ("Skiron", "AU", + "When the job runs hot, run a bigger fin."), + ("Talaria", "AU", + "Takes a knock, keeps pushing. Built for crews who work for a living."), + ("RevvITup 2.0", "NiteLife", + "Floor it. The bass drops when you do."), + ("PotaT+-", "NiteLife", + "Holds the charge until the drop, then lets it all go at once."), + ("not if i see you first", "DME", + "eyes in the dark/ you were seen before you looked/ say goodnight"), + ("Space Tractor", "Ewan Hart", + "It's a tractor. In space. Trap your enemies in gravity wells. Haul thousands of tons of hay through space!"), + }; + + // Designs whose text was flavour or named a brand, rewritten as tech-node text without a rename (ruling designs-are-tech-nodes). + // The Large Drive's old line ships as Steady Haul's text; the Tractor Beam's moves to its product, Space Tractor (ProductTexts). + public static readonly (string Design, string Text)[] DesignTexts = + { + ("Large Drive", "Large working drive."), + ("Tractor Beam", "Holds a target in a gravity well and hauls it in."), + ("Smoke Proximity", "A Light Laser that bursts by proximity, blast 8. For scenarios; no one builds it."), + ("Smoke Delayed", "A Light Laser that bursts after two cells of metal, blast 4. For scenarios; no one builds it."), + ("Smoke Refused", "A Light Laser whose blast is wider than its reach, so it never fires. For scenarios; no one builds it."), + ("Smoke Refused Charge", "A Charged Scatter Blaster whose blast is wider than its reach, so it never charges. For scenarios; no one builds it."), + }; + + // generic-designs: a design is named and described like a node on a tech tree, and the brand lives in the product it + // sells (rulings catalog-grows-generic-designs-branded-products, kitchen-sink-content, designs-are-tech-nodes). A + // Renames row renames the design found under its old name and gives it the functional text; a Brands row renames the + // maker's same-named product and sets its text and the design's functional text; ProductTexts sets the rest; every + // shipped product text ending in the authoring note loses it. Dry run unless passed "apply". + public static int GenericDesigns(bool apply, string root = null) + { + var db = AetherDb.Open(catalogWritable: apply, root: root); + var designs = db.Cache.GetAll().ToArray(); + var products = db.Cache.GetAll().ToArray(); + string MakerOf(FactionProductData product) => db.Cache.Get(product.Manufacturer)?.ShortName; + var changed = new List<(object Document, CultRecordKey Key)>(); + var report = new List(); + + void Write(object document, string what, string before, string after) + { + if (!changed.Any(c => ReferenceEquals(c.Document, document))) changed.Add((document, db.Cache.RefOf(document).Key)); + report.Add($"{what}: \"{before}\" -> \"{after}\""); + } + + foreach (var (old, generic, functional) in Renames) + { + var found = designs.Where(d => d.Name == old).ToArray(); + var held = designs.Where(d => d.Name == generic).ToArray(); + if (found.Length == 0 && held.Length == 0) throw new InvalidOperationException($"Rename row \"{old}\" -> \"{generic}\": no design carries either name."); + if (found.Length == 0) continue; + if (held.Length != 0) throw new InvalidOperationException($"Rename row \"{old}\" -> \"{generic}\": the generic name is already held by another design."); + if (found.Length != 1) throw new InvalidOperationException($"Rename row \"{old}\" -> \"{generic}\": {found.Length} designs carry the old name."); + var design = found[0]; + Write(design, "design name", design.Name, generic); + design.Name = generic; + if (design.Description != functional) Write(design, $"design \"{generic}\" text", design.Description, functional); + design.Description = functional; + } + + foreach (var (designName, maker, oldProduct, brand, text, designText) in Brands) + { + var found = designs.Where(d => d.Name == designName).ToArray(); + if (found.Length != 1) throw new InvalidOperationException($"Brand row \"{brand}\": {found.Length} designs are named \"{designName}\"."); + var design = found[0]; + var key = db.Cache.RefOf(design).Key; + var sold = products.Where(p => p.Design.Key.Equals(key) && MakerOf(p) == maker).ToArray(); + var product = sold.FirstOrDefault(p => p.Name == brand) ?? sold.FirstOrDefault(p => p.Name == oldProduct); + if (product == null) throw new InvalidOperationException($"Brand row \"{brand}\": {maker} sells no product of \"{designName}\" under either name."); + if (product.Name == brand) continue; + if (products.Any(p => !ReferenceEquals(p, product) && p.Name == brand)) throw new InvalidOperationException($"Brand row \"{brand}\": the brand is already held by another product."); + Write(product, $"product of \"{designName}\" by {maker}", product.Name, brand); + product.Name = brand; + Write(product, $"product \"{brand}\" text", product.Description, text); + product.Description = text; + if (design.Description != designText) Write(design, $"design \"{designName}\" text", design.Description, designText); + design.Description = designText; + } + + foreach (var (designName, text) in DesignTexts) + { + var found = designs.Where(d => d.Name == designName).ToArray(); + if (found.Length != 1) throw new InvalidOperationException($"Design text row \"{designName}\": {found.Length} designs carry the name."); + if (found[0].Description == text) continue; + Write(found[0], $"design \"{designName}\" text", found[0].Description, text); + found[0].Description = text; + } + + foreach (var (name, maker, text) in ProductTexts) + { + var found = products.Where(p => p.Name == name && MakerOf(p) == maker).ToArray(); + if (found.Length != 1) throw new InvalidOperationException($"Product text row \"{name}\" by {maker}: {found.Length} products match."); + if (found[0].Description == text) continue; + Write(found[0], $"product \"{name}\" text", found[0].Description, text); + found[0].Description = text; + } + + foreach (var product in products.Where(p => p.Description != null && p.Description.EndsWith(AuthoringNote, StringComparison.Ordinal))) + { + var stripped = product.Description.Substring(0, product.Description.Length - AuthoringNote.Length); + Write(product, $"product \"{product.Name}\" authoring note stripped", product.Description, stripped); + product.Description = stripped; + } + + if (changed.Count == 0) + { + Console.WriteLine("Already applied; nothing to do."); + return 0; + } + foreach (var line in report) Console.WriteLine(line); + if (!apply) + { + Console.WriteLine($"\nDry run. Pass \"apply\" to write {changed.Count} records."); + return 0; + } + foreach (var (document, _) in changed) CultRecordRefs.Validate(document); + // ExpectUnchanged lands the batch onto the file as it is: every record the command did not author keeps the bytes it has, + // where a plain commit would re-encode the whole catalog through today's types. + if (!db.Cache.Commit(batch => + { + batch.ExpectUnchanged(); + foreach (var (document, key) in changed) batch.Upsert(document.GetType(), document, key); + })) + throw new InvalidOperationException("The catalog changed while the generic designs were being authored; nothing was written. Run it again."); + Console.WriteLine($"\nWrote {changed.Count} records to Aetheria.cc"); + return 0; + } + + // aetheria-ew cut ew-hide-launch-catalog (rulings ew-suppressor-strength-ruled, ew-suppressor-makers-ruled, + // ew-mild-suppressor-makers-defaulted): two launch suppressors on the Tool hardpoint, one helper for both. The strong + // Launch Suppressor hides a launch from its own target and gives out after an opening volley; the mild Launch Baffle + // only dims the flash for distant observers and runs through a long fight. Every figure is one Quality term, linear in + // its role (baffles for the Factor, heat sink for the heat), so quality moves the part and nothing else does. Thermal + // constants and temperatures come from the Targeting Computer, the catalog's 1x1 tool, as the consumables do. Dry run + // unless passed "apply". + public static int LaunchSuppressorCatalog(bool apply, string root = null) + { + var db = AetherDb.Open(catalogWritable: apply, root: root); + var designNames = new[] { "Launch Suppressor", "Launch Baffle" }; + var template = db.Cache.GetAll().Single(g => g.Name == "Targeting Computer"); + + Faction Maker(string shortName) => + db.Cache.GetAll().FirstOrDefault(f => f.ShortName == shortName) ?? throw new InvalidOperationException($"No faction with short name \"{shortName}\"."); + PerformanceStat Rolled(float min, float max, string role) => new PerformanceStat + { + Min = min, + Max = max, + Terms = new List { new StatTerm { Source = StatSource.Quality, Exponent = 1f, Role = role } }, + }; + // Min applies at quality 0 of the role and Max at quality 1: a falling Factor and falling heat per unit are Min > Max. + GearData Design(string name, string description, int price, (float Min, float Max) factor, (float Min, float Max) heatPerUnit, (float Min, float Max) rated) + { + var design = new GearData + { + Name = name, + Description = description, + Hardpoint = HardpointType.Tool, + Mass = 60f, + Price = price, + Durability = 50f, + Shape = new Shape(1, 1), + SpecificHeat = template.SpecificHeat, + Conductivity = template.Conductivity, + MinimumTemperature = template.MinimumTemperature, + MaximumTemperature = template.MaximumTemperature, + OptimalTemperature = template.OptimalTemperature, + PlateauWidth = template.PlateauWidth, + ThermalResilience = template.ThermalResilience, + Roles = new[] { "baffles", "heat sink" }.Select(r => new ItemRole { Name = r }).ToList(), + Behaviors = new List + { + new LaunchSuppressorData + { + Factor = Rolled(factor.Min, factor.Max, "baffles"), + HeatPerUnit = Rolled(heatPerUnit.Min, heatPerUnit.Max, "heat sink"), + RatedTemperature = Rolled(rated.Min, rated.Max, "heat sink"), + }, + }, + }; + design.Shape.Cells[0, 0] = true; + return design; + } + + var strong = Design(designNames[0], "Baffles and a heat sink remove nearly all of a weapon's launch flash, hiding the shot from its target. The removed light is dissipated as heat in the device's own cell; above its rated temperature it passes the full flash.", + 40000, (.08f, .03f), (1.4f, .8f), (310f, 330f)); + var mild = Design(designNames[1], "Baffles dim a weapon's launch flash to a fraction and a heat sink absorbs the difference. The target still sees the shot; distant observers do not. The sink sustains the effect through a long fight.", + 25000, (.4f, .2f), (.8f, .5f), (310f, 330f)); + var designs = new[] { strong, mild }; + + var products = new (GearData Design, string Name, string Maker, string Description)[] + { + (strong, "Velvet Rope", "NiteLife", "Keeps the flash on the inside. Nobody sees who you let out."), + (strong, "Hush", "Finch", "Small, quiet, and the first shot is a secret. The second, probably."), + (strong, "lights out", "DME", "no flash/ no name/ nobody saw a thing"), + (strong, "Plausible Deniability", "R&D", "Hides 100% of launches!* *Launches defined as the ones nobody saw."), + (mild, "Low Profile", "Lightsail", "Quiet on the manifest, quiet on the scope. A hauler nobody notices is a hauler that gets paid."), + (mild, "Fast Pass Dim", "Alakrita", "Takes the glare off every launch and keeps the schedule. Anyone close enough to mind was already your problem."), + }; + foreach (var product in products) Maker(product.Maker); + + // Authored when both designs exist and every product is present on its own design; untouched when nothing is + // present; anything between needs a human, a product name that belongs to an unrelated item included. + var existing = designNames.Select(name => db.Cache.GetAll().SingleOrDefault(g => g.Name == name)).ToArray(); + var productNames = products.Select(p => p.Name).ToHashSet(); + var presentProducts = db.Cache.GetAll().Where(p => productNames.Contains(p.Name)).ToArray(); + if (existing.All(d => d != null) && presentProducts.Length == products.Length + && products.All(p => presentProducts.Any(x => x.Name == p.Name && x.Design.Key.Equals(db.Cache.RefOf(existing[p.Design == strong ? 0 : 1]).Key)))) + { + Console.WriteLine("The launch suppressors are already authored; nothing to do."); + return 0; + } + if (existing.Any(d => d != null) || presentProducts.Length != 0) + throw new InvalidOperationException("The launch suppressors are partly authored; the catalog needs a human."); + + Console.WriteLine("New designs:"); + foreach (var design in designs) + { + var data = design.Behaviors.OfType().Single(); + Console.WriteLine($" {design.Name,-18} {design.Shape.Width}x{design.Shape.Height} {design.Hardpoint} mass {design.Mass:0.##} price {design.Price} durability {design.Durability:0.##} roles [{string.Join(", ", design.Roles.Select(r => r.Name))}]"); + foreach (var (label, stat) in new[] { ("Factor", data.Factor), ("HeatPerUnit", data.HeatPerUnit), ("RatedTemperature", data.RatedTemperature) }) + Console.WriteLine($" {label} {stat.Min:0.##}-{stat.Max:0.##} ({stat.Terms.Single().Role})"); + Console.WriteLine($" \"{design.Description}\""); + } + Console.WriteLine("\nNew products:"); + foreach (var (design, name, maker, description) in products) + { + var (mean, dev) = MakerProfiles[maker]; + Console.WriteLine($" {design.Name} -> \"{name}\" by {maker}, every role mean {mean:0.##} dev {dev:0.##}: {description}"); + } + + if (!apply) + { + Console.WriteLine($"\nDry run. Pass \"apply\" to author 2 designs and {products.Length} products."); + return 0; + } + + foreach (var design in designs) CultRecordRefs.Validate(design); + // ExpectUnchanged lands the batch onto the file as it is: every other record keeps the bytes it has, where a plain + // commit would re-encode the whole catalog through today's types. + if (!db.Cache.Commit(batch => + { + batch.ExpectUnchanged(); + var keys = new Dictionary(); + foreach (var design in designs) keys[design] = batch.Upsert(typeof(GearData), design); + foreach (var (design, name, maker, description) in products) + { + var (mean, dev) = MakerProfiles[maker]; + batch.Upsert(typeof(FactionProductData), new FactionProductData + { + Name = name, + Description = description, + Design = new CultRecordRef(keys[design]), + Manufacturer = db.Cache.RefOf(Maker(maker)), + Roles = design.Roles.Select(r => new ProductRole { Role = r.Name, Mean = mean, StandardDeviation = dev }).ToList(), + }); + } + })) + throw new InvalidOperationException("The catalog changed while the launch suppressors were being authored; nothing was written. Run it again."); + Console.WriteLine($"\nAuthored 2 designs and {products.Length} products in Aetheria.cc"); + return 0; + } + + }