Merge pull request #7153 from reaperrr/ra-common20

More RA/Common reorganisation

OpenRA.Mods.Common/Commands/ChatCommands.cs

@@ -10,6 +10,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Commands

OpenRA.Mods.Common/OpenRA.Mods.Common.csproj

@@ -51,7 +51,6 @@
     <Compile Include="Activities\Move\Drag.cs" />
     <Compile Include="Activities\RemoveSelf.cs" />
     <Compile Include="Activities\SimpleTeleport.cs" />
-    <Compile Include="CommonTraitsInterfaces.cs" />
     <Compile Include="Effects\Beacon.cs" />
     <Compile Include="Effects\Bullet.cs" />
     <Compile Include="Effects\Contrail.cs" />
@@ -109,6 +108,7 @@
     <Compile Include="Scripting\Properties\PowerProperties.cs" />
     <Compile Include="Scripting\Properties\ResourceProperties.cs" />
     <Compile Include="Scripting\Properties\UpgradeProperties.cs" />
+    <Compile Include="TraitsInterfaces.cs" />
     <Compile Include="Traits\AppearsOnRadar.cs" />
     <Compile Include="Traits\BlocksBullets.cs" />
     <Compile Include="Traits\Buildable.cs" />
@@ -162,6 +162,7 @@
     <Compile Include="Traits\Render\WithBuildingPlacedAnimation.cs" />
     <Compile Include="Traits\Render\WithDeathAnimation.cs" />
     <Compile Include="Traits\Render\WithResources.cs" />
+    <Compile Include="Traits\Render\WithRotor.cs" />
     <Compile Include="Traits\Render\WithShadow.cs" />
     <Compile Include="Traits\Render\WithSmoke.cs" />
     <Compile Include="Traits\ShakeOnDeath.cs" />

OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs

@@ -13,7 +13,6 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Network;
 using OpenRA.Server;

OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using System.Linq;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Network;
 using OpenRA.Server;

OpenRA.Mods.Common/Traits/Render/WithRotor.cs

@@ -12,10 +12,9 @@ using System;
 using System.Collections.Generic;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Graphics;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Render
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Displays a helicopter rotor overlay.")]
 	public class WithRotorInfo : ITraitInfo, IRenderActorPreviewSpritesInfo, Requires<RenderSpritesInfo>, Requires<IBodyOrientationInfo>
@@ -64,7 +63,7 @@ namespace OpenRA.Mods.RA.Render
 			rotorAnim.PlayRepeating(info.Sequence);
 			rs.Add(info.Id, new AnimationWithOffset(rotorAnim,
 				() => body.LocalToWorld(info.Offset.Rotate(body.QuantizeOrientation(self, self.Orientation))),
-				null, () => false, p => WithTurret.ZOffsetFromCenter(self, p, 1)));
+				null, () => false, p => ZOffsetFromCenter(self, p, 1)));
 		}
 
 		public void Tick(Actor self)
@@ -75,5 +74,11 @@ namespace OpenRA.Mods.RA.Render
 
 			rotorAnim.ReplaceAnim(isFlying ? info.Sequence : info.GroundSequence);
 		}
+
+		static public int ZOffsetFromCenter(Actor self, WPos pos, int offset)
+		{
+			var delta = self.CenterPosition - pos;
+			return delta.Y + delta.Z + offset;
+		}
 	}
 }

OpenRA.Mods.Common/TraitsInterfaces.cs

@@ -14,7 +14,7 @@ using OpenRA.Mods.Common.Graphics;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	public interface INotifyResourceClaimLost
 	{

OpenRA.Mods.D2k/Activities/SwallowActor.cs

@@ -12,7 +12,6 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.Activities;
 using OpenRA.GameRules;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.D2k.Traits;
 using OpenRA.Mods.RA.Move;

OpenRA.Mods.D2k/Traits/Carryable.cs

@@ -10,7 +10,6 @@
 using System;
 using System.Linq;
 using OpenRA.Activities;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.D2k.Activities;
 using OpenRA.Traits;

OpenRA.Mods.D2k/Traits/Render/WithCrumbleOverlay.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using OpenRA.Graphics;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA;
 using OpenRA.Traits;

OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs

@@ -13,7 +13,6 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Buildings;

OpenRA.Mods.RA/AI/HackyAI.cs

@@ -12,7 +12,6 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Buildings;

OpenRA.Mods.RA/Activities/DeliverResources.cs

@@ -10,7 +10,7 @@
 
 using System.Drawing;
 using OpenRA.Activities;
-using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/Activities/FindResources.cs

@@ -13,7 +13,6 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Activities;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Traits;

OpenRA.Mods.RA/Buildings/Building.cs

@@ -11,7 +11,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Primitives;

OpenRA.Mods.RA/Buildings/RepairableBuilding.cs

@@ -12,7 +12,6 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Effects;
 using OpenRA.Traits;

OpenRA.Mods.RA/GainsStatUpgrades.cs

@@ -11,7 +11,7 @@
 using System;
 using System.Collections.Generic;
 using OpenRA.GameRules;
-using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -239,7 +239,6 @@
     <Compile Include="Render\RenderLandingCraft.cs" />
     <Compile Include="Render\WithBuildingExplosion.cs" />
     <Compile Include="Render\WithMuzzleFlash.cs" />
-    <Compile Include="Render\WithRotor.cs" />
     <Compile Include="Repairable.cs" />
     <Compile Include="RepairableNear.cs" />
     <Compile Include="ScaredyCat.cs" />

OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs

@@ -12,7 +12,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Graphics;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Buildings;

OpenRA.Mods.RA/Player/ProductionQueue.cs

@@ -11,7 +11,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;

OpenRA.Mods.RA/Render/RenderHarvester.cs

@@ -10,7 +10,6 @@
 
 using OpenRA.Activities;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;

OpenRA.Mods.RA/Render/WithHarvestAnimation.cs

@@ -10,7 +10,6 @@
 
 using OpenRA.Graphics;
 using OpenRA.Activities;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/Repairable.cs

@@ -12,7 +12,6 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Activities;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.Common.Traits;

OpenRA.Mods.RA/SupportPowers/SupportPowerManager.cs

@@ -12,7 +12,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/Traits/Air/Aircraft.cs

@@ -12,8 +12,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Activities;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Orders;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Buildings;

OpenRA.Mods.RA/Traits/Harvester.cs

@@ -12,7 +12,6 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Activities;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.Common.Orders;

OpenRA.Mods.RA/Widgets/Logic/IngameChatLogic.cs

@@ -11,8 +11,8 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Commands;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Network;
 using OpenRA.Widgets;
 

OpenRA.Mods.RA/Widgets/Logic/ObserverStatsLogic.cs

@@ -13,7 +13,6 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Network;

OpenRA.Mods.RA/Widgets/Logic/ProductionTooltipLogic.cs

@@ -11,7 +11,6 @@
 using System;
 using System.Drawing;
 using System.Linq;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 using OpenRA.Widgets;

OpenRA.Mods.TS/Traits/Render/RenderVoxels.cs

@@ -11,9 +11,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common;
-using OpenRA.Traits;
 using OpenRA.Mods.Common.Graphics;
+using OpenRA.Mods.Common.Traits;
+using OpenRA.Traits;
 
 namespace OpenRA.Mods.TS.Traits
 {