diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc index cf6dc536f..14c2243f7 100644 Binary files a/.voidbot/state/aetheria.cc and b/.voidbot/state/aetheria.cc differ diff --git a/Aetheria.State/README.md b/Aetheria.State/README.md index 8a967668d..2ca309856 100644 --- a/Aetheria.State/README.md +++ b/Aetheria.State/README.md @@ -96,10 +96,10 @@ Surviving item catalog Unity DTOs keep local legacy GUID fields only where old simulation APIs still accept DTO objects. The old `RuntimeCatalogEntry` and `RuntimeItemProjectionEntry` base names no longer appear in live source. The dead `InspectableRuntimeCatalogLinkAttribute` inspector metadata is gone; -typed runtime projection still uses `LegacyPayloadKeyAttribute` only where the -catalog importer and migration readers need deterministic field layout. Runtime -behavior config construction uses an explicit typed behavior-kind mapper instead -of reflecting over that metadata. +live Unity source no longer carries `LegacyPayloadKeyAttribute` either. +Catalog import and migration readers own deterministic legacy field layout +through explicit key maps, while runtime behavior config construction uses an +explicit typed behavior-kind mapper. Agent task DTOs no longer inherit the item projection base; they are local runtime AI work orders until a typed Verse task document exists. diff --git a/Assets/Scripts/ServerShared/Behaviors/AetherDrive.cs b/Assets/Scripts/ServerShared/Behaviors/AetherDrive.cs index 8e0c10a60..84954de06 100644 --- a/Assets/Scripts/ServerShared/Behaviors/AetherDrive.cs +++ b/Assets/Scripts/ServerShared/Behaviors/AetherDrive.cs @@ -8,43 +8,43 @@ using static Unity.Mathematics.math; [Inspectable, EntityTypeRestriction(HullType.Ship)] public class AetherDriveConfig : RuntimeBehaviorConfig { - [Inspectable, LegacyPayloadKey(1)] + [Inspectable] public float3 RotorDiameter; - [Inspectable, LegacyPayloadKey(2)] + [Inspectable] public float3 RotorMass; - [Inspectable, LegacyPayloadKey(3)] + [Inspectable] public PerformanceStat MaximumRpm; - [Inspectable, LegacyPayloadKey(4)] + [Inspectable] public float3 CouplingLambda; - [Inspectable, LegacyPayloadKey(5)] + [Inspectable] public PerformanceStat LambdaMultiplier; - [Inspectable, LegacyPayloadKey(6)] + [Inspectable] public PerformanceStat CouplingEfficiency; - [Inspectable, LegacyPayloadKey(7)] + [Inspectable] public PerformanceStat Torque; - [Inspectable, LegacyPayloadKey(8)] + [Inspectable] public BezierCurve TorqueProfile; - [Inspectable, LegacyPayloadKey(9)] + [Inspectable] public PerformanceStat EnergyDraw; - [Inspectable, LegacyPayloadKey(10)] + [Inspectable] public PerformanceStat PassiveCoupling; - [InspectableAudioParameter, LegacyPayloadKey(11)] + [InspectableAudioParameter] public uint RpmAudioParameter; - [InspectableAudioParameter, LegacyPayloadKey(12)] + [InspectableAudioParameter] public uint TorqueRatioAudioParameter; - [InspectablePrefab, LegacyPayloadKey(13)] + [InspectablePrefab] public string Particles; public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs b/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs index d81406ee4..9e422182c 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs @@ -144,7 +144,7 @@ public abstract class RuntimeBehaviorConfig { public string Kind { get; set; } = ""; - [Inspectable, LegacyPayloadKey(0)] + [Inspectable] public int Group; public abstract Behavior CreateInstance(EquippedItem item); diff --git a/Assets/Scripts/ServerShared/Behaviors/Capacitor.cs b/Assets/Scripts/ServerShared/Behaviors/Capacitor.cs index e1cb70542..ea8a9626a 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Capacitor.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Capacitor.cs @@ -9,10 +9,10 @@ using static Unity.Mathematics.math; [Inspectable] public class CapacitorConfig : RuntimeBehaviorConfig { - [Inspectable, LegacyPayloadKey(1)] + [Inspectable] public PerformanceStat Capacity = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(2)] + [Inspectable] public PerformanceStat Efficiency = new PerformanceStat(); public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/ChargedWeapon.cs b/Assets/Scripts/ServerShared/Behaviors/ChargedWeapon.cs index bce5336c7..17206f604 100644 --- a/Assets/Scripts/ServerShared/Behaviors/ChargedWeapon.cs +++ b/Assets/Scripts/ServerShared/Behaviors/ChargedWeapon.cs @@ -7,40 +7,40 @@ using static Unity.Mathematics.math; [Inspectable] public class ChargedWeaponConfig : InstantWeaponConfig { - [Inspectable, LegacyPayloadKey(21)] + [Inspectable] public PerformanceStat ChargeTime = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(22)] + [Inspectable] public PerformanceStat ChargeEnergy = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(23)] + [Inspectable] public PerformanceStat ChargeHeat = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(24)] + [Inspectable] public bool CanFireEarly; - [Inspectable, LegacyPayloadKey(25)] + [Inspectable] public float FailureCharge; - [Inspectable, LegacyPayloadKey(26)] + [Inspectable] public float FailureDamage = 1; - [Inspectable, LegacyPayloadKey(27)] + [Inspectable] public float ChargeFiringDamageMultiplier = 1; - [Inspectable, LegacyPayloadKey(28)] + [Inspectable] public float ChargeFiringSpreadMultiplier = 1; - [Inspectable, LegacyPayloadKey(29)] + [Inspectable] public float ChargeFiringBurstCountMultiplier = 1; - [Inspectable, LegacyPayloadKey(30)] + [Inspectable] public float ChargeFiringVisibilityMultiplier = 1; - [Inspectable, LegacyPayloadKey(31)] + [Inspectable] public float ChargeFiringVelocityMultiplier = 1; - [Inspectable, LegacyPayloadKey(32)] + [Inspectable] public float ChargeFiringHeatMultiplier = 1; public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/ConstantWeapon.cs b/Assets/Scripts/ServerShared/Behaviors/ConstantWeapon.cs index 9f6a800d8..b1e739689 100644 --- a/Assets/Scripts/ServerShared/Behaviors/ConstantWeapon.cs +++ b/Assets/Scripts/ServerShared/Behaviors/ConstantWeapon.cs @@ -9,7 +9,7 @@ using static Unity.Mathematics.math; [Inspectable] public class ConstantWeaponConfig : WeaponConfig { - [InspectablePrefab, LegacyPayloadKey(17)] + [InspectablePrefab] public float AmmoInterval = 1; public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/Cooldown.cs b/Assets/Scripts/ServerShared/Behaviors/Cooldown.cs index be046df71..0b7ca6650 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Cooldown.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Cooldown.cs @@ -10,7 +10,7 @@ using static Unity.Mathematics.math; [Inspectable, Order(-10)] public class CooldownConfig : RuntimeBehaviorConfig { - [Inspectable, LegacyPayloadKey(1)] + [Inspectable] public PerformanceStat Cooldown = new PerformanceStat(); public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/EnergyDraw.cs b/Assets/Scripts/ServerShared/Behaviors/EnergyDraw.cs index 5410c809a..cbd9c7370 100644 --- a/Assets/Scripts/ServerShared/Behaviors/EnergyDraw.cs +++ b/Assets/Scripts/ServerShared/Behaviors/EnergyDraw.cs @@ -7,10 +7,10 @@ using System.Linq; [Inspectable, Order(-20)] public class EnergyDrawConfig : RuntimeBehaviorConfig { - [Inspectable, LegacyPayloadKey(1)] + [Inspectable] public PerformanceStat EnergyDraw = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(2)] + [Inspectable] public bool PerSecond; public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/Heat.cs b/Assets/Scripts/ServerShared/Behaviors/Heat.cs index 65aa04728..0a9f47cf7 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Heat.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Heat.cs @@ -7,10 +7,10 @@ using System.Linq; [Inspectable, Order(10)] public class HeatConfig : RuntimeBehaviorConfig { - [Inspectable, LegacyPayloadKey(1)] + [Inspectable] public PerformanceStat Heat = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(2)] + [Inspectable] public bool PerSecond; public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/InstantWeapon.cs b/Assets/Scripts/ServerShared/Behaviors/InstantWeapon.cs index a3263f854..96b67d27f 100644 --- a/Assets/Scripts/ServerShared/Behaviors/InstantWeapon.cs +++ b/Assets/Scripts/ServerShared/Behaviors/InstantWeapon.cs @@ -7,16 +7,16 @@ using static Unity.Mathematics.math; [Inspectable] public class InstantWeaponConfig : WeaponConfig { - [Inspectable, LegacyPayloadKey(17)] + [Inspectable] public PerformanceStat Count = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(18)] + [Inspectable] public PerformanceStat BurstTime = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(19)] + [Inspectable] public PerformanceStat Cooldown = new PerformanceStat(); - [InspectablePrefab, LegacyPayloadKey(20)] + [InspectablePrefab] public bool SingleAmmoBurst; public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/ItemUsage.cs b/Assets/Scripts/ServerShared/Behaviors/ItemUsage.cs index 7e5fbf604..c65f368e4 100644 --- a/Assets/Scripts/ServerShared/Behaviors/ItemUsage.cs +++ b/Assets/Scripts/ServerShared/Behaviors/ItemUsage.cs @@ -7,7 +7,6 @@ using System.Linq; [Inspectable, Order(-5)] public class ItemUsageConfig : RuntimeBehaviorConfig { - [LegacyPayloadKey(1)] public Guid Item; public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/Launcher.cs b/Assets/Scripts/ServerShared/Behaviors/Launcher.cs index da16d04af..e91629cbc 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Launcher.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Launcher.cs @@ -7,22 +7,22 @@ using Unity.Mathematics; [Inspectable] public class LauncherConfig : LockWeaponConfig { - [InspectableAnimationCurve, LegacyPayloadKey(26)] + [InspectableAnimationCurve] public float4[] GuidanceCurve; - [InspectableAnimationCurve, LegacyPayloadKey(27)] + [InspectableAnimationCurve] public float4[] ThrustCurve; - [InspectableAnimationCurve, LegacyPayloadKey(28)] + [InspectableAnimationCurve] public float4[] LiftCurve; - [Inspectable, LegacyPayloadKey(29)] + [Inspectable] public PerformanceStat Thrust = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(30)] + [Inspectable] public float DodgeFrequency; - [Inspectable, LegacyPayloadKey(31)] + [Inspectable] public PerformanceStat MissileVelocity = new PerformanceStat(); public override Behavior CreateInstance(EquippedItem item) @@ -34,22 +34,22 @@ public class LauncherConfig : LockWeaponConfig [Inspectable] public class GuidedWeaponConfig : InstantWeaponConfig { - [InspectableAnimationCurve, LegacyPayloadKey(21)] + [InspectableAnimationCurve] public float4[] GuidanceCurve; - [InspectableAnimationCurve, LegacyPayloadKey(22)] + [InspectableAnimationCurve] public float4[] ThrustCurve; - [InspectableAnimationCurve, LegacyPayloadKey(23)] + [InspectableAnimationCurve] public float4[] LiftCurve; - [Inspectable, LegacyPayloadKey(24)] + [Inspectable] public PerformanceStat Thrust = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(25)] + [Inspectable] public float DodgeFrequency; - [Inspectable, LegacyPayloadKey(26)] + [Inspectable] public PerformanceStat MissileVelocity = new PerformanceStat(); public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/LockWeapon.cs b/Assets/Scripts/ServerShared/Behaviors/LockWeapon.cs index 87b0ae253..45225b99a 100644 --- a/Assets/Scripts/ServerShared/Behaviors/LockWeapon.cs +++ b/Assets/Scripts/ServerShared/Behaviors/LockWeapon.cs @@ -7,19 +7,19 @@ using static Unity.Mathematics.math; [Inspectable] public class LockWeaponConfig : InstantWeaponConfig { - [Inspectable, LegacyPayloadKey(21)] + [Inspectable] public PerformanceStat LockSpeed = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(22)] + [Inspectable] public PerformanceStat SensorImpact = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(23)] + [Inspectable] public PerformanceStat LockAngle = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(24)] + [Inspectable] public PerformanceStat DirectionImpact = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(25)] + [Inspectable] public PerformanceStat Decay = new PerformanceStat(); public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/MiningTool.cs b/Assets/Scripts/ServerShared/Behaviors/MiningTool.cs index a1213bbd9..22256e8d1 100644 --- a/Assets/Scripts/ServerShared/Behaviors/MiningTool.cs +++ b/Assets/Scripts/ServerShared/Behaviors/MiningTool.cs @@ -10,16 +10,16 @@ using static Unity.Mathematics.math; [Inspectable, Order(10)] public class MiningToolConfig : RuntimeBehaviorConfig { - [Inspectable, LegacyPayloadKey(1)] + [Inspectable] public PerformanceStat DamagePerSecond = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(2)] + [Inspectable] public PerformanceStat Efficiency = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(3)] + [Inspectable] public PerformanceStat Penetration = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(4)] + [Inspectable] public PerformanceStat Range = new PerformanceStat(); public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/Radiator.cs b/Assets/Scripts/ServerShared/Behaviors/Radiator.cs index 976bac304..d6d21edd0 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Radiator.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Radiator.cs @@ -8,22 +8,22 @@ using static Unity.Mathematics.math; [Inspectable] public class RadiatorConfig : RuntimeBehaviorConfig { - [Inspectable, LegacyPayloadKey(1)] + [Inspectable] public PerformanceStat Emissivity = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(2)] + [Inspectable] public PerformanceStat PumpedHeat = new PerformanceStat(); - [InspectableTemperature, LegacyPayloadKey(3)] + [InspectableTemperature] public float TemperatureFloor; - [Inspectable, LegacyPayloadKey(4)] + [Inspectable] public PerformanceStat WasteHeat = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(5)] + [Inspectable] public PerformanceStat EnergyUsage = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(6)] + [Inspectable] public PerformanceStat ThermalMass = new PerformanceStat(); public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/Reactor.cs b/Assets/Scripts/ServerShared/Behaviors/Reactor.cs index 9c498d6aa..75f27ca20 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Reactor.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Reactor.cs @@ -12,16 +12,16 @@ using static Unity.Mathematics.math; [Inspectable] public class ReactorConfig : RuntimeBehaviorConfig { - [Inspectable, LegacyPayloadKey(1)] + [Inspectable] public PerformanceStat Charge = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(2)] + [Inspectable] public PerformanceStat Efficiency = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(3)] + [Inspectable] public PerformanceStat OverloadEfficiency = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(4)] + [Inspectable] public PerformanceStat ThrottlingFactor = new PerformanceStat(); public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/Reflector.cs b/Assets/Scripts/ServerShared/Behaviors/Reflector.cs index 0aa22522b..36d9bba4f 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Reflector.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Reflector.cs @@ -8,10 +8,10 @@ using static Unity.Mathematics.math; [Inspectable] public class ReflectorConfig : RuntimeBehaviorConfig { - [Inspectable, LegacyPayloadKey(1)] + [Inspectable] public PerformanceStat CrossSection = new PerformanceStat(); - // [InspectableAnimationCurve, LegacyPayloadKey(1)] + // [InspectableAnimationCurve] // public float4[] VisibilityCurve; public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/ResourceScanner.cs b/Assets/Scripts/ServerShared/Behaviors/ResourceScanner.cs index 114fbb8c5..0011d665e 100644 --- a/Assets/Scripts/ServerShared/Behaviors/ResourceScanner.cs +++ b/Assets/Scripts/ServerShared/Behaviors/ResourceScanner.cs @@ -10,13 +10,13 @@ using static Unity.Mathematics.math; [Inspectable] public class ResourceScannerConfig : RuntimeBehaviorConfig { - [Inspectable, LegacyPayloadKey(1)] + [Inspectable] public PerformanceStat Range = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(2)] + [Inspectable] public PerformanceStat MinimumDensity = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(3)] + [Inspectable] public PerformanceStat ScanDuration = new PerformanceStat(); public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/Sensor.cs b/Assets/Scripts/ServerShared/Behaviors/Sensor.cs index ae8661a71..8bf9b4a98 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Sensor.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Sensor.cs @@ -10,31 +10,31 @@ using static Unity.Mathematics.math; [Inspectable] public class SensorConfig : RuntimeBehaviorConfig { - [Inspectable, LegacyPayloadKey(3)] + [Inspectable] public PerformanceStat Sensitivity = new PerformanceStat(); - [InspectableAnimationCurve, LegacyPayloadKey(4)] + [InspectableAnimationCurve] public BezierCurve SensitivityCurve; - [Inspectable, LegacyPayloadKey(5)] + [Inspectable] public PerformanceStat PingBoost; - [Inspectable, LegacyPayloadKey(6)] + [Inspectable] public PerformanceStat PingEnergy; - [Inspectable, LegacyPayloadKey(7)] + [Inspectable] public PerformanceStat PingVisibility; - [Inspectable, LegacyPayloadKey(8)] + [Inspectable] public PerformanceStat PingRange; - [Inspectable, LegacyPayloadKey(9)] + [Inspectable] public PerformanceStat PingCooldown; - [Inspectable, LegacyPayloadKey(10)] + [Inspectable] public float PingDuration = 2; - [Inspectable, LegacyPayloadKey(11)] + [Inspectable] public float PingRadiusExponent = .5f; public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/Shield.cs b/Assets/Scripts/ServerShared/Behaviors/Shield.cs index 2636548e8..3a471f757 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Shield.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Shield.cs @@ -8,10 +8,10 @@ using static Unity.Mathematics.math; [Inspectable] public class ShieldConfig : RuntimeBehaviorConfig { - [Inspectable, LegacyPayloadKey(1)] + [Inspectable] public PerformanceStat Efficiency = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(2)] + [Inspectable] public PerformanceStat EnergyUsage = new PerformanceStat(); public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/StatModifier.cs b/Assets/Scripts/ServerShared/Behaviors/StatModifier.cs index a9fd44fc5..74d8162e7 100644 --- a/Assets/Scripts/ServerShared/Behaviors/StatModifier.cs +++ b/Assets/Scripts/ServerShared/Behaviors/StatModifier.cs @@ -9,16 +9,16 @@ using GameCult.Aetheria.State.Unity; [Inspectable] public class StatModifierConfig : RuntimeBehaviorConfig { - [Inspectable, LegacyPayloadKey(1)] + [Inspectable] public StatReference Stat = new StatReference(); - [Inspectable, LegacyPayloadKey(2)] + [Inspectable] public PerformanceStat Modifier = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(3)] + [Inspectable] public StatModifierType Type; - [InspectableType(typeof(RuntimeBehaviorConfig)), LegacyPayloadKey(4)] + [InspectableType(typeof(RuntimeBehaviorConfig))] public string RequireBehavior; public override Behavior CreateInstance(EquippedItem item) @@ -153,9 +153,9 @@ public enum StatModifierType [Inspectable] public class StatReference { - [InspectableType(typeof(RuntimeBehaviorConfig)), LegacyPayloadKey(1)] + [InspectableType(typeof(RuntimeBehaviorConfig))] public string Target; - [Inspectable, LegacyPayloadKey(2)] + [Inspectable] public string Stat; } diff --git a/Assets/Scripts/ServerShared/Behaviors/Thermotoggle.cs b/Assets/Scripts/ServerShared/Behaviors/Thermotoggle.cs index fcde8030c..ce5b13109 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Thermotoggle.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Thermotoggle.cs @@ -7,13 +7,13 @@ using System.Linq; [Inspectable, Order(-22)] public class ThermotoggleConfig : RuntimeBehaviorConfig { - [InspectableTemperature, LegacyPayloadKey(1)] + [InspectableTemperature] public float TargetTemperature; - [Inspectable, LegacyPayloadKey(2)] + [Inspectable] public bool HighPass; - [Inspectable, LegacyPayloadKey(3)] + [Inspectable] public bool Adjustable; public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/Thruster.cs b/Assets/Scripts/ServerShared/Behaviors/Thruster.cs index 7d7c718aa..5ae503cf0 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Thruster.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Thruster.cs @@ -8,19 +8,19 @@ using static Unity.Mathematics.math; [Inspectable, EntityTypeRestriction(HullType.Ship)] public class ThrusterConfig : RuntimeBehaviorConfig { - [Inspectable, LegacyPayloadKey(1)] + [Inspectable] public PerformanceStat Thrust = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(2)] + [Inspectable] public PerformanceStat Visibility = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(3)] + [Inspectable] public PerformanceStat Heat = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(4)] + [Inspectable] public PerformanceStat EnergyUsage = new PerformanceStat(); - [InspectablePrefab, LegacyPayloadKey(5)] + [InspectablePrefab] public string ParticlesPrefab; public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/VelocityConversion.cs b/Assets/Scripts/ServerShared/Behaviors/VelocityConversion.cs index 2b7d7b077..830abd439 100644 --- a/Assets/Scripts/ServerShared/Behaviors/VelocityConversion.cs +++ b/Assets/Scripts/ServerShared/Behaviors/VelocityConversion.cs @@ -6,7 +6,7 @@ using Unity.Mathematics; using static Unity.Mathematics.math; public class VelocityConversionConfig : RuntimeBehaviorConfig { - [Inspectable, LegacyPayloadKey(1)] + [Inspectable] public PerformanceStat Lambda = new PerformanceStat(); public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/VelocityLimit.cs b/Assets/Scripts/ServerShared/Behaviors/VelocityLimit.cs index 2b7ba9ee2..a28d343b9 100644 --- a/Assets/Scripts/ServerShared/Behaviors/VelocityLimit.cs +++ b/Assets/Scripts/ServerShared/Behaviors/VelocityLimit.cs @@ -8,7 +8,7 @@ using static Unity.Mathematics.math; [Inspectable] public class VelocityLimitConfig : RuntimeBehaviorConfig { - [Inspectable, LegacyPayloadKey(1)] + [Inspectable] public PerformanceStat TopSpeed = new PerformanceStat(); public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/Visibility.cs b/Assets/Scripts/ServerShared/Behaviors/Visibility.cs index ba17acf58..6bc5b41ee 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Visibility.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Visibility.cs @@ -7,10 +7,10 @@ using System.Linq; [Inspectable] public class VisibilityConfig : RuntimeBehaviorConfig { - [Inspectable, LegacyPayloadKey(1)] + [Inspectable] public PerformanceStat Visibility = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(2)] + [Inspectable] public PerformanceStat VisibilityDecay = new PerformanceStat(); public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/Behaviors/Weapon.cs b/Assets/Scripts/ServerShared/Behaviors/Weapon.cs index a472d64c2..c7250668a 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Weapon.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Weapon.cs @@ -11,52 +11,50 @@ using static Unity.Mathematics.math; [Inspectable] public abstract class WeaponConfig : RuntimeBehaviorConfig { - [Inspectable, LegacyPayloadKey(1)] + [Inspectable] public DamageType DamageType; - [Inspectable, LegacyPayloadKey(2)] + [Inspectable] public PerformanceStat Damage = new PerformanceStat(); - [InspectableRangedFloat(0,1), LegacyPayloadKey(3)] + [InspectableRangedFloat(0,1)] public PerformanceStat Penetration = new PerformanceStat(); - [InspectableRangedFloat(0,1), LegacyPayloadKey(4)] + [InspectableRangedFloat(0,1)] public PerformanceStat DamageSpread = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(5)] + [Inspectable] public PerformanceStat MinRange = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(6)] + [Inspectable] public PerformanceStat Range = new PerformanceStat(); - [InspectableAnimationCurve, LegacyPayloadKey(7)] + [InspectableAnimationCurve] public BezierCurve DamageCurve; - [InspectablePrefab, LegacyPayloadKey(8)] + [InspectablePrefab] public string EffectPrefab; - [InspectablePrefab, LegacyPayloadKey(9)] + [InspectablePrefab] public PerformanceStat Energy = new PerformanceStat(); - [InspectablePrefab, LegacyPayloadKey(10)] + [InspectablePrefab] public PerformanceStat Heat = new PerformanceStat(); - [InspectablePrefab, LegacyPayloadKey(11)] + [InspectablePrefab] public PerformanceStat Visibility = new PerformanceStat(); - - [LegacyPayloadKey(12)] public Guid AmmoType; - [InspectablePrefab, LegacyPayloadKey(13)] + [InspectablePrefab] public int MagazineSize; - [InspectablePrefab, LegacyPayloadKey(14)] + [InspectablePrefab] public float ReloadTime = 1; - [InspectablePrefab, LegacyPayloadKey(15)] + [InspectablePrefab] public PerformanceStat Spread = new PerformanceStat(); - [Inspectable, LegacyPayloadKey(16)] + [Inspectable] public PerformanceStat Velocity = new PerformanceStat(); } diff --git a/Assets/Scripts/ServerShared/Behaviors/Wear.cs b/Assets/Scripts/ServerShared/Behaviors/Wear.cs index 877f4d6ac..2fbfec40b 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Wear.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Wear.cs @@ -9,7 +9,7 @@ using static Unity.Mathematics.math; [Inspectable, Order(1000)] public class WearConfig : RuntimeBehaviorConfig { - [InspectableTemperature, LegacyPayloadKey(1)] + [InspectableTemperature] public bool PerSecond = true; public override Behavior CreateInstance(EquippedItem item) diff --git a/Assets/Scripts/ServerShared/BezierCurve.cs b/Assets/Scripts/ServerShared/BezierCurve.cs index ccdaac8ca..f05224ea8 100644 --- a/Assets/Scripts/ServerShared/BezierCurve.cs +++ b/Assets/Scripts/ServerShared/BezierCurve.cs @@ -5,7 +5,7 @@ using static Unity.Mathematics.math; public class BezierCurve { - [LegacyPayloadKey(0)] public float4[] Keys; + public float4[] Keys; private int2 _cachedIndices; @@ -144,4 +144,4 @@ public class BezierCurve return t * (t * (a * t + b) + c) + d; } -} \ No newline at end of file +} diff --git a/Assets/Scripts/ServerShared/ItemData.cs b/Assets/Scripts/ServerShared/ItemData.cs index 1a52cedc7..b3b7717ca 100644 --- a/Assets/Scripts/ServerShared/ItemData.cs +++ b/Assets/Scripts/ServerShared/ItemData.cs @@ -14,7 +14,7 @@ using int2 = Unity.Mathematics.int2; [Inspectable] public class Shape { - [LegacyPayloadKey(0)] public bool[,] Cells; + public bool[,] Cells; private bool _dirty = true; @@ -264,29 +264,27 @@ public abstract class ItemData : INamedEntry { public Guid ID = Guid.NewGuid(); - [Inspectable, LegacyPayloadKey(1)] + [Inspectable] public string Name; - [InspectableText, LegacyPayloadKey(2)] + [InspectableText] public string Description; - - [LegacyPayloadKey(3)] public Guid Manufacturer; - [Inspectable, LegacyPayloadKey(4)] + [Inspectable] public float Mass; - [InspectableSchematicShape, LegacyPayloadKey(5)] + [InspectableSchematicShape] public Shape Shape; // Heat needed to change temperature of 1 gram by 1 degree - [Inspectable, LegacyPayloadKey(6)] + [Inspectable] public float SpecificHeat = 1; - [Inspectable, LegacyPayloadKey(7)] + [Inspectable] public float Conductivity = 1; - [Inspectable, LegacyPayloadKey(8)] + [Inspectable] public int Price = 0; public string EntryName @@ -311,89 +309,88 @@ public abstract class ItemData : INamedEntry public class SimpleCommodityData : ItemData { // // Types of body where this resource can be found - // [InspectableField, LegacyPayloadKey(6)] + // [InspectableField] // public BodyType ResourceBodyType; // // // Controls the lowest value in the resource distribution curve - // [InspectableField, LegacyPayloadKey(8)] + // [InspectableField] // public ExponentialLerp Distribution; // // // Minimum amount of resources needed for presence to register - // [InspectableField, LegacyPayloadKey(11)] + // [InspectableField] // public float Floor = 5f; - [Inspectable, LegacyPayloadKey(9)] + [Inspectable] public int MaxStack = 10; - [Inspectable, LegacyPayloadKey(10)] + [Inspectable] public SimpleCommodityCategory Category; } public abstract class CraftedItemData : ItemData { - // [Inspectable, LegacyPayloadKey(9)] + // [Inspectable] // public float IngredientQualityWeight = .5f; } [Inspectable] public class CompoundCommodityData : CraftedItemData { - [LegacyPayloadKey(10)] public Dictionary DemandProfile = new Dictionary(); - [Inspectable, LegacyPayloadKey(11)] + [Inspectable] public CompoundCommodityCategory Category; } [Inspectable] public class ConsumableItemData : CraftedItemData { - [Inspectable, LegacyPayloadKey(11)] + [Inspectable] public bool Stackable; - [Inspectable, LegacyPayloadKey(12)] + [Inspectable] public float Duration; - [InspectableTexture, LegacyPayloadKey(13)] + [InspectableTexture] public string Icon; - [Inspectable, LegacyPayloadKey(14)] + [Inspectable] public BezierCurve Effectiveness; } public abstract class EquippableItemData : CraftedItemData { - [InspectableTexture, LegacyPayloadKey(10)] + [InspectableTexture] public string Schematic; - [Inspectable, LegacyPayloadKey(12)] + [Inspectable] public float Durability; - [InspectableTemperature, LegacyPayloadKey(13)] + [InspectableTemperature] public float MinimumTemperature; - [InspectableTemperature, LegacyPayloadKey(14)] + [InspectableTemperature] public float MaximumTemperature; - // [InspectableField, LegacyPayloadKey(15), SimplePerformanceStat] + // [InspectableField, SimplePerformanceStat] // public PerformanceStat DurabilityExponent = new PerformanceStat(); // - // [InspectableField, LegacyPayloadKey(16), SimplePerformanceStat] + // [InspectableField, SimplePerformanceStat] // public PerformanceStat HeatExponent = new PerformanceStat(); - [InspectableAnimationCurve, LegacyPayloadKey(17)] + [InspectableAnimationCurve] public BezierCurve HeatPerformanceCurve; - [Inspectable, LegacyPayloadKey(18)] + [Inspectable] public float ThermalResilience = 1; - [InspectableTexture, LegacyPayloadKey(20)] + [InspectableTexture] public string ActionBarIcon; - [InspectableSoundBank, LegacyPayloadKey(21)] + [InspectableSoundBank] public uint SoundBank; - [Inspectable, LegacyPayloadKey(22)] + [Inspectable] public List AudioStats = new List(); public abstract HardpointType HardpointType { get; } @@ -435,17 +432,17 @@ public abstract class EquippableItemData : CraftedItemData [Inspectable] public class AudioStat { - [InspectableAudioParameter, LegacyPayloadKey(0)] + [InspectableAudioParameter] public uint Parameter; - [Inspectable, LegacyPayloadKey(1)] + [Inspectable] public PerformanceStat Stat = new PerformanceStat(); } [Inspectable] public class GearData : EquippableItemData { - [Inspectable, LegacyPayloadKey(23)] + [Inspectable] public HardpointType Hardpoint; public override HardpointType HardpointType => Hardpoint; @@ -454,7 +451,7 @@ public class GearData : EquippableItemData [Inspectable] public class CargoBayData : EquippableItemData { - [Inspectable, LegacyPayloadKey(24)] + [Inspectable] public Shape InteriorShape; public override HardpointType HardpointType => HardpointType.Tool; @@ -463,51 +460,51 @@ public class CargoBayData : EquippableItemData [Inspectable] public class DockingBayData : CargoBayData { - [Inspectable, LegacyPayloadKey(25)] + [Inspectable] public int2 MaxSize; } public class WeaponItemData : GearData { - [Inspectable, LegacyPayloadKey(24)] + [Inspectable] public WeaponRange WeaponRange; - [Inspectable, LegacyPayloadKey(25)] + [Inspectable] public WeaponCaliber WeaponCaliber; - [Inspectable, LegacyPayloadKey(26)] + [Inspectable] public WeaponType WeaponType; - [Inspectable, LegacyPayloadKey(27)] + [Inspectable] public WeaponFireType WeaponFireTypes; - [Inspectable, LegacyPayloadKey(28)] + [Inspectable] public WeaponModifiers WeaponModifiers; } [Inspectable] public class HullData : EquippableItemData { - [Inspectable, LegacyPayloadKey(23)] + [Inspectable] public List Hardpoints = new List(); - [InspectablePrefab, LegacyPayloadKey(24)] + [InspectablePrefab] public string Prefab; - [Inspectable, LegacyPayloadKey(25)] + [Inspectable] public HullType HullType; - [Inspectable, LegacyPayloadKey(26)] + [Inspectable] public float GridOffset; - [Inspectable, LegacyPayloadKey(27)] + [Inspectable] public float Armor; - [Inspectable, LegacyPayloadKey(28)] + [Inspectable] public float Drag; - [Inspectable, LegacyPayloadKey(29)] + [Inspectable] public bool CanTow; public Shape InteriorCells @@ -531,12 +528,12 @@ public class HullData : EquippableItemData [Inspectable] public class HardpointData : ITintInspector { - [Inspectable, LegacyPayloadKey(0)] public HardpointType Type; - [Inspectable, LegacyPayloadKey(1)] public int2 Position; - [Inspectable, LegacyPayloadKey(2)] public Shape Shape = new Shape(); - [Inspectable, LegacyPayloadKey(3)] public string Transform; - [Inspectable, LegacyPayloadKey(4)] public ItemRotation Rotation; - [Inspectable, LegacyPayloadKey(5)] public float Armor; + [Inspectable] public HardpointType Type; + [Inspectable] public int2 Position; + [Inspectable] public Shape Shape = new Shape(); + [Inspectable] public string Transform; + [Inspectable] public ItemRotation Rotation; + [Inspectable] public float Armor; public override string ToString() { @@ -568,23 +565,13 @@ public class HardpointData : ITintInspector public class PerformanceStat { - [LegacyPayloadKey(0)] public float Min; + public float Min; - [LegacyPayloadKey(1)] public float Max; - - [LegacyPayloadKey(2)] + public float Max; public float HeatExponentMultiplier; - - [LegacyPayloadKey(3)] public float DurabilityExponentMultiplier; - - [LegacyPayloadKey(4)] public float QualityExponent; - //[LegacyPayloadKey(5)] public Guid ID = Guid.NewGuid(); - - // [LegacyPayloadKey(5)] public Guid? Ingredient; - private Dictionary> _scaleModifiers; private Dictionary> _constantModifiers; diff --git a/Assets/Scripts/ServerShared/LegacyPayloadKeyAttribute.cs b/Assets/Scripts/ServerShared/LegacyPayloadKeyAttribute.cs deleted file mode 100644 index c97e1a641..000000000 --- a/Assets/Scripts/ServerShared/LegacyPayloadKeyAttribute.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; - -[AttributeUsage(AttributeTargets.Field)] -public sealed class LegacyPayloadKeyAttribute : Attribute -{ - public LegacyPayloadKeyAttribute(int key) - { - Key = key; - } - - public int Key { get; } -} diff --git a/Assets/Scripts/ServerShared/LegacyPayloadKeyAttribute.cs.meta b/Assets/Scripts/ServerShared/LegacyPayloadKeyAttribute.cs.meta deleted file mode 100644 index 6aa76295b..000000000 --- a/Assets/Scripts/ServerShared/LegacyPayloadKeyAttribute.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d84c2d3401b6477a9e708b7aa559f02b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md index a737397d7..2173bdb7a 100644 --- a/docs/aetheria-perfect-machine-map.md +++ b/docs/aetheria-perfect-machine-map.md @@ -533,9 +533,9 @@ legacy catalog cache, and legacy UI paths should be migration-only or deleted. DTOs no longer carry MessagePack object/key/ignore metadata. Typed corporation/name-file/catalog documents own durable state; these classes are inspector/runtime projections only. Item and behavior DTO field layout for - `AetheriaRuntimeItemCatalog` no longer depends on MessagePack attributes. The - temporary bridge uses `LegacyPayloadKeyAttribute` while typed item instances - and behavior factories are being built. + `AetheriaRuntimeItemCatalog` no longer depends on live Unity field + attributes; importer key maps, typed payload fields, and explicit runtime + mappers own migrated layout. - The dead `PersonalityAttribute` projection DTO and its unused property-panel hook have been deleted; no typed catalog import or runtime caller owned that shape. @@ -634,10 +634,10 @@ legacy catalog cache, and legacy UI paths should be migration-only or deleted. legacy DTO class names to classify typed catalog rows. The typed state verifier also consumes those package-owned category tokens for consumable and docking-bay coverage checks instead of hardcoding migrated class-name strings. - Item/behavior DTO field layout for the temporary projection bridge is now - marked with project-owned `LegacyPayloadKeyAttribute`, not MessagePack - metadata. That attribute is migration/layout metadata only; runtime behavior - construction does not use it as an authority. Item properties + Item/behavior DTO field layout is no longer marked in live Unity source with + MessagePack or project-owned payload-key attributes. Importer key maps and + typed runtime payload fields own migrated layout; runtime behavior + construction does not use field attributes as an authority. Item properties manufacturer display is a typed snapshot consumer; loadout generation uses typed catalog rows for hull type, shape, category, hardpoint type, behavior kind prefilters, and selected-item instantiation. The old trade debug UI @@ -1182,11 +1182,12 @@ First Aetheria surfaces to publish: - Done: demote legacy player, faction, name-file, galaxy-map-layer, and narrative helper DTOs from MessagePack metadata to plain runtime/inspector shapes. - - Done: replace remaining item/behavior DTO MessagePack field metadata with - `LegacyPayloadKeyAttribute`; no live `Assets/Scripts` source depends on - Newtonsoft, RethinkDB, or bespoke save-file serializer symbols. Remaining - package-level MessagePack usage is the typed CultCache `.cc` transport - boundary, not a gameplay save format. + - Done: delete remaining item/behavior DTO MessagePack field metadata and + the follow-on `LegacyPayloadKeyAttribute`; no live `Assets/Scripts` source + depends on Newtonsoft, RethinkDB, bespoke save-file serializer symbols, or + legacy payload-key annotations. Remaining package-level MessagePack usage + is the typed CultCache `.cc` transport boundary, not a gameplay save + format. - Done: delete dead `PlayerData` and `GalaxyMapLayerData` catalog roots, and remove legacy catalog group/table annotations from surviving runtime DTOs. - Done: move loadout generation's selected-item instantiation onto typed @@ -1327,9 +1328,10 @@ First Aetheria surfaces to publish: such as `Cockpit`, `TurretController`, and `Capacitor` remain stable catalog facts rather than class-name-derived selectors. - Done: replace `ItemManager` behavior config reflection with an explicit - typed behavior-kind mapper. `LegacyPayloadKeyAttribute` remains - migration/layout metadata only and no longer selects or mutates runtime - behavior configs. + typed behavior-kind mapper. + - Done: delete `LegacyPayloadKeyAttribute` from live Unity source after + importer constants and explicit typed mappers became the only migrated + field-key authorities. - Done: quarantine the vendored Unity `MessagePack` assembly by disabling asmdef auto-reference; only explicit state-spine assemblies should see it while the Unity CultCache bridge still needs a low-level `.cc` codec. @@ -1420,8 +1422,8 @@ First Aetheria surfaces to publish: item instances expose `ItemId` and `Reference`; the old `ItemInstance.Data` identity field is deleted. - Live Unity source has no `RuntimeCatalogEntry` or `RuntimeItemProjectionEntry`. -- Live Unity source has no `InspectableRuntimeCatalogLinkAttribute`; - `LegacyPayloadKeyAttribute` remains only as the temporary mapper key. +- Live Unity source has no `InspectableRuntimeCatalogLinkAttribute` or + `LegacyPayloadKeyAttribute`. - Unity batchmode compile also returned cleanly after disabling `MessagePack` auto-reference; `Assets/Scripts` and `Assets/Editor` have no `using MessagePack`, `MessagePackSerializer`, `[MessagePackObject]`, or