Remove building lock from Sellable.

This commit is contained in:
Paul Chote
2018-10-27 16:56:24 +00:00
committed by abcdefg30
parent 492bcdd9a7
commit 94088d37a6
21 changed files with 30 additions and 104 deletions

View File

@@ -58,10 +58,6 @@ namespace OpenRA.Mods.Common.Traits
if (IsTraitDisabled)
return;
var building = self.TraitOrDefault<Building>();
if (building != null && !building.Lock())
return;
self.CancelActivity();
foreach (var s in info.SellSounds)

View File

@@ -22,7 +22,7 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
get
{
return "Traits are no longer force-disabled while the WithMakeAnimation trait is active.\n" +
"This affects the With*Animation, With*Overlay, Transforms, Gate, and ConyardChronoReturn traits.\n" +
"This affects the With*Animation, With*Overlay, Transforms, Sellable, Gate, and ConyardChronoReturn traits.\n" +
"The AnnounceOnBuild trait has been replaced with a new VoiceAnnouncement trait.\n" +
"Affected actors are listed so that conditions may be manually defined.";
}
@@ -53,6 +53,7 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
"WithCrumbleOverlay",
"WithDeliveryOverlay",
"Transforms",
"Sellable",
"Gate",
"ConyardChronoReturn",
"VoiceAnnouncement"