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

Merge pull request #12268 from reaperrr/interface-cleanups01

Browse Source 
Several internal interface cleanups
This commit is contained in:
reaperrr
2016-10-22 18:14:55 +02:00
committed by GitHub
parent 1ffb151a38 72374279f0
commit 0f02a6ba7c
28 changed files with 172 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -189,6 +189,9 @@ check-scripts:
@luac -p $(shell find lua/* -iname '*.lua')
check: utility mods
@echo
@echo "Checking for explicit interface violations..."
@mono --debug OpenRA.Utility.exe all --check-explicit-interfaces
@echo
@echo "Checking for code style violations in OpenRA.Game..."
@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Game
@@ -220,9 +223,6 @@ check: utility mods
@echo "Checking for code style violations in OpenRA.Test..."
@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Test
@echo
@echo "Checking for explicit interface violations..."
@mono --debug OpenRA.Utility.exe all --check-explicit-interfaces
@echo
@echo "Checking for code style violations in OpenRA.Server..."
@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Server

47
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -66,20 +66,6 @@ namespace OpenRA.Traits
}
}
[Flags]
public enum ImpactType
{
None = 0,
Ground = 1,
GroundHit = 2,
Water = 4,
WaterHit = 8,
Air = 16,
AirHit = 32,
TargetTerrain = 64,
TargetHit = 128
}
public class AttackInfo
{
public Damage Damage;
@@ -143,23 +129,13 @@ namespace OpenRA.Traits
public interface INotifyCreated { void Created(Actor self); }
public interface INotifyAddedToWorld { void AddedToWorld(Actor self); }
public interface INotifyRemovedFromWorld { void RemovedFromWorld(Actor self); }
public interface INotifySold { void Selling(Actor self); void Sold(Actor self); }
public interface INotifyDamage { void Damaged(Actor self, AttackInfo e); }
public interface INotifyDamageStateChanged { void DamageStateChanged(Actor self, AttackInfo e); }
public interface INotifyRepair { void Repairing(Actor self, Actor target); }
public interface INotifyKilled { void Killed(Actor self, AttackInfo e); }
public interface INotifyActorDisposing { void Disposing(Actor self); }
public interface INotifyAppliedDamage { void AppliedDamage(Actor self, Actor damaged, AttackInfo e); }
public interface INotifyBuildComplete { void BuildingComplete(Actor self); }
public interface INotifyBuildingPlaced { void BuildingPlaced(Actor self); }
public interface INotifyProduction { void UnitProduced(Actor self, Actor other, CPos exit); }
public interface INotifyOtherProduction { void UnitProducedByOther(Actor self, Actor producer, Actor produced); }
public interface INotifyDelivery { void IncomingDelivery(Actor self); void Delivered(Actor self); }
public interface INotifyOwnerChanged { void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner); }
public interface INotifyEffectiveOwnerChanged { void OnEffectiveOwnerChanged(Actor self, Player oldEffectiveOwner, Player newEffectiveOwner); }
public interface INotifyCapture { void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner); }
public interface INotifyInfiltrated { void Infiltrated(Actor self, Actor infiltrator); }
public interface INotifyDiscovered { void OnDiscovered(Actor self, Player discoverer, bool playNotification); }
public interface ISeedableResource { void Seed(Actor self); }
@@ -176,15 +152,7 @@ namespace OpenRA.Traits
bool HasVoice(Actor self, string voice);
}
public interface IDemolishableInfo : ITraitInfoInterface { bool IsValidTarget(ActorInfo actorInfo, Actor saboteur); }
public interface IDemolishable
{
void Demolish(Actor self, Actor saboteur);
bool IsValidTarget(Actor self, Actor saboteur);
}
public interface IStoreResources { int Capacity { get; } }
public interface INotifyDocking { void Docked(Actor self, Actor harvester); void Undocked(Actor self, Actor harvester); }
public interface IEffectiveOwner
{
@@ -319,8 +287,6 @@ namespace OpenRA.Traits
bool IsBlocking(Actor self, CPos cell);
}
public interface INotifyBlockingMove { void OnNotifyBlockingMove(Actor self, Actor blocking); }
public interface IFacing
{
int TurnSpeed { get; }
@@ -329,19 +295,6 @@ namespace OpenRA.Traits
public interface IFacingInfo : ITraitInfoInterface { int GetInitialFacing(); }
[RequireExplicitImplementation]
public interface ICrushable
{
bool CrushableBy(Actor self, Actor crusher, HashSet<string> crushClasses);
}
[RequireExplicitImplementation]
public interface INotifyCrushed
{
void OnCrush(Actor self, Actor crusher, HashSet<string> crushClasses);
void WarnCrush(Actor self, Actor crusher, HashSet<string> crushClasses);
}
public interface ITraitInfoInterface { }
public interface ITraitInfo : ITraitInfoInterface { object Create(ActorInitializer init); }

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

@@ -143,7 +143,7 @@ namespace OpenRA.Mods.Common.Traits
readonly Actor self;
public readonly bool SkipMakeAnimation;
/* shared activity lock: undeploy, sell, capture, etc */
// Shared activity lock: undeploy, sell, capture, etc.
[Sync] public bool Locked = true;
public bool Lock()
@@ -181,7 +181,7 @@ namespace OpenRA.Mods.Common.Traits
return OccupiedCells().Select(c => self.World.Map.CenterOfCell(c.First));
}
public void Created(Actor self)
void INotifyCreated.Created(Actor self)
{
if (SkipMakeAnimation || !self.Info.HasTraitInfo<WithMakeAnimationInfo>())
NotifyBuildingComplete(self);
@@ -199,7 +199,7 @@ namespace OpenRA.Mods.Common.Traits
self.World.ScreenMap.Add(self);
}
public void RemovedFromWorld(Actor self)
void INotifyRemovedFromWorld.RemovedFromWorld(Actor self)
{
self.World.ActorMap.RemoveInfluence(self, this);
self.World.ActorMap.RemovePosition(self, this);
@@ -220,7 +220,7 @@ namespace OpenRA.Mods.Common.Traits
notify.BuildingComplete(self);
}
public void Selling(Actor self)
void INotifySold.Selling(Actor self)
{
if (Info.RemoveSmudgesOnSell)
RemoveSmudges();
@@ -228,9 +228,9 @@ namespace OpenRA.Mods.Common.Traits
BuildComplete = false;
}
public void Sold(Actor self) { }
void INotifySold.Sold(Actor self) { }
public void BeforeTransform(Actor self)
void INotifyTransform.BeforeTransform(Actor self)
{
if (Info.RemoveSmudgesOnTransform)
RemoveSmudges();
@@ -239,8 +239,8 @@ namespace OpenRA.Mods.Common.Traits
Game.Sound.PlayToPlayer(self.Owner, s, self.CenterPosition);
}
public void OnTransform(Actor self) { }
public void AfterTransform(Actor self) { }
void INotifyTransform.OnTransform(Actor self) { }
void INotifyTransform.AfterTransform(Actor self) { }
public void RemoveSmudges()
{

12
OpenRA.Mods.Common/Traits/Buildings/Refinery.cs
View File

@@ -109,7 +109,7 @@ namespace OpenRA.Mods.Common.Traits
dockedHarv.CancelActivity();
}
public void Tick(Actor self)
void ITick.Tick(Actor self)
{
// Harvester was killed while unloading
if (dockedHarv != null && dockedHarv.IsDead)
@@ -128,7 +128,7 @@ namespace OpenRA.Mods.Common.Traits
}
}
public void Disposing(Actor self)
void INotifyActorDisposing.Disposing(Actor self)
{
CancelDock(self);
foreach (var harv in GetLinkedHarvesters())
@@ -147,7 +147,7 @@ namespace OpenRA.Mods.Common.Traits
harv.QueueActivity(new CallFunc(() => harv.Trait<Harvester>().ContinueHarvesting(harv)));
}
public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{
// Unlink any harvesters
foreach (var harv in GetLinkedHarvesters())
@@ -156,7 +156,7 @@ namespace OpenRA.Mods.Common.Traits
playerResources = newOwner.PlayerActor.Trait<PlayerResources>();
}
public void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner)
void INotifyCapture.OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner)
{
// Steal any docked harv too
if (dockedHarv != null)
@@ -168,8 +168,8 @@ namespace OpenRA.Mods.Common.Traits
}
}
public void Selling(Actor self) { CancelDock(self); }
public void Sold(Actor self)
void INotifySold.Selling(Actor self) { CancelDock(self); }
void INotifySold.Sold(Actor self)
{
foreach (var harv in GetLinkedHarvesters())
harv.Trait.UnlinkProc(harv.Actor, self);

24
OpenRA.Mods.Common/Traits/Buildings/Reservable.cs
View File

@@ -23,14 +23,15 @@ namespace OpenRA.Mods.Common.Traits
Actor reservedFor;
Aircraft reservedForAircraft;
public void Tick(Actor self)
void ITick.Tick(Actor self)
{
// Nothing to do.
if (reservedFor == null)
return; /* nothing to do */
return;
if (!Target.FromActor(reservedFor).IsValidFor(self))
{
/* Not likely to arrive now. */
// Not likely to arrive now.
reservedForAircraft.UnReserve();
reservedFor = null;
reservedForAircraft = null;
@@ -64,24 +65,17 @@ namespace OpenRA.Mods.Common.Traits
return res != null && res.reservedForAircraft != null && !res.reservedForAircraft.MayYieldReservation;
}
public void Disposing(Actor self)
private void UnReserve()
{
if (reservedForAircraft != null)
reservedForAircraft.UnReserve();
}
public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{
if (reservedForAircraft != null)
reservedForAircraft.UnReserve();
}
void INotifyActorDisposing.Disposing(Actor self) { UnReserve(); }
public void Selling(Actor self) { Sold(self); }
void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner) { UnReserve(); }
public void Sold(Actor self)
{
if (reservedForAircraft != null)
reservedForAircraft.UnReserve();
}
void INotifySold.Selling(Actor self) { UnReserve(); }
void INotifySold.Sold(Actor self) { UnReserve(); }
}
}

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

