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

Moved AttackLeap to Mods.RA.Traits, moved AttackPopupTurreted to

Browse Source 
Mods.Cnc.Traits
This commit is contained in:
reaperrr
2014-12-21 01:39:11 +01:00
parent 65a140afa5
commit 370c3c65b6
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
View File

@@ -70,6 +70,7 @@
<Compile Include="Activities\HarvesterDockSequence.cs" />
<Compile Include="CncLoadScreen.cs" />
<Compile Include="Effects\IonCannon.cs" />
<Compile Include="Traits\AttackPopupTurreted.cs" />
<Compile Include="Traits\Buildings\ProductionAirdrop.cs" />
<Compile Include="Traits\Buildings\TiberiumRefinery.cs" />
<Compile Include="Traits\PoisonedByTiberium.cs" />

3
OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs → OpenRA.Mods.Cnc/Traits/AttackPopupTurreted.cs
View File

@@ -12,11 +12,12 @@ using System.Linq;
using OpenRA.Activities;
using OpenRA.GameRules;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.Cnc.Traits
{
[Desc("Actor's turret rises from the ground before attacking.")]
class AttackPopupTurretedInfo : AttackTurretedInfo, Requires<BuildingInfo>, Requires<RenderBuildingInfo>

4
OpenRA.Mods.RA/Attack/AttackTurreted.cs
View File

@@ -15,12 +15,12 @@ using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
[Desc("Actor has a visual turret used to attack.")]
class AttackTurretedInfo : AttackFollowInfo, Requires<TurretedInfo>
public class AttackTurretedInfo : AttackFollowInfo, Requires<TurretedInfo>
{
public override object Create(ActorInitializer init) { return new AttackTurreted(init.self, this); }
}
class AttackTurreted : AttackFollow, ITick, ISync
public class AttackTurreted : AttackFollow, ITick, ISync
{
protected IEnumerable<Turreted> turrets;

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

@@ -140,10 +140,9 @@
<Compile Include="Traits\AttackMove.cs" />
<Compile Include="Attack\AttackBase.cs" />
<Compile Include="Attack\AttackFrontal.cs" />
<Compile Include="Attack\AttackLeap.cs" />
<Compile Include="Traits\Attack\AttackLeap.cs" />
<Compile Include="Attack\AttackMedic.cs" />
<Compile Include="Attack\AttackOmni.cs" />
<Compile Include="Attack\AttackPopupTurreted.cs" />
<Compile Include="Attack\AttackCharge.cs" />
<Compile Include="Attack\AttackWander.cs" />
<Compile Include="AutoHeal.cs" />

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

@@ -12,7 +12,7 @@ using OpenRA.Activities;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.RA.Traits
{
[Desc("Dogs use this attack model.")]
class AttackLeapInfo : AttackFrontalInfo