OpenRA · abcdefg30 · Jul 20, 2021 · Jul 19, 2021 · Jul 20, 2021 · Jul 20, 2021
diff --git a/OpenRA.Mods.RA2.sln b/OpenRA.Mods.RA2.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29613.14

diff --git a/OpenRA.Mods.RA2/Activities/EnterCarrierParent.cs b/OpenRA.Mods.RA2/Activities/EnterCarrierParent.cs
@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made

diff --git a/OpenRA.Mods.RA2/Graphics/ElectricBoltRenderable.cs b/OpenRA.Mods.RA2/Graphics/ElectricBoltRenderable.cs
@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made

diff --git a/OpenRA.Mods.RA2/Graphics/RadBeamRenderable.cs b/OpenRA.Mods.RA2/Graphics/RadBeamRenderable.cs
@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made

diff --git a/OpenRA.Mods.RA2/Graphics/TintedCell.cs b/OpenRA.Mods.RA2/Graphics/TintedCell.cs
@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made

diff --git a/OpenRA.Mods.RA2/OpenRA.Mods.RA2.csproj b/OpenRA.Mods.RA2/OpenRA.Mods.RA2.csproj
@@ -1,45 +1,45 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
-    <Optimize>true</Optimize>
-    <LangVersion>5</LangVersion>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>../mods/ra2</OutputPath>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <CodeAnalysisRuleSet>..\engine\OpenRA.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <!-- Work around an issue where Rider does not detect files in the project root using the default glob -->
-    <Compile Include="**/*.cs" Exclude="$(DefaultItemExcludes)" />
-  </ItemGroup>
-
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Reference Include="Eluant">
-      <HintPath>../engine/thirdparty/download/Eluant.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-
-    <ProjectReference Include="..\engine\OpenRA.Game\OpenRA.Game.csproj" />
-    <ProjectReference Include="..\engine\OpenRA.Mods.Cnc\OpenRA.Mods.Cnc.csproj" />
-    <ProjectReference Include="..\engine\OpenRA.Mods.Common\OpenRA.Mods.Common.csproj" />
-
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
-    <AdditionalFiles Include="..\engine\stylecop.json" />
-  </ItemGroup>
-
-  <Target Name="DisableAnalyzers" BeforeTargets="CoreCompile" Condition="'$(Configuration)'=='Release'">
-    <!-- Disable code style analysis on Release builds to improve compile-time performance -->
-    <ItemGroup Condition="'$(Configuration)'=='Release'">
-      <Analyzer Remove="@(Analyzer)" />
-    </ItemGroup>
-  </Target>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net461</TargetFramework>
+    <Optimize>true</Optimize>
+    <LangVersion>5</LangVersion>
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>../mods/ra2</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <CodeAnalysisRuleSet>..\engine\OpenRA.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- Work around an issue where Rider does not detect files in the project root using the default glob -->
+    <Compile Include="**/*.cs" Exclude="$(DefaultItemExcludes)" />
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Eluant">
+      <HintPath>../engine/thirdparty/download/Eluant.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+
+    <ProjectReference Include="..\engine\OpenRA.Game\OpenRA.Game.csproj" />
+    <ProjectReference Include="..\engine\OpenRA.Mods.Cnc\OpenRA.Mods.Cnc.csproj" />
+    <ProjectReference Include="..\engine\OpenRA.Mods.Common\OpenRA.Mods.Common.csproj" />
+
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
+    <AdditionalFiles Include="..\engine\stylecop.json" />
+  </ItemGroup>
+
+  <Target Name="DisableAnalyzers" BeforeTargets="CoreCompile" Condition="'$(Configuration)'=='Release'">
+    <!-- Disable code style analysis on Release builds to improve compile-time performance -->
+    <ItemGroup Condition="'$(Configuration)'=='Release'">
+      <Analyzer Remove="@(Analyzer)" />
+    </ItemGroup>
+  </Target>
+</Project>
diff --git a/OpenRA.Mods.RA2/Projectiles/ArcLaserZap.cs b/OpenRA.Mods.RA2/Projectiles/ArcLaserZap.cs
@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made

diff --git a/OpenRA.Mods.RA2/Projectiles/ElectricBolt.cs b/OpenRA.Mods.RA2/Projectiles/ElectricBolt.cs
@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made

diff --git a/OpenRA.Mods.RA2/Projectiles/RadBeam.cs b/OpenRA.Mods.RA2/Projectiles/RadBeam.cs
@@ -94,8 +94,8 @@ public void Tick(World world)
 				if (hitanim != null)
 					hitanim.PlayThen(info.HitAnimSequence, () => animationComplete = true);
 				else
-					animationComplete = true;
-
+					animationComplete = true;
+
 				args.Weapon.Impact(Target.FromPos(target), new WarheadArgs(args));
 				doneDamage = true;
 			}

diff --git a/OpenRA.Mods.RA2/Traits/BaseSpawnerChild.cs b/OpenRA.Mods.RA2/Traits/BaseSpawnerChild.cs
@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made

diff --git a/OpenRA.Mods.RA2/Traits/BaseSpawnerParent.cs b/OpenRA.Mods.RA2/Traits/BaseSpawnerParent.cs
@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made

diff --git a/OpenRA.Mods.RA2/Traits/CarrierChild.cs b/OpenRA.Mods.RA2/Traits/CarrierChild.cs
@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made

diff --git a/OpenRA.Mods.RA2/Traits/CarrierParent.cs b/OpenRA.Mods.RA2/Traits/CarrierParent.cs
@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made

