Merge pull request #8712 from Phrohdoh/fix#rename-pwl

Rename ProduceableWithLevel to ProducibleWithLevel.
This commit is contained in:
Oliver Brakmann
2015-07-14 21:22:57 +02:00
10 changed files with 41 additions and 41 deletions

View File

@@ -15,7 +15,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Actors possessing this trait should define the GainsExperience trait. When the prerequisites are fulfilled, ",
"this trait grants a level-up to newly spawned actors. If additionally the actor's owning player defines the ProductionIconOverlay ",
"trait, the production queue icon renders with an overlay defined in that trait.")]
public class ProduceableWithLevelInfo : ITraitInfo, Requires<GainsExperienceInfo>
public class ProducibleWithLevelInfo : ITraitInfo, Requires<GainsExperienceInfo>
{
public readonly string[] Prerequisites = { };
@@ -25,14 +25,14 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Should the level-up animation be suppressed when actor is created?")]
public readonly bool SuppressLevelupAnimation = true;
public object Create(ActorInitializer init) { return new ProduceableWithLevel(init, this); }
public object Create(ActorInitializer init) { return new ProducibleWithLevel(init, this); }
}
public class ProduceableWithLevel : INotifyCreated
public class ProducibleWithLevel : INotifyCreated
{
readonly ProduceableWithLevelInfo info;
readonly ProducibleWithLevelInfo info;
public ProduceableWithLevel(ActorInitializer init, ProduceableWithLevelInfo info)
public ProducibleWithLevel(ActorInitializer init, ProducibleWithLevelInfo info)
{
this.info = info;
}

View File

@@ -70,7 +70,7 @@ namespace OpenRA.Mods.Common.Traits
foreach (var a in self.World.Map.Rules.Actors.Values)
{
var uwc = a.Traits.GetOrDefault<ProduceableWithLevelInfo>();
var uwc = a.Traits.GetOrDefault<ProducibleWithLevelInfo>();
if (uwc != null)
ttc.Add(MakeKey(a.Name), uwc.Prerequisites, 0, this);
}