Lint check and yaml enforcement for HitShape

Now that Health no longer provides a HitShape, actors with Health need at
least one HitShape trait.
This commit is contained in:
reaperrr
2017-05-21 16:54:24 +02:00
parent 7f81de2f8a
commit 7fd0a3aa58
3 changed files with 46 additions and 1 deletions

View File

@@ -0,0 +1,38 @@
#region Copyright & License Information
/*
* Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version. For more
* information, see COPYING.
*/
#endregion
using System;
using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Lint
{
class CheckHitShapes : ILintRulesPass
{
public void Run(Action<string> emitError, Action<string> emitWarning, Ruleset rules)
{
foreach (var actorInfo in rules.Actors)
{
if (actorInfo.Key.StartsWith("^", StringComparison.Ordinal))
continue;
var health = actorInfo.Value.TraitInfoOrDefault<HealthInfo>();
if (health == null)
continue;
var hitShapes = actorInfo.Value.TraitInfos<HitShapeInfo>();
if (!hitShapes.Any())
emitError("Actor type `{0}` has a Health trait but no HitShape trait!".F(actorInfo.Key));
}
}
}
}

View File

@@ -717,6 +717,7 @@
<Compile Include="Traits\CreatesShroud.cs" />
<Compile Include="Traits\RevealsShroud.cs" />
<Compile Include="Lint\CheckRevealFootprint.cs" />
<Compile Include="Lint\CheckHitShapes.cs" />
<Compile Include="Traits\ThrowsShrapnel.cs" />
<Compile Include="Traits\World\MusicPlaylist.cs" />
<Compile Include="Traits\SpawnActorOnDeath.cs" />

View File

@@ -14,7 +14,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
public class HealthInfo : ITraitInfo, UsesInit<HealthInit>
public class HealthInfo : ITraitInfo, UsesInit<HealthInit>, IRulesetLoaded
{
[Desc("HitPoints")]
public readonly int HP = 0;
@@ -22,6 +22,12 @@ namespace OpenRA.Mods.Common.Traits
public readonly bool NotifyAppliedDamage = true;
public virtual object Create(ActorInitializer init) { return new Health(init, this); }
public void RulesetLoaded(Ruleset rules, ActorInfo ai)
{
if (!ai.HasTraitInfo<HitShapeInfo>())
throw new YamlException("Actors with Health need at least one HitShape trait!");
}
}
public class Health : IHealth, ISync, ITick