epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename VoxelSequences to ModelSequences.

Browse Source
This commit is contained in:
Paul Chote
2017-06-09 16:00:43 +00:00
committed by reaperrr
parent 34810756c2
commit 17089f2aee
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/GameRules/Ruleset.cs
View File

@@ -122,7 +122,7 @@ namespace OpenRA
var music = MergeOrDefault("Manifest,Music", fs, m.Music, null, null, var music = MergeOrDefault("Manifest,Music", fs, m.Music, null, null,
k => new MusicInfo(k.Key, k.Value)); 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); k => k);
// The default ruleset does not include a preferred tileset or sequence set // The default ruleset does not include a preferred tileset or sequence set
@@ -189,7 +189,7 @@ namespace OpenRA
var modelSequences = dr.ModelSequences; var modelSequences = dr.ModelSequences;
if (mapModelSequences != null) if (mapModelSequences != null)
modelSequences = MergeOrDefault("ModelSequences", fileSystem, m.VoxelSequences, mapModelSequences, dr.ModelSequences, modelSequences = MergeOrDefault("ModelSequences", fileSystem, m.ModelSequences, mapModelSequences, dr.ModelSequences,
k => k); k => k);
ruleset = new Ruleset(actors, weapons, voices, notifications, music, ts, sequences, modelSequences); ruleset = new Ruleset(actors, weapons, voices, notifications, music, ts, sequences, modelSequences);

6
OpenRA.Game/Manifest.cs
View File

@@ -57,7 +57,7 @@ namespace OpenRA
public readonly ModMetadata Metadata; public readonly ModMetadata Metadata;
public readonly string[] public readonly string[]
Rules, ServerTraits, Rules, ServerTraits,
Sequences, VoxelSequences, Cursors, Chrome, Assemblies, ChromeLayout, Sequences, ModelSequences, Cursors, Chrome, Assemblies, ChromeLayout,
Weapons, Voices, Notifications, Music, Translations, TileSets, Weapons, Voices, Notifications, Music, Translations, TileSets,
ChromeMetrics, MapCompatibility, Missions; ChromeMetrics, MapCompatibility, Missions;
@@ -71,7 +71,7 @@ namespace OpenRA
public readonly string[] PackageFormats = { }; public readonly string[] PackageFormats = { };
readonly string[] reservedModuleNames = { "Metadata", "Folders", "MapFolders", "Packages", "Rules", 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", "Voices", "Notifications", "Music", "Translations", "TileSets", "ChromeMetrics", "Missions",
"ServerTraits", "LoadScreen", "Fonts", "SupportsMapsFrom", "SoundFormats", "SpriteFormats", "ServerTraits", "LoadScreen", "Fonts", "SupportsMapsFrom", "SoundFormats", "SpriteFormats",
"RequiresMods", "PackageFormats" }; "RequiresMods", "PackageFormats" };
@@ -98,7 +98,7 @@ namespace OpenRA
Rules = YamlList(yaml, "Rules"); Rules = YamlList(yaml, "Rules");
Sequences = YamlList(yaml, "Sequences"); Sequences = YamlList(yaml, "Sequences");
VoxelSequences = YamlList(yaml, "VoxelSequences"); ModelSequences = YamlList(yaml, "ModelSequences");
Cursors = YamlList(yaml, "Cursors"); Cursors = YamlList(yaml, "Cursors");
Chrome = YamlList(yaml, "Chrome"); Chrome = YamlList(yaml, "Chrome");
Assemblies = YamlList(yaml, "Assemblies"); Assemblies = YamlList(yaml, "Assemblies");

6
OpenRA.Game/Map/Map.cs
View File

