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

Dissolve Move namespace into Activities & Traits

Browse Source
This commit is contained in:
reaperrr
2014-12-21 00:44:21 +01:00
parent 38b579a081
commit 5c5210f5e3
40 changed files with 36 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.D2k/Activities/SwallowActor.cs
View File

@@ -14,7 +14,8 @@ using OpenRA.Activities;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.D2k.Traits; using OpenRA.Mods.D2k.Traits;
using OpenRA.Mods.RA.Move; using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.D2k.Activities namespace OpenRA.Mods.D2k.Activities

1
OpenRA.Mods.D2k/Traits/Render/WithProductionOverlay.cs
View File

@@ -14,6 +14,7 @@ using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA; using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Buildings; using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.D2k.Traits namespace OpenRA.Mods.D2k.Traits

1
OpenRA.Mods.D2k/Traits/World/ChooseBuildTabOnSelect.cs
View File

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

2
OpenRA.Mods.RA/AI/AttackOrFleeFuzzy.cs
View File

@@ -12,7 +12,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using AI.Fuzzy.Library; using AI.Fuzzy.Library;
using OpenRA.Mods.RA.Move; using OpenRA.Mods.RA.Traits;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Traits; using OpenRA.Traits;

1
OpenRA.Mods.RA/AI/HackyAI.cs
View File

@@ -16,7 +16,6 @@ using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Buildings; using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.RA.Move;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Support; using OpenRA.Support;
using OpenRA.Traits; using OpenRA.Traits;

1
OpenRA.Mods.RA/Activities/Attack.cs
View File

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

1
OpenRA.Mods.RA/Activities/AttackMoveActivity.cs
View File

@@ -10,7 +10,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.RA.Move;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;

2
OpenRA.Mods.RA/Activities/Enter.cs
View File

@@ -12,7 +12,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.RA.Move; using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities namespace OpenRA.Mods.RA.Activities

2
OpenRA.Mods.RA/Activities/ExternalCaptureActor.cs
View File

@@ -10,7 +10,7 @@
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Effects; using OpenRA.Effects;
using OpenRA.Mods.RA.Move; using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities namespace OpenRA.Mods.RA.Activities

1
OpenRA.Mods.RA/Activities/FindResources.cs
View File

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

2
OpenRA.Mods.RA/Activities/Hunt.cs
View File

@@ -43,7 +43,7 @@ namespace OpenRA.Mods.RA.Activities
return this; return this;
return Util.SequenceActivities( return Util.SequenceActivities(
new AttackMoveActivity(self, new Move.Move(self, target.Location, WRange.FromCells(2))), new AttackMoveActivity(self, new Move(self, target.Location, WRange.FromCells(2))),
new Wait(25), new Wait(25),
this); this);
} }

2
OpenRA.Mods.RA/Activities/Leap.cs
View File

@@ -12,7 +12,7 @@ using System;
using System.Linq; using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Mods.RA.Move; using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.RA.Render; using OpenRA.Mods.RA.Render;
using OpenRA.Traits; using OpenRA.Traits;

3
OpenRA.Mods.RA/Move/Move.cs → OpenRA.Mods.RA/Activities/Move.cs
View File

