moved paradrop crap into mod dll

This commit is contained in:
Chris Forbes
2010-01-29 19:24:30 +13:00
parent f89a40f2ca
commit 3cf1ec5b45
12 changed files with 26 additions and 42 deletions

View File

@@ -83,7 +83,6 @@
<Compile Include="Effects\GpsSatellite.cs" /> <Compile Include="Effects\GpsSatellite.cs" />
<Compile Include="Effects\InvulnEffect.cs" /> <Compile Include="Effects\InvulnEffect.cs" />
<Compile Include="Effects\MoveFlash.cs" /> <Compile Include="Effects\MoveFlash.cs" />
<Compile Include="Effects\Parachute.cs" />
<Compile Include="Effects\RepairIndicator.cs" /> <Compile Include="Effects\RepairIndicator.cs" />
<Compile Include="Effects\SatelliteLaunch.cs" /> <Compile Include="Effects\SatelliteLaunch.cs" />
<Compile Include="Effects\Smoke.cs" /> <Compile Include="Effects\Smoke.cs" />
@@ -225,8 +224,6 @@
<Compile Include="Traits\LightPaletteRotator.cs" /> <Compile Include="Traits\LightPaletteRotator.cs" />
<Compile Include="Traits\LimitedAmmo.cs" /> <Compile Include="Traits\LimitedAmmo.cs" />
<Compile Include="Traits\NukePower.cs" /> <Compile Include="Traits\NukePower.cs" />
<Compile Include="Traits\ParaDrop.cs" />
<Compile Include="Traits\ParatroopersPower.cs" />
<Compile Include="Traits\Passenger.cs" /> <Compile Include="Traits\Passenger.cs" />
<Compile Include="Traits\PlaceBuilding.cs" /> <Compile Include="Traits\PlaceBuilding.cs" />
<Compile Include="Traits\SonarPulsePower.cs" /> <Compile Include="Traits\SonarPulsePower.cs" />

View File

