Merge pull request #6921 from reaperrr/common-traits01

Moved various traits to Mods.Common

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

@@ -91,7 +91,6 @@
     <Compile Include="PaletteEffects\MenuPaletteEffect.cs" />
     <Compile Include="PaletteEffects\NukePaletteEffect.cs" />
     <Compile Include="PaletteEffects\WaterPaletteRotation.cs" />
-    <Compile Include="RallyPoint.cs" />
     <Compile Include="ServerTraits\ColorValidator.cs" />
     <Compile Include="ServerTraits\LobbyCommands.cs" />
     <Compile Include="ServerTraits\LobbySettingsNotification.cs" />
@@ -99,8 +98,14 @@
     <Compile Include="ServerTraits\PlayerPinger.cs" />
     <Compile Include="Traits\BlocksBullets.cs" />
     <Compile Include="Traits\Immobile.cs" />
+    <Compile Include="Traits\Burns.cs" />
+    <Compile Include="Traits\CustomBuildTimeValue.cs" />
+    <Compile Include="Traits\CustomSellValue.cs" />
+    <Compile Include="Traits\Demolishable.cs" />
     <Compile Include="Traits\JamsMissiles.cs" />
     <Compile Include="Traits\ProvidesRadar.cs" />
+    <Compile Include="Traits\RallyPoint.cs" />
+    <Compile Include="Traits\ShakeOnDeath.cs" />
     <Compile Include="Traits\Power\AffectedByPowerOutage.cs" />
     <Compile Include="Traits\Power\CanPowerDown.cs" />
     <Compile Include="Traits\Power\Player\PowerManager.cs" />
@@ -112,6 +117,25 @@
     <Compile Include="Traits\Sound\AnnounceOnBuild.cs" />
     <Compile Include="Traits\Sound\AnnounceOnKill.cs" />
     <Compile Include="Traits\Sound\DeathSounds.cs" />
+    <Compile Include="Traits\Sound\SoundOnDamageTransition.cs" />
+    <Compile Include="Traits\Valued.cs" />
+    <Compile Include="Traits\World\CreateMPPlayers.cs" />
+    <Compile Include="Traits\World\MPStartLocations.cs" />
+    <Compile Include="Traits\World\MPStartUnits.cs" />
+    <Compile Include="Traits\World\PaletteFromCurrentTileset.cs" />
+    <Compile Include="Traits\World\PaletteFromFile.cs" />
+    <Compile Include="Traits\World\PaletteFromRGBA.cs" />
+    <Compile Include="Traits\World\PlayerPaletteFromCurrentTileset.cs" />
+    <Compile Include="Traits\World\PlayMusicOnMapLoad.cs" />
+    <Compile Include="Traits\World\RadarPings.cs" />
+    <Compile Include="Traits\World\ResourceClaim.cs" />
+    <Compile Include="Traits\World\ResourceClaimLayer.cs" />
+    <Compile Include="Traits\World\ShroudPalette.cs" />
+    <Compile Include="Traits\World\ShroudRenderer.cs" />
+    <Compile Include="Traits\World\SmudgeLayer.cs" />
+    <Compile Include="Traits\World\SpawnMapActors.cs" />
+    <Compile Include="Traits\World\StartGameNotification.cs" />
+    <Compile Include="Traits\World\TerrainGeometryOverlay.cs" />
     <Compile Include="UtilityCommands\ConvertPngToShpCommand.cs" />
     <Compile Include="UtilityCommands\ConvertSpriteToPngCommand.cs" />
     <Compile Include="UtilityCommands\ExtractFilesCommand.cs" />
@@ -148,19 +172,6 @@
     <Compile Include="Widgets\MenuButtonWidget.cs" />
     <Compile Include="Widgets\RadarWidget.cs" />
     <Compile Include="Widgets\ResourceBarWidget.cs" />
