From 5ab3276a2dd6270a124f6384e074f7eeaabcc5e8 Mon Sep 17 00:00:00 2001
From: michaeldgg2 <119738087+michaeldgg2@users.noreply.github.com>
Date: Sat, 24 Jun 2023 11:47:15 +0200
Subject: [PATCH] Moved Minelaying related traits and activity to Common

---
 .../Activities/LayMines.cs                                   | 4 +---
 {OpenRA.Mods.Cnc => OpenRA.Mods.Common}/Traits/Mine.cs       | 3 +--
 {OpenRA.Mods.Cnc => OpenRA.Mods.Common}/Traits/Minelayer.cs  | 5 ++---
 3 files changed, 4 insertions(+), 8 deletions(-)
 rename {OpenRA.Mods.Cnc => OpenRA.Mods.Common}/Activities/LayMines.cs (97%)
 rename {OpenRA.Mods.Cnc => OpenRA.Mods.Common}/Traits/Mine.cs (97%)
 rename {OpenRA.Mods.Cnc => OpenRA.Mods.Common}/Traits/Minelayer.cs (99%)

diff --git a/OpenRA.Mods.Cnc/Activities/LayMines.cs b/OpenRA.Mods.Common/Activities/LayMines.cs
similarity index 97%
rename from OpenRA.Mods.Cnc/Activities/LayMines.cs
rename to OpenRA.Mods.Common/Activities/LayMines.cs
index 8b164dc6ac..32cb0f2bd8 100644
--- a/OpenRA.Mods.Cnc/Activities/LayMines.cs
+++ b/OpenRA.Mods.Common/Activities/LayMines.cs
@@ -12,13 +12,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Activities;
-using OpenRA.Mods.Cnc.Traits;
-using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Cnc.Activities
+namespace OpenRA.Mods.Common.Activities
 {
 	// Assumes you have Minelayer on that unit
 	public class LayMines : Activity
diff --git a/OpenRA.Mods.Cnc/Traits/Mine.cs b/OpenRA.Mods.Common/Traits/Mine.cs
similarity index 97%
rename from OpenRA.Mods.Cnc/Traits/Mine.cs
rename to OpenRA.Mods.Common/Traits/Mine.cs
index 5d5f9ac5dc..45b07c4b6b 100644
--- a/OpenRA.Mods.Cnc/Traits/Mine.cs
+++ b/OpenRA.Mods.Common/Traits/Mine.cs
@@ -9,11 +9,10 @@
  */
 #endregion
 
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Cnc.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	sealed class MineInfo : TraitInfo
 	{
diff --git a/OpenRA.Mods.Cnc/Traits/Minelayer.cs b/OpenRA.Mods.Common/Traits/Minelayer.cs
similarity index 99%
rename from OpenRA.Mods.Cnc/Traits/Minelayer.cs
rename to OpenRA.Mods.Common/Traits/Minelayer.cs
index fe66bf74e5..d90ea08ed6 100644
--- a/OpenRA.Mods.Cnc/Traits/Minelayer.cs
+++ b/OpenRA.Mods.Common/Traits/Minelayer.cs
@@ -13,13 +13,12 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Cnc.Activities;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Orders;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Cnc.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	public class MinelayerInfo : TraitInfo, Requires<RearmableInfo>
 	{