diff --git a/OpenRA.Mods.Common/Scripting/Properties/ConditionProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/ConditionProperties.cs index 1f22f340d2..7254161eb9 100644 --- a/OpenRA.Mods.Common/Scripting/Properties/ConditionProperties.cs +++ b/OpenRA.Mods.Common/Scripting/Properties/ConditionProperties.cs @@ -22,13 +22,13 @@ namespace OpenRA.Mods.Common.Scripting [ScriptPropertyGroup("General")] public class ConditionProperties : ScriptActorProperties, Requires { - readonly ConditionManager um; + readonly ConditionManager conditionManager; readonly Dictionary> legacyShim = new Dictionary>(); public ConditionProperties(ScriptContext context, Actor self) : base(context, self) { - um = self.Trait(); + conditionManager = self.Trait(); } [Desc("Grant an external condition on this actor and return the revocation token.", @@ -36,22 +36,22 @@ namespace OpenRA.Mods.Common.Scripting "If duration > 0 the condition will be automatically revoked after the defined number of ticks")] public int GrantCondition(string condition, int duration = 0) { - if (!um.AcceptsExternalCondition(Self, condition)) + if (!conditionManager.AcceptsExternalCondition(Self, condition)) throw new InvalidDataException("Condition `{0}` has not been listed on an ExternalConditions trait".F(condition)); - return um.GrantCondition(Self, condition, true, duration); + return conditionManager.GrantCondition(Self, condition, true, duration); } [Desc("Revoke a condition using the token returned by GrantCondition.")] public void RevokeCondition(int token) { - um.RevokeCondition(Self, token); + conditionManager.RevokeCondition(Self, token); } [Desc("Check whether this actor accepts a specific external condition.")] public bool AcceptsCondition(string condition) { - return um.AcceptsExternalCondition(Self, condition); + return conditionManager.AcceptsExternalCondition(Self, condition); } [Desc("Grant an upgrade to this actor. DEPRECATED! Will be removed.")] diff --git a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs index dc1c7358b4..d7831a1e2b 100644 --- a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs +++ b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs @@ -105,7 +105,7 @@ namespace OpenRA.Mods.Common.Traits public readonly AircraftInfo Info; readonly Actor self; - ConditionManager um; + ConditionManager conditionManager; IDisposable reservation; IEnumerable speedModifiers; @@ -146,7 +146,7 @@ namespace OpenRA.Mods.Common.Traits public void Created(Actor self) { - um = self.TraitOrDefault(); + conditionManager = self.TraitOrDefault(); speedModifiers = self.TraitsImplementing().ToArray().Select(sm => sm.GetSpeedModifier()); cachedPosition = self.CenterPosition; } @@ -669,8 +669,8 @@ namespace OpenRA.Mods.Common.Traits return; airborne = true; - if (um != null && !string.IsNullOrEmpty(Info.AirborneCondition) && airborneToken == ConditionManager.InvalidConditionToken) - airborneToken = um.GrantCondition(self, Info.AirborneCondition); + if (conditionManager != null && !string.IsNullOrEmpty(Info.AirborneCondition) && airborneToken == ConditionManager.InvalidConditionToken) + airborneToken = conditionManager.GrantCondition(self, Info.AirborneCondition); } void OnAirborneAltitudeLeft() @@ -679,8 +679,8 @@ namespace OpenRA.Mods.Common.Traits return; airborne = false; - if (um != null && airborneToken != ConditionManager.InvalidConditionToken) - airborneToken = um.RevokeCondition(self, airborneToken); + if (conditionManager != null && airborneToken != ConditionManager.InvalidConditionToken) + airborneToken = conditionManager.RevokeCondition(self, airborneToken); } #endregion @@ -693,8 +693,8 @@ namespace OpenRA.Mods.Common.Traits return; cruising = true; - if (um != null && !string.IsNullOrEmpty(Info.CruisingCondition) && cruisingToken == ConditionManager.InvalidConditionToken) - cruisingToken = um.GrantCondition(self, Info.CruisingCondition); + if (conditionManager != null && !string.IsNullOrEmpty(Info.CruisingCondition) && cruisingToken == ConditionManager.InvalidConditionToken) + cruisingToken = conditionManager.GrantCondition(self, Info.CruisingCondition); } void OnCruisingAltitudeLeft() @@ -702,8 +702,8 @@ namespace OpenRA.Mods.Common.Traits if (!cruising) return; cruising = false; - if (um != null && cruisingToken != ConditionManager.InvalidConditionToken) - cruisingToken = um.RevokeCondition(self, cruisingToken); + if (conditionManager != null && cruisingToken != ConditionManager.InvalidConditionToken) + cruisingToken = conditionManager.RevokeCondition(self, cruisingToken); } #endregion diff --git a/OpenRA.Mods.Common/Traits/Buildings/PrimaryBuilding.cs b/OpenRA.Mods.Common/Traits/Buildings/PrimaryBuilding.cs index 2f68729d5d..f74ac03bbe 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/PrimaryBuilding.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/PrimaryBuilding.cs @@ -41,7 +41,7 @@ namespace OpenRA.Mods.Common.Traits public class PrimaryBuilding : INotifyCreated, IIssueOrder, IResolveOrder { readonly PrimaryBuildingInfo info; - ConditionManager um; + ConditionManager conditionManager; int primaryToken = ConditionManager.InvalidConditionToken; public bool IsPrimary { get; private set; } @@ -53,7 +53,7 @@ namespace OpenRA.Mods.Common.Traits void INotifyCreated.Created(Actor self) { - um = self.TraitOrDefault(); + conditionManager = self.TraitOrDefault(); } IEnumerable IIssueOrder.Orders @@ -95,13 +95,13 @@ namespace OpenRA.Mods.Common.Traits b.Trait.SetPrimaryProducer(b.Actor, false); } - if (um != null && primaryToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(info.PrimaryCondition)) - primaryToken = um.GrantCondition(self, info.PrimaryCondition); + if (conditionManager != null && primaryToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(info.PrimaryCondition)) + primaryToken = conditionManager.GrantCondition(self, info.PrimaryCondition); Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", info.SelectionNotification, self.Owner.Faction.InternalName); } else if (primaryToken != ConditionManager.InvalidConditionToken) - primaryToken = um.RevokeCondition(self, primaryToken); + primaryToken = conditionManager.RevokeCondition(self, primaryToken); } } } diff --git a/OpenRA.Mods.Common/Traits/Cargo.cs b/OpenRA.Mods.Common/Traits/Cargo.cs index a81622909e..676510c4c3 100644 --- a/OpenRA.Mods.Common/Traits/Cargo.cs +++ b/OpenRA.Mods.Common/Traits/Cargo.cs @@ -88,7 +88,7 @@ namespace OpenRA.Mods.Common.Traits int totalWeight = 0; int reservedWeight = 0; Aircraft aircraft; - ConditionManager upgradeManager; + ConditionManager conditionManager; int loadingToken = ConditionManager.InvalidConditionToken; Stack loadedTokens = new Stack(); @@ -141,7 +141,7 @@ namespace OpenRA.Mods.Common.Traits void INotifyCreated.Created(Actor self) { aircraft = self.TraitOrDefault(); - upgradeManager = self.Trait(); + conditionManager = self.Trait(); } static int GetWeight(Actor a) { return a.Info.TraitInfo().Weight; } @@ -208,8 +208,8 @@ namespace OpenRA.Mods.Common.Traits if (!HasSpace(w)) return false; - if (upgradeManager != null && loadingToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(Info.LoadingCondition)) - loadingToken = upgradeManager.GrantCondition(self, Info.LoadingCondition); + if (conditionManager != null && loadingToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(Info.LoadingCondition)) + loadingToken = conditionManager.GrantCondition(self, Info.LoadingCondition); reserves.Add(a); reservedWeight += w; @@ -226,7 +226,7 @@ namespace OpenRA.Mods.Common.Traits reserves.Remove(a); if (loadingToken != ConditionManager.InvalidConditionToken) - loadingToken = upgradeManager.RevokeCondition(self, loadingToken); + loadingToken = conditionManager.RevokeCondition(self, loadingToken); } public string CursorForOrder(Actor self, Order order) @@ -266,10 +266,10 @@ namespace OpenRA.Mods.Common.Traits Stack passengerToken; if (passengerTokens.TryGetValue(a.Info.Name, out passengerToken) && passengerToken.Any()) - upgradeManager.RevokeCondition(self, passengerToken.Pop()); + conditionManager.RevokeCondition(self, passengerToken.Pop()); if (loadedTokens.Any()) - upgradeManager.RevokeCondition(self, loadedTokens.Pop()); + conditionManager.RevokeCondition(self, loadedTokens.Pop()); return a; } @@ -322,7 +322,7 @@ namespace OpenRA.Mods.Common.Traits reserves.Remove(a); if (loadingToken != ConditionManager.InvalidConditionToken) - loadingToken = upgradeManager.RevokeCondition(self, loadingToken); + loadingToken = conditionManager.RevokeCondition(self, loadingToken); } // If not initialized then this will be notified in the first tick @@ -334,11 +334,11 @@ namespace OpenRA.Mods.Common.Traits p.Transport = self; string passengerCondition; - if (upgradeManager != null && Info.PassengerConditions.TryGetValue(a.Info.Name, out passengerCondition)) - passengerTokens.GetOrAdd(a.Info.Name).Push(upgradeManager.GrantCondition(self, passengerCondition)); + if (conditionManager != null && Info.PassengerConditions.TryGetValue(a.Info.Name, out passengerCondition)) + passengerTokens.GetOrAdd(a.Info.Name).Push(conditionManager.GrantCondition(self, passengerCondition)); - if (upgradeManager != null && !string.IsNullOrEmpty(Info.LoadedCondition)) - loadedTokens.Push(upgradeManager.GrantCondition(self, Info.LoadedCondition)); + if (conditionManager != null && !string.IsNullOrEmpty(Info.LoadedCondition)) + loadedTokens.Push(conditionManager.GrantCondition(self, Info.LoadedCondition)); } void INotifyKilled.Killed(Actor self, AttackInfo e) diff --git a/OpenRA.Mods.Common/Traits/Carryable.cs b/OpenRA.Mods.Common/Traits/Carryable.cs index 6680bf0224..b368707095 100644 --- a/OpenRA.Mods.Common/Traits/Carryable.cs +++ b/OpenRA.Mods.Common/Traits/Carryable.cs @@ -33,7 +33,7 @@ namespace OpenRA.Mods.Common.Traits public class Carryable : UpgradableTrait { - ConditionManager upgradeManager; + ConditionManager conditionManager; int reservedToken = ConditionManager.InvalidConditionToken; int carriedToken = ConditionManager.InvalidConditionToken; @@ -51,7 +51,7 @@ namespace OpenRA.Mods.Common.Traits protected override void Created(Actor self) { - upgradeManager = self.Trait(); + conditionManager = self.Trait(); base.Created(self); } @@ -64,7 +64,7 @@ namespace OpenRA.Mods.Common.Traits attached = true; if (carriedToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(Info.CarriedCondition)) - carriedToken = upgradeManager.GrantCondition(self, Info.CarriedCondition); + carriedToken = conditionManager.GrantCondition(self, Info.CarriedCondition); } // This gets called by carrier after we touched down @@ -76,7 +76,7 @@ namespace OpenRA.Mods.Common.Traits attached = false; if (carriedToken != ConditionManager.InvalidConditionToken) - carriedToken = upgradeManager.RevokeCondition(self, carriedToken); + carriedToken = conditionManager.RevokeCondition(self, carriedToken); } public virtual bool Reserve(Actor self, Actor carrier) @@ -88,7 +88,7 @@ namespace OpenRA.Mods.Common.Traits Carrier = carrier; if (reservedToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(Info.ReservedCondition)) - reservedToken = upgradeManager.GrantCondition(self, Info.ReservedCondition); + reservedToken = conditionManager.GrantCondition(self, Info.ReservedCondition); return true; } @@ -99,7 +99,7 @@ namespace OpenRA.Mods.Common.Traits Carrier = null; if (reservedToken != ConditionManager.InvalidConditionToken) - reservedToken = upgradeManager.RevokeCondition(self, reservedToken); + reservedToken = conditionManager.RevokeCondition(self, reservedToken); } // Prepare for transport pickup diff --git a/OpenRA.Mods.Common/Traits/Cloak.cs b/OpenRA.Mods.Common/Traits/Cloak.cs index ecbdbd4a8d..44ac320395 100644 --- a/OpenRA.Mods.Common/Traits/Cloak.cs +++ b/OpenRA.Mods.Common/Traits/Cloak.cs @@ -66,7 +66,7 @@ namespace OpenRA.Mods.Common.Traits [Sync] int remainingTime; [Sync] bool damageDisabled; bool isDocking; - ConditionManager upgradeManager; + ConditionManager conditionManager; CPos? lastPos; bool wasCloaked = false; @@ -80,13 +80,13 @@ namespace OpenRA.Mods.Common.Traits void INotifyCreated.Created(Actor self) { - upgradeManager = self.TraitOrDefault(); + conditionManager = self.TraitOrDefault(); if (Cloaked) { wasCloaked = true; - if (upgradeManager != null && cloakedToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(Info.CloakedCondition)) - cloakedToken = upgradeManager.GrantCondition(self, Info.CloakedCondition); + if (conditionManager != null && cloakedToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(Info.CloakedCondition)) + cloakedToken = conditionManager.GrantCondition(self, Info.CloakedCondition); } } @@ -144,8 +144,8 @@ namespace OpenRA.Mods.Common.Traits var isCloaked = Cloaked; if (isCloaked && !wasCloaked) { - if (upgradeManager != null && cloakedToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(Info.CloakedCondition)) - cloakedToken = upgradeManager.GrantCondition(self, Info.CloakedCondition); + if (conditionManager != null && cloakedToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(Info.CloakedCondition)) + cloakedToken = conditionManager.GrantCondition(self, Info.CloakedCondition); if (!self.TraitsImplementing().Any(a => a != this && a.Cloaked)) Game.Sound.Play(SoundType.World, Info.CloakSound, self.CenterPosition); @@ -153,7 +153,7 @@ namespace OpenRA.Mods.Common.Traits else if (!isCloaked && wasCloaked) { if (cloakedToken != ConditionManager.InvalidConditionToken) - cloakedToken = upgradeManager.RevokeCondition(self, cloakedToken); + cloakedToken = conditionManager.RevokeCondition(self, cloakedToken); if (!self.TraitsImplementing().Any(a => a != this && a.Cloaked)) Game.Sound.Play(SoundType.World, Info.UncloakSound, self.CenterPosition); diff --git a/OpenRA.Mods.Common/Traits/Crates/GrantExternalConditionCrateAction.cs b/OpenRA.Mods.Common/Traits/Crates/GrantExternalConditionCrateAction.cs index f612bec658..a8d2a8c695 100644 --- a/OpenRA.Mods.Common/Traits/Crates/GrantExternalConditionCrateAction.cs +++ b/OpenRA.Mods.Common/Traits/Crates/GrantExternalConditionCrateAction.cs @@ -47,8 +47,8 @@ namespace OpenRA.Mods.Common.Traits bool AcceptsCondition(Actor a) { - var um = a.TraitOrDefault(); - return um != null && um.AcceptsExternalCondition(a, info.Condition); + var cm = a.TraitOrDefault(); + return cm != null && cm.AcceptsExternalCondition(a, info.Condition); } public override int GetSelectionShares(Actor collector) @@ -71,11 +71,11 @@ namespace OpenRA.Mods.Common.Traits if (!a.IsInWorld || a.IsDead) continue; - var um = a.TraitOrDefault(); + var cm = a.TraitOrDefault(); // Condition token is ignored because we never revoke this condition. - if (um != null) - um.GrantCondition(a, info.Condition, true, info.Duration); + if (cm != null) + cm.GrantCondition(a, info.Condition, true, info.Duration); } }); diff --git a/OpenRA.Mods.Common/Traits/GainsExperience.cs b/OpenRA.Mods.Common/Traits/GainsExperience.cs index dd3c892e9a..e84501d087 100644 --- a/OpenRA.Mods.Common/Traits/GainsExperience.cs +++ b/OpenRA.Mods.Common/Traits/GainsExperience.cs @@ -46,7 +46,7 @@ namespace OpenRA.Mods.Common.Traits readonly int initialExperience; readonly List> nextLevel = new List>(); - ConditionManager um; + ConditionManager conditionManager; // Stored as a percentage of our value [Sync] int experience = 0; @@ -70,7 +70,7 @@ namespace OpenRA.Mods.Common.Traits void INotifyCreated.Created(Actor self) { - um = self.TraitOrDefault(); + conditionManager = self.TraitOrDefault(); if (initialExperience > 0) GiveExperience(initialExperience, info.SuppressLevelupAnimation); } @@ -92,8 +92,8 @@ namespace OpenRA.Mods.Common.Traits while (Level < MaxLevel && experience >= nextLevel[Level].First) { - if (um != null) - um.GrantCondition(self, nextLevel[Level].Second); + if (conditionManager != null) + conditionManager.GrantCondition(self, nextLevel[Level].Second); Level++; diff --git a/OpenRA.Mods.Common/Traits/GrantConditionOnPrerequisite.cs b/OpenRA.Mods.Common/Traits/GrantConditionOnPrerequisite.cs index 009824cc96..4df6b24fff 100644 --- a/OpenRA.Mods.Common/Traits/GrantConditionOnPrerequisite.cs +++ b/OpenRA.Mods.Common/Traits/GrantConditionOnPrerequisite.cs @@ -34,7 +34,7 @@ namespace OpenRA.Mods.Common.Traits readonly GrantConditionOnPrerequisiteInfo info; readonly GrantConditionOnPrerequisiteManager globalManager; - ConditionManager manager; + ConditionManager conditionManager; int conditionToken = ConditionManager.InvalidConditionToken; bool wasAvailable; @@ -47,7 +47,7 @@ namespace OpenRA.Mods.Common.Traits void INotifyCreated.Created(Actor self) { - manager = self.TraitOrDefault(); + conditionManager = self.TraitOrDefault(); } void INotifyAddedToWorld.AddedToWorld(Actor self) @@ -64,13 +64,13 @@ namespace OpenRA.Mods.Common.Traits public void PrerequisitesUpdated(Actor self, bool available) { - if (available == wasAvailable || manager == null) + if (available == wasAvailable || conditionManager == null) return; if (available && conditionToken == ConditionManager.InvalidConditionToken) - conditionToken = manager.GrantCondition(self, info.Condition); + conditionToken = conditionManager.GrantCondition(self, info.Condition); else if (!available && conditionToken != ConditionManager.InvalidConditionToken) - conditionToken = manager.RevokeCondition(self, conditionToken); + conditionToken = conditionManager.RevokeCondition(self, conditionToken); wasAvailable = available; } diff --git a/OpenRA.Mods.Common/Traits/Parachutable.cs b/OpenRA.Mods.Common/Traits/Parachutable.cs index 2b4b926314..03d770928a 100644 --- a/OpenRA.Mods.Common/Traits/Parachutable.cs +++ b/OpenRA.Mods.Common/Traits/Parachutable.cs @@ -50,7 +50,7 @@ namespace OpenRA.Mods.Common.Traits readonly ParachutableInfo info; readonly IPositionable positionable; - ConditionManager um; + ConditionManager conditionManager; int parachutingToken = ConditionManager.InvalidConditionToken; public Parachutable(Actor self, ParachutableInfo info) @@ -61,19 +61,19 @@ namespace OpenRA.Mods.Common.Traits void INotifyCreated.Created(Actor self) { - um = self.TraitOrDefault(); + conditionManager = self.TraitOrDefault(); } void INotifyParachute.OnParachute(Actor self) { - if (um != null && parachutingToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(info.ParachutingCondition)) - parachutingToken = um.GrantCondition(self, info.ParachutingCondition); + if (conditionManager != null && parachutingToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(info.ParachutingCondition)) + parachutingToken = conditionManager.GrantCondition(self, info.ParachutingCondition); } void INotifyParachute.OnLanded(Actor self, Actor ignore) { if (parachutingToken != ConditionManager.InvalidConditionToken) - parachutingToken = um.RevokeCondition(self, parachutingToken); + parachutingToken = conditionManager.RevokeCondition(self, parachutingToken); if (!info.KilledOnImpassableTerrain) return; diff --git a/OpenRA.Mods.Common/Traits/Pluggable.cs b/OpenRA.Mods.Common/Traits/Pluggable.cs index 79fe810a81..fa03d36687 100644 --- a/OpenRA.Mods.Common/Traits/Pluggable.cs +++ b/OpenRA.Mods.Common/Traits/Pluggable.cs @@ -34,7 +34,7 @@ namespace OpenRA.Mods.Common.Traits public readonly PluggableInfo Info; readonly string initialPlug; - ConditionManager upgradeManager; + ConditionManager conditionManager; int conditionToken = ConditionManager.InvalidConditionToken; string active; @@ -50,7 +50,7 @@ namespace OpenRA.Mods.Common.Traits public void Created(Actor self) { - upgradeManager = self.TraitOrDefault(); + conditionManager = self.TraitOrDefault(); if (!string.IsNullOrEmpty(initialPlug)) EnablePlug(self, initialPlug); @@ -67,7 +67,7 @@ namespace OpenRA.Mods.Common.Traits if (!Info.Conditions.TryGetValue(type, out condition)) return; - conditionToken = upgradeManager.GrantCondition(self, condition); + conditionToken = conditionManager.GrantCondition(self, condition); active = type; } @@ -77,7 +77,7 @@ namespace OpenRA.Mods.Common.Traits return; if (conditionToken != ConditionManager.InvalidConditionToken) - conditionToken = upgradeManager.RevokeCondition(self, conditionToken); + conditionToken = conditionManager.RevokeCondition(self, conditionToken); active = null; } diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/GrantExternalConditionPower.cs b/OpenRA.Mods.Common/Traits/SupportPowers/GrantExternalConditionPower.cs index 6d4dad148a..ec17c31f20 100644 --- a/OpenRA.Mods.Common/Traits/SupportPowers/GrantExternalConditionPower.cs +++ b/OpenRA.Mods.Common/Traits/SupportPowers/GrantExternalConditionPower.cs @@ -69,11 +69,11 @@ namespace OpenRA.Mods.Common.Traits foreach (var a in UnitsInRange(order.TargetLocation)) { - var um = a.TraitOrDefault(); + var cm = a.TraitOrDefault(); // Condition token is ignored because we never revoke this condition. - if (um != null) - um.GrantCondition(a, info.Condition, true, info.Duration); + if (cm != null) + cm.GrantCondition(a, info.Condition, true, info.Duration); } } @@ -90,8 +90,8 @@ namespace OpenRA.Mods.Common.Traits if (!a.Owner.IsAlliedWith(Self.Owner)) return false; - var um = a.TraitOrDefault(); - return um != null && um.AcceptsExternalCondition(a, info.Condition); + var cm = a.TraitOrDefault(); + return cm != null && cm.AcceptsExternalCondition(a, info.Condition); }); } diff --git a/OpenRA.Mods.Common/Traits/Upgrades/GrantCondition.cs b/OpenRA.Mods.Common/Traits/Upgrades/GrantCondition.cs index 708aabfba2..1b122de42c 100644 --- a/OpenRA.Mods.Common/Traits/Upgrades/GrantCondition.cs +++ b/OpenRA.Mods.Common/Traits/Upgrades/GrantCondition.cs @@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.Traits class GrantCondition : UpgradableTrait { - ConditionManager manager; + ConditionManager conditionManager; int conditionToken = ConditionManager.InvalidConditionToken; public GrantCondition(GrantConditionInfo info) @@ -34,7 +34,7 @@ namespace OpenRA.Mods.Common.Traits protected override void Created(Actor self) { - manager = self.Trait(); + conditionManager = self.Trait(); base.Created(self); } @@ -42,7 +42,7 @@ namespace OpenRA.Mods.Common.Traits protected override void TraitEnabled(Actor self) { if (conditionToken == ConditionManager.InvalidConditionToken) - conditionToken = manager.GrantCondition(self, Info.Condition); + conditionToken = conditionManager.GrantCondition(self, Info.Condition); } protected override void TraitDisabled(Actor self) @@ -50,7 +50,7 @@ namespace OpenRA.Mods.Common.Traits if (conditionToken == ConditionManager.InvalidConditionToken) return; - conditionToken = manager.RevokeCondition(self, conditionToken); + conditionToken = conditionManager.RevokeCondition(self, conditionToken); } } } \ No newline at end of file diff --git a/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnDamageState.cs b/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnDamageState.cs index 6f3c672af4..1fd17e11ab 100644 --- a/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnDamageState.cs +++ b/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnDamageState.cs @@ -41,7 +41,7 @@ namespace OpenRA.Mods.Common.Traits readonly GrantConditionOnDamageStateInfo info; readonly Health health; - ConditionManager manager; + ConditionManager conditionManager; int conditionToken = ConditionManager.InvalidConditionToken; public GrantConditionOnDamageState(Actor self, GrantConditionOnDamageStateInfo info) @@ -52,7 +52,7 @@ namespace OpenRA.Mods.Common.Traits void INotifyCreated.Created(Actor self) { - manager = self.TraitOrDefault(); + conditionManager = self.TraitOrDefault(); GrantUpgradeOnValidDamageState(self, health.DamageState); } @@ -61,7 +61,7 @@ namespace OpenRA.Mods.Common.Traits if (!info.ValidDamageStates.HasFlag(state) || conditionToken != ConditionManager.InvalidConditionToken) return; - conditionToken = manager.GrantCondition(self, info.Condition); + conditionToken = conditionManager.GrantCondition(self, info.Condition); var sound = info.EnabledSounds.RandomOrDefault(Game.CosmeticRandom); Game.Sound.Play(SoundType.World, sound, self.CenterPosition); @@ -70,14 +70,14 @@ namespace OpenRA.Mods.Common.Traits void INotifyDamageStateChanged.DamageStateChanged(Actor self, AttackInfo e) { var granted = conditionToken != ConditionManager.InvalidConditionToken; - if ((granted && info.GrantPermanently) || manager == null) + if ((granted && info.GrantPermanently) || conditionManager == null) return; if (!granted && !info.ValidDamageStates.HasFlag(e.PreviousDamageState)) GrantUpgradeOnValidDamageState(self, health.DamageState); else if (granted && !info.ValidDamageStates.HasFlag(e.DamageState) && info.ValidDamageStates.HasFlag(e.PreviousDamageState)) { - conditionToken = manager.RevokeCondition(self, conditionToken); + conditionToken = conditionManager.RevokeCondition(self, conditionToken); var sound = info.DisabledSounds.RandomOrDefault(Game.CosmeticRandom); Game.Sound.Play(SoundType.World, sound, self.CenterPosition); diff --git a/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnDeploy.cs b/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnDeploy.cs index 54230f79e3..a1589781a5 100644 --- a/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnDeploy.cs +++ b/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnDeploy.cs @@ -72,7 +72,7 @@ namespace OpenRA.Mods.Common.Traits readonly Lazy body; DeployState deployState; - ConditionManager manager; + ConditionManager conditionManager; int deployedToken = ConditionManager.InvalidConditionToken; int undeployedToken = ConditionManager.InvalidConditionToken; @@ -89,7 +89,7 @@ namespace OpenRA.Mods.Common.Traits public void Created(Actor self) { - manager = self.TraitOrDefault(); + conditionManager = self.TraitOrDefault(); switch (deployState) { @@ -244,15 +244,15 @@ namespace OpenRA.Mods.Common.Traits void OnDeployStarted() { if (undeployedToken != ConditionManager.InvalidConditionToken) - undeployedToken = manager.RevokeCondition(self, undeployedToken); + undeployedToken = conditionManager.RevokeCondition(self, undeployedToken); deployState = DeployState.Deploying; } void OnDeployCompleted() { - if (manager != null && !string.IsNullOrEmpty(info.DeployedCondition) && deployedToken == ConditionManager.InvalidConditionToken) - deployedToken = manager.GrantCondition(self, info.DeployedCondition); + if (conditionManager != null && !string.IsNullOrEmpty(info.DeployedCondition) && deployedToken == ConditionManager.InvalidConditionToken) + deployedToken = conditionManager.GrantCondition(self, info.DeployedCondition); deployState = DeployState.Deployed; } @@ -260,15 +260,15 @@ namespace OpenRA.Mods.Common.Traits void OnUndeployStarted() { if (deployedToken != ConditionManager.InvalidConditionToken) - deployedToken = manager.RevokeCondition(self, deployedToken); + deployedToken = conditionManager.RevokeCondition(self, deployedToken); deployState = DeployState.Deploying; } void OnUndeployCompleted() { - if (manager != null && !string.IsNullOrEmpty(info.UndeployedCondition) && undeployedToken == ConditionManager.InvalidConditionToken) - undeployedToken = manager.GrantCondition(self, info.UndeployedCondition); + if (conditionManager != null && !string.IsNullOrEmpty(info.UndeployedCondition) && undeployedToken == ConditionManager.InvalidConditionToken) + undeployedToken = conditionManager.GrantCondition(self, info.UndeployedCondition); deployState = DeployState.Undeployed; } diff --git a/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnMovement.cs b/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnMovement.cs index 2265952abe..6240bf503a 100644 --- a/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnMovement.cs +++ b/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnMovement.cs @@ -31,7 +31,7 @@ namespace OpenRA.Mods.Common.Traits { readonly IMove movement; - ConditionManager manager; + ConditionManager conditionManager; int conditionToken = ConditionManager.InvalidConditionToken; public GrantConditionOnMovement(Actor self, GrantConditionOnMovementInfo info) @@ -42,21 +42,21 @@ namespace OpenRA.Mods.Common.Traits protected override void Created(Actor self) { - manager = self.TraitOrDefault(); + conditionManager = self.TraitOrDefault(); base.Created(self); } void ITick.Tick(Actor self) { - if (manager == null) + if (conditionManager == null) return; var isMovingVertically = Info.ConsiderVerticalMovement ? movement.IsMovingVertically : false; var isMoving = !IsTraitDisabled && !self.IsDead && (movement.IsMoving || isMovingVertically); if (isMoving && conditionToken == ConditionManager.InvalidConditionToken) - conditionToken = manager.GrantCondition(self, Info.Condition); + conditionToken = conditionManager.GrantCondition(self, Info.Condition); else if (!isMoving && conditionToken != ConditionManager.InvalidConditionToken) - conditionToken = manager.RevokeCondition(self, conditionToken); + conditionToken = conditionManager.RevokeCondition(self, conditionToken); } } } diff --git a/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnTerrain.cs b/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnTerrain.cs index 97f53640be..315e94509b 100644 --- a/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnTerrain.cs +++ b/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnTerrain.cs @@ -32,7 +32,7 @@ namespace OpenRA.Mods.Common.Traits { readonly GrantConditionOnTerrainInfo info; - ConditionManager manager; + ConditionManager conditionManager; int conditionToken = ConditionManager.InvalidConditionToken; string previousTerrain; @@ -43,12 +43,12 @@ namespace OpenRA.Mods.Common.Traits void INotifyCreated.Created(Actor self) { - manager = self.TraitOrDefault(); + conditionManager = self.TraitOrDefault(); } public void Tick(Actor self) { - if (manager == null) + if (conditionManager == null) return; var currentTerrain = self.World.Map.GetTerrainInfo(self.Location).Type; @@ -56,9 +56,9 @@ namespace OpenRA.Mods.Common.Traits if (currentTerrain != previousTerrain) { if (wantsGranted && conditionToken == ConditionManager.InvalidConditionToken) - conditionToken = manager.GrantCondition(self, info.Condition); + conditionToken = conditionManager.GrantCondition(self, info.Condition); else if (!wantsGranted && conditionToken != ConditionManager.InvalidConditionToken) - conditionToken = manager.RevokeCondition(self, conditionToken); + conditionToken = conditionManager.RevokeCondition(self, conditionToken); } previousTerrain = currentTerrain; diff --git a/OpenRA.Mods.Common/Traits/Upgrades/ProximityExternalCondition.cs b/OpenRA.Mods.Common/Traits/Upgrades/ProximityExternalCondition.cs index 2d7d879191..4e454d6883 100644 --- a/OpenRA.Mods.Common/Traits/Upgrades/ProximityExternalCondition.cs +++ b/OpenRA.Mods.Common/Traits/Upgrades/ProximityExternalCondition.cs @@ -108,9 +108,9 @@ namespace OpenRA.Mods.Common.Traits if (!info.ValidStances.HasStance(stance)) return; - var um = a.TraitOrDefault(); - if (um != null && !tokens.ContainsKey(a) && um.AcceptsExternalCondition(a, info.Condition)) - tokens[a] = um.GrantCondition(a, info.Condition, true); + var cm = a.TraitOrDefault(); + if (cm != null && !tokens.ContainsKey(a) && cm.AcceptsExternalCondition(a, info.Condition)) + tokens[a] = cm.GrantCondition(a, info.Condition, true); } public void UnitProducedByOther(Actor self, Actor producer, Actor produced) @@ -130,9 +130,9 @@ namespace OpenRA.Mods.Common.Traits if (!info.ValidStances.HasStance(stance)) return; - var um = produced.TraitOrDefault(); - if (um != null && um.AcceptsExternalCondition(produced, info.Condition)) - tokens[produced] = um.GrantCondition(produced, info.Condition, true); + var cm = produced.TraitOrDefault(); + if (cm != null && cm.AcceptsExternalCondition(produced, info.Condition)) + tokens[produced] = cm.GrantCondition(produced, info.Condition, true); } } @@ -146,9 +146,9 @@ namespace OpenRA.Mods.Common.Traits return; tokens.Remove(a); - var um = a.TraitOrDefault(); - if (um != null) - um.RevokeCondition(a, token); + var cm = a.TraitOrDefault(); + if (cm != null) + cm.RevokeCondition(a, token); } } } diff --git a/OpenRA.Mods.Common/Warheads/GrantExternalConditionWarhead.cs b/OpenRA.Mods.Common/Warheads/GrantExternalConditionWarhead.cs index 147ca4c860..8c178a2f9b 100644 --- a/OpenRA.Mods.Common/Warheads/GrantExternalConditionWarhead.cs +++ b/OpenRA.Mods.Common/Warheads/GrantExternalConditionWarhead.cs @@ -36,11 +36,11 @@ namespace OpenRA.Mods.Common.Warheads if (!IsValidAgainst(a, firedBy)) continue; - var um = a.TraitOrDefault(); + var cm = a.TraitOrDefault(); // Condition token is ignored because we never revoke this condition. - if (um != null && um.AcceptsExternalCondition(a, Condition)) - um.GrantCondition(a, Condition, true, Duration); + if (cm != null && cm.AcceptsExternalCondition(a, Condition)) + cm.GrantCondition(a, Condition, true, Duration); } } } diff --git a/OpenRA.Mods.D2k/Activities/SwallowActor.cs b/OpenRA.Mods.D2k/Activities/SwallowActor.cs index 6c7ac23bab..237230e7a8 100644 --- a/OpenRA.Mods.D2k/Activities/SwallowActor.cs +++ b/OpenRA.Mods.D2k/Activities/SwallowActor.cs @@ -28,7 +28,7 @@ namespace OpenRA.Mods.D2k.Activities readonly Target target; readonly Sandworm sandworm; - readonly ConditionManager manager; + readonly ConditionManager conditionManager; readonly WeaponInfo weapon; readonly RadarPings radarPings; readonly AttackSwallow swallow; @@ -46,7 +46,7 @@ namespace OpenRA.Mods.D2k.Activities sandworm = self.Trait(); positionable = self.Trait(); swallow = self.Trait(); - manager = self.TraitOrDefault(); + conditionManager = self.TraitOrDefault(); radarPings = self.World.WorldActor.TraitOrDefault(); } @@ -109,9 +109,9 @@ namespace OpenRA.Mods.D2k.Activities stance = AttackState.Burrowed; countdown = swallow.Info.AttackDelay; burrowLocation = self.Location; - if (manager != null && attackingToken == ConditionManager.InvalidConditionToken && + if (conditionManager != null && attackingToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(swallow.Info.AttackingCondition)) - attackingToken = manager.GrantCondition(self, swallow.Info.AttackingCondition); + attackingToken = conditionManager.GrantCondition(self, swallow.Info.AttackingCondition); break; case AttackState.Burrowed: if (--countdown > 0) @@ -171,7 +171,7 @@ namespace OpenRA.Mods.D2k.Activities void RevokeCondition(Actor self) { if (attackingToken != ConditionManager.InvalidConditionToken) - attackingToken = manager.RevokeCondition(self, attackingToken); + attackingToken = conditionManager.RevokeCondition(self, attackingToken); } } } diff --git a/OpenRA.Mods.RA/Traits/Disguise.cs b/OpenRA.Mods.RA/Traits/Disguise.cs index f3e6b64118..7d3d97c0f6 100644 --- a/OpenRA.Mods.RA/Traits/Disguise.cs +++ b/OpenRA.Mods.RA/Traits/Disguise.cs @@ -83,7 +83,7 @@ namespace OpenRA.Mods.RA.Traits readonly Actor self; readonly DisguiseInfo info; - ConditionManager um; + ConditionManager conditionManager; int disguisedToken = ConditionManager.InvalidConditionToken; public Disguise(Actor self, DisguiseInfo info) @@ -94,7 +94,7 @@ namespace OpenRA.Mods.RA.Traits void INotifyCreated.Created(Actor self) { - um = self.TraitOrDefault(); + conditionManager = self.TraitOrDefault(); } public IEnumerable Orders @@ -187,12 +187,12 @@ namespace OpenRA.Mods.RA.Traits foreach (var t in self.TraitsImplementing()) t.OnEffectiveOwnerChanged(self, oldEffectiveOwner, AsPlayer); - if (Disguised != oldDisguiseSetting && um != null) + if (Disguised != oldDisguiseSetting && conditionManager != null) { if (Disguised && disguisedToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(info.DisguisedCondition)) - disguisedToken = um.GrantCondition(self, info.DisguisedCondition); + disguisedToken = conditionManager.GrantCondition(self, info.DisguisedCondition); else if (!Disguised && disguisedToken != ConditionManager.InvalidConditionToken) - disguisedToken = um.RevokeCondition(self, disguisedToken); + disguisedToken = conditionManager.RevokeCondition(self, disguisedToken); } }