From 4cf0610fd95a2db8f04d2e8fd1bad0a4ecc2a284 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Fri, 30 Jul 2010 21:46:41 +1200 Subject: [PATCH] Change DamageState names --- OpenRA.Game/Traits/Health.cs | 10 +++++----- OpenRA.Game/Traits/Render/RenderSimple.cs | 2 +- OpenRA.Game/Traits/Selectable.cs | 4 ++-- OpenRA.Mods.RA/Bridge.cs | 2 +- OpenRA.Mods.RA/Render/RenderBuilding.cs | 4 ++-- OpenRA.Mods.RA/Render/RenderBuildingTurreted.cs | 4 ++-- OpenRA.Mods.RA/Render/RenderBuildingWall.cs | 8 ++++---- OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs | 6 +++--- OpenRA.Mods.RA/Render/RenderUnit.cs | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/OpenRA.Game/Traits/Health.cs b/OpenRA.Game/Traits/Health.cs index d77034a22a..1b901bac38 100644 --- a/OpenRA.Game/Traits/Health.cs +++ b/OpenRA.Game/Traits/Health.cs @@ -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; } } diff --git a/OpenRA.Game/Traits/Render/RenderSimple.cs b/OpenRA.Game/Traits/Render/RenderSimple.cs index 6fa9b4b0c7..c3ddc8b7e4 100644 --- a/OpenRA.Game/Traits/Render/RenderSimple.cs +++ b/OpenRA.Game/Traits/Render/RenderSimple.cs @@ -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) diff --git a/OpenRA.Game/Traits/Selectable.cs b/OpenRA.Game/Traits/Selectable.cs index 0df0d312a9..0b16dd497c 100644 --- a/OpenRA.Game/Traits/Selectable.cs +++ b/OpenRA.Game/Traits/Selectable.cs @@ -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, diff --git a/OpenRA.Mods.RA/Bridge.cs b/OpenRA.Mods.RA/Bridge.cs index ded089bfa2..0d3c816aac 100644 --- a/OpenRA.Mods.RA/Bridge.cs +++ b/OpenRA.Mods.RA/Bridge.cs @@ -168,7 +168,7 @@ namespace OpenRA.Mods.RA } var ds = Health.DamageState; - currentTemplate = (ds == DamageState.Half && Info.DamagedTemplate > 0) ? Info.DamagedTemplate : + currentTemplate = (ds == DamageState.Heavy && Info.DamagedTemplate > 0) ? Info.DamagedTemplate : (ds == DamageState.Dead && Info.DestroyedTemplate > 0) ? Info.DestroyedTemplate : Info.Template; if (Info.Long && ds == DamageState.Dead) diff --git a/OpenRA.Mods.RA/Render/RenderBuilding.cs b/OpenRA.Mods.RA/Render/RenderBuilding.cs index 19adccfe7e..063a35260d 100644 --- a/OpenRA.Mods.RA/Render/RenderBuilding.cs +++ b/OpenRA.Mods.RA/Render/RenderBuilding.cs @@ -63,10 +63,10 @@ namespace OpenRA.Mods.RA.Render switch( e.DamageState ) { - case DamageState.ThreeQuarter: case DamageState.Normal: case DamageState.Undamaged: + case DamageState.Medium: case DamageState.Light: case DamageState.Undamaged: anim.ReplaceAnim("idle"); break; - case DamageState.Half: case DamageState.Quarter: + case DamageState.Heavy: case DamageState.Critical: anim.ReplaceAnim("damaged-idle"); Sound.Play(self.Info.Traits.Get().DamagedSound, self.CenterLocation); break; diff --git a/OpenRA.Mods.RA/Render/RenderBuildingTurreted.cs b/OpenRA.Mods.RA/Render/RenderBuildingTurreted.cs index 4080f67ce7..2a34d02b13 100644 --- a/OpenRA.Mods.RA/Render/RenderBuildingTurreted.cs +++ b/OpenRA.Mods.RA/Render/RenderBuildingTurreted.cs @@ -35,10 +35,10 @@ namespace OpenRA.Mods.RA.Render switch( e.DamageState ) { - case DamageState.ThreeQuarter: case DamageState.Normal: case DamageState.Undamaged: + case DamageState.Medium: case DamageState.Light: case DamageState.Undamaged: anim.ReplaceAnim("idle"); break; - case DamageState.Half: case DamageState.Quarter: + case DamageState.Heavy: case DamageState.Critical: anim.ReplaceAnim("damaged-idle"); Sound.Play(self.Info.Traits.Get().DamagedSound, self.CenterLocation); break; diff --git a/OpenRA.Mods.RA/Render/RenderBuildingWall.cs b/OpenRA.Mods.RA/Render/RenderBuildingWall.cs index 6b99c54d73..6416452f67 100644 --- a/OpenRA.Mods.RA/Render/RenderBuildingWall.cs +++ b/OpenRA.Mods.RA/Render/RenderBuildingWall.cs @@ -39,18 +39,18 @@ namespace OpenRA.Mods.RA.Render switch (e.DamageState) { - case DamageState.Normal: + case DamageState.Light: seqName = "idle"; break; - case DamageState.ThreeQuarter: + case DamageState.Medium: if (numStates >= 4) seqName = "minor-damaged-idle"; break; - case DamageState.Half: + case DamageState.Heavy: seqName = "damaged-idle"; Sound.Play(self.Info.Traits.Get().DamagedSound, self.CenterLocation); break; - case DamageState.Quarter: + case DamageState.Critical: if (numStates >= 3) { seqName = "critical-idle"; diff --git a/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs b/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs index 99e49ffb10..367adcd09c 100644 --- a/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs +++ b/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs @@ -27,7 +27,7 @@ namespace OpenRA.Mods.RA.Render string GetPrefix(Actor self) { - return self.GetDamageState() <= DamageState.Half ? "damaged-" : ""; + return self.GetDamageState() <= DamageState.Heavy ? "damaged-" : ""; } public RenderWarFactory(Actor self) @@ -57,10 +57,10 @@ namespace OpenRA.Mods.RA.Render switch( e.DamageState ) { - case DamageState.ThreeQuarter: case DamageState.Normal: case DamageState.Undamaged: + case DamageState.Medium: case DamageState.Light: case DamageState.Undamaged: roof.ReplaceAnim(roof.CurrentSequence.Name.Replace("damaged-","")); break; - case DamageState.Half: case DamageState.Quarter: + case DamageState.Heavy: case DamageState.Critical: roof.ReplaceAnim("damaged-" + roof.CurrentSequence.Name); break; } diff --git a/OpenRA.Mods.RA/Render/RenderUnit.cs b/OpenRA.Mods.RA/Render/RenderUnit.cs index 473790171b..d1c30109f4 100644 --- a/OpenRA.Mods.RA/Render/RenderUnit.cs +++ b/OpenRA.Mods.RA/Render/RenderUnit.cs @@ -37,7 +37,7 @@ namespace OpenRA.Mods.RA.Render public void Damaged(Actor self, AttackInfo e) { - if (e.DamageState > DamageState.Half) return; + if (e.DamageState > DamageState.Heavy) return; if (isSmoking) return; isSmoking = true;