Move more traits from Mods.RA to Mods.Common

This commit is contained in:
reaperrr
2014-12-14 14:18:02 +01:00
parent 8723aa86fb
commit 4bf50c9153
7 changed files with 10 additions and 9 deletions

View File

@@ -106,10 +106,13 @@
<Compile Include="Scripting\Properties\PowerProperties.cs" /> <Compile Include="Scripting\Properties\PowerProperties.cs" />
<Compile Include="Scripting\Properties\ResourceProperties.cs" /> <Compile Include="Scripting\Properties\ResourceProperties.cs" />
<Compile Include="Scripting\Properties\UpgradeProperties.cs" /> <Compile Include="Scripting\Properties\UpgradeProperties.cs" />
<Compile Include="Traits\AppearsOnRadar.cs" />
<Compile Include="Traits\BlocksBullets.cs" /> <Compile Include="Traits\BlocksBullets.cs" />
<Compile Include="Traits\Buildable.cs" /> <Compile Include="Traits\Buildable.cs" />
<Compile Include="Traits\Buildings\BaseProvider.cs" /> <Compile Include="Traits\Buildings\BaseProvider.cs" />
<Compile Include="Traits\Buildings\DeadBuildingState.cs" /> <Compile Include="Traits\Buildings\DeadBuildingState.cs" />
<Compile Include="Traits\Buildings\LineBuild.cs" />
<Compile Include="Traits\Buildings\LineBuildNode.cs" />
<Compile Include="Traits\Buildings\RallyPoint.cs" /> <Compile Include="Traits\Buildings\RallyPoint.cs" />
<Compile Include="Traits\Burns.cs" /> <Compile Include="Traits\Burns.cs" />
<Compile Include="Traits\CustomBuildTimeValue.cs" /> <Compile Include="Traits\CustomBuildTimeValue.cs" />
@@ -141,6 +144,7 @@
<Compile Include="Traits\Power\RequiresPower.cs" /> <Compile Include="Traits\Power\RequiresPower.cs" />
<Compile Include="Traits\Power\ScalePowerWithHealth.cs" /> <Compile Include="Traits\Power\ScalePowerWithHealth.cs" />
<Compile Include="Traits\ProvidesRadar.cs" /> <Compile Include="Traits\ProvidesRadar.cs" />
<Compile Include="Traits\RadarColorFromTerrain.cs" />
<Compile Include="Traits\Render\RenderEditorOnly.cs" /> <Compile Include="Traits\Render\RenderEditorOnly.cs" />
<Compile Include="Traits\Render\RenderFlare.cs" /> <Compile Include="Traits\Render\RenderFlare.cs" />
<Compile Include="Traits\Render\RenderNameTag.cs" /> <Compile Include="Traits\Render\RenderNameTag.cs" />

View File

