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

Group update rule display by update path.

Browse Source
This commit is contained in:
Paul Chote
2018-07-08 20:29:10 +00:00
parent f9230a72f2
commit e64a966b4f
3 changed files with 62 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.Common/UpdateRules/UpdatePath.cs
View File

@@ -85,7 +85,7 @@ namespace OpenRA.Mods.Common.UpdateRules
}) })
}; };
public static IEnumerable<UpdateRule> FromSource(ObjectCreator objectCreator, string source) public static IEnumerable<UpdateRule> FromSource(ObjectCreator objectCreator, string source, bool chain = true)
{ {
// Use reflection to identify types // Use reflection to identify types
var namedType = objectCreator.FindType(source); var namedType = objectCreator.FindType(source);
@@ -93,7 +93,7 @@ namespace OpenRA.Mods.Common.UpdateRules
return new[] { (UpdateRule)objectCreator.CreateBasic(namedType) }; return new[] { (UpdateRule)objectCreator.CreateBasic(namedType) };
var namedPath = Paths.FirstOrDefault(p => p.source == source); var namedPath = Paths.FirstOrDefault(p => p.source == source);
return namedPath != null ? namedPath.Rules : null; return namedPath != null ? namedPath.Rules(chain) : null;
} }
public static IEnumerable<string> KnownPaths { get { return Paths.Select(p => p.source); } } public static IEnumerable<string> KnownPaths { get { return Paths.Select(p => p.source); } }
@@ -115,18 +115,15 @@ namespace OpenRA.Mods.Common.UpdateRules
this.chainToSource = chainToSource; this.chainToSource = chainToSource;
} }
IEnumerable<UpdateRule> Rules IEnumerable<UpdateRule> Rules(bool chain = true)
{ {
get if (chainToSource != null && chain)
{ {
if (chainToSource != null) var child = Paths.First(p => p.source == chainToSource);
{ return rules.Concat(child.Rules(chain));
var chain = Paths.First(p => p.source == chainToSource);
return rules.Concat(chain.Rules);
} }
return rules; return rules;
} }
} }
} }
}

27
OpenRA.Mods.Common/UtilityCommands/UpdateMapCommand.cs
View File

@@ -53,15 +53,40 @@ namespace OpenRA.Mods.Common.UtilityCommands
Console.WriteLine("Valid sources are:"); Console.WriteLine("Valid sources are:");
var ruleGroups = new Dictionary<string, List<string>>();
// Print known tags // Print known tags
Console.WriteLine(" Update Paths:"); Console.WriteLine(" Update Paths:");
foreach (var p in UpdatePath.KnownPaths) foreach (var p in UpdatePath.KnownPaths)
{
Console.WriteLine(" " + p); Console.WriteLine(" " + p);
ruleGroups[p] = UpdatePath.FromSource(modData.ObjectCreator, p, false)
.Select(r => r.GetType().Name)
.Where(r => !ruleGroups.Values.Any(g => g.Contains(r)))
.ToList();
}
// Print known rules // Print known rules
Console.WriteLine(" Individual Rules:"); Console.WriteLine(" Individual Rules:");
foreach (var r in UpdatePath.KnownRules(modData.ObjectCreator)) foreach (var kv in ruleGroups)
{
if (!kv.Value.Any())
continue;
Console.WriteLine(" " + kv.Key + ":");
foreach (var r in kv.Value)
Console.WriteLine(" " + r); Console.WriteLine(" " + r);
}
var other = UpdatePath.KnownRules(modData.ObjectCreator)
.Where(r => !ruleGroups.Values.Any(g => g.Contains(r)));
if (other.Any())
{
Console.WriteLine(" Other:");
foreach (var r in other)
Console.WriteLine(" " + r);
}
return; return;
} }

27
OpenRA.Mods.Common/UtilityCommands/UpdateModCommand.cs
View File

@@ -45,15 +45,40 @@ namespace OpenRA.Mods.Common.UtilityCommands
Console.WriteLine("Valid sources are:"); Console.WriteLine("Valid sources are:");
var ruleGroups = new Dictionary<string, List<string>>();
// Print known tags // Print known tags
Console.WriteLine(" Update Paths:"); Console.WriteLine(" Update Paths:");
foreach (var p in UpdatePath.KnownPaths) foreach (var p in UpdatePath.KnownPaths)
{
Console.WriteLine(" " + p); Console.WriteLine(" " + p);
ruleGroups[p] = UpdatePath.FromSource(modData.ObjectCreator, p, false)
.Select(r => r.GetType().Name)
.Where(r => !ruleGroups.Values.Any(g => g.Contains(r)))
.ToList();
}
// Print known rules // Print known rules
Console.WriteLine(" Individual Rules:"); Console.WriteLine(" Individual Rules:");
foreach (var r in UpdatePath.KnownRules(modData.ObjectCreator)) foreach (var kv in ruleGroups)
{
if (!kv.Value.Any())
continue;
Console.WriteLine(" " + kv.Key + ":");
foreach (var r in kv.Value)
Console.WriteLine(" " + r); Console.WriteLine(" " + r);
}
var other = UpdatePath.KnownRules(modData.ObjectCreator)
.Where(r => !ruleGroups.Values.Any(g => g.Contains(r)));
if (other.Any())
{
Console.WriteLine(" Other:");
foreach (var r in other)
Console.WriteLine(" " + r);
}
return; return;
} }