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

Fix the sequence filename update rule node placement

Browse Source
This commit is contained in:
abcdefg30
2023-02-15 23:49:48 +01:00
committed by Matthias Mailänder
parent 64933ed04b
commit cb8921dc22
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenRA.Mods.Common/UpdateRules/Rules/20221203/ExplicitSequenceFilenames.cs
View File

@@ -207,25 +207,36 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
} }
} }
var inheritsNode = imageNode.LastChildMatching("Inherits");
var inheritsNodeIndex = inheritsNode == null ? 0 : imageNode.Value.Nodes.IndexOf(inheritsNode) + 1;
var maxDuplicateTilesetCount = duplicateTilesetCount.MaxByOrDefault(kv => kv.Value).Value; var maxDuplicateTilesetCount = duplicateTilesetCount.MaxByOrDefault(kv => kv.Value).Value;
if (maxDuplicateTilesetCount > 1) if (maxDuplicateTilesetCount > 1)
{ {
if (imageNode.LastChildMatching("Defaults") == null) var defaultsNode = imageNode.LastChildMatching("Defaults");
imageNode.Value.Nodes.Insert(0, new MiniYamlNode("Defaults", "")); if (defaultsNode == null)
{
defaultsNode = new MiniYamlNode("Defaults", "");
imageNode.Value.Nodes.Insert(inheritsNodeIndex, defaultsNode);
}
var nodes = MiniYaml.FromString(duplicateTilesetCount.First(kv => kv.Value == maxDuplicateTilesetCount).Key); var nodes = MiniYaml.FromString(duplicateTilesetCount.First(kv => kv.Value == maxDuplicateTilesetCount).Key);
defaultTilesetFilenamesNode = new MiniYamlNode("TilesetFilenames", "", nodes); defaultTilesetFilenamesNode = new MiniYamlNode("TilesetFilenames", "", nodes);
imageNode.LastChildMatching("Defaults").Value.Nodes.Insert(0, defaultTilesetFilenamesNode); defaultsNode.Value.Nodes.Insert(0, defaultTilesetFilenamesNode);
} }
var maxDuplicateCount = duplicateCount.MaxByOrDefault(kv => kv.Value).Value; var maxDuplicateCount = duplicateCount.MaxByOrDefault(kv => kv.Value).Value;
if (maxDuplicateCount > 1) if (maxDuplicateCount > 1)
{ {
if (imageNode.LastChildMatching("Defaults") == null) var defaultsNode = imageNode.LastChildMatching("Defaults");
imageNode.Value.Nodes.Insert(0, new MiniYamlNode("Defaults", "")); if (defaultsNode == null)
{
defaultsNode = new MiniYamlNode("Defaults", "");
imageNode.Value.Nodes.Insert(inheritsNodeIndex, defaultsNode);
}
defaultFilenameNode = new MiniYamlNode("Filename", duplicateCount.First(kv => kv.Value == maxDuplicateCount).Key); defaultFilenameNode = new MiniYamlNode("Filename", duplicateCount.First(kv => kv.Value == maxDuplicateCount).Key);
imageNode.LastChildMatching("Defaults").Value.Nodes.Insert(0, defaultFilenameNode); defaultsNode.Value.Nodes.Insert(0, defaultFilenameNode);
} }
} }