From 1459ec483c1406074e804ac03e612756c3b52897 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Fri, 30 Jul 2010 21:40:40 +1200 Subject: [PATCH] Rename ExtendedDamageState -> DamageState --- OpenRA.Game/Traits/Building.cs | 2 +- OpenRA.Game/Traits/Health.cs | 26 +++++++++---------- OpenRA.Game/Traits/Render/RenderSimple.cs | 2 +- OpenRA.Game/Traits/RepairableBuilding.cs | 2 +- OpenRA.Game/Traits/Selectable.cs | 4 +-- OpenRA.Game/Traits/TraitsInterfaces.cs | 4 +-- OpenRA.Game/Traits/Unit.cs | 2 +- OpenRA.Mods.Cnc/CriticalBuildingState.cs | 2 +- OpenRA.Mods.Cnc/TiberiumRefineryDockAction.cs | 2 +- OpenRA.Mods.RA/Activities/Repair.cs | 2 +- OpenRA.Mods.RA/Activities/RepairBuilding.cs | 2 +- OpenRA.Mods.RA/AttackBase.cs | 2 +- OpenRA.Mods.RA/AutoHeal.cs | 4 +-- OpenRA.Mods.RA/Bridge.cs | 14 +++++----- OpenRA.Mods.RA/DemoTruck.cs | 2 +- OpenRA.Mods.RA/EmitInfantryOnSell.cs | 2 +- OpenRA.Mods.RA/EngineerRepair.cs | 6 ++--- OpenRA.Mods.RA/Explodes.cs | 2 +- OpenRA.Mods.RA/GivesExperience.cs | 2 +- OpenRA.Mods.RA/Harvester.cs | 2 +- OpenRA.Mods.RA/LeavesHusk.cs | 2 +- OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs | 2 +- OpenRA.Mods.RA/OreRefinery.cs | 2 +- OpenRA.Mods.RA/Render/RenderBuilding.cs | 10 +++---- .../Render/RenderBuildingTurreted.cs | 8 +++--- OpenRA.Mods.RA/Render/RenderBuildingWall.cs | 12 ++++----- .../Render/RenderBuildingWarFactory.cs | 10 +++---- OpenRA.Mods.RA/Render/RenderInfantry.cs | 2 +- OpenRA.Mods.RA/Render/RenderUnit.cs | 2 +- OpenRA.Mods.RA/Repairable.cs | 2 +- OpenRA.Mods.RA/RepairableNear.cs | 2 +- 31 files changed, 70 insertions(+), 70 deletions(-) mode change 100755 => 100644 OpenRA.Game/Traits/Selectable.cs mode change 100755 => 100644 OpenRA.Mods.RA/AttackBase.cs mode change 100755 => 100644 OpenRA.Mods.RA/Harvester.cs mode change 100755 => 100644 OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs mode change 100755 => 100644 OpenRA.Mods.RA/OreRefinery.cs mode change 100755 => 100644 OpenRA.Mods.RA/Render/RenderBuilding.cs mode change 100755 => 100644 OpenRA.Mods.RA/Render/RenderBuildingTurreted.cs mode change 100755 => 100644 OpenRA.Mods.RA/Render/RenderBuildingWall.cs mode change 100755 => 100644 OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs mode change 100755 => 100644 OpenRA.Mods.RA/Render/RenderInfantry.cs mode change 100755 => 100644 OpenRA.Mods.RA/Render/RenderUnit.cs diff --git a/OpenRA.Game/Traits/Building.cs b/OpenRA.Game/Traits/Building.cs index 47403b26fb..e35fe99e6e 100644 --- a/OpenRA.Game/Traits/Building.cs +++ b/OpenRA.Game/Traits/Building.cs @@ -78,7 +78,7 @@ namespace OpenRA.Traits public void Damaged(Actor self, AttackInfo e) { - if (e.ExtendedDamageState == ExtendedDamageState.Dead) + if (e.DamageState == DamageState.Dead) { self.World.WorldActor.traits.Get().AddEffect(10, self.CenterLocation, 1); Sound.Play(Info.DestroyedSound, self.CenterLocation); diff --git a/OpenRA.Game/Traits/Health.cs b/OpenRA.Game/Traits/Health.cs index 20fd7a3b64..d77034a22a 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 ExtendedDamageState { Dead, Quarter, Half, ThreeQuarter, Normal, Undamaged }; + public enum DamageState { Dead, Quarter, Half, ThreeQuarter, Normal, Undamaged }; public class Health { @@ -53,26 +53,26 @@ namespace OpenRA.Traits public bool IsDead { get { return hp <= 0; } } public bool RemoveOnDeath = true; - public ExtendedDamageState ExtendedDamageState + public DamageState DamageState { get { if (hp <= 0) - return ExtendedDamageState.Dead; + return DamageState.Dead; if (hp < MaxHP * 0.25f) - return ExtendedDamageState.Quarter; + return DamageState.Quarter; if (hp < MaxHP * 0.5f) - return ExtendedDamageState.Half; + return DamageState.Half; if (hp < MaxHP * 0.75f) - return ExtendedDamageState.ThreeQuarter; + return DamageState.ThreeQuarter; if (hp == MaxHP) - return ExtendedDamageState.Undamaged; + return DamageState.Undamaged; - return ExtendedDamageState.Normal; + return DamageState.Normal; } } @@ -80,7 +80,7 @@ namespace OpenRA.Traits { if (IsDead) return; /* overkill! don't count extra hits as more kills! */ - var oldExtendedState = this.ExtendedDamageState; + var oldState = this.DamageState; /* apply the damage modifiers, if we have any. */ var modifier = (float)self.traits.WithInterface() @@ -109,8 +109,8 @@ namespace OpenRA.Traits { Attacker = attacker, Damage = damage, - ExtendedDamageState = this.ExtendedDamageState, - ExtendedDamageStateChanged = this.ExtendedDamageState != oldExtendedState, + DamageState = this.DamageState, + DamageStateChanged = this.DamageState != oldState, Warhead = warhead }); } @@ -124,10 +124,10 @@ namespace OpenRA.Traits return (health == null) ? true : health.IsDead; } - public static ExtendedDamageState GetExtendedDamageState(this Actor self) + public static DamageState GetDamageState(this Actor self) { var health = self.traits.GetOrDefault(); - return (health == null) ? ExtendedDamageState.Undamaged : health.ExtendedDamageState; + return (health == null) ? DamageState.Undamaged : health.DamageState; } public static void InflictDamage(this Actor self, Actor attacker, int damage, WarheadInfo warhead) diff --git a/OpenRA.Game/Traits/Render/RenderSimple.cs b/OpenRA.Game/Traits/Render/RenderSimple.cs index 61fd0e0d97..6fa9b4b0c7 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.GetExtendedDamageState() <= ExtendedDamageState.Half ? "damaged-" : ""; + return self.GetDamageState() <= DamageState.Half ? "damaged-" : ""; } public void PlayCustomAnim(Actor self, string name) diff --git a/OpenRA.Game/Traits/RepairableBuilding.cs b/OpenRA.Game/Traits/RepairableBuilding.cs index ea6736a59c..5e2b2533ea 100644 --- a/OpenRA.Game/Traits/RepairableBuilding.cs +++ b/OpenRA.Game/Traits/RepairableBuilding.cs @@ -68,7 +68,7 @@ namespace OpenRA.Traits self.World.AddFrameEndTask(w => w.Add(new RepairIndicator(self))); self.InflictDamage(self, -hpToRepair, null); - if (Health.ExtendedDamageState == ExtendedDamageState.Undamaged) + if (Health.DamageState == DamageState.Undamaged) { isRepairing = false; return; diff --git a/OpenRA.Game/Traits/Selectable.cs b/OpenRA.Game/Traits/Selectable.cs old mode 100755 new mode 100644 index 53e878cf7e..0df0d312a9 --- 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.ExtendedDamageState == ExtendedDamageState.Quarter) ? Color.Red : - (health.ExtendedDamageState == ExtendedDamageState.Half) ? Color.Yellow : Color.LimeGreen; + var healthColor = (health.DamageState == DamageState.Quarter) ? Color.Red : + (health.DamageState == DamageState.Half) ? Color.Yellow : Color.LimeGreen; var healthColor2 = Color.FromArgb( 255, diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs index e1ba1487f7..2f0194bef6 100644 --- a/OpenRA.Game/Traits/TraitsInterfaces.cs +++ b/OpenRA.Game/Traits/TraitsInterfaces.cs @@ -25,8 +25,8 @@ namespace OpenRA.Traits public Actor Attacker; public WarheadInfo Warhead; public int Damage; - public ExtendedDamageState ExtendedDamageState; - public bool ExtendedDamageStateChanged; + public DamageState DamageState; + public bool DamageStateChanged; } public interface ITick { void Tick(Actor self); } diff --git a/OpenRA.Game/Traits/Unit.cs b/OpenRA.Game/Traits/Unit.cs index b0c2b5bbbc..d2b9c57e7b 100755 --- a/OpenRA.Game/Traits/Unit.cs +++ b/OpenRA.Game/Traits/Unit.cs @@ -32,7 +32,7 @@ namespace OpenRA.Traits public void Damaged(Actor self, AttackInfo e) { - if (e.ExtendedDamageState == ExtendedDamageState.Dead) + if (e.DamageState == DamageState.Dead) if (self.Owner == self.World.LocalPlayer) Sound.PlayVoice("Lost", self); } diff --git a/OpenRA.Mods.Cnc/CriticalBuildingState.cs b/OpenRA.Mods.Cnc/CriticalBuildingState.cs index 2f76359ec9..7532912440 100644 --- a/OpenRA.Mods.Cnc/CriticalBuildingState.cs +++ b/OpenRA.Mods.Cnc/CriticalBuildingState.cs @@ -31,7 +31,7 @@ namespace OpenRA.Mods.Cnc public void Damaged(Actor self, AttackInfo e) { - if (e.ExtendedDamageStateChanged && e.ExtendedDamageState == ExtendedDamageState.Dead) + if (e.DamageStateChanged && e.DamageState == DamageState.Dead) { self.traits.Get().anim.PlayRepeating("critical-idle"); self.World.AddFrameEndTask( diff --git a/OpenRA.Mods.Cnc/TiberiumRefineryDockAction.cs b/OpenRA.Mods.Cnc/TiberiumRefineryDockAction.cs index 7357b6d85a..ce0d45e2aa 100644 --- a/OpenRA.Mods.Cnc/TiberiumRefineryDockAction.cs +++ b/OpenRA.Mods.Cnc/TiberiumRefineryDockAction.cs @@ -82,7 +82,7 @@ namespace OpenRA.Mods.Cnc public void Damaged (Actor self, AttackInfo e) { - if (e.ExtendedDamageState == ExtendedDamageState.Dead) + if (e.DamageState == DamageState.Dead) CancelDock(self, dockedHarv); } diff --git a/OpenRA.Mods.RA/Activities/Repair.cs b/OpenRA.Mods.RA/Activities/Repair.cs index ce1e615029..f7f8b604d5 100644 --- a/OpenRA.Mods.RA/Activities/Repair.cs +++ b/OpenRA.Mods.RA/Activities/Repair.cs @@ -43,7 +43,7 @@ namespace OpenRA.Mods.RA.Activities } self.InflictDamage(self, -hpToRepair, null); - if (health.ExtendedDamageState == ExtendedDamageState.Undamaged) + if (health.DamageState == DamageState.Undamaged) return NextActivity; if (host != null) diff --git a/OpenRA.Mods.RA/Activities/RepairBuilding.cs b/OpenRA.Mods.RA/Activities/RepairBuilding.cs index d5d2400d69..a9afb462f7 100644 --- a/OpenRA.Mods.RA/Activities/RepairBuilding.cs +++ b/OpenRA.Mods.RA/Activities/RepairBuilding.cs @@ -24,7 +24,7 @@ namespace OpenRA.Mods.RA.Activities { if (target == null || target.IsDead()) return NextActivity; var health = target.traits.Get(); - if (health.ExtendedDamageState == ExtendedDamageState.Undamaged) + if (health.DamageState == DamageState.Undamaged) return NextActivity; target.InflictDamage(self, -health.MaxHP, null); diff --git a/OpenRA.Mods.RA/AttackBase.cs b/OpenRA.Mods.RA/AttackBase.cs old mode 100755 new mode 100644 index 0ccedbfc7e..2ad16393ae --- a/OpenRA.Mods.RA/AttackBase.cs +++ b/OpenRA.Mods.RA/AttackBase.cs @@ -223,7 +223,7 @@ namespace OpenRA.Mods.RA if (self.Owner.Stances[underCursor.Owner] != Stance.Ally && !forceFire) return null; // don't allow healing of fully-healed stuff! - if (underCursor.GetExtendedDamageState() == ExtendedDamageState.Undamaged) return null; + if (underCursor.GetDamageState() == DamageState.Undamaged) return null; } else { diff --git a/OpenRA.Mods.RA/AutoHeal.cs b/OpenRA.Mods.RA/AutoHeal.cs index 1650f8bd8c..4bcb4e0602 100644 --- a/OpenRA.Mods.RA/AutoHeal.cs +++ b/OpenRA.Mods.RA/AutoHeal.cs @@ -39,7 +39,7 @@ namespace OpenRA.Mods.RA return true; // wandered off faster than we could follow if (attack.target.IsActor - && attack.target.Actor.GetExtendedDamageState() == ExtendedDamageState.Undamaged) + && attack.target.Actor.GetDamageState() == DamageState.Undamaged) return true; // fully healed return false; @@ -60,7 +60,7 @@ namespace OpenRA.Mods.RA return inRange .Where(a => a != self && self.Owner.Stances[ a.Owner ] == Stance.Ally) .Where(a => !a.IsDead()) - .Where(a => a.traits.Contains() && a.GetExtendedDamageState() < ExtendedDamageState.Undamaged) + .Where(a => a.traits.Contains() && a.GetDamageState() < DamageState.Undamaged) .Where(a => Combat.HasAnyValidWeapons(self, Target.FromActor(a))) .OrderBy(a => (a.Location - self.Location).LengthSquared) .FirstOrDefault(); diff --git a/OpenRA.Mods.RA/Bridge.cs b/OpenRA.Mods.RA/Bridge.cs index 18d8d46a14..ded089bfa2 100644 --- a/OpenRA.Mods.RA/Bridge.cs +++ b/OpenRA.Mods.RA/Bridge.cs @@ -160,18 +160,18 @@ namespace OpenRA.Mods.RA void UpdateState() { // If this is a long bridge next to a destroyed shore piece, we need die to give clean edges to the break - if (Info.Long && Health.ExtendedDamageState != ExtendedDamageState.Dead && + if (Info.Long && Health.DamageState != DamageState.Dead && ((southNeighbour != null && Info.ShorePieces.Contains(southNeighbour.Type) && !IsIntact(southNeighbour)) || (northNeighbour != null && Info.ShorePieces.Contains(northNeighbour.Type) && !IsIntact(northNeighbour)))) { self.Kill(self); // this changes the damagestate } - var ds = Health.ExtendedDamageState; - currentTemplate = (ds == ExtendedDamageState.Half && Info.DamagedTemplate > 0) ? Info.DamagedTemplate : - (ds == ExtendedDamageState.Dead && Info.DestroyedTemplate > 0) ? Info.DestroyedTemplate : Info.Template; + var ds = Health.DamageState; + currentTemplate = (ds == DamageState.Half && Info.DamagedTemplate > 0) ? Info.DamagedTemplate : + (ds == DamageState.Dead && Info.DestroyedTemplate > 0) ? Info.DestroyedTemplate : Info.Template; - if (Info.Long && ds == ExtendedDamageState.Dead) + if (Info.Long && ds == DamageState.Dead) { // Long bridges have custom art for multiple segments being destroyed bool waterToSouth = !IsIntact(southNeighbour); @@ -185,7 +185,7 @@ namespace OpenRA.Mods.RA currentTemplate = Info.DestroyedPlusSouthTemplate; } - if (ds == ExtendedDamageState.Dead && !dead) + if (ds == DamageState.Dead && !dead) { dead = true; KillUnitsOnBridge(); @@ -198,7 +198,7 @@ namespace OpenRA.Mods.RA public void Damaged(Actor self, AttackInfo e) { - if (e.ExtendedDamageStateChanged) + if (e.DamageStateChanged) { UpdateState(); if (northNeighbour != null) northNeighbour.UpdateState(); diff --git a/OpenRA.Mods.RA/DemoTruck.cs b/OpenRA.Mods.RA/DemoTruck.cs index 8b276a6844..6daa3102c8 100644 --- a/OpenRA.Mods.RA/DemoTruck.cs +++ b/OpenRA.Mods.RA/DemoTruck.cs @@ -27,7 +27,7 @@ namespace OpenRA.Mods.RA // Fire primary on death public void Damaged(Actor self, AttackInfo e) { - if (e.ExtendedDamageState == ExtendedDamageState.Dead) + if (e.DamageState == DamageState.Dead) Detonate(self, e.Attacker); } diff --git a/OpenRA.Mods.RA/EmitInfantryOnSell.cs b/OpenRA.Mods.RA/EmitInfantryOnSell.cs index ac9df2ebdf..9105a0c02a 100644 --- a/OpenRA.Mods.RA/EmitInfantryOnSell.cs +++ b/OpenRA.Mods.RA/EmitInfantryOnSell.cs @@ -57,7 +57,7 @@ namespace OpenRA.Mods.RA public void Damaged(Actor self, AttackInfo e) { - if (e.ExtendedDamageStateChanged && e.ExtendedDamageState == ExtendedDamageState.Dead) + if (e.DamageStateChanged && e.DamageState == DamageState.Dead) Emit(self); } } diff --git a/OpenRA.Mods.RA/EngineerRepair.cs b/OpenRA.Mods.RA/EngineerRepair.cs index c190731eee..5f78435c8a 100644 --- a/OpenRA.Mods.RA/EngineerRepair.cs +++ b/OpenRA.Mods.RA/EngineerRepair.cs @@ -39,19 +39,19 @@ namespace OpenRA.Mods.RA { if (order.OrderString != "EngineerRepair") return null; if (order.TargetActor == null) return null; - return (order.TargetActor.GetExtendedDamageState() == ExtendedDamageState.Undamaged) ? "goldwrench-blocked" : "goldwrench"; + return (order.TargetActor.GetDamageState() == DamageState.Undamaged) ? "goldwrench-blocked" : "goldwrench"; } public string VoicePhraseForOrder(Actor self, Order order) { return (order.OrderString == "EngineerRepair" - && order.TargetActor.GetExtendedDamageState() < ExtendedDamageState.Undamaged) ? "Attack" : null; + && order.TargetActor.GetDamageState() < DamageState.Undamaged) ? "Attack" : null; } public void ResolveOrder(Actor self, Order order) { if (order.OrderString == "EngineerRepair" - && order.TargetActor.GetExtendedDamageState() < ExtendedDamageState.Undamaged) + && order.TargetActor.GetDamageState() < DamageState.Undamaged) { if (self.Owner == self.World.LocalPlayer) self.World.AddFrameEndTask(w => diff --git a/OpenRA.Mods.RA/Explodes.cs b/OpenRA.Mods.RA/Explodes.cs index b82ebc95b0..3f991c7b00 100644 --- a/OpenRA.Mods.RA/Explodes.cs +++ b/OpenRA.Mods.RA/Explodes.cs @@ -25,7 +25,7 @@ namespace OpenRA.Mods.RA { public void Damaged(Actor self, AttackInfo e) { - if (e.ExtendedDamageState == ExtendedDamageState.Dead) + if (e.DamageState == DamageState.Dead) { var weapon = ChooseWeaponForExplosion(self); if (weapon != null) diff --git a/OpenRA.Mods.RA/GivesExperience.cs b/OpenRA.Mods.RA/GivesExperience.cs index ba794d929d..0f80ff9075 100644 --- a/OpenRA.Mods.RA/GivesExperience.cs +++ b/OpenRA.Mods.RA/GivesExperience.cs @@ -18,7 +18,7 @@ namespace OpenRA.Mods.RA { public void Damaged(Actor self, AttackInfo e) { - if (e.ExtendedDamageState == ExtendedDamageState.Dead) + if (e.DamageState == DamageState.Dead) { // Prevent TK from giving exp if (e.Attacker == null || e.Attacker.Owner.Stances[ self.Owner ] == Stance.Ally ) diff --git a/OpenRA.Mods.RA/Harvester.cs b/OpenRA.Mods.RA/Harvester.cs old mode 100755 new mode 100644 index 1a8a3d9a3f..0ebd2cfe06 --- a/OpenRA.Mods.RA/Harvester.cs +++ b/OpenRA.Mods.RA/Harvester.cs @@ -164,7 +164,7 @@ namespace OpenRA.Mods.RA public void Damaged(Actor self, AttackInfo e) { - if (e.ExtendedDamageState == ExtendedDamageState.Dead) + if (e.DamageState == DamageState.Dead) if (LinkedProc != null) LinkedProc.traits.WithInterface().FirstOrDefault().UnlinkHarvester(LinkedProc,self); } diff --git a/OpenRA.Mods.RA/LeavesHusk.cs b/OpenRA.Mods.RA/LeavesHusk.cs index 89f35ed60a..bed5690bbf 100644 --- a/OpenRA.Mods.RA/LeavesHusk.cs +++ b/OpenRA.Mods.RA/LeavesHusk.cs @@ -22,7 +22,7 @@ namespace OpenRA.Mods.RA { public void Damaged(Actor self, AttackInfo e) { - if (e.ExtendedDamageState == ExtendedDamageState.Dead) + if (e.DamageState == DamageState.Dead) self.World.AddFrameEndTask(w => { var info = self.Info.Traits.Get(); diff --git a/OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs b/OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs old mode 100755 new mode 100644 index 12ae45099d..d1d15dd6a6 --- a/OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs +++ b/OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs @@ -35,7 +35,7 @@ namespace OpenRA.Mods.RA.Orders yield break; if (underCursor.Info.Traits.Contains() - && underCursor.GetExtendedDamageState() < ExtendedDamageState.Undamaged) + && underCursor.GetDamageState() < DamageState.Undamaged) yield return new Order("Repair", underCursor); } } diff --git a/OpenRA.Mods.RA/OreRefinery.cs b/OpenRA.Mods.RA/OreRefinery.cs old mode 100755 new mode 100644 index d8469380eb..5e6ef0c827 --- a/OpenRA.Mods.RA/OreRefinery.cs +++ b/OpenRA.Mods.RA/OreRefinery.cs @@ -92,7 +92,7 @@ namespace OpenRA.Mods.RA public void Damaged (Actor self, AttackInfo e) { - if (e.ExtendedDamageState == ExtendedDamageState.Dead) + if (e.DamageState == DamageState.Dead) foreach (var harv in LinkedHarv) harv.traits.Get ().UnlinkProc(harv, self); } diff --git a/OpenRA.Mods.RA/Render/RenderBuilding.cs b/OpenRA.Mods.RA/Render/RenderBuilding.cs old mode 100755 new mode 100644 index f5ccfebc21..19adccfe7e --- a/OpenRA.Mods.RA/Render/RenderBuilding.cs +++ b/OpenRA.Mods.RA/Render/RenderBuilding.cs @@ -58,19 +58,19 @@ namespace OpenRA.Mods.RA.Render public virtual void Damaged(Actor self, AttackInfo e) { - if (!e.ExtendedDamageStateChanged) + if (!e.DamageStateChanged) return; - switch( e.ExtendedDamageState ) + switch( e.DamageState ) { - case ExtendedDamageState.ThreeQuarter: case ExtendedDamageState.Normal: case ExtendedDamageState.Undamaged: + case DamageState.ThreeQuarter: case DamageState.Normal: case DamageState.Undamaged: anim.ReplaceAnim("idle"); break; - case ExtendedDamageState.Half: case ExtendedDamageState.Quarter: + case DamageState.Half: case DamageState.Quarter: anim.ReplaceAnim("damaged-idle"); Sound.Play(self.Info.Traits.Get().DamagedSound, self.CenterLocation); break; - case ExtendedDamageState.Dead: + case DamageState.Dead: self.World.AddFrameEndTask(w => w.Add(new Explosion(w, self.CenterLocation.ToInt2(), "building", false))); break; } diff --git a/OpenRA.Mods.RA/Render/RenderBuildingTurreted.cs b/OpenRA.Mods.RA/Render/RenderBuildingTurreted.cs old mode 100755 new mode 100644 index d4ee7ca9cd..4080f67ce7 --- a/OpenRA.Mods.RA/Render/RenderBuildingTurreted.cs +++ b/OpenRA.Mods.RA/Render/RenderBuildingTurreted.cs @@ -31,14 +31,14 @@ namespace OpenRA.Mods.RA.Render public override void Damaged(Actor self, AttackInfo e) { - if (!e.ExtendedDamageStateChanged) return; + if (!e.DamageStateChanged) return; - switch( e.ExtendedDamageState ) + switch( e.DamageState ) { - case ExtendedDamageState.ThreeQuarter: case ExtendedDamageState.Normal: case ExtendedDamageState.Undamaged: + case DamageState.ThreeQuarter: case DamageState.Normal: case DamageState.Undamaged: anim.ReplaceAnim("idle"); break; - case ExtendedDamageState.Half: case ExtendedDamageState.Quarter: + case DamageState.Half: case DamageState.Quarter: 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 old mode 100755 new mode 100644 index 715e37472d..6b99c54d73 --- a/OpenRA.Mods.RA/Render/RenderBuildingWall.cs +++ b/OpenRA.Mods.RA/Render/RenderBuildingWall.cs @@ -35,22 +35,22 @@ namespace OpenRA.Mods.RA.Render { var numStates = self.Info.Traits.Get().DamageStates; - if (!e.ExtendedDamageStateChanged) return; + if (!e.DamageStateChanged) return; - switch (e.ExtendedDamageState) + switch (e.DamageState) { - case ExtendedDamageState.Normal: + case DamageState.Normal: seqName = "idle"; break; - case ExtendedDamageState.ThreeQuarter: + case DamageState.ThreeQuarter: if (numStates >= 4) seqName = "minor-damaged-idle"; break; - case ExtendedDamageState.Half: + case DamageState.Half: seqName = "damaged-idle"; Sound.Play(self.Info.Traits.Get().DamagedSound, self.CenterLocation); break; - case ExtendedDamageState.Quarter: + case DamageState.Quarter: if (numStates >= 3) { seqName = "critical-idle"; diff --git a/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs b/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs old mode 100755 new mode 100644 index c3730ef509..99e49ffb10 --- 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.GetExtendedDamageState() <= ExtendedDamageState.Half ? "damaged-" : ""; + return self.GetDamageState() <= DamageState.Half ? "damaged-" : ""; } public RenderWarFactory(Actor self) @@ -53,14 +53,14 @@ namespace OpenRA.Mods.RA.Render public void Damaged(Actor self, AttackInfo e) { - if (!e.ExtendedDamageStateChanged) return; + if (!e.DamageStateChanged) return; - switch( e.ExtendedDamageState ) + switch( e.DamageState ) { - case ExtendedDamageState.ThreeQuarter: case ExtendedDamageState.Normal: case ExtendedDamageState.Undamaged: + case DamageState.ThreeQuarter: case DamageState.Normal: case DamageState.Undamaged: roof.ReplaceAnim(roof.CurrentSequence.Name.Replace("damaged-","")); break; - case ExtendedDamageState.Half: case ExtendedDamageState.Quarter: + case DamageState.Half: case DamageState.Quarter: roof.ReplaceAnim("damaged-" + roof.CurrentSequence.Name); break; } diff --git a/OpenRA.Mods.RA/Render/RenderInfantry.cs b/OpenRA.Mods.RA/Render/RenderInfantry.cs old mode 100755 new mode 100644 index 62b19a86c4..8947a3128e --- a/OpenRA.Mods.RA/Render/RenderInfantry.cs +++ b/OpenRA.Mods.RA/Render/RenderInfantry.cs @@ -78,7 +78,7 @@ namespace OpenRA.Mods.RA.Render public void Damaged(Actor self, AttackInfo e) { - if (e.ExtendedDamageState == ExtendedDamageState.Dead) + if (e.DamageState == DamageState.Dead) { var death = e.Warhead != null ? e.Warhead.InfDeath : 0; Sound.PlayVoice("Die", self); diff --git a/OpenRA.Mods.RA/Render/RenderUnit.cs b/OpenRA.Mods.RA/Render/RenderUnit.cs old mode 100755 new mode 100644 index cb2670a7f7..473790171b --- 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.ExtendedDamageState > ExtendedDamageState.Half) return; + if (e.DamageState > DamageState.Half) return; if (isSmoking) return; isSmoking = true; diff --git a/OpenRA.Mods.RA/Repairable.cs b/OpenRA.Mods.RA/Repairable.cs index ad68fb89f6..9695ca6b36 100644 --- a/OpenRA.Mods.RA/Repairable.cs +++ b/OpenRA.Mods.RA/Repairable.cs @@ -46,7 +46,7 @@ namespace OpenRA.Mods.RA bool CanRepair(Actor self) { var li = self.traits.GetOrDefault(); - return (Health.ExtendedDamageState < ExtendedDamageState.Undamaged || (li != null && !li.FullAmmo()) ); + return (Health.DamageState < DamageState.Undamaged || (li != null && !li.FullAmmo()) ); } public string CursorForOrder(Actor self, Order order) diff --git a/OpenRA.Mods.RA/RepairableNear.cs b/OpenRA.Mods.RA/RepairableNear.cs index c50a879dd7..87b56fd6b9 100644 --- a/OpenRA.Mods.RA/RepairableNear.cs +++ b/OpenRA.Mods.RA/RepairableNear.cs @@ -31,7 +31,7 @@ namespace OpenRA.Mods.RA if (underCursor.Owner == self.Owner && self.Info.Traits.Get().Buildings.Contains( underCursor.Info.Name ) && - self.GetExtendedDamageState() < ExtendedDamageState.Undamaged) + self.GetDamageState() < DamageState.Undamaged) return new Order("Enter", self, underCursor); return null;