@@ -124,7 +124,7 @@ namespace OpenRA.Mods.Common.Traits
facing = Exts.Lazy(self.TraitOrDefault<IFacing>);
}
public void Created(Actor self)
void INotifyCreated.Created(Actor self)
{
aircraft = self.TraitOrDefault<Aircraft>();
}
@@ -320,7 +320,7 @@ namespace OpenRA.Mods.Common.Traits
upgradeManager.GrantUpgrade(self, u, p);
}
public void Killed(Actor self, AttackInfo e)
void INotifyKilled.Killed(Actor self, AttackInfo e)
{
if (Info.EjectOnDeath)
while (!IsEmpty(self) && CanUnload())
@@ -348,7 +348,7 @@ namespace OpenRA.Mods.Common.Traits
cargo.Clear();
}
public void Disposing(Actor self)
void INotifyActorDisposing.Disposing(Actor self)
{
foreach (var c in cargo)
c.Dispose();
@@ -356,8 +356,8 @@ namespace OpenRA.Mods.Common.Traits
cargo.Clear();
}
public void Selling(Actor self) { }
public void Sold(Actor self)
void INotifySold.Selling(Actor self) { }
void INotifySold.Sold(Actor self)
{
if (!Info.EjectOnSell || cargo == null)
return;
@@ -377,7 +377,7 @@ namespace OpenRA.Mods.Common.Traits
});
}
public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{
if (cargo == null)
return;
@@ -389,7 +389,7 @@ namespace OpenRA.Mods.Common.Traits
});
}
public void AddedToWorld(Actor self)
void INotifyAddedToWorld.AddedToWorld(Actor self)
{
// Force location update to avoid issues when initial spawn is outside map
currentCell = self.Location;
@@ -397,7 +397,7 @@ namespace OpenRA.Mods.Common.Traits
}
bool initialized;
public void Tick(Actor self)
void ITick.Tick(Actor self)
{
// Notify initial cargo load
if (!initialized)
@@ -422,12 +422,6 @@ namespace OpenRA.Mods.Common.Traits
}
}
[RequireExplicitImplementation]
public interface INotifyPassengerEntered { void OnPassengerEntered(Actor self, Actor passenger); }
[RequireExplicitImplementation]
public interface INotifyPassengerExited { void OnPassengerExited(Actor self, Actor passenger); }
public class RuntimeCargoInit : IActorInit<Actor[]>, ISuppressInitExport
{
[FieldFromYamlKey]

4
OpenRA.Mods.Common/Traits/EmitInfantryOnSell.cs
View File

@@ -45,7 +45,7 @@ namespace OpenRA.Mods.Common.Traits
correctFaction = factionsList.Count == 0 || factionsList.Contains(self.Owner.Faction.InternalName);
}
public void Selling(Actor self) { }
void INotifySold.Selling(Actor self) { }
void Emit(Actor self)
{
@@ -85,6 +85,6 @@ namespace OpenRA.Mods.Common.Traits
}
}
public void Sold(Actor self) { Emit(self); }
void INotifySold.Sold(Actor self) { Emit(self); }
}
}

