diff --git a/OpenRA.Game/GameRules/Ruleset.cs b/OpenRA.Game/GameRules/Ruleset.cs index 54dbdd3bed..a5720d51ad 100644 --- a/OpenRA.Game/GameRules/Ruleset.cs +++ b/OpenRA.Game/GameRules/Ruleset.cs @@ -122,7 +122,7 @@ namespace OpenRA var music = MergeOrDefault("Manifest,Music", fs, m.Music, null, null, k => new MusicInfo(k.Key, k.Value)); - var modelSequences = MergeOrDefault("Manifest,ModelSequences", fs, m.VoxelSequences, null, null, + var modelSequences = MergeOrDefault("Manifest,ModelSequences", fs, m.ModelSequences, null, null, k => k); // The default ruleset does not include a preferred tileset or sequence set @@ -189,7 +189,7 @@ namespace OpenRA var modelSequences = dr.ModelSequences; if (mapModelSequences != null) - modelSequences = MergeOrDefault("ModelSequences", fileSystem, m.VoxelSequences, mapModelSequences, dr.ModelSequences, + modelSequences = MergeOrDefault("ModelSequences", fileSystem, m.ModelSequences, mapModelSequences, dr.ModelSequences, k => k); ruleset = new Ruleset(actors, weapons, voices, notifications, music, ts, sequences, modelSequences); diff --git a/OpenRA.Game/Manifest.cs b/OpenRA.Game/Manifest.cs index 35c993622b..fd0df0f62f 100644 --- a/OpenRA.Game/Manifest.cs +++ b/OpenRA.Game/Manifest.cs @@ -57,7 +57,7 @@ namespace OpenRA public readonly ModMetadata Metadata; public readonly string[] Rules, ServerTraits, - Sequences, VoxelSequences, Cursors, Chrome, Assemblies, ChromeLayout, + Sequences, ModelSequences, Cursors, Chrome, Assemblies, ChromeLayout, Weapons, Voices, Notifications, Music, Translations, TileSets, ChromeMetrics, MapCompatibility, Missions; @@ -71,7 +71,7 @@ namespace OpenRA public readonly string[] PackageFormats = { }; readonly string[] reservedModuleNames = { "Metadata", "Folders", "MapFolders", "Packages", "Rules", - "Sequences", "VoxelSequences", "Cursors", "Chrome", "Assemblies", "ChromeLayout", "Weapons", + "Sequences", "ModelSequences", "Cursors", "Chrome", "Assemblies", "ChromeLayout", "Weapons", "Voices", "Notifications", "Music", "Translations", "TileSets", "ChromeMetrics", "Missions", "ServerTraits", "LoadScreen", "Fonts", "SupportsMapsFrom", "SoundFormats", "SpriteFormats", "RequiresMods", "PackageFormats" }; @@ -98,7 +98,7 @@ namespace OpenRA Rules = YamlList(yaml, "Rules"); Sequences = YamlList(yaml, "Sequences"); - VoxelSequences = YamlList(yaml, "VoxelSequences"); + ModelSequences = YamlList(yaml, "ModelSequences"); Cursors = YamlList(yaml, "Cursors"); Chrome = YamlList(yaml, "Chrome"); Assemblies = YamlList(yaml, "Assemblies"); diff --git a/OpenRA.Game/Map/Map.cs b/OpenRA.Game/Map/Map.cs index ccacae3002..79f12b494b 100644 --- a/OpenRA.Game/Map/Map.cs +++ b/OpenRA.Game/Map/Map.cs @@ -169,7 +169,7 @@ namespace OpenRA new MapField("Actors", "ActorDefinitions"), new MapField("Rules", "RuleDefinitions", required: false), new MapField("Sequences", "SequenceDefinitions", required: false), - new MapField("VoxelSequences", "VoxelSequenceDefinitions", required: false), + new MapField("ModelSequences", "ModelSequenceDefinitions", required: false), new MapField("Weapons", "WeaponDefinitions", required: false), new MapField("Voices", "VoiceDefinitions", required: false), new MapField("Music", "MusicDefinitions", required: false), @@ -200,7 +200,7 @@ namespace OpenRA // Custom map yaml. Public for access by the map importers and lint checks public readonly MiniYaml RuleDefinitions; public readonly MiniYaml SequenceDefinitions; - public readonly MiniYaml VoxelSequenceDefinitions; + public readonly MiniYaml ModelSequenceDefinitions; public readonly MiniYaml WeaponDefinitions; public readonly MiniYaml VoiceDefinitions; public readonly MiniYaml MusicDefinitions; @@ -387,7 +387,7 @@ namespace OpenRA try { Rules = Ruleset.Load(modData, this, Tileset, RuleDefinitions, WeaponDefinitions, - VoiceDefinitions, NotificationDefinitions, MusicDefinitions, SequenceDefinitions, VoxelSequenceDefinitions); + VoiceDefinitions, NotificationDefinitions, MusicDefinitions, SequenceDefinitions, ModelSequenceDefinitions); } catch (Exception e) { diff --git a/OpenRA.Game/Map/MapPreview.cs b/OpenRA.Game/Map/MapPreview.cs index 79b8a9b471..dd2976cd6b 100644 --- a/OpenRA.Game/Map/MapPreview.cs +++ b/OpenRA.Game/Map/MapPreview.cs @@ -307,7 +307,7 @@ namespace OpenRA var musicDefinitions = LoadRuleSection(yaml, "Music"); var notificationDefinitions = LoadRuleSection(yaml, "Notifications"); var sequenceDefinitions = LoadRuleSection(yaml, "Sequences"); - var modelSequenceDefinitions = LoadRuleSection(yaml, "VoxelSequences"); + var modelSequenceDefinitions = LoadRuleSection(yaml, "ModelSequences"); var rules = Ruleset.Load(modData, this, TileSet, ruleDefinitions, weaponDefinitions, voiceDefinitions, notificationDefinitions, musicDefinitions, sequenceDefinitions, modelSequenceDefinitions); var flagged = Ruleset.DefinesUnsafeCustomRules(modData, this, ruleDefinitions, @@ -391,7 +391,7 @@ namespace OpenRA var musicDefinitions = LoadRuleSection(rulesYaml, "Music"); var notificationDefinitions = LoadRuleSection(rulesYaml, "Notifications"); var sequenceDefinitions = LoadRuleSection(rulesYaml, "Sequences"); - var modelSequenceDefinitions = LoadRuleSection(rulesYaml, "VoxelSequences"); + var modelSequenceDefinitions = LoadRuleSection(rulesYaml, "ModelSequences"); var rules = Ruleset.Load(modData, this, TileSet, ruleDefinitions, weaponDefinitions, voiceDefinitions, notificationDefinitions, musicDefinitions, sequenceDefinitions, modelSequenceDefinitions); var flagged = Ruleset.DefinesUnsafeCustomRules(modData, this, ruleDefinitions, diff --git a/OpenRA.Mods.Common/UtilityCommands/ExtractMapRules.cs b/OpenRA.Mods.Common/UtilityCommands/ExtractMapRules.cs index 8466d602c6..61be56a3ad 100644 --- a/OpenRA.Mods.Common/UtilityCommands/ExtractMapRules.cs +++ b/OpenRA.Mods.Common/UtilityCommands/ExtractMapRules.cs @@ -57,7 +57,7 @@ namespace OpenRA.Mods.Common.UtilityCommands var map = new Map(modData, new Folder(".").OpenPackage(args[1], modData.ModFiles)); MergeAndPrint(map, "Rules", map.RuleDefinitions); MergeAndPrint(map, "Sequences", map.SequenceDefinitions); - MergeAndPrint(map, "VoxelSequences", map.VoxelSequenceDefinitions); + MergeAndPrint(map, "ModelSequences", map.ModelSequenceDefinitions); MergeAndPrint(map, "Weapons", map.WeaponDefinitions); MergeAndPrint(map, "Voices", map.VoiceDefinitions); MergeAndPrint(map, "Music", map.MusicDefinitions); diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml index 62515d5273..81aa4a8e99 100644 --- a/mods/ts/mod.yaml +++ b/mods/ts/mod.yaml @@ -100,7 +100,7 @@ Sequences: ts|sequences/bridges.yaml ts|sequences/critters.yaml -VoxelSequences: +ModelSequences: ts|sequences/voxels.yaml TileSets: