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

Merge pull request #3256 from Mailaender/debug-trait-removal

Browse Source 
Removed all Debug traits
This commit is contained in:
Paul Chote
2013-05-15 00:05:44 -07:00
parent 63c71bf3f5 6aae5d2ad6
commit 44336b1ea5
22 changed files with 9 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
OpenRA.Mods.RA/Air/Aircraft.cs
View File

@@ -19,53 +19,6 @@ using OpenRA.Traits;
namespace OpenRA.Mods.RA.Air
{
public class DebugAircraftFacingInfo : ITraitInfo, Requires<AircraftInfo>
{
public object Create(ActorInitializer init) { return new DebugAircraftFacing(init.self); }
}
public class DebugAircraftFacing : ISync
{
readonly Aircraft a;
public DebugAircraftFacing(Actor self){ a = self.Trait<Aircraft>(); }
[Sync] public int foo { get { return a.Facing; } }
}
public class DebugAircraftSubPxXInfo : ITraitInfo, Requires<AircraftInfo>
{
public object Create(ActorInitializer init) { return new DebugAircraftSubPxX(init.self); }
}
public class DebugAircraftSubPxX : ISync
{
readonly Aircraft a;
public DebugAircraftSubPxX(Actor self){ a = self.Trait<Aircraft>(); }
[Sync] public int foo { get { return a.SubPxPosition.Y; } }
}
public class DebugAircraftSubPxYInfo : ITraitInfo, Requires<AircraftInfo>
{
public object Create(ActorInitializer init) { return new DebugAircraftSubPxY(init.self); }
}
public class DebugAircraftSubPxY : ISync
{
readonly Aircraft a;
public DebugAircraftSubPxY(Actor self){ a = self.Trait<Aircraft>(); }
[Sync] public int foo { get { return a.SubPxPosition.Y; } }
}
public class DebugAircraftAltitudeInfo : ITraitInfo, Requires<AircraftInfo>
{
public object Create(ActorInitializer init) { return new DebugAircraftAltitude(init.self); }
}
public class DebugAircraftAltitude : ISync
{
readonly Aircraft a;
public DebugAircraftAltitude(Actor self){ a = self.Trait<Aircraft>(); }
[Sync] public int foo { get { return a.Altitude; } }
}
public class AircraftInfo : ITraitInfo, IFacingInfo, UsesInit<AltitudeInit>, UsesInit<LocationInit>, UsesInit<FacingInit>
{
@@ -111,7 +64,7 @@ namespace OpenRA.Mods.RA.Air
readonly AircraftInfo Info;
public Aircraft( ActorInitializer init , AircraftInfo info)
public Aircraft(ActorInitializer init , AircraftInfo info)
{
this.self = init.self;
if( init.Contains<LocationInit>() )

34
OpenRA.Mods.RA/AutoTarget.cs
View File

@@ -20,6 +20,7 @@ namespace OpenRA.Mods.RA
{
[Desc("It will try to hunt down the enemy if it is not set to defend.")]
public readonly bool AllowMovement = true;
[Desc("Set to a value >1 to override weapons maximum range for this.")]
public readonly int ScanRadius = -1;
public readonly UnitStance InitialStance = UnitStance.AttackAnything;
@@ -121,20 +122,22 @@ namespace OpenRA.Mods.RA
var inRange = self.World.FindUnitsInCircle(self.CenterLocation, (int)(Game.CellSize * range));
if (self.Owner.HasFogVisibility()) {
if (self.Owner.HasFogVisibility())
{
return inRange
.Where(a => a.AppearsHostileTo(self))
.Where(a => !a.HasTrait<AutoTargetIgnore>())
.Where(a => attack.HasAnyValidWeapons(Target.FromActor(a)))
.ClosestTo( self.CenterLocation );
.ClosestTo(self.CenterLocation);
}
else {
else
{
return inRange
.Where(a => a.AppearsHostileTo(self))
.Where(a => !a.HasTrait<AutoTargetIgnore>())
.Where(a => attack.HasAnyValidWeapons(Target.FromActor(a)))
.Where(a => self.Owner.Shroud.IsTargetable(a))
.ClosestTo( self.CenterLocation );
.ClosestTo(self.CenterLocation);
}
}
}
@@ -142,28 +145,5 @@ namespace OpenRA.Mods.RA
[Desc("Will not get automatically targeted by enemy (like walls)")]
class AutoTargetIgnoreInfo : TraitInfo<AutoTargetIgnore> { }
class AutoTargetIgnore { }
public class DebugRetiliateAgainstAggressorInfo : ITraitInfo, Requires<AutoTargetInfo>
{
public object Create(ActorInitializer init) { return new DebugRetiliateAgainstAggressor(init.self); }
}
public class DebugRetiliateAgainstAggressor : ISync
{
readonly AutoTarget a;
public DebugRetiliateAgainstAggressor(Actor self){ a = self.Trait<AutoTarget>(); }
[Sync] public int Aggressor { get { return a.AggressorID; } }
}
public class DebugNextAutoTargetScanTimeInfo : ITraitInfo, Requires<AutoTargetInfo>
{
public object Create(ActorInitializer init) { return new DebugNextAutoTargetScanTime(init.self); }
}
public class DebugNextAutoTargetScanTime : ISync
{
readonly AutoTarget a;
public DebugNextAutoTargetScanTime(Actor self){ a = self.Trait<AutoTarget>(); }
[Sync] public int NextAutoTargetScanTime { get { return a.nextScanTime; } }
}
}