4
OpenRA.Mods.Common/Traits/Harvester.cs
View File

@@ -78,6 +78,7 @@ namespace OpenRA.Mods.Common.Traits
readonly Mobile mobile;
Dictionary<ResourceTypeInfo, int> contents = new Dictionary<ResourceTypeInfo, int>();
bool idleSmart = true;
int idleDuration;
[Sync] public Actor OwnerLinkedProc = null;
[Sync] public Actor LastLinkedProc = null;
@@ -233,7 +234,7 @@ namespace OpenRA.Mods.Common.Traits
}
}
public void OnNotifyBlockingMove(Actor self, Actor blocking)
void INotifyBlockingMove.OnNotifyBlockingMove(Actor self, Actor blocking)
{
// I'm blocking someone else from moving to my location:
var act = self.GetCurrentActivity();
@@ -253,7 +254,6 @@ namespace OpenRA.Mods.Common.Traits
}
}
int idleDuration;
public void TickIdle(Actor self)
{
// Should we be intelligent while idle?

2
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -770,7 +770,7 @@ namespace OpenRA.Mods.Common.Traits
public Activity MoveFollow(Actor self, Target target, WDist minRange, WDist maxRange) { return new Follow(self, target, minRange, maxRange); }
public Activity MoveTo(Func<List<CPos>> pathFunc) { return new Move(self, pathFunc); }
public void OnNotifyBlockingMove(Actor self, Actor blocking)
void INotifyBlockingMove.OnNotifyBlockingMove(Actor self, Actor blocking)
{
if (self.IsIdle && self.AppearsFriendlyTo(blocking))
Nudge(self, blocking, true);

14
OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs
View File

@@ -118,7 +118,7 @@ namespace OpenRA.Mods.Common.Traits
queue.Clear();
}
public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{
ClearQueue();
@@ -138,13 +138,13 @@ namespace OpenRA.Mods.Common.Traits
newOwner.PlayerActor.Trait<TechTree>().Update();
}
public void Killed(Actor killed, AttackInfo e) { if (killed == self) { ClearQueue(); Enabled = false; } }
public void Selling(Actor self) { ClearQueue(); Enabled = false; }
public void Sold(Actor self) { }
void INotifyKilled.Killed(Actor killed, AttackInfo e) { if (killed == self) { ClearQueue(); Enabled = false; } }
void INotifySold.Selling(Actor self) { ClearQueue(); Enabled = false; }
void INotifySold.Sold(Actor self) { }
public void BeforeTransform(Actor self) { ClearQueue(); Enabled = false; }
public void OnTransform(Actor self) { }
public void AfterTransform(Actor self) { }
void INotifyTransform.BeforeTransform(Actor self) { ClearQueue(); Enabled = false; }
void INotifyTransform.OnTransform(Actor self) { }
void INotifyTransform.AfterTransform(Actor self) { }
void CacheProducibles(Actor playerActor)
{

8
OpenRA.Mods.Common/Traits/Render/WithChargeOverlay.cs
View File

@@ -49,19 +49,19 @@ namespace OpenRA.Mods.Common.Traits.Render
info.Palette, info.IsPlayerPalette);
}
public void Charging(Actor self, Target target)
void INotifyCharging.Charging(Actor self, Target target)
{
charging = true;
overlay.PlayThen(RenderSprites.NormalizeSequence(overlay, self.GetDamageState(), info.Sequence), () => charging = false);
}
public void DamageStateChanged(Actor self, AttackInfo e)
void INotifyDamageStateChanged.DamageStateChanged(Actor self, AttackInfo e)
{
overlay.ReplaceAnim(RenderSprites.NormalizeSequence(overlay, e.DamageState, info.Sequence));
}
public void Sold(Actor self) { }
public void Selling(Actor self)
void INotifySold.Sold(Actor self) { }
void INotifySold.Selling(Actor self)
{
charging = false;
}

