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

Merge pull request #11406 from Mailaender/upgrademanager-exception

Browse Source 
Added an error message when setting up upgrades without UpgradeManager
This commit is contained in:
reaperrr
2016-06-11 12:59:59 +02:00
committed by GitHub
parent 0c5799cd1b 3b27975b33
commit 239f51e8b2
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Mods.Common/Lint/CheckUpgrades.cs
View File

@@ -31,14 +31,23 @@ namespace OpenRA.Mods.Common.Lint
foreach (var actorInfo in rules.Actors) foreach (var actorInfo in rules.Actors)
{ {
if (actorInfo.Key.StartsWith("^"))
continue;
foreach (var trait in actorInfo.Value.TraitInfos<ITraitInfo>()) foreach (var trait in actorInfo.Value.TraitInfos<ITraitInfo>())
{ {
var fields = trait.GetType().GetFields(); var fields = trait.GetType().GetFields();
foreach (var field in fields.Where(x => x.HasAttribute<UpgradeUsedReferenceAttribute>())) foreach (var field in fields.Where(x => x.HasAttribute<UpgradeUsedReferenceAttribute>()))
{ {
var values = LintExts.GetFieldValues(trait, field, emitError); var values = LintExts.GetFieldValues(trait, field, emitError);
foreach (var value in values.Where(x => !upgradesGranted.Contains(x))) foreach (var value in values)
emitError("Actor type `{0}` uses upgrade `{1}` that is not granted by anything!".F(actorInfo.Key, value)); {
if (!upgradesGranted.Contains(value))
emitError("Actor type `{0}` uses upgrade `{1}` that is not granted by anything!".F(actorInfo.Key, value));
if (actorInfo.Value.TraitInfoOrDefault<UpgradeManagerInfo>() == null)
emitError("Actor type `{0}` uses upgrade `{1}`, but doesn't have the UpgradeManager trait.".F(actorInfo.Key, value));
}
} }
} }
} }
@@ -51,6 +60,9 @@ namespace OpenRA.Mods.Common.Lint
// Check all upgrades granted by traits. // Check all upgrades granted by traits.
foreach (var actorInfo in rules.Actors) foreach (var actorInfo in rules.Actors)
{ {
if (actorInfo.Key.StartsWith("^"))
continue;
foreach (var trait in actorInfo.Value.TraitInfos<ITraitInfo>()) foreach (var trait in actorInfo.Value.TraitInfos<ITraitInfo>())
{ {
var fields = trait.GetType().GetFields(); var fields = trait.GetType().GetFields();