-    <Compile Include="World\CreateMPPlayers.cs" />
-    <Compile Include="World\MPStartLocations.cs" />
-    <Compile Include="World\MPStartUnits.cs" />
-    <Compile Include="World\PaletteFromCurrentTileset.cs" />
-    <Compile Include="World\PaletteFromFile.cs" />
-    <Compile Include="World\PaletteFromRGBA.cs" />
-    <Compile Include="World\PlayerPaletteFromCurrentTileset.cs" />
-    <Compile Include="World\PlayMusicOnMapLoad.cs" />
-    <Compile Include="World\RadarPings.cs" />
-    <Compile Include="World\ResourceClaim.cs" />
-    <Compile Include="World\ResourceClaimLayer.cs" />
-    <Compile Include="World\SmudgeLayer.cs" />
-    <Compile Include="World\SpawnMapActors.cs" />
     <Compile Include="SpriteLoaders\ShpTDLoader.cs" />
     <Compile Include="SpriteLoaders\ShpTSLoader.cs" />
     <Compile Include="SpriteLoaders\TmpRALoader.cs" />
@@ -168,7 +179,6 @@
     <Compile Include="SpriteLoaders\ShpD2Loader.cs" />
     <Compile Include="Widgets\Logic\SettingsLogic.cs" />
     <Compile Include="Widgets\TerrainTemplatePreviewWidget.cs" />
-    <Compile Include="World\TerrainGeometryOverlay.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

OpenRA.Mods.Common/Traits/Burns.cs

@@ -12,7 +12,7 @@ using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits.Render;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	[Desc("This actor will play a fire animation over its body and take damage over time.")]
 	class BurnsInfo : ITraitInfo, Requires<RenderSpritesInfo>