10
OpenRA.Mods.Common/Traits/Render/WithDockedOverlay.cs
View File

@@ -65,19 +65,19 @@ namespace OpenRA.Mods.Common.Traits.Render
anim.Animation.PlayThen(info.Sequence, PlayDockingOverlay);
}
public void BuildingComplete(Actor self)
void INotifyBuildComplete.BuildingComplete(Actor self)
{
self.World.AddFrameEndTask(w => w.Add(new DelayedAction(120, () =>
buildComplete = true)));
}
public void Sold(Actor self) { }
public void Selling(Actor self)
void INotifySold.Sold(Actor self) { }
void INotifySold.Selling(Actor self)
{
buildComplete = false;
}
public void Docked(Actor self, Actor harvester) { docked = true; PlayDockingOverlay(); }
public void Undocked(Actor self, Actor harvester) { docked = false; }
void INotifyDocking.Docked(Actor self, Actor harvester) { docked = true; PlayDockingOverlay(); }
void INotifyDocking.Undocked(Actor self, Actor harvester) { docked = false; }
}
}

8
OpenRA.Mods.Common/Traits/Render/WithIdleAnimation.cs
View File

@@ -41,7 +41,7 @@ namespace OpenRA.Mods.Common.Traits.Render
ticks = info.Interval;
}
public void Tick(Actor self)
void ITick.Tick(Actor self)
{
if (!buildComplete || IsTraitDisabled)
return;
@@ -54,16 +54,16 @@ namespace OpenRA.Mods.Common.Traits.Render
}
}
public void BuildingComplete(Actor self)
void INotifyBuildComplete.BuildingComplete(Actor self)
{
buildComplete = true;
}
public void Selling(Actor self)
void INotifySold.Selling(Actor self)
{
buildComplete = false;
}
public void Sold(Actor self) { }
void INotifySold.Sold(Actor self) { }
}
}

14
OpenRA.Mods.Common/Traits/Render/WithIdleOverlay.cs
View File

@@ -100,26 +100,26 @@ namespace OpenRA.Mods.Common.Traits.Render
rs.Add(anim, info.Palette, info.IsPlayerPalette);
}
public void BuildingComplete(Actor self)
void INotifyBuildComplete.BuildingComplete(Actor self)
{
buildComplete = true;
}
public void Sold(Actor self) { }
public void Selling(Actor self)
void INotifySold.Sold(Actor self) { }
void INotifySold.Selling(Actor self)
{
buildComplete = false;
}
public void BeforeTransform(Actor self)
void INotifyTransform.BeforeTransform(Actor self)
{
buildComplete = false;
}
public void OnTransform(Actor self) { }
public void AfterTransform(Actor self) { }
void INotifyTransform.OnTransform(Actor self) { }
void INotifyTransform.AfterTransform(Actor self) { }
public void DamageStateChanged(Actor self, AttackInfo e)
void INotifyDamageStateChanged.DamageStateChanged(Actor self, AttackInfo e)
{
overlay.ReplaceAnim(RenderSprites.NormalizeSequence(overlay, e.DamageState, overlay.CurrentSequence.Name));
}

12
OpenRA.Mods.Common/Traits/Render/WithProductionDoorOverlay.cs
View File

@@ -57,30 +57,30 @@ namespace OpenRA.Mods.Common.Traits.Render
renderSprites.Add(new AnimationWithOffset(door, null, () => !buildComplete, offset));
}
public void BuildingComplete(Actor self)
void INotifyBuildComplete.BuildingComplete(Actor self)
{
buildComplete = true;
}
public void Tick(Actor self)
void ITick.Tick(Actor self)
{
if (desiredFrame > 0 && !self.World.ActorMap.GetActorsAt(openExit).Any(a => a != self))
desiredFrame = 0;
}
public void DamageStateChanged(Actor self, AttackInfo e)
void INotifyDamageStateChanged.DamageStateChanged(Actor self, AttackInfo e)
{
if (door.CurrentSequence != null)
door.ReplaceAnim(RenderSprites.NormalizeSequence(door, e.DamageState, door.CurrentSequence.Name));
}
public void UnitProduced(Actor self, Actor other, CPos exit)
void INotifyProduction.UnitProduced(Actor self, Actor other, CPos exit)
{
openExit = exit;
desiredFrame = door.CurrentSequence.Length - 1;
}
public void Selling(Actor self) { buildComplete = false; }
public void Sold(Actor self) { }
void INotifySold.Selling(Actor self) { buildComplete = false; }
void INotifySold.Sold(Actor self) { }
}
}

