Update mod to release-20250330

.github/workflows/ci.yml

@@ -17,10 +17,10 @@ jobs:
         run: sudo apt-get remove -y dotnet*
 
       - name: Clone Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install .NET 6.0
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '6.0.x'
 
@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: Clone Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Prepare Environment
         run: |
@@ -70,10 +70,10 @@ jobs:
 
     steps:
       - name: Clone Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install .NET 6.0
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '6.0.x'
 

CODE_OF_CONDUCT.md

@@ -70,7 +70,7 @@ members of the project's leadership.
 ## Attribution
 
 This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
+available at [https://contributor-covenant.org/version/1/4][version]
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+[homepage]: https://contributor-covenant.org
+[version]: https://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

@@ -7,9 +7,9 @@ Please note that this repository is specifically for the scripts and infrastruct
 When developing new features, it is important to make sure that they work on all our supported platforms.  Right now, this means Windows >= 7 (with PowerShell >= 3), macOS >= 10.7, and Linux.  We would like to also support *BSD, but do not currently have a means to test this.
 
 Some issues to be aware of include:
-* Use http://www.shellcheck.net/ to confirm POSIX compatibility of *.sh scripts.
+* Use https://www.shellcheck.net/ to confirm POSIX compatibility of *.sh scripts.
 * Avoid non-standard gnu extensions to common Unix tools (e.g. the `-f` flag from GNU `readlink`)
 
 While your pull-request is in review it will be helpful if you join IRC to discuss the changes.
 
-See also the in-depth guide on [contributing](https://github.com/OpenRA/OpenRA/wiki/Contributing) on the main OpenRA project wiki.  Most of the content on this page also applies to the Mod SDK.
+See also the in-depth guide on [contributing](https://github.com/OpenRA/OpenRA/wiki/Contributing) on the main OpenRA project wiki.  Most of the content on this page also applies to the Mod SDK.

LICENSE

@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/philosophy/why-not-lgpl.html>.

OpenRA.Mods.RA2/FileSystem/BagFile.cs

@@ -20,11 +20,12 @@
 
 namespace OpenRA.Mods.Cnc.FileSystem
 {
-	public class AudioBagLoader : IPackageLoader
+	public sealed class AudioBagLoader : IPackageLoader
 	{
 		sealed class BagFile : IReadOnlyPackage
 		{
-			public string Name { get; private set; }
+			public string Name { get; }
+
 			public IEnumerable<string> Contents => index.Keys;
 
 			readonly Stream s;
@@ -50,19 +51,19 @@ public Stream GetStream(string filename)
 				if ((entry.Flags & 2) > 0)
 				{
 					// PCM
-					waveHeaderMemoryStream.WriteArray(Encoding.ASCII.GetBytes("RIFF"));
-					waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(entry.Length + 36));
-					waveHeaderMemoryStream.WriteArray(Encoding.ASCII.GetBytes("WAVE"));
-					waveHeaderMemoryStream.WriteArray(Encoding.ASCII.GetBytes("fmt "));
-					waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(16));
-					waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes((short)1));
-					waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes((short)channels));
-					waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(entry.SampleRate));
-					waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(2 * channels * entry.SampleRate));
-					waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes((short)(2 * channels)));
-					waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes((short)16));
-					waveHeaderMemoryStream.WriteArray(Encoding.ASCII.GetBytes("data"));
-					waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(entry.Length));
+					waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("RIFF"));
+					waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length + 36));
+					waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("WAVE"));
+					waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("fmt "));
+					waveHeaderMemoryStream.Write(BitConverter.GetBytes(16));
+					waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)1));
+					waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)channels));
+					waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.SampleRate));
+					waveHeaderMemoryStream.Write(BitConverter.GetBytes(2 * channels * entry.SampleRate));
+					waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)(2 * channels)));
+					waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)16));
+					waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("data"));
+					waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length));
 				}
 
 				if ((entry.Flags & 8) > 0)
@@ -72,24 +73,24 @@ public Stream GetStream(string filename)
 					var bytesPerSec = (int)Math.Floor((double)(2 * entry.ChunkSize) / samplesPerChunk * ((double)entry.SampleRate / 2));
 					var chunkSize = entry.ChunkSize > entry.Length ? entry.Length : entry.ChunkSize;
 
