diff --git a/Assets/Scripts/ServerShared/Corporations.cs b/Assets/Scripts/ServerShared/Corporations.cs index 3b676aef4..e527606d9 100644 --- a/Assets/Scripts/ServerShared/Corporations.cs +++ b/Assets/Scripts/ServerShared/Corporations.cs @@ -47,14 +47,7 @@ public class Faction [Inspectable, CultReference(typeof(Faction), many: true), CultInspectorRange(0, 1), JsonProperty("allegiance"), Key(12)] public Dictionary, float> Allegiance = new Dictionary, float>(); - [Inspectable, JsonProperty("overworldMusic"), Key(13)] - public uint OverworldMusic; - - [Inspectable, JsonProperty("combatMusic"), Key(14)] - public uint CombatMusic; - - [Inspectable, JsonProperty("bossMusic"), Key(15)] - public uint BossMusic; + // Keys 13 to 15 (overworldMusic, combatMusic, bossMusic) held Wwise ids; retired, never reuse them. // Key 16 is reserved for Relations (operator ruling faction-relations-field). diff --git a/Assets/Scripts/ServerShared/ItemData.cs b/Assets/Scripts/ServerShared/ItemData.cs index fe705b4f6..72c07fc9a 100644 --- a/Assets/Scripts/ServerShared/ItemData.cs +++ b/Assets/Scripts/ServerShared/ItemData.cs @@ -417,11 +417,7 @@ public abstract class EquippableItemData : CraftedItemData [Inspectable, CultInspectorAssetGuid, JsonProperty("actionIcon"), Key(20)] public string ActionBarIcon; - [Inspectable, JsonProperty("soundBank"), Key(21)] - public uint SoundBank; - - [Inspectable, JsonProperty("audioStats"), Key(22)] - public List AudioStats = new List(); + // Keys 21 (soundBank) and 22 (audioStats) held Wwise ids; audio is native Unity plus AquaSynth now. Retired; never reuse them. [IgnoreMember] public abstract HardpointType HardpointType { get; } @@ -455,16 +451,6 @@ public abstract class EquippableItemData : CraftedItemData } } -[Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)] -public class AudioStat -{ - [Inspectable, JsonProperty("parameter"), Key(0)] - public uint Parameter; - - [Inspectable, JsonProperty("stat"), Key(1)] - public PerformanceStat Stat = new PerformanceStat(); -} - [CultDocument("aetheria.geardata", "1"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)] public class GearData : EquippableItemData { diff --git a/docs/aetheria-release-map.md b/docs/aetheria-release-map.md index 3176c3163..87e5beb8c 100644 --- a/docs/aetheria-release-map.md +++ b/docs/aetheria-release-map.md @@ -224,9 +224,11 @@ at the same commit. stat); `SoundBank` is catalog key 21 (`:403-404`). - Gone since B5: the `AetherDrive` audio calls and its `RpmAudioParameter` and `TorqueRatioAudioParameter` fields (grep 0), and the `EntityInstance` block that read - `item.Data.SoundBank` (grep 0). Follow-up `wwise-catalog-fields` still names both; its live - set is `SoundBank` (key 21), `AudioStats` (key 22) and `Faction.OverworldMusic`, - `CombatMusic`, `BossMusic` (`Corporations.cs:52-59`, keys 13 to 15). + `item.Data.SoundBank` (grep 0). Follow-up `wwise-catalog-fields` retired the rest: `SoundBank` + (key 21), `AudioStats` (key 22, with `AudioStat`) and `Faction.OverworldMusic`, `CombatMusic`, + `BossMusic` (keys 13 to 15) are deleted, their keys left as never-reuse comments. The shipped + `GameData/Aetheria.cc` still carries the old values (29 equippables with a `SoundBank`, 2 factions + with music); the reader skips unknown keys and the next catalog write drops them. - `WwiseMetadata.cs` (91 lines) and `WwiseSoundBinding.cs` (21 lines) are used only by that surface; both have `.meta` files. A repo-wide grep outside `docs` finds the Wwise symbols in exactly these files: `ChargedWeapon.cs`, `InstantWeapon.cs`, `Reactor.cs`, `Thruster.cs`,