12
OpenRA.Mods.Common/Traits/Render/WithProductionOverlay.cs
View File

@@ -80,30 +80,30 @@ namespace OpenRA.Mods.Common.Traits.Render
throw new InvalidOperationException("Can't find production queues.");
}
public void Created(Actor self)
void INotifyCreated.Created(Actor self)
{
if (buildComplete)
SelectQueue(self);
}
public void BuildingComplete(Actor self)
void INotifyBuildComplete.BuildingComplete(Actor self)
{
buildComplete = true;
SelectQueue(self);
}
public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{
self.World.AddFrameEndTask(w => SelectQueue(self));
}
public void Sold(Actor self) { }
public void Selling(Actor self)
void INotifySold.Sold(Actor self) { }
void INotifySold.Selling(Actor self)
{
buildComplete = false;
}
public void DamageStateChanged(Actor self, AttackInfo e)
void INotifyDamageStateChanged.DamageStateChanged(Actor self, AttackInfo e)
{
overlay.ReplaceAnim(RenderSprites.NormalizeSequence(overlay, e.DamageState, overlay.CurrentSequence.Name));
}

6
OpenRA.Mods.Common/Traits/Render/WithRearmAnimation.cs
View File

@@ -42,16 +42,16 @@ namespace OpenRA.Mods.Common.Traits.Render
spriteBody.PlayCustomAnimation(self, info.Sequence, () => spriteBody.CancelCustomAnimation(self));
}
public void BuildingComplete(Actor self)
void INotifyBuildComplete.BuildingComplete(Actor self)
{
buildComplete = true;
}
public void Selling(Actor self)
void INotifySold.Selling(Actor self)
{
buildComplete = false;
}
public void Sold(Actor self) { }
void INotifySold.Sold(Actor self) { }
}
}

8
OpenRA.Mods.Common/Traits/Render/WithRepairAnimation.cs
View File

@@ -36,22 +36,22 @@ namespace OpenRA.Mods.Common.Traits.Render
spriteBody = self.TraitOrDefault<WithSpriteBody>();
}
public void Repairing(Actor self, Actor target)
void INotifyRepair.Repairing(Actor self, Actor target)
{
if (buildComplete && spriteBody != null && !(info.PauseOnLowPower && self.IsDisabled()))
spriteBody.PlayCustomAnimation(self, info.Sequence, () => spriteBody.CancelCustomAnimation(self));
}
public void BuildingComplete(Actor self)
void INotifyBuildComplete.BuildingComplete(Actor self)
{
buildComplete = true;
}
public void Selling(Actor self)
void INotifySold.Selling(Actor self)
{
buildComplete = false;
}
public void Sold(Actor self) { }
void INotifySold.Sold(Actor self) { }
}
}

10
OpenRA.Mods.Common/Traits/Render/WithRepairOverlay.cs
View File

@@ -59,24 +59,24 @@ namespace OpenRA.Mods.Common.Traits.Render
rs.Add(anim, info.Palette, info.IsPlayerPalette);
}
public void BuildingComplete(Actor self)
void INotifyBuildComplete.BuildingComplete(Actor self)
{
self.World.AddFrameEndTask(w => w.Add(new DelayedAction(120, () =>
buildComplete = true)));
}
public void Sold(Actor self) { }
public void Selling(Actor self)
void INotifySold.Sold(Actor self) { }
void INotifySold.Selling(Actor self)
{
buildComplete = false;
}
public void DamageStateChanged(Actor self, AttackInfo e)
void INotifyDamageStateChanged.DamageStateChanged(Actor self, AttackInfo e)
{
overlay.ReplaceAnim(RenderSprites.NormalizeSequence(overlay, e.DamageState, overlay.CurrentSequence.Name));
}
public void Repairing(Actor self, Actor host)
void INotifyRepair.Repairing(Actor self, Actor host)
{
visible = true;
overlay.PlayThen(overlay.CurrentSequence.Name, () => visible = false);

10
OpenRA.Mods.Common/Traits/Render/WithResources.cs
View File

@@ -50,23 +50,23 @@ namespace OpenRA.Mods.Common.Traits.Render
rs.Add(anim);
}
public void BuildingComplete(Actor self)
void INotifyBuildComplete.BuildingComplete(Actor self)
{
buildComplete = true;
}
public void DamageStateChanged(Actor self, AttackInfo e)
void INotifyDamageStateChanged.DamageStateChanged(Actor self, AttackInfo e)
{
if (anim.Animation.CurrentSequence != null)
anim.Animation.ReplaceAnim(wsb.NormalizeSequence(self, info.Sequence));
}
public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{
playerResources = newOwner.PlayerActor.Trait<PlayerResources>();
}
public void Selling(Actor self) { rs.Remove(anim); }
public void Sold(Actor self) { }
void INotifySold.Selling(Actor self) { rs.Remove(anim); }
void INotifySold.Sold(Actor self) { }
}
}

