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

moved almost all Attack* to ra

Browse Source
This commit is contained in:
Chris Forbes
2010-05-20 18:37:36 +12:00
parent d008fd9eed
commit be974f7970
15 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/OpenRA.Game.csproj
View File

@@ -81,8 +81,6 @@
<Compile Include="GameRules\WeaponInfo.cs" />
<Compile Include="Group.cs" />
<Compile Include="Orders\GenericSelectTarget.cs" />
<Compile Include="Traits\Activities\Leap.cs" />
<Compile Include="Traits\Attack\AttackLeap.cs" />
<Compile Include="Traits\DetectCloaked.cs" />
<Compile Include="Traits\Player\ActorGroupProxy.cs" />
<Compile Include="Traits\Player\PlayerResources.cs" />
@@ -140,8 +138,6 @@
<Compile Include="Sound.cs" />
<Compile Include="Support\PerfHistory.cs" />
<Compile Include="Sync.cs" />
<Compile Include="Traits\Attack\AttackOmni.cs" />
<Compile Include="Traits\Attack\AttackTesla.cs" />
<Compile Include="Traits\Chrome\PowerDownButton.cs" />
<Compile Include="Traits\CustomSellValue.cs" />
<Compile Include="Traits\World\SpatialBins.cs" />
@@ -204,11 +200,7 @@
<Compile Include="Traits\Activities\Turn.cs" />
<Compile Include="Traits\Activities\UndeployMcv.cs" />
<Compile Include="Traits\Attack\AttackBase.cs" />
<Compile Include="Traits\Attack\AttackFrontal.cs" />
<Compile Include="Traits\Attack\AttackHeli.cs" />
<Compile Include="Traits\Attack\AttackInfo.cs" />
<Compile Include="Traits\Attack\AttackPlane.cs" />
<Compile Include="Traits\Attack\AttackTurreted.cs" />
<Compile Include="Traits\Modifiers\BelowUnits.cs" />
<Compile Include="Traits\Buildable.cs" />
<Compile Include="Traits\Building.cs" />

2
OpenRA.Game/Traits/Activities/Follow.cs
View File

@@ -20,7 +20,7 @@
namespace OpenRA.Traits.Activities
{
class Follow : IActivity
public class Follow : IActivity
{
Actor Target;
int Range;

2
OpenRA.Game/Traits/Activities/HeliAttack.cs
View File

@@ -24,7 +24,7 @@ using OpenRA.GameRules;
namespace OpenRA.Traits.Activities
{
class HeliAttack : IActivity
public class HeliAttack : IActivity
{
Actor target;
public HeliAttack( Actor target ) { this.target = target; }

2
OpenRA.Game/Traits/Activities/HeliReturn.cs
View File

@@ -22,7 +22,7 @@ using System.Linq;
namespace OpenRA.Traits.Activities
{
class HeliReturn : IActivity
public class HeliReturn : IActivity
{
public IActivity NextActivity { get; set; }
bool isCanceled;

2
OpenRA.Game/Traits/Render/RenderBuildingCharge.cs
View File

@@ -27,7 +27,7 @@ namespace OpenRA.Traits
}
/* used for tesla */
class RenderBuildingCharge : RenderBuilding
public class RenderBuildingCharge : RenderBuilding
{
public RenderBuildingCharge(Actor self)
: base(self)

2
OpenRA.Game/Traits/Turreted.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRA.Traits
public object Create(Actor self) { return new Turreted(self); }
}
class Turreted : ITick
public class Turreted : ITick
{
[Sync]
public int turretFacing = 0;

3
OpenRA.Game/Traits/Activities/Leap.cs → OpenRA.Mods.RA/Activities/Leap.cs
View File

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

3
OpenRA.Game/Traits/Attack/AttackFrontal.cs → OpenRA.Mods.RA/AttackFrontal.cs
View File

@@ -19,8 +19,9 @@
#endregion
using System;
using OpenRA.Traits;
namespace OpenRA.Traits
namespace OpenRA.Mods.RA
{
abstract class AttackFrontal : AttackBase
{

3
OpenRA.Game/Traits/Attack/AttackHeli.cs → OpenRA.Mods.RA/AttackHeli.cs
View File

@@ -18,9 +18,10 @@
*/
#endregion
using OpenRA.Traits;
using OpenRA.Traits.Activities;
namespace OpenRA.Traits
namespace OpenRA.Mods.RA
{
class AttackHeliInfo : AttackBaseInfo
{

5
OpenRA.Game/Traits/Attack/AttackLeap.cs → OpenRA.Mods.RA/AttackLeap.cs
View File

@@ -18,9 +18,10 @@
*/
#endregion
using OpenRA.Traits.Activities;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
namespace OpenRA.Traits
namespace OpenRA.Mods.RA
{
class AttackLeapInfo : AttackBaseInfo
{

4
OpenRA.Game/Traits/Attack/AttackOmni.cs → OpenRA.Mods.RA/AttackOmni.cs Executable file → Normal file
View File

@@ -18,7 +18,9 @@
*/
#endregion
namespace OpenRA.Traits
using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
class AttackOmniInfo : AttackBaseInfo
{

3
OpenRA.Game/Traits/Attack/AttackPlane.cs → OpenRA.Mods.RA/AttackPlane.cs
View File

@@ -18,9 +18,10 @@
*/
#endregion
using OpenRA.Traits;
using OpenRA.Traits.Activities;
namespace OpenRA.Traits
namespace OpenRA.Mods.RA
{
class AttackPlaneInfo : AttackBaseInfo
{

9
OpenRA.Game/Traits/Attack/AttackTesla.cs → OpenRA.Mods.RA/AttackTesla.cs Executable file → Normal file
View File

@@ -19,17 +19,14 @@
#endregion
using System;
using OpenRA.Traits;
namespace OpenRA.Traits
namespace OpenRA.Mods.RA
{
class AttackTeslaInfo : AttackOmniInfo
{
public readonly int MaxCharges = 3;
public override object Create( Actor self )
{
return new AttackTesla( self );
}
public override object Create(Actor self) { return new AttackTesla(self); }
}
class AttackTesla : AttackOmni, ITick

3
OpenRA.Game/Traits/Attack/AttackTurreted.cs → OpenRA.Mods.RA/AttackTurreted.cs Executable file → Normal file
View File

@@ -19,6 +19,7 @@
#endregion
using System;
using OpenRA.Traits.Activities;
namespace OpenRA.Traits
{
@@ -61,7 +62,7 @@ namespace OpenRA.Traits
var weapon = order.Subject.GetPrimaryWeapon() ?? order.Subject.GetSecondaryWeapon();
if (self.traits.Contains<Mobile>())
self.QueueActivity( new Traits.Activities.Follow( order.TargetActor,
self.QueueActivity( new Follow( order.TargetActor,
Math.Max( 0, (int)weapon.Range - RangeTolerance ) ) );
target = order.TargetActor;

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

@@ -52,10 +52,18 @@
<Compile Include="Activities\EnterTransport.cs" />
<Compile Include="Activities\Infiltrate.cs" />
<Compile Include="Activities\LayMine.cs" />
<Compile Include="Activities\Leap.cs" />
<Compile Include="Activities\Steal.cs" />
<Compile Include="Activities\Teleport.cs" />
<Compile Include="Activities\UnloadCargo.cs" />
<Compile Include="AirstrikePower.cs" />
<Compile Include="AttackFrontal.cs" />
<Compile Include="AttackHeli.cs" />
<Compile Include="AttackLeap.cs" />
<Compile Include="AttackOmni.cs" />
<Compile Include="AttackPlane.cs" />
<Compile Include="AttackTesla.cs" />
<Compile Include="AttackTurreted.cs" />
<Compile Include="AutoHeal.cs" />
<Compile Include="AutoTarget.cs" />
<Compile Include="Bridge.cs" />