@@ -13,12 +13,11 @@ using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.RA.Traits;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Move namespace OpenRA.Mods.RA.Activities
{ {
class Move : Activity class Move : Activity
{ {

1
OpenRA.Mods.RA/Activities/MoveAdjacentTo.cs
View File

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

2
OpenRA.Mods.RA/Activities/MoveWithinRange.cs
View File

@@ -11,7 +11,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.RA.Move; using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities namespace OpenRA.Mods.RA.Activities

1
OpenRA.Mods.RA/Activities/UnloadCargo.cs
View File

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

2
OpenRA.Mods.RA/Attack/AttackFollow.cs
View File

@@ -10,7 +10,7 @@
using System; using System;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.RA.Move; using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA

1
OpenRA.Mods.RA/Buildings/ClonesProducedUnits.cs
View File

@@ -10,6 +10,7 @@
using System; using System;
using System.Linq; using System.Linq;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA

3
OpenRA.Mods.RA/Crate.cs
View File

@@ -12,11 +12,10 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Buildings; using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Move;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
class CrateInfo : ITraitInfo, IOccupySpaceInfo, Requires<RenderSpritesInfo> class CrateInfo : ITraitInfo, IOccupySpaceInfo, Requires<RenderSpritesInfo>
{ {

2
OpenRA.Mods.RA/Crates/DuplicateUnitCrateAction.cs
View File

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

2
OpenRA.Mods.RA/Crates/GiveUnitCrateAction.cs
View File

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

3
OpenRA.Mods.RA/Crushable.cs
View File

@@ -10,10 +10,9 @@
using System.Linq; using System.Linq;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Move;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
[Desc("This actor is crushable.")] [Desc("This actor is crushable.")]
class CrushableInfo : ITraitInfo class CrushableInfo : ITraitInfo

3
OpenRA.Mods.RA/EjectOnDeath.cs
View File

@@ -9,11 +9,10 @@
#endregion #endregion
using OpenRA.Mods.RA.Effects; using OpenRA.Mods.RA.Effects;
using OpenRA.Mods.RA.Move;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
[Desc("Eject a ground soldier or a paratrooper while in the air.")] [Desc("Eject a ground soldier or a paratrooper while in the air.")]
public class EjectOnDeathInfo : TraitInfo<EjectOnDeath> public class EjectOnDeathInfo : TraitInfo<EjectOnDeath>

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

@@ -200,10 +200,10 @@
<Compile Include="Traits\MadTank.cs" /> <Compile Include="Traits\MadTank.cs" />
<Compile Include="Traits\Mine.cs" /> <Compile Include="Traits\Mine.cs" />
<Compile Include="Traits\Minelayer.cs" /> <Compile Include="Traits\Minelayer.cs" />
<Compile Include="Move\Mobile.cs" /> <Compile Include="Traits\Mobile.cs" />
<Compile Include="Move\Move.cs" /> <Compile Include="Activities\Move.cs" />
<Compile Include="Move\PathFinder.cs" /> <Compile Include="Traits\World\PathFinder.cs" />
<Compile Include="Move\PathSearch.cs" /> <Compile Include="Traits\World\PathSearch.cs" />
<Compile Include="Orders\PlaceBuildingOrderGenerator.cs" /> <Compile Include="Orders\PlaceBuildingOrderGenerator.cs" />
<Compile Include="Orders\GlobalButtonOrderGenerator.cs" /> <Compile Include="Orders\GlobalButtonOrderGenerator.cs" />
<Compile Include="Orders\RepairOrderGenerator.cs" /> <Compile Include="Orders\RepairOrderGenerator.cs" />

1
OpenRA.Mods.RA/Player/ProductionQueue.cs
View File

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

4
OpenRA.Mods.RA/Production.cs
View File

@@ -14,12 +14,10 @@ using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Move;
using OpenRA.Mods.RA.Traits;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
[Desc("This unit has access to build queues.")] [Desc("This unit has access to build queues.")]
public class ProductionInfo : ITraitInfo public class ProductionInfo : ITraitInfo

1
OpenRA.Mods.RA/ProductionBar.cs
View File

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

1
OpenRA.Mods.RA/ProductionQueueFromSelection.cs
View File

@@ -10,6 +10,7 @@
using System; using System;
using System.Linq; using System.Linq;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.RA.Widgets; using OpenRA.Mods.RA.Widgets;
using OpenRA.Traits; using OpenRA.Traits;
using OpenRA.Widgets; using OpenRA.Widgets;

3
OpenRA.Mods.RA/ScaredyCat.cs
View File

@@ -8,10 +8,9 @@
*/ */
#endregion #endregion
using OpenRA.Mods.RA.Move;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
[Desc("Makes the unit automatically run around when taking damage.")] [Desc("Makes the unit automatically run around when taking damage.")]
class ScaredyCatInfo : ITraitInfo class ScaredyCatInfo : ITraitInfo

7
OpenRA.Mods.RA/Scripting/Properties/MobileProperties.cs
View File

@@ -8,7 +8,8 @@
*/ */
#endregion #endregion
using OpenRA.Mods.RA.Move; using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Scripting; using OpenRA.Scripting;
using OpenRA.Traits; using OpenRA.Traits;
@@ -30,14 +31,14 @@ namespace OpenRA.Mods.RA.Scripting
"(in cells) that will be considered close enough to complete the activity.")] "(in cells) that will be considered close enough to complete the activity.")]
public void Move(CPos cell, int closeEnough = 0) public void Move(CPos cell, int closeEnough = 0)
{ {
self.QueueActivity(new Move.Move(self, cell, WRange.FromCells(closeEnough))); self.QueueActivity(new Move(self, cell, WRange.FromCells(closeEnough)));
} }
[ScriptActorPropertyActivity] [ScriptActorPropertyActivity]
[Desc("Moves within the cell grid, ignoring lane biases.")] [Desc("Moves within the cell grid, ignoring lane biases.")]
public void ScriptedMove(CPos cell) public void ScriptedMove(CPos cell)
{ {
self.QueueActivity(new Move.Move(self, cell)); self.QueueActivity(new Move(self, cell));
} }
[ScriptActorPropertyActivity] [ScriptActorPropertyActivity]

2
OpenRA.Mods.RA/Scripting/Properties/PlayerProperties.cs
View File

@@ -12,7 +12,7 @@ using System;
using System.Linq; using System.Linq;
using Eluant; using Eluant;
using OpenRA.Scripting; using OpenRA.Scripting;
using OpenRA.Mods.RA.Move; using OpenRA.Mods.RA.Traits;
namespace OpenRA.Mods.RA.Scripting namespace OpenRA.Mods.RA.Scripting
{ {

3
OpenRA.Mods.RA/SpawnMPUnits.cs
View File

@@ -12,11 +12,10 @@ using System;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Move;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
[Desc("Spawn base actor at the spawnpoint and support units in an annulus around the base actor. Both are defined at MPStartUnits. Attach this to the world actor.")] [Desc("Spawn base actor at the spawnpoint and support units in an annulus around the base actor. Both are defined at MPStartUnits. Attach this to the world actor.")]
public class SpawnMPUnitsInfo : TraitInfo<SpawnMPUnits>, Requires<MPStartLocationsInfo>, Requires<MPStartUnitsInfo> { } public class SpawnMPUnitsInfo : TraitInfo<SpawnMPUnits>, Requires<MPStartLocationsInfo>, Requires<MPStartUnitsInfo> { }

1
OpenRA.Mods.RA/Traits/Harvester.cs
View File

@@ -16,7 +16,6 @@ using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Orders; using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Move;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.RA.Traits

1
OpenRA.Mods.RA/Traits/LeavesHusk.cs
View File

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

1
OpenRA.Mods.RA/Traits/MadTank.cs
View File

@@ -16,7 +16,6 @@ using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Orders; using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Move;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;

1
OpenRA.Mods.RA/Traits/Mine.cs
View File

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

2
OpenRA.Mods.RA/Move/Mobile.cs → OpenRA.Mods.RA/Traits/Mobile.cs
View File

@@ -18,7 +18,7 @@ using OpenRA.Mods.RA.Activities;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Move namespace OpenRA.Mods.RA.Traits
{ {
[Flags] [Flags]
public enum CellConditions public enum CellConditions

1
OpenRA.Mods.RA/Traits/World/DomainIndex.cs
View File

@@ -13,7 +13,6 @@ using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.RA.Move;
using OpenRA.Traits; using OpenRA.Traits;
using OpenRA.Support; using OpenRA.Support;

3
OpenRA.Mods.RA/Move/PathFinder.cs → OpenRA.Mods.RA/Traits/World/PathFinder.cs
View File

@@ -12,13 +12,12 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using OpenRA.Mods.RA.Traits;
using OpenRA; using OpenRA;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Support; using OpenRA.Support;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Move namespace OpenRA.Mods.RA.Traits
{ {
[Desc("Calculates routes for mobile units based on the A* search algorithm.", " Attach this to the world actor.")] [Desc("Calculates routes for mobile units based on the A* search algorithm.", " Attach this to the world actor.")]
public class PathFinderInfo : ITraitInfo public class PathFinderInfo : ITraitInfo

2
OpenRA.Mods.RA/Move/PathSearch.cs → OpenRA.Mods.RA/Traits/World/PathSearch.cs Executable file → Normal file
View File

@@ -15,7 +15,7 @@ using System.Linq;
using OpenRA; using OpenRA;
using OpenRA.Primitives; using OpenRA.Primitives;
namespace OpenRA.Mods.RA.Move namespace OpenRA.Mods.RA.Traits
{ {
public sealed class PathSearch : IDisposable public sealed class PathSearch : IDisposable
{ {