46
OpenRA.Mods.Common/TraitsInterfaces.cs
View File

@@ -36,6 +36,33 @@ namespace OpenRA.Mods.Common.Traits
IEnumerable<IRenderable> Render(WorldRenderer wr, World w, ActorInfo ai, WPos centerPosition);
}
[RequireExplicitImplementation]
public interface INotifySold
{
void Selling(Actor self);
void Sold(Actor self);
}
public interface IDemolishableInfo : ITraitInfoInterface { bool IsValidTarget(ActorInfo actorInfo, Actor saboteur); }
public interface IDemolishable
{
void Demolish(Actor self, Actor saboteur);
bool IsValidTarget(Actor self, Actor saboteur);
}
[RequireExplicitImplementation]
public interface ICrushable
{
bool CrushableBy(Actor self, Actor crusher, HashSet<string> crushClasses);
}
[RequireExplicitImplementation]
public interface INotifyCrushed
{
void OnCrush(Actor self, Actor crusher, HashSet<string> crushClasses);
void WarnCrush(Actor self, Actor crusher, HashSet<string> crushClasses);
}
[RequireExplicitImplementation]
public interface INotifyAttack
{
@@ -43,13 +70,32 @@ namespace OpenRA.Mods.Common.Traits
void PreparingAttack(Actor self, Target target, Armament a, Barrel barrel);
}
public interface INotifyBuildComplete { void BuildingComplete(Actor self); }
public interface INotifyBuildingPlaced { void BuildingPlaced(Actor self); }
public interface INotifyRepair { void Repairing(Actor self, Actor target); }
public interface INotifyBurstComplete { void FiredBurst(Actor self, Target target, Armament a); }
public interface INotifyCharging { void Charging(Actor self, Target target); }
public interface INotifyChat { bool OnChat(string from, string message); }
public interface INotifyProduction { void UnitProduced(Actor self, Actor other, CPos exit); }
public interface INotifyOtherProduction { void UnitProducedByOther(Actor self, Actor producer, Actor produced); }
public interface INotifyDelivery { void IncomingDelivery(Actor self); void Delivered(Actor self); }
public interface INotifyDocking { void Docked(Actor self, Actor harvester); void Undocked(Actor self, Actor harvester); }
public interface INotifyParachuteLanded { void OnLanded(Actor ignore); }
public interface INotifyCapture { void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner); }
public interface INotifyInfiltrated { void Infiltrated(Actor self, Actor infiltrator); }
public interface INotifyDiscovered { void OnDiscovered(Actor self, Player discoverer, bool playNotification); }
public interface IRenderActorPreviewInfo : ITraitInfo { IEnumerable<IActorPreview> RenderPreview(ActorPreviewInitializer init); }
public interface ICruiseAltitudeInfo : ITraitInfo { WDist GetCruiseAltitude(); }
[RequireExplicitImplementation]
public interface INotifyBlockingMove { void OnNotifyBlockingMove(Actor self, Actor blocking); }
[RequireExplicitImplementation]
public interface INotifyPassengerEntered { void OnPassengerEntered(Actor self, Actor passenger); }
[RequireExplicitImplementation]
public interface INotifyPassengerExited { void OnPassengerExited(Actor self, Actor passenger); }
public interface IUpgradable
{
IEnumerable<string> UpgradeTypes { get; }

16
OpenRA.Mods.Common/Warheads/Warhead.cs
View File

@@ -9,12 +9,27 @@
*/
#endregion
using System;
using System.Collections.Generic;
using System.Drawing;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Warheads
{
[Flags]
public enum ImpactType
{
None = 0,
Ground = 1,
GroundHit = 2,
Water = 4,
WaterHit = 8,
Air = 16,
AirHit = 32,
TargetTerrain = 64,
TargetHit = 128
}
[Desc("Base warhead class. This can be used to derive other warheads from.")]
public abstract class Warhead : IWarhead
{
@@ -32,6 +47,7 @@ namespace OpenRA.Mods.Common.Warheads
[Desc("Delay in ticks before applying the warhead effect.", "0 = instant (old model).")]
public readonly int Delay = 0;
int IWarhead.Delay { get { return Delay; } }
[Desc("The color used for this warhead's visualization in the world's `WarheadDebugOverlay` trait.")]

10
OpenRA.Mods.D2k/Traits/Render/WithDeliveryOverlay.cs
View File

@@ -69,19 +69,19 @@ namespace OpenRA.Mods.D2k.Traits.Render
anim.Animation.PlayThen(info.Sequence, PlayDeliveryOverlay);
}
public void BuildingComplete(Actor self)
void INotifyBuildComplete.BuildingComplete(Actor self)
{
self.World.AddFrameEndTask(w => w.Add(new DelayedAction(120, () =>
buildComplete = true)));
}
public void Sold(Actor self) { }
public void Selling(Actor self)
void INotifySold.Sold(Actor self) { }
void INotifySold.Selling(Actor self)
{
buildComplete = false;
}
public void IncomingDelivery(Actor self) { delivering = true; PlayDeliveryOverlay(); }
public void Delivered(Actor self) { delivering = false; }
void INotifyDelivery.IncomingDelivery(Actor self) { delivering = true; PlayDeliveryOverlay(); }
void INotifyDelivery.Delivered(Actor self) { delivering = false; }
}
}

