moved other chrono-related stuff into the mod dll.

This commit is contained in:
Bob
2010-04-02 22:45:01 +12:00
committed by Chris Forbes
parent 9cbfd3914a
commit 8a3c1e137e
8 changed files with 21 additions and 8 deletions

View File

@@ -168,7 +168,6 @@
<Compile Include="Traits\Activities\Repair.cs" /> <Compile Include="Traits\Activities\Repair.cs" />
<Compile Include="Traits\Activities\ReturnToBase.cs" /> <Compile Include="Traits\Activities\ReturnToBase.cs" />
<Compile Include="Traits\Activities\Sell.cs" /> <Compile Include="Traits\Activities\Sell.cs" />
<Compile Include="Traits\Activities\Teleport.cs" />
<Compile Include="Orders\IOrderGenerator.cs" /> <Compile Include="Orders\IOrderGenerator.cs" />
<Compile Include="Orders\PlaceBuildingOrderGenerator.cs" /> <Compile Include="Orders\PlaceBuildingOrderGenerator.cs" />
<Compile Include="Player.cs" /> <Compile Include="Player.cs" />
@@ -211,8 +210,6 @@
<Compile Include="Traits\World\BuildingInfluence.cs" /> <Compile Include="Traits\World\BuildingInfluence.cs" />
<Compile Include="Traits\CanPowerDown.cs" /> <Compile Include="Traits\CanPowerDown.cs" />
<Compile Include="Traits\Cargo.cs" /> <Compile Include="Traits\Cargo.cs" />
<Compile Include="Traits\Chronoshiftable.cs" />
<Compile Include="Traits\World\ChronoshiftPaletteEffect.cs" />
<Compile Include="Traits\Crate.cs" /> <Compile Include="Traits\Crate.cs" />
<Compile Include="Traits\Explodes.cs" /> <Compile Include="Traits\Explodes.cs" />
<Compile Include="Traits\Fake.cs" /> <Compile Include="Traits\Fake.cs" />

View File

@@ -20,6 +20,8 @@
using System.Collections.Generic; using System.Collections.Generic;
using OpenRA.Mods.Aftermath.Orders; using OpenRA.Mods.Aftermath.Orders;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.SupportPowers;
using OpenRA.Traits; using OpenRA.Traits;
using OpenRA.Traits.Activities; using OpenRA.Traits.Activities;

View File

@@ -20,6 +20,7 @@
using OpenRA.Effects; using OpenRA.Effects;
using OpenRA.Traits; using OpenRA.Traits;
using OpenRA.Mods.RA;
namespace OpenRA.Mods.Aftermath namespace OpenRA.Mods.Aftermath
{ {

View File

@@ -60,6 +60,10 @@
<Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project> <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
<Name>OpenRA.Game</Name> <Name>OpenRA.Game</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\OpenRA.Mods.RA\OpenRA.Mods.RA.csproj">
<Project>{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}</Project>
<Name>OpenRA.Mods.RA</Name>
</ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

View File

@@ -18,7 +18,9 @@
*/ */
#endregion #endregion
namespace OpenRA.Traits.Activities using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities
{ {
public class Teleport : IActivity public class Teleport : IActivity
{ {

View File

@@ -18,7 +18,10 @@
*/ */
#endregion #endregion
namespace OpenRA.Traits using OpenRA.Traits;
using OpenRA.Mods.RA.Activities;
namespace OpenRA.Mods.RA
{ {
class ChronoshiftableInfo : ITraitInfo class ChronoshiftableInfo : ITraitInfo
{ {
@@ -48,7 +51,7 @@ namespace OpenRA.Traits
{ {
self.CancelActivity(); self.CancelActivity();
// Todo: need a new Teleport method that will move to the closest available cell // Todo: need a new Teleport method that will move to the closest available cell
self.QueueActivity(new Activities.Teleport(chronoshiftOrigin)); self.QueueActivity(new Teleport(chronoshiftOrigin));
} }
} }
@@ -71,7 +74,7 @@ namespace OpenRA.Traits
// Set up the teleport // Set up the teleport
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new Activities.Teleport(targetLocation)); self.QueueActivity(new Teleport(targetLocation));
return true; return true;
} }

View File

@@ -51,8 +51,11 @@
<Compile Include="Activities\Infiltrate.cs" /> <Compile Include="Activities\Infiltrate.cs" />
<Compile Include="Activities\LayMine.cs" /> <Compile Include="Activities\LayMine.cs" />
<Compile Include="Activities\Steal.cs" /> <Compile Include="Activities\Steal.cs" />
<Compile Include="Activities\Teleport.cs" />
<Compile Include="C4Demolition.cs" /> <Compile Include="C4Demolition.cs" />
<Compile Include="Chronoshiftable.cs" />
<Compile Include="Effects\NukeLaunch.cs" /> <Compile Include="Effects\NukeLaunch.cs" />
<Compile Include="SupportPowers\ChronoshiftPaletteEffect.cs" />
<Compile Include="SupportPowers\ChronoshiftPower.cs" /> <Compile Include="SupportPowers\ChronoshiftPower.cs" />
<Compile Include="Crates\ArmorUpgradeCrateAction.cs" /> <Compile Include="Crates\ArmorUpgradeCrateAction.cs" />
<Compile Include="Crates\ExplodeCrateAction.cs" /> <Compile Include="Crates\ExplodeCrateAction.cs" />

View File

@@ -19,8 +19,9 @@
#endregion #endregion
using System.Drawing; using System.Drawing;
using OpenRA.Traits;
namespace OpenRA.Traits namespace OpenRA.Mods.RA.SupportPowers
{ {
class ChronoshiftPaletteEffectInfo : StatelessTraitInfo<ChronoshiftPaletteEffect> { } class ChronoshiftPaletteEffectInfo : StatelessTraitInfo<ChronoshiftPaletteEffect> { }