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

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)