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

Remove the hardcoded cloak reference from activities

Browse Source
This commit is contained in:
abcdefg30
2017-07-13 23:45:48 +02:00
committed by reaperrr
parent 049ed086f9
commit 71f2026b32
6 changed files with 57 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Traits/Buildings/Building.cs
View File

@@ -237,7 +237,7 @@ namespace OpenRA.Mods.Common.Traits
}
public class Building : IOccupySpace, ITargetableCells, INotifySold, INotifyTransform, ISync, INotifyCreated,
INotifyAddedToWorld, INotifyRemovedFromWorld
INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyDemolition
{
public readonly bool SkipMakeAnimation;
public readonly BuildingInfo Info;
@@ -331,6 +331,11 @@ namespace OpenRA.Mods.Common.Traits
notify.BuildingComplete(self);
}
void INotifyDemolition.Demolishing(Actor self)
{
Lock();
}
void INotifySold.Selling(Actor self)
{
if (Info.RemoveSmudgesOnSell)

22
OpenRA.Mods.Common/Traits/Cloak.cs
View File

@@ -62,8 +62,8 @@ namespace OpenRA.Mods.Common.Traits
public override object Create(ActorInitializer init) { return new Cloak(this); }
}
public class Cloak : ConditionalTrait<CloakInfo>, IRenderModifier, INotifyDamage,
INotifyAttack, ITick, IVisibilityModifier, IRadarColorModifier, INotifyCreated, INotifyHarvesterAction
public class Cloak : ConditionalTrait<CloakInfo>, IRenderModifier, INotifyDamage, INotifyUnload, INotifyDemolition, INotifyInfiltration,
INotifyAttack, ITick, IVisibilityModifier, IRadarColorModifier, INotifyCreated, INotifyHarvesterAction
{
[Sync] int remainingTime;
bool isDocking;
@@ -212,5 +212,23 @@ namespace OpenRA.Mods.Common.Traits
{
isDocking = false;
}
void INotifyUnload.Unloading(Actor self)
{
if (Info.UncloakOn.HasFlag(UncloakType.Unload))
Uncloak();
}
void INotifyDemolition.Demolishing(Actor self)
{
if (Info.UncloakOn.HasFlag(UncloakType.Demolish))
Uncloak();
}
void INotifyInfiltration.Infiltrating(Actor self)
{
if (Info.UncloakOn.HasFlag(UncloakType.Infiltrate))
Uncloak();
}
}
}