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

Change DamageState names

Browse Source
This commit is contained in:
Paul Chote
2010-07-30 21:46:41 +12:00
parent 1459ec483c
commit 4cf0610fd9
9 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@ namespace OpenRA.Traits
public virtual object Create(ActorInitializer init) { return new Health(init, this); }
}
public enum DamageState { Dead, Quarter, Half, ThreeQuarter, Normal, Undamaged };
public enum DamageState { Dead, Critical, Heavy, Medium, Light, Undamaged };
public class Health
{
@@ -61,18 +61,18 @@ namespace OpenRA.Traits
return DamageState.Dead;
if (hp < MaxHP * 0.25f)
return DamageState.Quarter;
return DamageState.Critical;
if (hp < MaxHP * 0.5f)
return DamageState.Half;
return DamageState.Heavy;
if (hp < MaxHP * 0.75f)
return DamageState.ThreeQuarter;
return DamageState.Medium;
if (hp == MaxHP)
return DamageState.Undamaged;
return DamageState.Normal;
return DamageState.Light;
}
}

2
OpenRA.Game/Traits/Render/RenderSimple.cs
View File

@@ -64,7 +64,7 @@ namespace OpenRA.Traits
protected virtual string GetPrefix(Actor self)
{
return self.GetDamageState() <= DamageState.Half ? "damaged-" : "";
return self.GetDamageState() <= DamageState.Heavy ? "damaged-" : "";
}
public void PlayCustomAnim(Actor self, string name)

4
OpenRA.Game/Traits/Selectable.cs
View File

@@ -69,8 +69,8 @@ namespace OpenRA.Traits
Game.Renderer.LineRenderer.DrawLine(xy + new float2(0, -2), xy + new float2(0, -4), c, c);
Game.Renderer.LineRenderer.DrawLine(Xy + new float2(0, -2), Xy + new float2(0, -4), c, c);
var healthColor = (health.DamageState == DamageState.Quarter) ? Color.Red :
(health.DamageState == DamageState.Half) ? Color.Yellow : Color.LimeGreen;
var healthColor = (health.DamageState == DamageState.Critical) ? Color.Red :
(health.DamageState == DamageState.Heavy) ? Color.Yellow : Color.LimeGreen;
var healthColor2 = Color.FromArgb(
255,