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

Added IDisabledTrait & rewrote upgrade code using a level-based approach.

Browse Source 
Upgradeable traits are notified whenever an upgrade of their declared types are granted or revoked.  The traits maintain their own internal level counter, which is then used to enable or disable the trait functionality.  A trait can register for multiple upgrade types which then all affect the internal level counter.

	IDisabledTrait for identifying (and filtering) disabled traits
	UpgradableTrait provides an abstract base for traits to support upgrade levels
	Added IDisabledTrait support to GlobalButtonOrderGenerator

	Includes rework by pchote with alterations.
This commit is contained in:
atlimit8
2014-10-13 18:09:16 -05:00
parent 76cf5b8b98
commit bbd54cb32f
38 changed files with 545 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
OpenRA.Mods.RA/KillsSelf.cs
View File

@@ -12,57 +12,38 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using OpenRA.Effects;
using OpenRA.Mods.Common;
using OpenRA.Primitives;
using OpenRA.Traits;
using OpenRA.Effects;
namespace OpenRA.Mods.RA
{
class KillsSelfInfo : ITraitInfo
class KillsSelfInfo : UpgradableTraitInfo, ITraitInfo
{
[Desc("Enable only if this upgrade is enabled.")]
public readonly string RequiresUpgrade = null;
[Desc("Remove the actor from the world (and destroy it) instead of killing it.")]
public readonly bool RemoveInstead = false;
public object Create(ActorInitializer init) { return new KillsSelf(init.self, this); }
public object Create(ActorInitializer init) { return new KillsSelf(this); }
}
class KillsSelf : INotifyAddedToWorld, IUpgradable
class KillsSelf : UpgradableTrait<KillsSelfInfo>, INotifyAddedToWorld
{
readonly KillsSelfInfo info;
readonly Actor self;
public KillsSelf(Actor self, KillsSelfInfo info)
{
this.info = info;
this.self = self;
}
public KillsSelf(KillsSelfInfo info)
: base(info) { }
public void AddedToWorld(Actor self)
{
if (info.RequiresUpgrade == null)
Kill();
if (!IsTraitDisabled)
UpgradeEnabled(self);
}
public bool AcceptsUpgrade(string type)
{
return type == info.RequiresUpgrade;
}
public void UpgradeAvailable(Actor self, string type, bool available)
{
if (type == info.RequiresUpgrade)
Kill();
}
void Kill()
protected override void UpgradeEnabled(Actor self)
{
if (self.IsDead)
return;
if (info.RemoveInstead || !self.HasTrait<Health>())
if (Info.RemoveInstead || !self.HasTrait<Health>())
self.Destroy();
else
self.Kill(self);