From 2ea729759c23728fc5a51a073158982449cde326 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Fri, 8 Jan 2010 22:28:27 +1300 Subject: [PATCH] rename GpsSatellite trait to GpsLaunchSite --- OpenRa.Game/GameRules/SupportPowerInfo.cs | 6 +----- OpenRa.Game/OpenRa.Game.csproj | 2 +- OpenRa.Game/SupportPower.cs | 3 --- OpenRa.Game/SupportPowers/GpsSatellite.cs | 8 +++----- OpenRa.Game/Traits/GpsLaunchSite.cs | 6 ++++++ OpenRa.Game/Traits/GpsSatellite.cs | 6 ------ units.ini | 2 +- 7 files changed, 12 insertions(+), 21 deletions(-) create mode 100644 OpenRa.Game/Traits/GpsLaunchSite.cs delete mode 100644 OpenRa.Game/Traits/GpsSatellite.cs diff --git a/OpenRa.Game/GameRules/SupportPowerInfo.cs b/OpenRa.Game/GameRules/SupportPowerInfo.cs index 0f6192c8cd..a86f7fda87 100644 --- a/OpenRa.Game/GameRules/SupportPowerInfo.cs +++ b/OpenRa.Game/GameRules/SupportPowerInfo.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - + namespace OpenRa.Game.GameRules { public class SupportPowerInfo diff --git a/OpenRa.Game/OpenRa.Game.csproj b/OpenRa.Game/OpenRa.Game.csproj index f2d076e61e..b714392a7e 100644 --- a/OpenRa.Game/OpenRa.Game.csproj +++ b/OpenRa.Game/OpenRa.Game.csproj @@ -223,7 +223,7 @@ - + diff --git a/OpenRa.Game/SupportPower.cs b/OpenRa.Game/SupportPower.cs index 3f8bab86a6..02e170b8a4 100644 --- a/OpenRa.Game/SupportPower.cs +++ b/OpenRa.Game/SupportPower.cs @@ -1,9 +1,6 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; using OpenRa.Game.GameRules; -using OpenRa.Game.Traits; using OpenRa.Game.SupportPowers; namespace OpenRa.Game diff --git a/OpenRa.Game/SupportPowers/GpsSatellite.cs b/OpenRa.Game/SupportPowers/GpsSatellite.cs index a40f959de1..be748106fa 100644 --- a/OpenRa.Game/SupportPowers/GpsSatellite.cs +++ b/OpenRa.Game/SupportPowers/GpsSatellite.cs @@ -1,8 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Linq; using OpenRa.Game.Effects; +using OpenRa.Game.Traits; namespace OpenRa.Game.SupportPowers { @@ -13,7 +11,7 @@ namespace OpenRa.Game.SupportPowers public void Activate(SupportPower p) { var launchSite = Game.world.Actors - .FirstOrDefault( a => a.Owner == p.Owner && a.traits.Contains() ); + .FirstOrDefault( a => a.Owner == p.Owner && a.traits.Contains() ); if (launchSite == null) return; diff --git a/OpenRa.Game/Traits/GpsLaunchSite.cs b/OpenRa.Game/Traits/GpsLaunchSite.cs new file mode 100644 index 0000000000..639f5b93a1 --- /dev/null +++ b/OpenRa.Game/Traits/GpsLaunchSite.cs @@ -0,0 +1,6 @@ +using OpenRa.Game.Effects; + +namespace OpenRa.Game.Traits +{ + class GpsLaunchSite { public GpsLaunchSite(Actor self) { } } +} diff --git a/OpenRa.Game/Traits/GpsSatellite.cs b/OpenRa.Game/Traits/GpsSatellite.cs deleted file mode 100644 index 3e6f70fd5e..0000000000 --- a/OpenRa.Game/Traits/GpsSatellite.cs +++ /dev/null @@ -1,6 +0,0 @@ -using OpenRa.Game.Effects; - -namespace OpenRa.Game.Traits -{ - class GpsSatellite { public GpsSatellite(Actor self) { } } -} diff --git a/units.ini b/units.ini index 0e151fcc56..8d7d1ac456 100644 --- a/units.ini +++ b/units.ini @@ -348,7 +348,7 @@ MINV ; `Produces` is a category of objects that this building can produce. [ATEK] Description=Allied Tech Center -Traits=Building, RenderBuilding, IronCurtainable, GpsSatellite +Traits=Building, RenderBuilding, IronCurtainable, GpsLaunchSite Dimensions=2,2 Footprint=xx xx SelectionPriority=3