diff --git a/OpenRA.Mods.Common/Scripting/Properties/ConditionProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/ConditionProperties.cs index fe8277ca1b..6ac1454990 100644 --- a/OpenRA.Mods.Common/Scripting/Properties/ConditionProperties.cs +++ b/OpenRA.Mods.Common/Scripting/Properties/ConditionProperties.cs @@ -23,8 +23,6 @@ namespace OpenRA.Mods.Common.Scripting { readonly ExternalCondition[] externalConditions; - readonly Dictionary> legacyShim = new Dictionary>(); - public ConditionProperties(ScriptContext context, Actor self) : base(context, self) { @@ -59,37 +57,5 @@ namespace OpenRA.Mods.Common.Scripting return externalConditions .Any(t => t.Info.Condition == condition && t.CanGrantCondition(Self, this)); } - - [Desc("Grant an upgrade to this actor. DEPRECATED! Will be removed.")] - public void GrantUpgrade(string upgrade) - { - Game.Debug("GrantUpgrade is deprecated. Use GrantCondition instead."); - legacyShim.GetOrAdd(upgrade).Push(GrantCondition(upgrade)); - } - - [Desc("Revoke an upgrade that was previously granted using GrantUpgrade. DEPRECATED! Will be removed.")] - public void RevokeUpgrade(string upgrade) - { - Game.Debug("RevokeUpgrade is deprecated. Use RevokeCondition instead."); - Stack tokens; - if (!legacyShim.TryGetValue(upgrade, out tokens) || !tokens.Any()) - throw new InvalidDataException("Attempting to revoke upgrade `{0}` that has not been granted.".F(upgrade)); - - RevokeCondition(tokens.Pop()); - } - - [Desc("Grant a limited-time upgrade to this actor. DEPRECATED! Will be removed.")] - public void GrantTimedUpgrade(string upgrade, int duration) - { - Game.Debug("GrantTimedUpgrade is deprecated. Use GrantCondition instead."); - GrantCondition(upgrade, duration); - } - - [Desc("Check whether this actor accepts a specific upgrade. DEPRECATED! Will be removed.")] - public bool AcceptsUpgrade(string upgrade) - { - Game.Debug("AcceptsUpgrade is deprecated. Use AcceptsCondition instead."); - return AcceptsCondition(upgrade); - } } }