@@ -13,7 +13,7 @@ using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.Common.Traits
{ {
public class AppearsOnRadarInfo : ITraitInfo public class AppearsOnRadarInfo : ITraitInfo
{ {

View File

@@ -10,7 +10,7 @@
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Buildings namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Place the second actor in line to build more of the same at once (used for walls).")] [Desc("Place the second actor in line to build more of the same at once (used for walls).")]
public class LineBuildInfo : TraitInfo<LineBuild> public class LineBuildInfo : TraitInfo<LineBuild>

View File

@@ -10,7 +10,7 @@
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Buildings namespace OpenRA.Mods.Common.Traits
{ {
[Desc("LineBuild actors attach to LineBuildNodes.")] [Desc("LineBuild actors attach to LineBuildNodes.")]
public class LineBuildNodeInfo : TraitInfo<LineBuildNode> public class LineBuildNodeInfo : TraitInfo<LineBuildNode>

View File

@@ -11,7 +11,7 @@
using System.Drawing; using System.Drawing;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.Common.Traits
{ {
public class RadarColorFromTerrainInfo : ITraitInfo public class RadarColorFromTerrainInfo : ITraitInfo
{ {

View File

@@ -141,7 +141,6 @@
<Compile Include="EjectOnDeath.cs" /> <Compile Include="EjectOnDeath.cs" />
<Compile Include="AI\RushFuzzy.cs" /> <Compile Include="AI\RushFuzzy.cs" />
<Compile Include="AI\StateMachine.cs" /> <Compile Include="AI\StateMachine.cs" />
<Compile Include="AppearsOnRadar.cs" />
<Compile Include="Traits\AttackMove.cs" /> <Compile Include="Traits\AttackMove.cs" />
<Compile Include="Attack\AttackBase.cs" /> <Compile Include="Attack\AttackBase.cs" />
<Compile Include="Attack\AttackFrontal.cs" /> <Compile Include="Attack\AttackFrontal.cs" />
@@ -157,7 +156,6 @@
<Compile Include="Buildings\Building.cs" /> <Compile Include="Buildings\Building.cs" />
<Compile Include="Buildings\BuildingInfluence.cs" /> <Compile Include="Buildings\BuildingInfluence.cs" />
<Compile Include="Buildings\FootprintUtils.cs" /> <Compile Include="Buildings\FootprintUtils.cs" />
<Compile Include="Buildings\LineBuild.cs" />
<Compile Include="Buildings\RepairableBuilding.cs" /> <Compile Include="Buildings\RepairableBuilding.cs" />
<Compile Include="Buildings\Util.cs" /> <Compile Include="Buildings\Util.cs" />
<Compile Include="Scripting\Properties\RepairableBuildingProperties.cs" /> <Compile Include="Scripting\Properties\RepairableBuildingProperties.cs" />
@@ -229,7 +227,6 @@
<Compile Include="ProductionBar.cs" /> <Compile Include="ProductionBar.cs" />
<Compile Include="ProximityCaptor.cs" /> <Compile Include="ProximityCaptor.cs" />
<Compile Include="ProximityCapturable.cs" /> <Compile Include="ProximityCapturable.cs" />
<Compile Include="RadarColorFromTerrain.cs" />
<Compile Include="Reloads.cs" /> <Compile Include="Reloads.cs" />
<Compile Include="RenderDetectionCircle.cs" /> <Compile Include="RenderDetectionCircle.cs" />
<Compile Include="RenderJammerCircle.cs" /> <Compile Include="RenderJammerCircle.cs" />
@@ -371,7 +368,6 @@
<Compile Include="Widgets\Logic\LobbyMapPreviewLogic.cs" /> <Compile Include="Widgets\Logic\LobbyMapPreviewLogic.cs" />
<Compile Include="Orders\BeaconOrderGenerator.cs" /> <Compile Include="Orders\BeaconOrderGenerator.cs" />
<Compile Include="Widgets\Logic\ControlGroupLogic.cs" /> <Compile Include="Widgets\Logic\ControlGroupLogic.cs" />
<Compile Include="Buildings\LineBuildNode.cs" />
<Compile Include="Scripting\Global\ReinforcementsGlobal.cs" /> <Compile Include="Scripting\Global\ReinforcementsGlobal.cs" />
<Compile Include="Scripting\Properties\ProductionProperties.cs" /> <Compile Include="Scripting\Properties\ProductionProperties.cs" />
<Compile Include="Scripting\Properties\MissionObjectiveProperties.cs" /> <Compile Include="Scripting\Properties\MissionObjectiveProperties.cs" />
@@ -479,4 +475,4 @@ copy "FuzzyLogicLibrary.dll" "$(SolutionDir)"
cd "$(SolutionDir)"</PostBuildEvent> cd "$(SolutionDir)"</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
<ItemGroup /> <ItemGroup />
</Project> </Project>

View File

@@ -14,6 +14,7 @@ using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common; using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Graphics; using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Buildings; using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Render; using OpenRA.Mods.RA.Render;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.RA.Traits;