-					waveHeaderMemoryStream.WriteArray(Encoding.ASCII.GetBytes("RIFF"));
-					waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(entry.Length + 52));
-					waveHeaderMemoryStream.WriteArray(Encoding.ASCII.GetBytes("WAVE"));
-					waveHeaderMemoryStream.WriteArray(Encoding.ASCII.GetBytes("fmt "));
-					waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(20));
-					waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes((short)17));
-					waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes((short)channels));
-					waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(entry.SampleRate));
-					waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(bytesPerSec));
-					waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes((short)chunkSize));
-					waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes((short)4));
-					waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes((short)2));
-					waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes((short)samplesPerChunk));
-					waveHeaderMemoryStream.WriteArray(Encoding.ASCII.GetBytes("fact"));
-					waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(4));
-					waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(4 * entry.Length));
-					waveHeaderMemoryStream.WriteArray(Encoding.ASCII.GetBytes("data"));
-					waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(entry.Length));
+					waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("RIFF"));
+					waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length + 52));
+					waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("WAVE"));
+					waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("fmt "));
+					waveHeaderMemoryStream.Write(BitConverter.GetBytes(20));
+					waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)17));
+					waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)channels));
+					waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.SampleRate));
+					waveHeaderMemoryStream.Write(BitConverter.GetBytes(bytesPerSec));
+					waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)chunkSize));
+					waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)4));
+					waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)2));
+					waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)samplesPerChunk));
+					waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("fact"));
+					waveHeaderMemoryStream.Write(BitConverter.GetBytes(4));
+					waveHeaderMemoryStream.Write(BitConverter.GetBytes(4 * entry.Length));
+					waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("data"));
+					waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length));
 				}
 
 				waveHeaderMemoryStream.Seek(0, SeekOrigin.Begin);

OpenRA.Mods.RA2/Graphics/RadBeamRenderable.cs

@@ -61,7 +61,7 @@ public void Render(WorldRenderer wr)
 
 			var cycleCount = sourceToTarget.Length / wavelength.Length;
 			if (sourceToTarget.Length % wavelength.Length != 0)
-				cycleCount += 1; // I'm emulating Math.Ceil
+				cycleCount++; // I'm emulating Math.Ceil
 
 			var screenWidth = wr.ScreenVector(new WVec(width, WDist.Zero, WDist.Zero))[0];
 

OpenRA.Mods.RA2/Projectiles/ArcLaserZap.cs

@@ -107,7 +107,9 @@ public void Tick(World world)
 		{
 			// Beam tracks target
 			if (info.TrackTarget && args.GuidedTarget.IsValidFor(args.SourceActor))
-				target = args.Weapon.TargetActorCenter ? args.GuidedTarget.CenterPosition : args.GuidedTarget.Positions.PositionClosestTo(source);
+				target = args.Weapon.TargetActorCenter
+					? args.GuidedTarget.CenterPosition
+					: args.GuidedTarget.Positions.ClosestToIgnoringPath(source);
 
 			// Check for blocking actors
 			if (info.Blockable && BlocksProjectiles.AnyBlockingActorsBetween(world, args.SourceActor.Owner, source, target,

OpenRA.Mods.RA2/Projectiles/RadBeam.cs

@@ -19,7 +19,7 @@
 namespace OpenRA.Mods.RA2.Projectiles
 {
 	[Desc("Not a sprite, but an engine effect.")]
-	public class RadBeamInfo : IProjectileInfo
+	public sealed class RadBeamInfo : IProjectileInfo
 	{
 		[Desc("The thickness of the beam.")]
 		public readonly WDist Thickness = new(16);
@@ -62,7 +62,7 @@ public IProjectile Create(ProjectileArgs args)
 		}
 	}
 
-	public class RadBeam : IProjectile
+	public sealed class RadBeam : IProjectile
 	{
 		readonly ProjectileArgs args;
 		readonly RadBeamInfo info;
@@ -117,7 +117,8 @@ public IEnumerable<IRenderable> Render(WorldRenderer wr)
 					? info.Amplitude * ticks / info.BeamDuration
 					: info.Amplitude;
 
-				yield return new RadBeamRenderable(args.Source, info.ZOffset, target - args.Source, info.Thickness, info.Color, amp, info.WaveLength, info.QuantizationCount);
+				yield return new RadBeamRenderable(args.Source, info.ZOffset, target - args.Source,
+					info.Thickness, info.Color, amp, info.WaveLength, info.QuantizationCount);
 			}
 
 			if (hitanim != null)

OpenRA.Mods.RA2/Traits/ChronoResourceDelivery.cs

@@ -9,15 +9,14 @@
  */
 #endregion
 
-using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA2.Activities;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA2.Traits
 {
 	[Desc("When returning to a refinery to deliver resources, this actor will teleport if possible.")]
-	public class ChronoResourceDeliveryInfo : TraitInfo, Requires<HarvesterInfo>
+	public sealed class ChronoResourceDeliveryInfo : TraitInfo, Requires<HarvesterInfo>
 	{
 		[Desc("The number of ticks between each check to see if we can teleport to the refinery.")]
 		public readonly int CheckTeleportDelay = 10;
@@ -46,12 +45,11 @@ public class ChronoResourceDeliveryInfo : TraitInfo, Requires<HarvesterInfo>
 		public override object Create(ActorInitializer init) { return new ChronoResourceDelivery(this); }
 	}
 
-	public class ChronoResourceDelivery : INotifyHarvesterAction, ITick
+	public sealed class ChronoResourceDelivery : INotifyHarvestAction, ITick
 	{
 		readonly ChronoResourceDeliveryInfo info;
 
 		CPos? destination;
-		Actor refinery;
 		int ticksTillCheck;
 
 		// TODO: Rewrite this entire thing, possible to be a subclass of harvester
@@ -76,28 +74,27 @@ void ITick.Tick(Actor self)
 				ticksTillCheck--;
 		}
 
-		void INotifyHarvesterAction.MovingToResources(Actor self, CPos targetCell)
-		{
-			Reset();
-		}
+		void INotifyHarvestAction.Harvested(Actor self, string resourceType) { }
 
-		void INotifyHarvesterAction.MovingToRefinery(Actor self, Actor refineryActor)
+		void INotifyHarvestAction.MovingToResources(Actor self, CPos targetCell)
 		{
-			var iao = refineryActor.Trait<IAcceptResources>();
-			var targetCell = self.World.Map.CellContaining(iao.DeliveryPosition);
-			if (destination != null && destination.Value != targetCell)
-				ticksTillCheck = 0;
-
-			refinery = refineryActor;
-			destination = targetCell;
+			Reset();
 		}
 
-		public void MovementCancelled(Actor self)
+		void INotifyHarvestAction.MovementCancelled(Actor self)
 		{
 			Reset();
 		}
 
-		public void Harvested(Actor self, string resourceType) { }
+		// void INotifyHarvestAction.MovingToRefinery(Actor self, Actor refineryActor)
+		// {
+		// 	var iao = refineryActor.Trait<IAcceptResources>();
+		// 	var targetCell = self.World.Map.CellContaining(iao.DeliveryPosition);
+		// 	if (destination != null && destination.Value != targetCell)
+		// 		ticksTillCheck = 0;
+		// 	refinery = refineryActor;
+		// 	destination = targetCell;
+		// }
 		public void Docked() { }
 		public void Undocked() { }
 
@@ -119,8 +116,8 @@ void TeleportIfPossible(Actor self)
 				self.QueueActivity(new ChronoResourceTeleport(dest, info));
 
 				// HACK: Manually queue a delivery and new find since we just cancelled all activities
-				self.QueueActivity(new DeliverResources(self, refinery));
-				self.QueueActivity(new FindAndDeliverResources(self, refinery));
+				// self.QueueActivity(new DeliverResources(self, refinery));
+				// self.QueueActivity(new FindAndDeliverResources(self, refinery));
 				Reset();
 			}
 		}
@@ -129,7 +126,6 @@ void Reset()
 		{
 			ticksTillCheck = 0;
 			destination = null;
-			refinery = null;
 		}
 	}
 }