@@ -169,7 +169,7 @@ namespace OpenRA
new MapField("Actors", "ActorDefinitions"), new MapField("Actors", "ActorDefinitions"),
new MapField("Rules", "RuleDefinitions", required: false), new MapField("Rules", "RuleDefinitions", required: false),
new MapField("Sequences", "SequenceDefinitions", 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("Weapons", "WeaponDefinitions", required: false),
new MapField("Voices", "VoiceDefinitions", required: false), new MapField("Voices", "VoiceDefinitions", required: false),
new MapField("Music", "MusicDefinitions", 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 // Custom map yaml. Public for access by the map importers and lint checks
public readonly MiniYaml RuleDefinitions; public readonly MiniYaml RuleDefinitions;
public readonly MiniYaml SequenceDefinitions; public readonly MiniYaml SequenceDefinitions;
public readonly MiniYaml VoxelSequenceDefinitions; public readonly MiniYaml ModelSequenceDefinitions;
public readonly MiniYaml WeaponDefinitions; public readonly MiniYaml WeaponDefinitions;
public readonly MiniYaml VoiceDefinitions; public readonly MiniYaml VoiceDefinitions;
public readonly MiniYaml MusicDefinitions; public readonly MiniYaml MusicDefinitions;
@@ -387,7 +387,7 @@ namespace OpenRA
try try
{ {
Rules = Ruleset.Load(modData, this, Tileset, RuleDefinitions, WeaponDefinitions, Rules = Ruleset.Load(modData, this, Tileset, RuleDefinitions, WeaponDefinitions,
VoiceDefinitions, NotificationDefinitions, MusicDefinitions, SequenceDefinitions, VoxelSequenceDefinitions); VoiceDefinitions, NotificationDefinitions, MusicDefinitions, SequenceDefinitions, ModelSequenceDefinitions);
} }
catch (Exception e) catch (Exception e)
{ {

4
OpenRA.Game/Map/MapPreview.cs
View File

@@ -307,7 +307,7 @@ namespace OpenRA
var musicDefinitions = LoadRuleSection(yaml, "Music"); var musicDefinitions = LoadRuleSection(yaml, "Music");
var notificationDefinitions = LoadRuleSection(yaml, "Notifications"); var notificationDefinitions = LoadRuleSection(yaml, "Notifications");
var sequenceDefinitions = LoadRuleSection(yaml, "Sequences"); var sequenceDefinitions = LoadRuleSection(yaml, "Sequences");
var modelSequenceDefinitions = LoadRuleSection(yaml, "VoxelSequences"); var modelSequenceDefinitions = LoadRuleSection(yaml, "ModelSequences");
var rules = Ruleset.Load(modData, this, TileSet, ruleDefinitions, weaponDefinitions, var rules = Ruleset.Load(modData, this, TileSet, ruleDefinitions, weaponDefinitions,
voiceDefinitions, notificationDefinitions, musicDefinitions, sequenceDefinitions, modelSequenceDefinitions); voiceDefinitions, notificationDefinitions, musicDefinitions, sequenceDefinitions, modelSequenceDefinitions);
var flagged = Ruleset.DefinesUnsafeCustomRules(modData, this, ruleDefinitions, var flagged = Ruleset.DefinesUnsafeCustomRules(modData, this, ruleDefinitions,
@@ -391,7 +391,7 @@ namespace OpenRA
var musicDefinitions = LoadRuleSection(rulesYaml, "Music"); var musicDefinitions = LoadRuleSection(rulesYaml, "Music");
var notificationDefinitions = LoadRuleSection(rulesYaml, "Notifications"); var notificationDefinitions = LoadRuleSection(rulesYaml, "Notifications");
var sequenceDefinitions = LoadRuleSection(rulesYaml, "Sequences"); var sequenceDefinitions = LoadRuleSection(rulesYaml, "Sequences");
var modelSequenceDefinitions = LoadRuleSection(rulesYaml, "VoxelSequences"); var modelSequenceDefinitions = LoadRuleSection(rulesYaml, "ModelSequences");
var rules = Ruleset.Load(modData, this, TileSet, ruleDefinitions, weaponDefinitions, var rules = Ruleset.Load(modData, this, TileSet, ruleDefinitions, weaponDefinitions,
voiceDefinitions, notificationDefinitions, musicDefinitions, sequenceDefinitions, modelSequenceDefinitions); voiceDefinitions, notificationDefinitions, musicDefinitions, sequenceDefinitions, modelSequenceDefinitions);
var flagged = Ruleset.DefinesUnsafeCustomRules(modData, this, ruleDefinitions, var flagged = Ruleset.DefinesUnsafeCustomRules(modData, this, ruleDefinitions,

2
OpenRA.Mods.Common/UtilityCommands/ExtractMapRules.cs
View File

@@ -57,7 +57,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
var map = new Map(modData, new Folder(".").OpenPackage(args[1], modData.ModFiles)); var map = new Map(modData, new Folder(".").OpenPackage(args[1], modData.ModFiles));
MergeAndPrint(map, "Rules", map.RuleDefinitions); MergeAndPrint(map, "Rules", map.RuleDefinitions);
MergeAndPrint(map, "Sequences", map.SequenceDefinitions); MergeAndPrint(map, "Sequences", map.SequenceDefinitions);
MergeAndPrint(map, "VoxelSequences", map.VoxelSequenceDefinitions); MergeAndPrint(map, "ModelSequences", map.ModelSequenceDefinitions);
MergeAndPrint(map, "Weapons", map.WeaponDefinitions); MergeAndPrint(map, "Weapons", map.WeaponDefinitions);
MergeAndPrint(map, "Voices", map.VoiceDefinitions); MergeAndPrint(map, "Voices", map.VoiceDefinitions);
MergeAndPrint(map, "Music", map.MusicDefinitions); MergeAndPrint(map, "Music", map.MusicDefinitions);

2
mods/ts/mod.yaml
View File

@@ -100,7 +100,7 @@ Sequences:
ts|sequences/bridges.yaml ts|sequences/bridges.yaml
ts|sequences/critters.yaml ts|sequences/critters.yaml
VoxelSequences: ModelSequences:
ts|sequences/voxels.yaml ts|sequences/voxels.yaml
TileSets: TileSets: