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

moved paradrop crap into mod dll

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRa.Game/OpenRa.Game.csproj
View File

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

5
OpenRa.Game/Traits/Activities/Fly.cs
View File

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

4
OpenRa.Game/Traits/Activities/FlyAttack.cs
View File

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

8
OpenRa.Game/Traits/Activities/RemoveSelf.cs
View File

@@ -1,11 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace OpenRa.Traits.Activities
{
class RemoveSelf : IActivity
public class RemoveSelf : IActivity
{
bool isCanceled;
public IActivity NextActivity { get; set; }

4
OpenRa.Game/Traits/Cargo.cs
View File

@@ -3,7 +3,7 @@ using OpenRa.Traits.Activities;
namespace OpenRa.Traits
{
class CargoInfo : ITraitInfo
public class CargoInfo : ITraitInfo
{
public readonly int Passengers = 0;
public readonly UnitMovementType[] PassengerTypes = { };
@@ -12,7 +12,7 @@ namespace OpenRa.Traits
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>();

8
OpenRa.Game/Traits/Mobile.cs
View File

@@ -1,18 +1,16 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using OpenRa.GameRules;
namespace OpenRa.Traits
{
class MobileInfo : ITraitInfo
public class MobileInfo : ITraitInfo
{
public readonly UnitMovementType MovementType = UnitMovementType.Wheel;
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;

3
OpenRa.Game/Traits/Util.cs
View File

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

2
OpenRa.Game/WorldUtils.cs
View File

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

10
OpenRa.Game/Effects/Parachute.cs → OpenRa.Mods.RA/Effects/Parachute.cs
View File

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

3
OpenRa.Mods.RA/OpenRa.Mods.RA.csproj
View File

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

10
OpenRa.Game/Traits/ParaDrop.cs → OpenRa.Mods.RA/ParaDrop.cs
View File

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

8
OpenRa.Game/Traits/ParatroopersPower.cs → OpenRa.Mods.RA/ParatroopersPower.cs
View File

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