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

Add ILintSequencesPass.

Browse Source
This commit is contained in:
Paul Chote
2022-12-28 22:14:19 +13:00
committed by Gustas
parent 7cd4272350
commit b7cdcf419f
3 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRA.Mods.Common/Lint/CheckSequences.cs
View File

@@ -18,24 +18,9 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Lint namespace OpenRA.Mods.Common.Lint
{ {
class CheckSequences : ILintRulesPass class CheckSequences : ILintSequencesPass
{ {
void ILintRulesPass.Run(Action<string> emitError, Action<string> emitWarning, ModData modData, Ruleset rules) void ILintSequencesPass.Run(Action<string> emitError, Action<string> emitWarning, ModData modData, Ruleset rules, SequenceProvider sequences)
{
// Custom maps define rules.Sequences, default mod rules leave it null.
if (rules.Sequences == null)
{
foreach (var kv in modData.DefaultSequences)
{
Console.WriteLine("Testing default sequences for {0}", kv.Key);
Run(emitError, emitWarning, rules, kv.Value);
}
}
else if (!modData.DefaultSequences.Values.Contains(rules.Sequences))
Run(emitError, emitWarning, rules, rules.Sequences);
}
void Run(Action<string> emitError, Action<string> emitWarning, Ruleset rules, SequenceProvider sequences)
{ {
var factions = rules.Actors[SystemActors.World].TraitInfos<FactionInfo>().Select(f => f.InternalName).ToArray(); var factions = rules.Actors[SystemActors.World].TraitInfos<FactionInfo>().Select(f => f.InternalName).ToArray();
foreach (var actorInfo in rules.Actors) foreach (var actorInfo in rules.Actors)

28
OpenRA.Mods.Common/UtilityCommands/CheckYaml.cs
View File

@@ -13,6 +13,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.FileSystem; using OpenRA.FileSystem;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Lint; using OpenRA.Mods.Common.Lint;
namespace OpenRA.Mods.Common.UtilityCommands namespace OpenRA.Mods.Common.UtilityCommands
@@ -62,6 +63,13 @@ namespace OpenRA.Mods.Common.UtilityCommands
// Run all rule checks on the default mod rules. // Run all rule checks on the default mod rules.
CheckRules(modData, modData.DefaultRules); CheckRules(modData, modData.DefaultRules);
foreach (var tileset in modData.DefaultTerrainInfo.Keys)
{
Console.WriteLine($"Testing default sequences for {tileset}");
var sequences = new SequenceProvider(modData.DefaultFileSystem, modData, tileset, null);
CheckSequences(modData, modData.DefaultRules, sequences);
}
// Run all generic (not mod-level) checks here. // Run all generic (not mod-level) checks here.
foreach (var customPassType in modData.ObjectCreator.GetTypesImplementing<ILintPass>()) foreach (var customPassType in modData.ObjectCreator.GetTypesImplementing<ILintPass>())
@@ -120,7 +128,11 @@ namespace OpenRA.Mods.Common.UtilityCommands
// Run all rule checks on the map if it defines custom rules. // Run all rule checks on the map if it defines custom rules.
if (map.RuleDefinitions != null || map.VoiceDefinitions != null || map.WeaponDefinitions != null) if (map.RuleDefinitions != null || map.VoiceDefinitions != null || map.WeaponDefinitions != null)
{
CheckRules(modData, map.Rules); CheckRules(modData, map.Rules);
if (map.SequenceDefinitions != null)
CheckSequences(modData, modData.DefaultRules, map.Sequences);
}
// Run all map-level checks here. // Run all map-level checks here.
foreach (var customMapPassType in modData.ObjectCreator.GetTypesImplementing<ILintMapPass>()) foreach (var customMapPassType in modData.ObjectCreator.GetTypesImplementing<ILintMapPass>())
@@ -152,5 +164,21 @@ namespace OpenRA.Mods.Common.UtilityCommands
} }
} }
} }
void CheckSequences(ModData modData, Ruleset rules, SequenceProvider sequences)
{
foreach (var customSequencesPassType in modData.ObjectCreator.GetTypesImplementing<ILintSequencesPass>())
{
try
{
var customRulesPass = (ILintSequencesPass)modData.ObjectCreator.CreateBasic(customSequencesPassType);
customRulesPass.Run(EmitError, EmitWarning, modData, rules, sequences);
}
catch (Exception e)
{
EmitError($"{customSequencesPassType} failed with exception: {e}");
}
}
}
} }
} }

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

@@ -10,10 +10,12 @@
#endregion #endregion
using System; using System;
using OpenRA.Graphics;
namespace OpenRA.Mods.Common.Lint namespace OpenRA.Mods.Common.Lint
{ {
public interface ILintPass { void Run(Action<string> emitError, Action<string> emitWarning, ModData modData); } public interface ILintPass { void Run(Action<string> emitError, Action<string> emitWarning, ModData modData); }
public interface ILintMapPass { void Run(Action<string> emitError, Action<string> emitWarning, ModData modData, Map map); } public interface ILintMapPass { void Run(Action<string> emitError, Action<string> emitWarning, ModData modData, Map map); }
public interface ILintRulesPass { void Run(Action<string> emitError, Action<string> emitWarning, ModData modData, Ruleset rules); } public interface ILintRulesPass { void Run(Action<string> emitError, Action<string> emitWarning, ModData modData, Ruleset rules); }
public interface ILintSequencesPass { void Run(Action<string> emitError, Action<string> emitWarning, ModData modData, Ruleset rules, SequenceProvider sequences); }
} }