1
OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForDecoration.cs
View File

@@ -11,6 +11,7 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Traits.Render;
using OpenRA.Traits;

1
OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForExploration.cs
View File

@@ -9,6 +9,7 @@
*/
#endregion
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits

1
OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForSupportPower.cs
View File

@@ -9,6 +9,7 @@
*/
#endregion
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;

10
OpenRA.Mods.RA/Traits/SupportPowers/GpsPower.cs
View File

@@ -84,10 +84,10 @@ namespace OpenRA.Mods.RA.Traits
});
}
public void Killed(Actor self, AttackInfo e) { RemoveGps(self); }
void INotifyKilled.Killed(Actor self, AttackInfo e) { RemoveGps(self); }
public void Selling(Actor self) { }
public void Sold(Actor self) { RemoveGps(self); }
void INotifySold.Selling(Actor self) { }
void INotifySold.Sold(Actor self) { RemoveGps(self); }
void RemoveGps(Actor self)
{
@@ -95,7 +95,7 @@ namespace OpenRA.Mods.RA.Traits
owner.GpsRemove(self);
}
public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{
RemoveGps(self);
owner = newOwner.PlayerActor.Trait<GpsWatcher>();
@@ -105,7 +105,7 @@ namespace OpenRA.Mods.RA.Traits
bool NoActiveRadar { get { return !self.World.ActorsHavingTrait<ProvidesRadar>(r => r.IsActive).Any(a => a.Owner == self.Owner); } }
bool wasDisabled;
public void Tick(Actor self)
void ITick.Tick(Actor self)
{
if (!wasDisabled && (self.IsDisabled() || (info.RequiresActiveRadar && NoActiveRadar)))
{

4
make.ps1
View File

@@ -164,6 +164,8 @@ elseif ($command -eq "check")
{
if (Test-Path OpenRA.Utility.exe)
{
echo "Checking for explicit interface violations..."
./OpenRA.Utility.exe all --check-explicit-interfaces
echo "Checking for code style violations in OpenRA.Platforms.Default..."
./OpenRA.Utility.exe cnc --check-code-style OpenRA.Platforms.Default
echo "Checking for code style violations in OpenRA.GameMonitor..."
@@ -184,8 +186,6 @@ elseif ($command -eq "check")
./OpenRA.Utility.exe cnc --check-code-style OpenRA.Utility
echo "Checking for code style violations in OpenRA.Test..."
./OpenRA.Utility.exe cnc --check-code-style OpenRA.Test
echo "Checking for explicit interface violations..."
./OpenRA.Utility.exe all --check-explicit-interfaces
}
else
{