OpenRA.Mods.RA2/Traits/MindController.cs

@@ -17,7 +17,7 @@
 namespace OpenRA.Mods.RA2.Traits
 {
 	[Desc("This actor can mind control other actors.")]
-	public class MindControllerInfo : PausableConditionalTraitInfo, Requires<ArmamentInfo>, Requires<HealthInfo>
+	public sealed class MindControllerInfo : PausableConditionalTraitInfo, Requires<ArmamentInfo>, Requires<HealthInfo>
 	{
 		[Desc("Name of the armaments that grant this condition.")]
 		public readonly HashSet<string> ArmamentNames = new() { "primary" };
@@ -30,7 +30,8 @@ public class MindControllerInfo : PausableConditionalTraitInfo, Requires<Armamen
 			"If false, controlling new units is forbidden after capacity is reached.")]
 		public readonly bool DiscardOldest = true;
 
-		[Desc("Condition to grant to self when controlling actors. Can stack up by the number of enslaved actors. You can use this to forbid firing of the dummy MC weapon.")]
+		[Desc("Condition to grant to self when controlling actors. Can stack up by the number of enslaved actors. " +
+			"You can use this to forbid firing of the dummy MC weapon.")]
 		[GrantedConditionReference]
 		[FieldLoader.Require]
 		public readonly string ControllingCondition = null;
@@ -41,7 +42,7 @@ public class MindControllerInfo : PausableConditionalTraitInfo, Requires<Armamen
 		public override object Create(ActorInitializer init) { return new MindController(this); }
 	}
 
-	public class MindController : PausableConditionalTrait<MindControllerInfo>, INotifyAttack, INotifyKilled, INotifyActorDisposing
+	public sealed class MindController : PausableConditionalTrait<MindControllerInfo>, INotifyAttack, INotifyKilled, INotifyActorDisposing
 	{
 		readonly List<Actor> slaves = new();
 
@@ -70,11 +71,8 @@ void UnstackControllingCondition(Actor self, string condition)
 
 		public void UnlinkSlave(Actor self, Actor slave)
 		{
-			if (slaves.Contains(slave))
-			{
-				slaves.Remove(slave);
+			if (slaves.Remove(slave))
 				UnstackControllingCondition(self, Info.ControllingCondition);
-			}
 		}
 
 		void INotifyAttack.PreparingAttack(Actor self, in Target target, Armament a, Barrel barrel) { }