diff --git a/Assets/Scripts/Editor/WireMines.cs b/Assets/Scripts/Editor/WireMines.cs index 98b6c8857..8de62c218 100644 --- a/Assets/Scripts/Editor/WireMines.cs +++ b/Assets/Scripts/Editor/WireMines.cs @@ -84,6 +84,7 @@ public static class WireMines if (AssetDatabase.TryGetGUIDAndLocalFileIdentifier(asset, out _, out long id) && id == fileId) return asset; if (assets.Length == 1) return assets[0]; - throw new System.InvalidOperationException($"No {typeof(T).Name} with file id {fileId} in {path}"); + throw new System.InvalidOperationException($"No {typeof(T).Name} with file id {fileId} in {path}; it holds " + + string.Join(", ", AssetDatabase.LoadAllAssetsAtPath(path).Select(a => $"{a.GetType().Name} {a.name}"))); } } diff --git a/Assets/Scripts/Editor/WireMines.cs.meta b/Assets/Scripts/Editor/WireMines.cs.meta new file mode 100644 index 000000000..6720cacbf --- /dev/null +++ b/Assets/Scripts/Editor/WireMines.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ecae11055e2a7a04cace71a05965ae88 \ No newline at end of file diff --git a/Assets/Scripts/Gameplay/MineInstance.cs.meta b/Assets/Scripts/Gameplay/MineInstance.cs.meta new file mode 100644 index 000000000..6640716ed --- /dev/null +++ b/Assets/Scripts/Gameplay/MineInstance.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 35c62f5e26769f645b1a1614a70422e1 \ No newline at end of file diff --git a/tests/Aetheria.Shared.Tests/EvasionTrackingTests.cs b/tests/Aetheria.Shared.Tests/EvasionTrackingTests.cs index 08d886c57..c15091031 100644 --- a/tests/Aetheria.Shared.Tests/EvasionTrackingTests.cs +++ b/tests/Aetheria.Shared.Tests/EvasionTrackingTests.cs @@ -285,8 +285,9 @@ public sealed partial class RunStartTests Assert.True(price > limited * 2f, $"the mount limit priced the limited gun down: {limited} against {price}"); } - // The shipped catalog's weapon behaviours: launchers and guided weapons never mount-track, every other gun is a mount. - private static bool EvMountless(WeaponData data) => data is LauncherData || data is GuidedWeaponData; + // The shipped catalog's weapon behaviours: launchers, guided weapons and mine layers (which lay at no bearing) + // never mount-track, every other gun is a mount. + private static bool EvMountless(WeaponData data) => data is LauncherData || data is GuidedWeaponData || data is MineLayerData; private IEnumerable<(WeaponItemData item, WeaponData data)> EvCatalogGuns() => _cache.GetAll().SelectMany(item => item.Behaviors.OfType().Select(data => (item, data))); diff --git a/tools/AetherDb/Program.cs b/tools/AetherDb/Program.cs index 4872e68a0..967449419 100644 --- a/tools/AetherDb/Program.cs +++ b/tools/AetherDb/Program.cs @@ -1543,6 +1543,7 @@ public static class Program new MineLayerData { DamageType = DamageType.Kinetic, + DamageCurve = new BezierCurve { Keys = new[] { new float4(0f, 1f, 0f, 0f), new float4(1f, 1f, 0f, 0f) } }, Damage = Constant(50f), Range = Constant(2000f), MinRange = Constant(0f),