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

fix #1052; tidy up *Init; route initial turret facing for husks through new TurretFacingInit

Browse Source
This commit is contained in:
Chris Forbes
2011-07-28 23:07:14 +12:00
parent 096fe7759c
commit 2bf7cb1496
7 changed files with 84 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
OpenRA.Game/ActorInitializer.cs
View File

@@ -17,6 +17,7 @@ namespace OpenRA
{
public readonly Actor self;
public World world { get { return self.World; } }
internal TypeDictionary dict;
public ActorInitializer( Actor actor, TypeDictionary dict )
@@ -25,23 +26,9 @@ namespace OpenRA
this.dict = dict;
}
public T Get<T>()
where T : IActorInit
{
return dict.Get<T>();
}
public U Get<T,U>()
where T : IActorInit<U>
{
return dict.Get<T>().Value( world );
}
public bool Contains<T>()
where T : IActorInit
{
return dict.Contains<T>();
}
public T Get<T>() where T : IActorInit { return dict.Get<T>(); }
public U Get<T,U>() where T : IActorInit<U> { return dict.Get<T>().Value( world ); }
public bool Contains<T>() where T : IActorInit { return dict.Contains<T>(); }
}
public interface IActorInit {}
@@ -53,91 +40,53 @@ namespace OpenRA
public class FacingInit : IActorInit<int>
{
[FieldFromYamlKey]
public readonly int value = 128;
[FieldFromYamlKey] public readonly int value = 128;
public FacingInit() { }
public FacingInit( int init )
{
value = init;
}
public int Value( World world )
{
return value;
}
public FacingInit( int init ) { value = init; }
public int Value( World world ) { return value; }
}
public class TurretFacingInit : IActorInit<int>
{
[FieldFromYamlKey] public readonly int value = 128;
public TurretFacingInit() { }
public TurretFacingInit( int init ) { value = init; }
public int Value( World world ) { return value; }
}
public class AltitudeInit : IActorInit<int>
{
[FieldFromYamlKey]
public readonly int value = 0;
[FieldFromYamlKey] public readonly int value = 0;
public AltitudeInit() { }
public AltitudeInit( int init )
{
value = init;
}
public int Value( World world )
{
return value;
}
public AltitudeInit( int init ) { value = init; }
public int Value( World world ) { return value; }
}
public class LocationInit : IActorInit<int2>
{
[FieldFromYamlKey]
public readonly int2 value = int2.Zero;
[FieldFromYamlKey] public readonly int2 value = int2.Zero;
public LocationInit() { }
public LocationInit( int2 init )
{
value = init;
}
public int2 Value( World world )
{
return value;
}
public LocationInit( int2 init ) { value = init; }
public int2 Value( World world ) { return value; }
}
public class CenterLocationInit : IActorInit<int2>
{
[FieldFromYamlKey]
public readonly int2 value = int2.Zero;
[FieldFromYamlKey] public readonly int2 value = int2.Zero;
public CenterLocationInit() { }
public CenterLocationInit( int2 init )
{
value = init;
}
public int2 Value( World world )
{
return value;
}
public CenterLocationInit( int2 init ) { value = init; }
public int2 Value( World world ) { return value; }
}
public class OwnerInit : IActorInit<Player>
{
[FieldFromYamlKey]
public readonly string PlayerName = "Neutral";
[FieldFromYamlKey] public readonly string PlayerName = "Neutral";
Player player;
public OwnerInit() { }
public OwnerInit( string playerName ) { this.PlayerName = playerName; }
public OwnerInit( string playerName )
{
this.PlayerName = playerName;
}
public OwnerInit( Player player )
{
public OwnerInit( Player player ) {
this.player = player;
this.PlayerName = player.InternalName;
}

20
OpenRA.Game/Traits/ActorStance.cs
View File

@@ -15,7 +15,7 @@ namespace OpenRA.Traits
{
public object Create(ActorInitializer init) { return new ActorStance(init); }
}
public class ActorStance
{
// Stances modify default actor behavior
@@ -31,22 +31,12 @@ namespace OpenRA.Traits
// Doesn't do anything... yet
public ActorStance(ActorInitializer init) {}
}
public class ActorStanceInit : IActorInit<ActorStance.Stance>
{
[FieldFromYamlKey]
public readonly ActorStance.Stance value = ActorStance.Stance.None;
[FieldFromYamlKey] public readonly ActorStance.Stance value = ActorStance.Stance.None;
public ActorStanceInit() { }
public ActorStanceInit( ActorStance.Stance init )
{
value = init;
}
public ActorStance.Stance Value( World world )
{
return value;
}
public ActorStanceInit( ActorStance.Stance init ) { value = init; }
public ActorStance.Stance Value( World world ) { return value; }
}
}

22
OpenRA.Game/Traits/Health.cs
View File

@@ -133,27 +133,15 @@ namespace OpenRA.Traits
DisplayHp = (2 * DisplayHp + hp) / 3;
}
}
public class HealthInit : IActorInit<float>
{
[FieldFromYamlKey]
public readonly float value = 1f;
[FieldFromYamlKey] public readonly float value = 1f;
public HealthInit() { }
public HealthInit( float init )
{
value = init;
}
public float Value( World world )
{
return value;
}
public HealthInit( float init ) { value = init; }
public float Value( World world ) { return value; }
}
public static class HealthExts
{
public static bool IsDead(this Actor self)