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

Update mod.yaml loading methods to account for potential "package paths"

Browse Source
This commit is contained in:
Pavel Penev
2015-12-16 23:25:28 +02:00
parent 0e53312a1d
commit 778492840f
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Game/Manifest.cs
View File

@@ -154,8 +154,10 @@ namespace OpenRA
if (!yaml.ContainsKey(key)) if (!yaml.ContainsKey(key))
return new string[] { }; return new string[] { };
var list = yaml[key].ToDictionary().Keys.ToArray(); if (parsePaths)
return parsePaths ? list.Select(Platform.ResolvePath).ToArray() : list; return yaml[key].Nodes.Select(node => Platform.ResolvePath(node.Key, node.Value.Value ?? string.Empty)).ToArray();
return yaml[key].ToDictionary().Keys.ToArray();
} }
static IReadOnlyDictionary<string, string> YamlDictionary(Dictionary<string, MiniYaml> yaml, string key, bool parsePaths = false) static IReadOnlyDictionary<string, string> YamlDictionary(Dictionary<string, MiniYaml> yaml, string key, bool parsePaths = false)
@@ -166,15 +168,19 @@ namespace OpenRA
var inner = new Dictionary<string, string>(); var inner = new Dictionary<string, string>();
foreach (var node in yaml[key].Nodes) foreach (var node in yaml[key].Nodes)
{ {
var line = node.Key;
if (node.Value.Value != null)
line += ":" + node.Value.Value;
// '@' may be used in mod.yaml to indicate extra information (similar to trait @ tags). // '@' may be used in mod.yaml to indicate extra information (similar to trait @ tags).
// Applies to MapFolders (to indicate System and User directories) and Packages (to indicate package annotation). // Applies to MapFolders (to indicate System and User directories) and Packages (to indicate package annotation).
if (node.Key.Contains('@')) if (line.Contains('@'))
{ {
var split = node.Key.Split('@'); var split = line.Split('@');
inner.Add(split[0], split[1]); inner.Add(parsePaths ? Platform.ResolvePath(split[0]) : split[0], split[1]);
} }
else else
inner.Add(node.Key, null); inner.Add(line, null);
} }
return new ReadOnlyDictionary<string, string>(inner); return new ReadOnlyDictionary<string, string>(inner);