epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.Any(), .Count() -> .Count or .Length

Browse Source
This commit is contained in:
Eduardo Cáceres
2022-05-02 13:05:22 +02:00
committed by atlimit8
parent 6eb4fe8980
commit 79f321cb44
138 changed files with 233 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -1012,13 +1012,13 @@ namespace OpenRA.Mods.Common.Traits
Order IIssueDeployOrder.IssueDeployOrder(Actor self, bool queued)
{
if (IsTraitDisabled || rearmable == null || !rearmable.Info.RearmActors.Any())
if (IsTraitDisabled || rearmable == null || rearmable.Info.RearmActors.Count == 0)
return null;
return new Order("ReturnToBase", self, queued);
}
bool IIssueDeployOrder.CanIssueDeployOrder(Actor self, bool queued) { return rearmable != null && rearmable.Info.RearmActors.Any(); }
bool IIssueDeployOrder.CanIssueDeployOrder(Actor self, bool queued) { return rearmable != null && rearmable.Info.RearmActors.Count > 0; }
public string VoicePhraseForOrder(Actor self, Order order)
{
@@ -1043,7 +1043,7 @@ namespace OpenRA.Mods.Common.Traits
case "Scatter":
return Info.Voice;
case "ReturnToBase":
return rearmable != null && rearmable.Info.RearmActors.Any() ? Info.Voice : null;
return rearmable != null && rearmable.Info.RearmActors.Count > 0 ? Info.Voice : null;
default: return null;
}
}
@@ -1123,7 +1123,7 @@ namespace OpenRA.Mods.Common.Traits
else if (orderString == "ReturnToBase")
{
// Do nothing if not rearmable and don't restart activity every time deploy hotkey is triggered
if (rearmable == null || !rearmable.Info.RearmActors.Any() || self.CurrentActivity is ReturnToBase || GetActorBelow() != null)
if (rearmable == null || rearmable.Info.RearmActors.Count == 0 || self.CurrentActivity is ReturnToBase || GetActorBelow() != null)
return;
if (!order.Queued)