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

Improve visibility lint

Browse Source
This commit is contained in:
Gustas
2023-04-29 13:47:43 +03:00
committed by Matthias Mailänder
parent 9b71317280
commit f344ccb714
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.Common/Lint/CheckDefaultVisibility.cs
View File

@@ -36,12 +36,13 @@ namespace OpenRA.Mods.Common.Lint
// Catch TypeDictionary errors. // Catch TypeDictionary errors.
try try
{ {
var count = actorInfo.Value.TraitInfos<IDefaultVisibilityInfo>().Count(); var visibilityTypes = actorInfo.Value.TraitInfos<IDefaultVisibilityInfo>();
var count = visibilityTypes.Count();
if (count == 0) if (count == 0)
emitError($"Actor type `{actorInfo.Key}` does not define a default visibility type."); emitError($"Actor type `{actorInfo.Key}` does not define a default visibility type.");
else if (count > 1) else if (count > 1)
emitError($"Actor type `{actorInfo.Key}` defines multiple default visibility types."); emitError($"Actor type `{actorInfo.Key}` defines multiple default visibility types: {string.Join(", ", visibilityTypes.Select(vis => vis.GetType().Name))}.");
else else
{ {
var vis = actorInfo.Value.TraitInfoOrDefault<HiddenUnderShroudInfo>(); var vis = actorInfo.Value.TraitInfoOrDefault<HiddenUnderShroudInfo>();
@@ -49,9 +50,9 @@ namespace OpenRA.Mods.Common.Lint
{ {
var ios = actorInfo.Value.TraitInfoOrDefault<IOccupySpaceInfo>(); var ios = actorInfo.Value.TraitInfoOrDefault<IOccupySpaceInfo>();
if (ios == null) if (ios == null)
emitError($"Actor type `{actorInfo.Key}` defines VisibilityType.Footprint in `{vis.GetType()}` but has no IOccupySpace traits."); emitError($"Actor type `{actorInfo.Key}` defines VisibilityType.Footprint in `{vis.GetType().Name}` but has no IOccupySpace traits.");
else if (ios.OccupiedCells(actorInfo.Value, CPos.Zero).Count == 0) else if (ios.OccupiedCells(actorInfo.Value, CPos.Zero).Count == 0)
emitError($"Actor type `{actorInfo.Key}` defines VisibilityType.Footprint in `{vis.GetType()}` but does not have any footprint cells."); emitError($"Actor type `{actorInfo.Key}` defines VisibilityType.Footprint in `{vis.GetType().Name}` but does not have any footprint cells.");
} }
} }
} }