@@ -1,11 +1,8 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace OpenRa.Traits.Activities namespace OpenRa.Traits.Activities
{ {
class Fly : IActivity public class Fly : IActivity
{ {
readonly float2 Pos; readonly float2 Pos;
bool isCanceled; bool isCanceled;

View File

@@ -5,7 +5,7 @@ using System.Text;
namespace OpenRa.Traits.Activities namespace OpenRa.Traits.Activities
{ {
class FlyAttack : IActivity public class FlyAttack : IActivity
{ {
public IActivity NextActivity { get; set; } public IActivity NextActivity { get; set; }
Actor Target; Actor Target;
@@ -30,7 +30,7 @@ namespace OpenRa.Traits.Activities
public void Cancel(Actor self) { Target = null; NextActivity = null; } public void Cancel(Actor self) { Target = null; NextActivity = null; }
} }
class FlyCircle : IActivity public class FlyCircle : IActivity
{ {
public IActivity NextActivity { get; set; } public IActivity NextActivity { get; set; }
int2 Target; int2 Target;

View File

@@ -1,11 +1,7 @@
using System; 
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace OpenRa.Traits.Activities namespace OpenRa.Traits.Activities
{ {
class RemoveSelf : IActivity public class RemoveSelf : IActivity
{ {
bool isCanceled; bool isCanceled;
public IActivity NextActivity { get; set; } public IActivity NextActivity { get; set; }

View File

@@ -3,7 +3,7 @@ using OpenRa.Traits.Activities;
namespace OpenRa.Traits namespace OpenRa.Traits
{ {
class CargoInfo : ITraitInfo public class CargoInfo : ITraitInfo
{ {
public readonly int Passengers = 0; public readonly int Passengers = 0;
public readonly UnitMovementType[] PassengerTypes = { }; public readonly UnitMovementType[] PassengerTypes = { };
@@ -12,7 +12,7 @@ namespace OpenRa.Traits
public object Create(Actor self) { return new Cargo(self); } public object Create(Actor self) { return new Cargo(self); }
} }
class Cargo : IPips, IIssueOrder, IResolveOrder public class Cargo : IPips, IIssueOrder, IResolveOrder
{ {
List<Actor> cargo = new List<Actor>(); List<Actor> cargo = new List<Actor>();

View File

@@ -1,18 +1,16 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRa.GameRules;
namespace OpenRa.Traits namespace OpenRa.Traits
{ {
class MobileInfo : ITraitInfo public class MobileInfo : ITraitInfo
{ {
public readonly UnitMovementType MovementType = UnitMovementType.Wheel; public readonly UnitMovementType MovementType = UnitMovementType.Wheel;
public object Create(Actor self) { return new Mobile(self); } public object Create(Actor self) { return new Mobile(self); }
} }
class Mobile : IIssueOrder, IResolveOrder, IOccupySpace, IMovement public class Mobile : IIssueOrder, IResolveOrder, IOccupySpace, IMovement
{ {
readonly Actor self; readonly Actor self;

View File

@@ -1,12 +1,11 @@
using System; using System;
using System.Linq; using System.Linq;
using OpenRa.GameRules;
using OpenRa.Graphics; using OpenRa.Graphics;
using OpenRa.Traits.Activities; using OpenRa.Traits.Activities;
namespace OpenRa.Traits namespace OpenRa.Traits
{ {
static class Util public static class Util
{ {
public static void TickFacing( ref int facing, int desiredFacing, int rot ) public static void TickFacing( ref int facing, int desiredFacing, int rot )
{ {

View File

@@ -8,7 +8,7 @@ using OpenRa.FileFormats;
namespace OpenRa namespace OpenRa
{ {
static class WorldUtils public static class WorldUtils
{ {
public static bool IsCellBuildable(this World world, int2 a, UnitMovementType umt) public static bool IsCellBuildable(this World world, int2 a, UnitMovementType umt)
{ {

View File

@@ -1,11 +1,9 @@
using System; using System.Collections.Generic;
using System.Collections.Generic; using OpenRa.Effects;
using System.Linq;
using System.Text;
using OpenRa.Traits;
using OpenRa.Graphics; using OpenRa.Graphics;
using OpenRa.Traits;
namespace OpenRa.Effects namespace OpenRa.Mods.RA.Effects
{ {
class Parachute : IEffect class Parachute : IEffect
{ {

View File

@@ -53,8 +53,11 @@
<Compile Include="Activities\Steal.cs" /> <Compile Include="Activities\Steal.cs" />
<Compile Include="C4Demolition.cs" /> <Compile Include="C4Demolition.cs" />
<Compile Include="Effects\CrateEffectSpeedUpgrade.cs" /> <Compile Include="Effects\CrateEffectSpeedUpgrade.cs" />
<Compile Include="Effects\Parachute.cs" />
<Compile Include="EngineerCapture.cs" /> <Compile Include="EngineerCapture.cs" />
<Compile Include="InfiltrateForSonarPulse.cs" /> <Compile Include="InfiltrateForSonarPulse.cs" />
<Compile Include="ParaDrop.cs" />
<Compile Include="ParatroopersPower.cs" />
<Compile Include="RequiresPower.cs" /> <Compile Include="RequiresPower.cs" />
<Compile Include="Mine.cs" /> <Compile Include="Mine.cs" />
<Compile Include="MineImmune.cs" /> <Compile Include="MineImmune.cs" />

View File

@@ -1,11 +1,9 @@
using System; using System.Collections.Generic;
using System.Collections.Generic; using OpenRa.Mods.RA.Effects;
using System.Linq; using OpenRa.Traits;
using System.Text;
using OpenRa.Traits.Activities; using OpenRa.Traits.Activities;
using OpenRa.Effects;
namespace OpenRa.Traits namespace OpenRa.Mods.RA
{ {
class ParaDropInfo : ITraitInfo class ParaDropInfo : ITraitInfo
{ {

View File

@@ -1,10 +1,8 @@
using System; using System.Collections.Generic;
using System.Collections.Generic; using OpenRa.Traits;
using System.Linq;
using System.Text;
using OpenRa.Traits.Activities; using OpenRa.Traits.Activities;
namespace OpenRa.Traits namespace OpenRa.Mods.RA
{ {
class ParatroopersPowerInfo : SupportPowerInfo class ParatroopersPowerInfo : SupportPowerInfo
{ {