diff --git a/OpenRA.Mods.RA2/Traits/ChronoResourceDelivery.cs b/OpenRA.Mods.RA2/Traits/ChronoResourceDelivery.cs
@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2019 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made

diff --git a/OpenRA.Mods.RA2/Traits/DamagedByTintedCells.cs b/OpenRA.Mods.RA2/Traits/DamagedByTintedCells.cs
@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made

diff --git a/OpenRA.Mods.RA2/Traits/PeriodicExplosion.cs b/OpenRA.Mods.RA2/Traits/PeriodicExplosion.cs
@@ -103,17 +103,17 @@ void ITick.Tick(Actor self)
 				var localoffset = body != null
 					? body.LocalToWorld(info.LocalOffset.Rotate(body.QuantizeOrientation(self, self.Orientation)))
 					: info.LocalOffset;
-
-				var args = new WarheadArgs
-				{
-					Weapon = weapon,
-					DamageModifiers = self.TraitsImplementing<IFirepowerModifier>().Select(a => a.GetFirepowerModifier()).ToArray(),
-					Source = self.CenterPosition,
-					SourceActor = self,
-					WeaponTarget = Target.FromPos(self.CenterPosition + localoffset)
-				};
-
-				weapon.Impact(args.WeaponTarget, args);
+
+				var args = new WarheadArgs
+				{
+					Weapon = weapon,
+					DamageModifiers = self.TraitsImplementing<IFirepowerModifier>().Select(a => a.GetFirepowerModifier()).ToArray(),
+					Source = self.CenterPosition,
+					SourceActor = self,
+					WeaponTarget = Target.FromPos(self.CenterPosition + localoffset)
+				};
+
+				weapon.Impact(args.WeaponTarget, args);
 
 				if (weapon.Report != null && weapon.Report.Any())
 					Game.Sound.Play(SoundType.World, weapon.Report.Random(self.World.SharedRandom), self.CenterPosition);

diff --git a/OpenRA.Mods.RA2/Traits/Render/WithExitOverlay.cs b/OpenRA.Mods.RA2/Traits/Render/WithExitOverlay.cs
@@ -79,9 +79,9 @@ void ITick.Tick(Actor self)
 				enable = self.World.ActorMap.GetActorsAt(exit).Any(a => a != self);
 		}
 
-		protected override void TraitDisabled(Actor self)
-		{
-			enable = false;
-		}
+		protected override void TraitDisabled(Actor self)
+		{
+			enable = false;
+		}
 	}
 }
diff --git a/OpenRA.Mods.RA2/Traits/Render/WithTurretDeployAnimation.cs b/OpenRA.Mods.RA2/Traits/Render/WithTurretDeployAnimation.cs
@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2019 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made

diff --git a/OpenRA.Mods.RA2/Traits/Render/WithVoxelHelicopterBody.cs b/OpenRA.Mods.RA2/Traits/Render/WithVoxelHelicopterBody.cs
@@ -6,9 +6,9 @@
  * as published by the Free Software Foundation, either version 3 of
  * the License, or (at your option) any later version. For more
  * information, see COPYING.
- */
+ */
 #endregion
-
+
 using System;
 using System.Collections.Generic;
 using OpenRA.Graphics;

diff --git a/OpenRA.Mods.RA2/Traits/SpawnSurvivors.cs b/OpenRA.Mods.RA2/Traits/SpawnSurvivors.cs
@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
@@ -65,7 +65,7 @@ void Spawn(Actor self)
 
 					var unit = w.CreateActor(true, actorType.ToLowerInvariant(), td);
 					var mobile = unit.TraitOrDefault<Mobile>();
-					if (mobile != null)
+					if (mobile != null)
 						mobile.Nudge(unit);
 				}
 			});

diff --git a/OpenRA.Mods.RA2/Traits/WeatherControlSupportPower.cs b/OpenRA.Mods.RA2/Traits/WeatherControlSupportPower.cs
@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
@@ -121,11 +121,11 @@ void ITick.Tick(Actor self)
 
 			if (--hitDelay < 0)
 			{
-				hitDelay = info.HitDelay;
-
-				var warheadArgs = new WarheadArgs()
-				{
-					SourceActor = self
+				hitDelay = info.HitDelay;
+
+				var warheadArgs = new WarheadArgs()
+				{
+					SourceActor = self
 				};
 
 				info.WeaponInfo.Impact(Target.FromPos(targetPos), warheadArgs);
@@ -139,11 +139,11 @@ void ITick.Tick(Actor self)
 				{
 					var offset = RandomOffset(self.World);
 					var newPos = targetPos + offset;
-					var scatterTarget = Target.FromPos(newPos);
-
-					var warheadArgs = new WarheadArgs()
-					{
-						SourceActor = self
+					var scatterTarget = Target.FromPos(newPos);
+
+					var warheadArgs = new WarheadArgs()
+					{
+						SourceActor = self
 					};
 
 					info.WeaponInfo.Impact(scatterTarget, warheadArgs);

diff --git a/OpenRA.Mods.RA2/Traits/World/TintedCellsLayer.cs b/OpenRA.Mods.RA2/Traits/World/TintedCellsLayer.cs
@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made

diff --git a/OpenRA.Mods.RA2/Warheads/CreateTintedCellsWarhead.cs b/OpenRA.Mods.RA2/Warheads/CreateTintedCellsWarhead.cs
@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made