OpenRA.Mods.Common/Traits/CustomBuildTimeValue.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Buildings
+namespace OpenRA.Mods.Common
 {
 	[Desc("Overrides the build time calculated by actor value.")]
 	public class CustomBuildTimeValueInfo : TraitInfo<CustomBuildTimeValue>

OpenRA.Mods.Common/Traits/CustomSellValue.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Buildings
+namespace OpenRA.Mods.Common
 {
 	[Desc("Allow a non-standard sell/repair value to avoid buy-sell exploits.")]
 	public class CustomSellValueInfo : TraitInfo<CustomSellValue>

OpenRA.Mods.Common/Traits/Demolishable.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	[Desc("Handle demolitions from C4 explosives.")]
 	public class DemolishableInfo : IDemolishableInfo, ITraitInfo

OpenRA.Mods.Common/Traits/ShakeOnDeath.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Buildings
+namespace OpenRA.Mods.Common
 {
 	public class ShakeOnDeathInfo : ITraitInfo
 	{

OpenRA.Mods.Common/Traits/Sound/SoundOnDamageTransition.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Buildings
+namespace OpenRA.Mods.Common
 {
 	public class SoundOnDamageTransitionInfo : ITraitInfo
 	{

OpenRA.Mods.Common/Traits/Valued.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	[Desc("How much the unit is worth.")]
 	public class ValuedInfo : TraitInfo<Valued>

OpenRA.Mods.Common/Traits/World/ShroudPalette.cs

@@ -13,7 +13,7 @@ using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	[Desc("Adds the hard-coded shroud palette to the game")]
 	class ShroudPaletteInfo : ITraitInfo

OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs

@@ -12,7 +12,7 @@ using System;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	public class ShroudRendererInfo : ITraitInfo
 	{

OpenRA.Mods.Common/Traits/World/StartGameNotification.cs

@@ -11,7 +11,7 @@
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	class StartGameNotificationInfo : ITraitInfo
 	{

OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs

@@ -13,10 +13,11 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
+using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Power;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Orders;
-using OpenRA.Mods.Common.Power;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Network;
 using OpenRA.Primitives;

OpenRA.Mods.RA/AI/SupportPowerDecision.cs

@@ -13,6 +13,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using OpenRA;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.RA.AI;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/Activities/Repair.cs

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

OpenRA.Mods.RA/Activities/Sell.cs

@@ -8,7 +8,7 @@
  */
 #endregion
 
-using OpenRA.Mods.RA.Buildings;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/Buildings/RepairableBuilding.cs

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

OpenRA.Mods.RA/Crates/DuplicateUnitCrateAction.cs

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

OpenRA.Mods.RA/EmitInfantryOnSell.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Primitives;
 using OpenRA.Traits;

OpenRA.Mods.RA/GainsExperience.cs

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

OpenRA.Mods.RA/GivesBounty.cs

@@ -9,7 +9,7 @@
 #endregion
 
 using System.Linq;
-using OpenRA.Mods.RA.Buildings;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/GivesExperience.cs

@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Mods.Common;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA

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

@@ -164,16 +164,11 @@
     <Compile Include="CaptureNotification.cs" />
     <Compile Include="Buildings\Building.cs" />
     <Compile Include="Buildings\BuildingInfluence.cs" />
-    <Compile Include="Buildings\CustomSellValue.cs" />
-    <Compile Include="Buildings\CustomBuildTimeValue.cs" />
     <Compile Include="Buildings\DeadBuildingState.cs" />
     <Compile Include="Buildings\FootprintUtils.cs" />
     <Compile Include="Buildings\LineBuild.cs" />
     <Compile Include="Buildings\RepairableBuilding.cs" />
-    <Compile Include="Buildings\ShakeOnDeath.cs" />
-    <Compile Include="Buildings\SoundOnDamageTransition.cs" />
     <Compile Include="Buildings\Util.cs" />
-    <Compile Include="Burns.cs" />
     <Compile Include="C4Demolition.cs" />
     <Compile Include="ExternalCapturable.cs" />
     <Compile Include="ExternalCapturableBar.cs" />
@@ -291,7 +286,6 @@
     <Compile Include="SeedsResource.cs" />
     <Compile Include="SelfHealing.cs" />
     <Compile Include="Sellable.cs" />
-    <Compile Include="ShroudPalette.cs" />
     <Compile Include="SmokeTrailWhenDamaged.cs" />
     <Compile Include="SpawnMPUnits.cs" />
     <Compile Include="Disguise.cs" />
@@ -316,7 +310,6 @@
     <Compile Include="TransformOnPassenger.cs" />
     <Compile Include="Transforms.cs" />
     <Compile Include="Turreted.cs" />
-    <Compile Include="Valued.cs" />
     <Compile Include="Widgets\Logic\KickSpectatorsLogic.cs" />
     <Compile Include="Widgets\Logic\MissionBrowserLogic.cs" />
     <Compile Include="Widgets\Logic\IngameMenuLogic.cs" />
@@ -387,9 +380,7 @@
     <Compile Include="CombatDebugOverlay.cs" />
     <Compile Include="World\PathfinderDebugOverlay.cs" />
     <Compile Include="AttackBomber.cs" />
-    <Compile Include="ShroudRenderer.cs" />
     <Compile Include="Render\WithCrateBody.cs" />
-    <Compile Include="Buildings\Demolishable.cs" />
     <Compile Include="Activities\FlyFollow.cs" />
     <Compile Include="Widgets\Logic\GameTimerLogic.cs" />
     <Compile Include="Widgets\Logic\ReplayControlBarLogic.cs" />
@@ -402,7 +393,6 @@
     <Compile Include="Widgets\Logic\ControlGroupLogic.cs" />
     <Compile Include="Buildings\LineBuildNode.cs" />
     <Compile Include="Render\WithBuildingPlacedAnimation.cs" />
-    <Compile Include="StartGameNotification.cs" />
     <Compile Include="Scripting\LuaScript.cs" />
     <Compile Include="Scripting\CallLuaFunc.cs" />
     <Compile Include="Scripting\Global\ActorGlobal.cs" />

OpenRA.Mods.RA/Player/ClassicProductionQueue.cs

@@ -10,8 +10,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.RA.Buildings;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Power;
+using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA

OpenRA.Mods.RA/Player/PlayerStatistics.cs

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

OpenRA.Mods.RA/Player/ProductionQueue.cs

@@ -11,8 +11,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.RA.Buildings;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Power;
+using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA

OpenRA.Mods.RA/Scripting/Global/ActorGlobal.cs

@@ -10,6 +10,7 @@
 
 using System.Linq;
 using Eluant;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.RA.Air;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Primitives;

OpenRA.Mods.RA/UtilityCommands/ActorStatsExport.cs

@@ -13,6 +13,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Linq;
 using OpenRA.GameRules;
+using OpenRA.Mods.Common;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.UtilityCommands

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

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

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

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