GameCult/Aetheria
Watch
9
0
Fork
You've already forked Aetheria
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request 'Retire the Wwise catalog fields (SoundBank, AudioStats, faction music)' (#4) from nibu/remove-wwise-catalog-fields into master

Browse source
This commit is contained in:
Nibu 2026-11-10 17:50:48 +00:00
commit 9f8452818d
3 changed files with 7 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Assets/Scripts/ServerShared/Corporations.cs
View file

@ -47,14 +47,7 @@ public class Faction
[Inspectable, CultReference(typeof(Faction), many: true), CultInspectorRange(0, 1), JsonProperty("allegiance"), Key(12)]
public Dictionary<CultRecordRef<Faction>, float> Allegiance = new Dictionary<CultRecordRef<Faction>, 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).

16
Assets/Scripts/ServerShared/ItemData.cs
View file

@ -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<AudioStat> AudioStats = new List<AudioStat>();
// 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
{