Remove legacy building.Locked and building.BuildComplete from Gate.

This commit is contained in:
Paul Chote
2018-10-03 20:44:56 +00:00
committed by abcdefg30
parent b88b84c05a
commit 3b16938ae5
2 changed files with 6 additions and 4 deletions

View File

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.Common.Traits
}
public class Gate : PausableConditionalTrait<GateInfo>, ITick, ITemporaryBlocker, IBlocksProjectiles,
INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyBlockingMove, ISync
INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyBlockingMove
{
readonly Actor self;
readonly Building building;
@@ -58,7 +58,7 @@ namespace OpenRA.Mods.Common.Traits
void ITick.Tick(Actor self)
{
if (IsTraitDisabled || IsTraitPaused || building.Locked || !building.BuildComplete)
if (IsTraitDisabled || IsTraitPaused)
return;
if (desiredPosition < Position)
@@ -125,7 +125,7 @@ namespace OpenRA.Mods.Common.Traits
bool CanRemoveBlockage(Actor self, Actor blocking)
{
return !IsTraitDisabled && !IsTraitPaused && building.BuildComplete && !building.Locked && blocking.AppearsFriendlyTo(self);
return !IsTraitDisabled && !IsTraitPaused && blocking.AppearsFriendlyTo(self);
}
bool IsBlocked()

View File

@@ -1133,6 +1133,8 @@
-Capturable:
-GivesBuildableArea:
-MustBeDestroyed:
WithMakeAnimation:
Condition: build-incomplete
-WithSpriteBody:
WithGateSpriteBody:
OpenSequence: open
@@ -1148,10 +1150,10 @@
MapEditorData:
Categories: Wall
Gate:
PauseOnCondition: empdisable || build-incomplete
OpeningSound: gateup1.aud
ClosingSound: gatedwn1.aud
BlocksProjectilesHeight: 768
PauseOnCondition: empdisable
^Gate_A:
Inherits: ^Gate