diff --git a/OpenRA.Mods.RA/Air/AttackHeli.cs b/OpenRA.Mods.RA/Air/AttackHeli.cs index 763ae160e9..b14bb33bf4 100755 --- a/OpenRA.Mods.RA/Air/AttackHeli.cs +++ b/OpenRA.Mods.RA/Air/AttackHeli.cs @@ -1,6 +1,6 @@ #region Copyright & License Information /* - * Copyright 2007-2011 The OpenRA Developers (see AUTHORS) + * Copyright 2007-2014 The OpenRA Developers (see AUTHORS) * This file is part of OpenRA, which is free software. It is made * available to you under the terms of the GNU General Public License * as published by the Free Software Foundation. For more information, @@ -19,11 +19,12 @@ namespace OpenRA.Mods.RA.Air class AttackHeli : AttackFrontal { - public AttackHeli(Actor self, AttackHeliInfo info) : base(self, info) { } + public AttackHeli(Actor self, AttackHeliInfo info) + : base(self, info) { } public override Activity GetAttackActivity(Actor self, Target newTarget, bool allowMove) { - return new HeliAttack( newTarget ); + return new HeliAttack(newTarget); } } } diff --git a/OpenRA.Mods.RA/Air/AttackPlane.cs b/OpenRA.Mods.RA/Air/AttackPlane.cs index 87588e8daf..c259ad2b3a 100755 --- a/OpenRA.Mods.RA/Air/AttackPlane.cs +++ b/OpenRA.Mods.RA/Air/AttackPlane.cs @@ -1,6 +1,6 @@ #region Copyright & License Information /* - * Copyright 2007-2013 The OpenRA Developers (see AUTHORS) + * Copyright 2007-2014 The OpenRA Developers (see AUTHORS) * This file is part of OpenRA, which is free software. It is made * available to you under the terms of the GNU General Public License * as published by the Free Software Foundation. For more information, @@ -19,7 +19,8 @@ namespace OpenRA.Mods.RA.Air class AttackPlane : AttackFrontal { - public AttackPlane(Actor self, AttackPlaneInfo info) : base(self, info) { } + public AttackPlane(Actor self, AttackPlaneInfo info) + : base(self, info) { } public override Activity GetAttackActivity(Actor self, Target newTarget, bool allowMove) { diff --git a/OpenRA.Mods.RA/Attack/AttackFrontal.cs b/OpenRA.Mods.RA/Attack/AttackFrontal.cs index 360e002be5..eb6d3848c5 100644 --- a/OpenRA.Mods.RA/Attack/AttackFrontal.cs +++ b/OpenRA.Mods.RA/Attack/AttackFrontal.cs @@ -1,6 +1,6 @@ #region Copyright & License Information /* - * Copyright 2007-2011 The OpenRA Developers (see AUTHORS) + * Copyright 2007-2014 The OpenRA Developers (see AUTHORS) * This file is part of OpenRA, which is free software. It is made * available to you under the terms of the GNU General Public License * as published by the Free Software Foundation. For more information, diff --git a/OpenRA.Mods.RA/Attack/AttackLeap.cs b/OpenRA.Mods.RA/Attack/AttackLeap.cs index 386d406e69..0a657a74c3 100644 --- a/OpenRA.Mods.RA/Attack/AttackLeap.cs +++ b/OpenRA.Mods.RA/Attack/AttackLeap.cs @@ -1,6 +1,6 @@ #region Copyright & License Information /* - * Copyright 2007-2011 The OpenRA Developers (see AUTHORS) + * Copyright 2007-2014 The OpenRA Developers (see AUTHORS) * This file is part of OpenRA, which is free software. It is made * available to you under the terms of the GNU General Public License * as published by the Free Software Foundation. For more information, diff --git a/OpenRA.Mods.RA/Attack/AttackLoyalty.cs b/OpenRA.Mods.RA/Attack/AttackLoyalty.cs index e216ff0196..28537fc62a 100644 --- a/OpenRA.Mods.RA/Attack/AttackLoyalty.cs +++ b/OpenRA.Mods.RA/Attack/AttackLoyalty.cs @@ -1,6 +1,6 @@ #region Copyright & License Information /* - * Copyright 2007-2011 The OpenRA Developers (see AUTHORS) + * Copyright 2007-2014 The OpenRA Developers (see AUTHORS) * This file is part of OpenRA, which is free software. It is made * available to you under the terms of the GNU General Public License * as published by the Free Software Foundation. For more information, @@ -21,7 +21,7 @@ namespace OpenRA.Mods.RA public class AttackLoyalty : AttackFrontal { public AttackLoyalty(Actor self, AttackLoyaltyInfo info) - : base( self, info ) {} + : base(self, info) { } public override void DoAttack(Actor self, Target target) { diff --git a/OpenRA.Mods.RA/Attack/AttackMedic.cs b/OpenRA.Mods.RA/Attack/AttackMedic.cs index c9fbc1fc31..461047f6a1 100644 --- a/OpenRA.Mods.RA/Attack/AttackMedic.cs +++ b/OpenRA.Mods.RA/Attack/AttackMedic.cs @@ -1,6 +1,6 @@ #region Copyright & License Information /* - * Copyright 2007-2013 The OpenRA Developers (see AUTHORS) + * Copyright 2007-2014 The OpenRA Developers (see AUTHORS) * This file is part of OpenRA, which is free software. It is made * available to you under the terms of the GNU General Public License * as published by the Free Software Foundation. For more information, diff --git a/OpenRA.Mods.RA/Attack/AttackTurreted.cs b/OpenRA.Mods.RA/Attack/AttackTurreted.cs index f57d86072a..15ca6d32ed 100644 --- a/OpenRA.Mods.RA/Attack/AttackTurreted.cs +++ b/OpenRA.Mods.RA/Attack/AttackTurreted.cs @@ -1,6 +1,6 @@ #region Copyright & License Information /* - * Copyright 2007-2011 The OpenRA Developers (see AUTHORS) + * Copyright 2007-2014 The OpenRA Developers (see AUTHORS) * This file is part of OpenRA, which is free software. It is made * available to you under the terms of the GNU General Public License * as published by the Free Software Foundation. For more information, @@ -28,7 +28,8 @@ namespace OpenRA.Mods.RA protected IEnumerable turrets; [Sync] protected bool buildComplete; - public AttackTurreted(Actor self) : base(self) + public AttackTurreted(Actor self) + : base(self) { turrets = self.TraitsImplementing(); } @@ -41,11 +42,13 @@ namespace OpenRA.Mods.RA if (!target.IsValidFor(self)) return false; - bool canAttack = false; + var canAttack = false; foreach (var t in turrets) if (t.FaceTarget(self, target)) canAttack = true; - if (!canAttack) return false; + + if (!canAttack) + return false; return base.CanAttack(self, target); } @@ -88,7 +91,8 @@ namespace OpenRA.Mods.RA if (IsCanceled || !target.IsValidFor(self)) return NextActivity; - if (self.IsDisabled()) return this; + if (self.IsDisabled()) + return this; var attack = self.Trait(); const int RangeTolerance = 1; /* how far inside our maximum range we should try to sit */ diff --git a/OpenRA.Mods.RA/AttackBomber.cs b/OpenRA.Mods.RA/AttackBomber.cs index 1c97616a4b..fdc268ab0b 100644 --- a/OpenRA.Mods.RA/AttackBomber.cs +++ b/OpenRA.Mods.RA/AttackBomber.cs @@ -1,6 +1,6 @@ #region Copyright & License Information /* - * Copyright 2007-2013 The OpenRA Developers (see AUTHORS) + * Copyright 2007-2014 The OpenRA Developers (see AUTHORS) * This file is part of OpenRA, which is free software. It is made * available to you under the terms of the GNU General Public License * as published by the Free Software Foundation. For more information,