epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move everything ExternalCapture-related to Mods.Common

Browse Source
This commit is contained in:
penev92
2015-01-06 01:26:23 +02:00
parent 8504c233d9
commit 18ac3953cc
6 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/Activities/ExternalCaptureActor.cs → OpenRA.Mods.Common/Activities/ExternalCaptureActor.cs
View File

@@ -10,12 +10,10 @@
using OpenRA.Activities;
using OpenRA.Effects;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities
namespace OpenRA.Mods.Common.Activities
{
class ExternalCaptureActor : Activity
{

4
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -74,6 +74,7 @@
<Compile Include="Activities\Attack.cs" />
<Compile Include="Activities\Enter.cs" />
<Compile Include="Activities\EnterTransport.cs" />
<Compile Include="Activities\ExternalCaptureActor.cs" />
<Compile Include="Activities\Heal.cs" />
<Compile Include="Activities\Hunt.cs" />
<Compile Include="Activities\Move\AttackMoveActivity.cs" />
@@ -201,6 +202,9 @@
<Compile Include="Traits\CashTrickler.cs" />
<Compile Include="Traits\Cloak.cs" />
<Compile Include="Traits\Crushable.cs" />
<Compile Include="Traits\ExternalCapturable.cs" />
<Compile Include="Traits\ExternalCapturableBar.cs" />
<Compile Include="Traits\ExternalCaptures.cs" />
<Compile Include="Traits\IgnoresDisguise.cs" />
<Compile Include="Traits\DetectCloaked.cs" />
<Compile Include="Traits\EngineerRepair.cs" />

3
OpenRA.Mods.RA/ExternalCapturable.cs → OpenRA.Mods.Common/Traits/ExternalCapturable.cs
View File

@@ -9,10 +9,9 @@
#endregion
using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Common.Traits
{
[Desc("This actor can be captured by a unit with ExternalCaptures: trait.")]
public class ExternalCapturableInfo : ITraitInfo

2
OpenRA.Mods.RA/ExternalCapturableBar.cs → OpenRA.Mods.Common/Traits/ExternalCapturableBar.cs
View File

@@ -11,7 +11,7 @@
using System.Drawing;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Common.Traits
{
[Desc("Visualize the remaining CaptureCompleteTime from ExternalCapturable: trait.")]
class ExternalCapturableBarInfo : ITraitInfo, Requires<ExternalCapturableInfo>

5
OpenRA.Mods.RA/ExternalCaptures.cs → OpenRA.Mods.Common/Traits/ExternalCaptures.cs
View File

@@ -10,12 +10,11 @@
using System.Collections.Generic;
using System.Drawing;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Common.Traits
{
[Desc("This actor can capture other actors which have the ExternalCapturable: trait.")]
class ExternalCapturesInfo : ITraitInfo

4
OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
View File

@@ -84,7 +84,6 @@
<Compile Include="AI\HackyAI.cs" />
<Compile Include="Render\WithIdleOverlay.cs" />
<Compile Include="Traits\AcceptsSupplies.cs" />
<Compile Include="Activities\ExternalCaptureActor.cs" />
<Compile Include="Activities\DeliverResources.cs" />
<Compile Include="Activities\Demolish.cs" />
<Compile Include="Activities\DonateSupplies.cs" />
@@ -108,10 +107,7 @@
<Compile Include="CaptureNotification.cs" />
<Compile Include="Scripting\Properties\RepairableBuildingProperties.cs" />
<Compile Include="C4Demolition.cs" />
<Compile Include="ExternalCapturable.cs" />
<Compile Include="ExternalCapturableBar.cs" />
<Compile Include="Capturable.cs" />
<Compile Include="ExternalCaptures.cs" />
<Compile Include="Traits\PaletteEffects\ChronoshiftPaletteEffect.cs" />
<Compile Include="Traits\Chronoshiftable.cs" />
<Compile Include="CrateSpawner.cs" />