diff --git a/OpenRa.Game/Controller.cs b/OpenRa.Game/Controller.cs index ca143b7aff..14b7b586d2 100644 --- a/OpenRa.Game/Controller.cs +++ b/OpenRa.Game/Controller.cs @@ -179,12 +179,12 @@ namespace OpenRa.Game return Cursor.Deploy; else return Cursor.DeployBlocked; - case "Deploy": return Cursor.Deploy; - case "Chronoshift": + case "Deploy": return Cursor.Deploy; + case "Chronoshift": if (movement.CanEnterCell(location)) - return Cursor.Chronoshift; - else - return Cursor.MoveBlocked; + return Cursor.Chronoshift; + else + return Cursor.MoveBlocked; case "Enter": return Cursor.Enter; case "Deliver": return Cursor.Enter; case "Infiltrate": return Cursor.Enter; diff --git a/OpenRa.Game/Cursor.cs b/OpenRa.Game/Cursor.cs index 6a7d341fef..d5ff149cb9 100644 --- a/OpenRa.Game/Cursor.cs +++ b/OpenRa.Game/Cursor.cs @@ -22,7 +22,7 @@ namespace OpenRa.Game public static Cursor Deploy { get { return new Cursor("deploy"); } } public static Cursor Enter { get { return new Cursor("enter"); } } public static Cursor DeployBlocked { get { return new Cursor("deploy-blocked"); } } - public static Cursor Chronoshift { get { return new Cursor("chrono"); } } + public static Cursor Chronoshift { get { return new Cursor("chrono"); } } public static Cursor C4 { get { return new Cursor("c4"); } } public static Cursor Capture { get { return new Cursor("capture"); } } public static Cursor Heal { get { return new Cursor("heal"); } } diff --git a/OpenRa.Game/GameRules/Rules.cs b/OpenRa.Game/GameRules/Rules.cs index 25be1f7693..70a3acdb5e 100755 --- a/OpenRa.Game/GameRules/Rules.cs +++ b/OpenRa.Game/GameRules/Rules.cs @@ -19,7 +19,7 @@ namespace OpenRa.Game public static InfoLoader VoiceInfo; public static InfoLoader SupportPowerInfo; public static GeneralInfo General; - public static AftermathInfo Aftermath; + public static AftermathInfo Aftermath; public static TechTree TechTree; public static Map Map; public static TileSet TileSet; @@ -48,7 +48,7 @@ namespace OpenRa.Game General = new GeneralInfo(); FieldLoader.Load(General, AllRules.GetSection("General")); - Aftermath = new AftermathInfo(); + Aftermath = new AftermathInfo(); if (useAftermath) FieldLoader.Load(Aftermath, AllRules.GetSection("Aftermath")); diff --git a/OpenRa.Game/Traits/Activities/Teleport.cs b/OpenRa.Game/Traits/Activities/Teleport.cs index bb0dc81d7b..f638a60a7b 100644 --- a/OpenRa.Game/Traits/Activities/Teleport.cs +++ b/OpenRa.Game/Traits/Activities/Teleport.cs @@ -6,24 +6,24 @@ using OpenRa.Game.GameRules; namespace OpenRa.Game.Traits.Activities { - class Teleport : IActivity - { - public IActivity NextActivity { get; set; } + class Teleport : IActivity + { + public IActivity NextActivity { get; set; } - int2 destination; + int2 destination; - public Teleport(int2 destination) - { - this.destination = destination; - } + public Teleport(int2 destination) + { + this.destination = destination; + } - public IActivity Tick(Actor self) - { - var mobile = self.traits.Get(); + public IActivity Tick(Actor self) + { + var mobile = self.traits.Get(); mobile.TeleportTo(self, destination); - return NextActivity; - } + return NextActivity; + } public void Cancel(Actor self) { } - } + } } diff --git a/OpenRa.Game/Traits/ChronoshiftDeploy.cs b/OpenRa.Game/Traits/ChronoshiftDeploy.cs index 2730b979e7..c637e279df 100644 --- a/OpenRa.Game/Traits/ChronoshiftDeploy.cs +++ b/OpenRa.Game/Traits/ChronoshiftDeploy.cs @@ -4,52 +4,52 @@ using OpenRa.Game.Orders; namespace OpenRa.Game.Traits { - class ChronoshiftDeploy : IOrder, ISpeedModifier, ITick, IPips - { - public ChronoshiftDeploy(Actor self) { } - int remainingChargeTime = 0; // How long until we can chronoshift again? - int chargeTime = (int)(Rules.Aftermath.ChronoTankDuration * 60 * 25); // How long between shifts? - - public void Tick(Actor self) - { - if (remainingChargeTime > 0) - remainingChargeTime--; - } + class ChronoshiftDeploy : IOrder, ISpeedModifier, ITick, IPips + { + public ChronoshiftDeploy(Actor self) { } + int remainingChargeTime = 0; // How long until we can chronoshift again? + int chargeTime = (int)(Rules.Aftermath.ChronoTankDuration * 60 * 25); // How long between shifts? - public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor) - { - if (mi.Button == MouseButton.Left) return null; + public void Tick(Actor self) + { + if (remainingChargeTime > 0) + remainingChargeTime--; + } - else if (xy == self.Location && remainingChargeTime <= 0) + public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor) + { + if (mi.Button == MouseButton.Left) return null; + + else if (xy == self.Location && remainingChargeTime <= 0) return new Order("Deploy", self, null, int2.Zero, null); - return null; - } + return null; + } - public void ResolveOrder(Actor self, Order order) - { - if (order.OrderString == "Deploy" && remainingChargeTime <= 0) - { + public void ResolveOrder(Actor self, Order order) + { + if (order.OrderString == "Deploy" && remainingChargeTime <= 0) + { Game.controller.orderGenerator = new TeleportOrderGenerator(self); - self.CancelActivity(); - } - + self.CancelActivity(); + } + var movement = self.traits.WithInterface().FirstOrDefault(); if (order.OrderString == "Chronoshift" && movement.CanEnterCell(order.TargetLocation)) - { + { Game.controller.CancelInputMode(); self.CancelActivity(); - self.QueueActivity(new Activities.Teleport(order.TargetLocation)); - Sound.Play("chrotnk1.aud"); - remainingChargeTime = chargeTime; - } - } - - public float GetSpeedModifier() - { - return (Game.controller.orderGenerator is TeleportOrderGenerator) ? 0f : 1f; - } - + self.QueueActivity(new Activities.Teleport(order.TargetLocation)); + Sound.Play("chrotnk1.aud"); + remainingChargeTime = chargeTime; + } + } + + public float GetSpeedModifier() + { + return (Game.controller.orderGenerator is TeleportOrderGenerator) ? 0f : 1f; + } + // Display 5 pips indicating the current charge status public IEnumerable GetPips() { @@ -78,5 +78,5 @@ namespace OpenRa.Game.Traits } } } - } + } } diff --git a/OpenRa.Game/Traits/Cloak.cs b/OpenRa.Game/Traits/Cloak.cs index 3818f7bff1..491962f89d 100644 --- a/OpenRa.Game/Traits/Cloak.cs +++ b/OpenRa.Game/Traits/Cloak.cs @@ -12,16 +12,16 @@ namespace OpenRa.Game.Traits public void Attacking(Actor self) { - if (remainingUncloakTime <= 0) + if (remainingUncloakTime <= 0) OnCloak(); - remainingUncloakTime = (int)(Rules.General.SubmergeDelay * 60 * 25); + remainingUncloakTime = (int)(Rules.General.SubmergeDelay * 60 * 25); } public IEnumerable ModifyRender(Actor self, IEnumerable rs) { - if (remainingUncloakTime > 0) + if (remainingUncloakTime > 0) return rs; if (self.Owner == Game.LocalPlayer) @@ -32,8 +32,8 @@ namespace OpenRa.Game.Traits public void Tick(Actor self) { - if (remainingUncloakTime > 0) - if (--remainingUncloakTime <= 0) + if (remainingUncloakTime > 0) + if (--remainingUncloakTime <= 0) OnUncloak(); } diff --git a/OpenRa.Game/Traits/Submarine.cs b/OpenRa.Game/Traits/Submarine.cs index 40d943d483..46da5d9a93 100644 --- a/OpenRa.Game/Traits/Submarine.cs +++ b/OpenRa.Game/Traits/Submarine.cs @@ -4,11 +4,11 @@ using OpenRa.Game.Graphics; namespace OpenRa.Game.Traits { - class Submarine : IRenderModifier, INotifyAttack, ITick, INotifyDamage - { - int remainingSurfaceTime = 2; /* setup for initial dive */ + class Submarine : IRenderModifier, INotifyAttack, ITick, INotifyDamage + { + int remainingSurfaceTime = 2; /* setup for initial dive */ - public Submarine(Actor self) { } + public Submarine(Actor self) { } void DoSurface() { @@ -18,36 +18,36 @@ namespace OpenRa.Game.Traits remainingSurfaceTime = (int)(Rules.General.SubmergeDelay * 60 * 25); } - public void Attacking(Actor self) { DoSurface(); } + public void Attacking(Actor self) { DoSurface(); } public void Damaged(Actor self, AttackInfo e) { DoSurface(); } - public IEnumerable - ModifyRender(Actor self, IEnumerable rs) - { - if (remainingSurfaceTime > 0) - return rs; + public IEnumerable + ModifyRender(Actor self, IEnumerable rs) + { + if (remainingSurfaceTime > 0) + return rs; if (self.Owner == Game.LocalPlayer) return rs.Select(a => a.WithPalette(PaletteType.Shadow)); else return new Renderable[] { }; - } + } - public void Tick(Actor self) - { - if (remainingSurfaceTime > 0) - if (--remainingSurfaceTime <= 0) - OnDive(); - } + public void Tick(Actor self) + { + if (remainingSurfaceTime > 0) + if (--remainingSurfaceTime <= 0) + OnDive(); + } - void OnSurface() - { - Sound.Play("subshow1.aud"); - } + void OnSurface() + { + Sound.Play("subshow1.aud"); + } - void OnDive() - { - Sound.Play("subshow1.aud"); /* is this the right sound?? */ - } + void OnDive() + { + Sound.Play("subshow1.aud"); /* is this the right sound?? */ + } } }