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

Actor.traits is implementation detail

Browse Source
This commit is contained in:
Bob
2010-08-14 15:19:30 +12:00
committed by alzeih
parent f6c6255f64
commit ae703d50b2
165 changed files with 586 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Render/RenderBuilding.cs
View File

@@ -39,7 +39,7 @@ namespace OpenRA.Mods.RA.Render
void Complete( Actor self )
{
anim.PlayRepeating( GetPrefix(self) + "idle" );
foreach( var x in self.traits.WithInterface<INotifyBuildComplete>() )
foreach( var x in self.TraitsImplementing<INotifyBuildComplete>() )
x.BuildingComplete( self );
}

2
OpenRA.Mods.RA/Render/RenderBuildingOre.cs
View File

@@ -27,7 +27,7 @@ namespace OpenRA.Mods.RA.Render
public void BuildingComplete( Actor self )
{
anim.PlayFetchIndex( "idle",
() => (int)( 4.9 * self.Owner.PlayerActor.traits.Get<PlayerResources>().GetSiloFullness() ) );
() => (int)( 4.9 * self.Owner.PlayerActor.Trait<PlayerResources>().GetSiloFullness() ) );
}
}
}

2
OpenRA.Mods.RA/Render/RenderBuildingTurreted.cs
View File

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.RA.Render
class RenderBuildingTurreted : RenderBuilding, INotifyBuildComplete
{
public RenderBuildingTurreted(Actor self)
: base(self, () => self.traits.Get<Turreted>().turretFacing)
: base(self, () => self.Trait<Turreted>().turretFacing)
{
}

2
OpenRA.Mods.RA/Render/RenderBuildingWall.cs
View File

@@ -69,7 +69,7 @@ namespace OpenRA.Mods.RA.Render
foreach (var w in adjWalls)
{
w.traits.Get<RenderBuildingWall>().AddAdjacentWall(w.Location, self.Location);
w.Trait<RenderBuildingWall>().AddAdjacentWall(w.Location, self.Location);
AddAdjacentWall(self.Location, w.Location);
}
hasTicked = true;

8
OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs
View File

@@ -34,18 +34,18 @@ namespace OpenRA.Mods.RA.Render
public RenderWarFactory(Actor self)
{
roof = new Animation(self.traits.Get<RenderSimple>().GetImage(self));
roof = new Animation(self.Trait<RenderSimple>().GetImage(self));
}
public void BuildingComplete( Actor self )
{
roof.Play( GetPrefix(self) + "idle-top" );
self.traits.Get<RenderSimple>().anims.Add( "roof", new RenderSimple.AnimationWithOffset( roof ) { ZOffset = 2 } );
self.Trait<RenderSimple>().anims.Add( "roof", new RenderSimple.AnimationWithOffset( roof ) { ZOffset = 2 } );
}
public void Tick(Actor self)
{
if (isOpen && !self.World.WorldActor.traits.Get<UnitInfluence>()
if (isOpen && !self.World.WorldActor.Trait<UnitInfluence>()
.GetUnitsAt(openExit).Any())
{
isOpen = false;
@@ -70,7 +70,7 @@ namespace OpenRA.Mods.RA.Render
public void Selling( Actor self )
{
self.traits.Get<RenderSimple>().anims.Remove( "roof" );
self.Trait<RenderSimple>().anims.Remove( "roof" );
}
public void Sold( Actor self ) { }

6
OpenRA.Mods.RA/Render/RenderInfantry.cs
View File

@@ -22,7 +22,7 @@ namespace OpenRA.Mods.RA.Render
public class RenderInfantry : RenderSimple, INotifyAttack, INotifyDamage
{
public RenderInfantry(Actor self)
: base(self, () => self.traits.Get<IFacing>().Facing)
: base(self, () => self.Trait<IFacing>().Facing)
{
anim.Play("stand");
}
@@ -32,7 +32,7 @@ namespace OpenRA.Mods.RA.Render
if (!(self.GetCurrentActivity() is Move) && !(self.GetCurrentActivity() is Drag)) // A bit of a hack
return false;
var mobile = self.traits.Get<Mobile>();
var mobile = self.Trait<Mobile>();
if (float2.WithinEpsilon(self.CenterLocation, Util.CenterOfCell(mobile.toCell), 2)) return false;
var seq = IsProne(self) ? "crawl" : "run";
@@ -46,7 +46,7 @@ namespace OpenRA.Mods.RA.Render
bool inAttack = false;
bool IsProne(Actor self)
{
var takeCover = self.traits.GetOrDefault<TakeCover>();
var takeCover = self.TraitOrDefault<TakeCover>();
return takeCover != null && takeCover.IsProne;
}

2
OpenRA.Mods.RA/Render/RenderUnit.cs
View File

@@ -22,7 +22,7 @@ namespace OpenRA.Mods.RA.Render
public class RenderUnit : RenderSimple, INotifyDamage
{
public RenderUnit(Actor self)
: base(self, () => self.traits.Contains<IFacing>() ? self.traits.Get<IFacing>().Facing : 0)
: base(self, () => self.HasTrait<IFacing>() ? self.Trait<IFacing>().Facing : 0)
{
anim.Play("idle");
anims.Add( "smoke", new AnimationWithOffset( new Animation( "smoke_m" ), null, () => !isSmoking ) );

2
OpenRA.Mods.RA/Render/RenderUnitReload.cs
View File

@@ -26,7 +26,7 @@ namespace OpenRA.Mods.RA.Render
{
var isAttacking = self.GetCurrentActivity() is Attack;
var attack = self.traits.GetOrDefault<AttackBase>();
var attack = self.TraitOrDefault<AttackBase>();
if (attack != null)
anim.ReplaceAnim((attack.IsReloading() ? "empty-" : "")

4
OpenRA.Mods.RA/Render/RenderUnitRotor.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRA.Mods.RA.Render
public RenderUnitRotor( Actor self )
: base(self)
{
var facing = self.traits.Get<IFacing>();
var facing = self.Trait<IFacing>();
var info = self.Info.Traits.Get<RenderUnitRotorInfo>();
rotorAnim = new Animation(GetImage(self));
@@ -52,7 +52,7 @@ namespace OpenRA.Mods.RA.Render
{
base.Tick(self);
var isFlying = self.traits.Get<IMove>().Altitude > 0;
var isFlying = self.Trait<IMove>().Altitude > 0;
if (isFlying ^ (rotorAnim.CurrentSequence.Name != "rotor"))
return;

2
OpenRA.Mods.RA/Render/RenderUnitSpinner.cs
View File

@@ -30,7 +30,7 @@ namespace OpenRA.Mods.RA.Render
spinnerAnim.PlayRepeating("spinner");
anims.Add("spinner", new AnimationWithOffset(
spinnerAnim,
() => Combat.GetTurretPosition( self, self.traits.Get<IFacing>(), new Turret(info.Offset)),
() => Combat.GetTurretPosition( self, self.Trait<IFacing>(), new Turret(info.Offset)),
null ) { ZOffset = 1 } );
}
}

6
OpenRA.Mods.RA/Render/RenderUnitTurreted.cs
View File

@@ -23,9 +23,9 @@ namespace OpenRA.Mods.RA.Render
public RenderUnitTurreted(Actor self)
: base(self)
{
var facing = self.traits.Get<IFacing>();
var turreted = self.traits.Get<Turreted>();
var attack = self.traits.GetOrDefault<AttackBase>();
var facing = self.Trait<IFacing>();
var turreted = self.Trait<Turreted>();
var attack = self.TraitOrDefault<AttackBase>();
var attackInfo = self.Info.Traits.Get<AttackBaseInfo>();
var turretAnim = new Animation(GetImage(self), () => turreted.turretFacing );