From d602ec6485d06257ed30ab3fff44b34a78ff10a5 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 12 Nov 2017 00:49:15 +0100 Subject: [PATCH] Rename SelfReloads to AutoReloads --- OpenRA.Mods.Common/AI/States/AirStates.cs | 2 +- OpenRA.Mods.Common/Activities/Air/FlyAttack.cs | 6 +++--- OpenRA.Mods.Common/Activities/Air/HeliAttack.cs | 6 +++--- OpenRA.Mods.Common/Activities/Air/HeliReturnToBase.cs | 2 +- OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs | 2 +- OpenRA.Mods.Common/Activities/Rearm.cs | 2 +- OpenRA.Mods.Common/Traits/AmmoPool.cs | 7 +++---- OpenRA.Mods.Common/Traits/Repairable.cs | 2 +- 8 files changed, 14 insertions(+), 15 deletions(-) diff --git a/OpenRA.Mods.Common/AI/States/AirStates.cs b/OpenRA.Mods.Common/AI/States/AirStates.cs index 23bfa9e651..17c32f2fc3 100644 --- a/OpenRA.Mods.Common/AI/States/AirStates.cs +++ b/OpenRA.Mods.Common/AI/States/AirStates.cs @@ -120,7 +120,7 @@ namespace OpenRA.Mods.Common.AI protected static bool ReloadsAutomatically(Actor a) { var ammoPools = a.TraitsImplementing(); - return ammoPools.All(x => x.SelfReloads); + return ammoPools.All(x => x.AutoReloads); } protected static bool IsRearm(Actor a) diff --git a/OpenRA.Mods.Common/Activities/Air/FlyAttack.cs b/OpenRA.Mods.Common/Activities/Air/FlyAttack.cs index 43accce195..55ff8db109 100644 --- a/OpenRA.Mods.Common/Activities/Air/FlyAttack.cs +++ b/OpenRA.Mods.Common/Activities/Air/FlyAttack.cs @@ -22,7 +22,7 @@ namespace OpenRA.Mods.Common.Activities readonly Aircraft aircraft; readonly AttackPlane attackPlane; - readonly bool selfReloads; + readonly bool autoReloads; int ticksUntilTurn; public FlyAttack(Actor self, Target target) @@ -31,7 +31,7 @@ namespace OpenRA.Mods.Common.Activities aircraft = self.Trait(); attackPlane = self.TraitOrDefault(); ticksUntilTurn = attackPlane.AttackPlaneInfo.AttackTurnDelay; - selfReloads = self.TraitsImplementing().All(p => p.SelfReloads); + autoReloads = self.TraitsImplementing().All(p => p.AutoReloads); } public override Activity Tick(Actor self) @@ -47,7 +47,7 @@ namespace OpenRA.Mods.Common.Activities return NextActivity; // If all valid weapons have depleted their ammo and RearmBuilding is defined, return to RearmBuilding to reload and then resume the activity - if (!selfReloads && aircraft.Info.RearmBuildings.Any() && attackPlane.Armaments.All(x => x.IsTraitPaused || !x.Weapon.IsValidAgainst(target, self.World, self))) + if (!autoReloads && aircraft.Info.RearmBuildings.Any() && attackPlane.Armaments.All(x => x.IsTraitPaused || !x.Weapon.IsValidAgainst(target, self.World, self))) return ActivityUtils.SequenceActivities(new ReturnToBase(self, aircraft.Info.AbortOnResupply), this); if (attackPlane != null) diff --git a/OpenRA.Mods.Common/Activities/Air/HeliAttack.cs b/OpenRA.Mods.Common/Activities/Air/HeliAttack.cs index a67a60f043..bb41bd8875 100644 --- a/OpenRA.Mods.Common/Activities/Air/HeliAttack.cs +++ b/OpenRA.Mods.Common/Activities/Air/HeliAttack.cs @@ -22,7 +22,7 @@ namespace OpenRA.Mods.Common.Activities readonly Aircraft helicopter; readonly AttackHeli attackHeli; readonly bool attackOnlyVisibleTargets; - readonly bool selfReloads; + readonly bool autoReloads; Target target; bool canHideUnderFog; @@ -47,7 +47,7 @@ namespace OpenRA.Mods.Common.Activities helicopter = self.Trait(); attackHeli = self.Trait(); this.attackOnlyVisibleTargets = attackOnlyVisibleTargets; - selfReloads = self.TraitsImplementing().All(p => p.SelfReloads); + autoReloads = self.TraitsImplementing().All(p => p.AutoReloads); } public override Activity Tick(Actor self) @@ -75,7 +75,7 @@ namespace OpenRA.Mods.Common.Activities } // If all valid weapons have depleted their ammo and RearmBuilding is defined, return to RearmBuilding to reload and then resume the activity - if (!selfReloads && helicopter.Info.RearmBuildings.Any() && attackHeli.Armaments.All(x => x.IsTraitPaused || !x.Weapon.IsValidAgainst(target, self.World, self))) + if (!autoReloads && helicopter.Info.RearmBuildings.Any() && attackHeli.Armaments.All(x => x.IsTraitPaused || !x.Weapon.IsValidAgainst(target, self.World, self))) return ActivityUtils.SequenceActivities(new HeliReturnToBase(self, helicopter.Info.AbortOnResupply), this); var dist = targetPos - pos; diff --git a/OpenRA.Mods.Common/Activities/Air/HeliReturnToBase.cs b/OpenRA.Mods.Common/Activities/Air/HeliReturnToBase.cs index 4ce9768e02..638987fcf4 100644 --- a/OpenRA.Mods.Common/Activities/Air/HeliReturnToBase.cs +++ b/OpenRA.Mods.Common/Activities/Air/HeliReturnToBase.cs @@ -109,7 +109,7 @@ namespace OpenRA.Mods.Common.Activities return true; return heli.Info.RearmBuildings.Contains(dest.Info.Name) && self.TraitsImplementing() - .Any(p => !p.SelfReloads && !p.FullAmmo()); + .Any(p => !p.AutoReloads && !p.FullAmmo()); } } } diff --git a/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs b/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs index 5c456a8d6c..6fd1c5b428 100644 --- a/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs +++ b/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs @@ -105,7 +105,7 @@ namespace OpenRA.Mods.Common.Activities return true; return planeInfo.RearmBuildings.Contains(dest.Info.Name) && self.TraitsImplementing() - .Any(p => !p.SelfReloads && !p.FullAmmo()); + .Any(p => !p.AutoReloads && !p.FullAmmo()); } public override Activity Tick(Actor self) diff --git a/OpenRA.Mods.Common/Activities/Rearm.cs b/OpenRA.Mods.Common/Activities/Rearm.cs index 5c15f4dcf2..99ae4449f1 100644 --- a/OpenRA.Mods.Common/Activities/Rearm.cs +++ b/OpenRA.Mods.Common/Activities/Rearm.cs @@ -23,7 +23,7 @@ namespace OpenRA.Mods.Common.Activities public Rearm(Actor self) { - ammoPools = self.TraitsImplementing().Where(p => !p.SelfReloads).ToArray(); + ammoPools = self.TraitsImplementing().Where(p => !p.AutoReloads).ToArray(); } public override Activity Tick(Actor self) diff --git a/OpenRA.Mods.Common/Traits/AmmoPool.cs b/OpenRA.Mods.Common/Traits/AmmoPool.cs index 6a25a9b944..0e2ea81fbc 100644 --- a/OpenRA.Mods.Common/Traits/AmmoPool.cs +++ b/OpenRA.Mods.Common/Traits/AmmoPool.cs @@ -62,10 +62,9 @@ namespace OpenRA.Mods.Common.Traits readonly Stack tokens = new Stack(); ConditionManager conditionManager; - bool selfReloads; - // HACK: Temporarily needed until Rearm activity is gone for good [Sync] public int RemainingTicks; + [Sync] int currentAmmo; public AmmoPool(Actor self, AmmoPoolInfo info) @@ -100,12 +99,12 @@ namespace OpenRA.Mods.Common.Traits // This mostly serves to avoid complicated ReloadAmmoPool look-ups in various other places. // TODO: Investigate removing this when the Rearm activity is replaced with a condition-based solution. - public bool SelfReloads { get { return selfReloads; } } + public bool AutoReloads { get; private set; } void INotifyCreated.Created(Actor self) { conditionManager = self.TraitOrDefault(); - selfReloads = self.TraitsImplementing().Any(r => r.Info.AmmoPool == Info.Name && r.Info.RequiresCondition == null); + AutoReloads = self.TraitsImplementing().Any(r => r.Info.AmmoPool == Info.Name && r.Info.RequiresCondition == null); UpdateCondition(self); diff --git a/OpenRA.Mods.Common/Traits/Repairable.cs b/OpenRA.Mods.Common/Traits/Repairable.cs index 2ea23eb628..a61c644f5d 100644 --- a/OpenRA.Mods.Common/Traits/Repairable.cs +++ b/OpenRA.Mods.Common/Traits/Repairable.cs @@ -77,7 +77,7 @@ namespace OpenRA.Mods.Common.Traits bool CanRearm() { - return ammoPools.Any(x => !x.SelfReloads && !x.FullAmmo()); + return ammoPools.Any(x => !x.AutoReloads && !x.FullAmmo()); } public string VoicePhraseForOrder(Actor self, Order order)