Rename ITeleportable -> IPositionable.

OpenRA.Game/Traits/TraitsInterfaces.cs

@@ -138,7 +138,7 @@ namespace OpenRA.Traits
 	public interface ITags { IEnumerable<TagType> GetTags(); }
 	public interface ISelectionBar { float GetValue(); Color GetColor(); }
 
-	public interface ITeleportable : IOccupySpace
+	public interface IPositionable : IOccupySpace
 	{
 		bool CanEnterCell(CPos location);
 		void SetPosition(Actor self, CPos cell);

OpenRA.Mods.Cnc/Missions/Gdi01Script.cs

@@ -205,7 +205,7 @@ namespace OpenRA.Mods.Cnc.Missions
 						{
 							if (b.Destroyed) return;
 							w2.Add(b);
-							b.TraitsImplementing<ITeleportable>().FirstOrDefault().SetPosition(b, a.Location);
+							b.TraitsImplementing<IPositionable>().FirstOrDefault().SetPosition(b, a.Location);
 							b.QueueActivity(mobile.MoveTo(unload, 2));
 						});
 					}

OpenRA.Mods.Cnc/Missions/Nod01Script.cs

@@ -5,6 +5,7 @@
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation. For more information,
  * see COPYING.
+<<<<<<< HEAD
  */
 #endregion
 
@@ -135,7 +136,7 @@ namespace OpenRA.Mods.Cnc.Missions
 		IEnumerable<Actor> UnitsNearActor(Actor actor, int range)
 		{
 			return world.FindActorsInCircle(actor.CenterPosition, WRange.FromCells(range))
-				.Where(a => a.IsInWorld && a != world.WorldActor && !a.Destroyed && a.HasTrait<ITeleportable>() && !a.Owner.NonCombatant);
+				.Where(a => a.IsInWorld && a != world.WorldActor && !a.Destroyed && a.HasTrait<IPositionable>() && !a.Owner.NonCombatant);
 		}
 
 		void NODReinforceNthA()

OpenRA.Mods.RA/AI/HackyAI.cs

@@ -763,7 +763,7 @@ namespace OpenRA.Mods.RA.AI
 			if (!buildableThings.Any()) return null;
 
 			var myUnits = p.World
-				.ActorsWithTrait<ITeleportable>()
+				.ActorsWithTrait<IPositionable>()
 				.Where(a => a.Actor.Owner == p)
 				.Select(a => a.Actor.Info.Name).ToArray();
 
@@ -783,7 +783,7 @@ namespace OpenRA.Mods.RA.AI
 
 		int CountUnits(string unit, Player owner)
 		{
-			return world.ActorsWithTrait<ITeleportable>().Where(a => a.Actor.Owner == owner && a.Actor.Info.Name == unit).Count();
+			return world.ActorsWithTrait<IPositionable>().Where(a => a.Actor.Owner == owner && a.Actor.Info.Name == unit).Count();
 		}
 
 		int? CountBuildingByCommonName(string commonName, Player owner)
@@ -1145,7 +1145,7 @@ namespace OpenRA.Mods.RA.AI
 
 		void FindNewUnits(Actor self)
 		{
-			var newUnits = self.World.ActorsWithTrait<ITeleportable>()
+			var newUnits = self.World.ActorsWithTrait<IPositionable>()
 				.Where(a => a.Actor.Owner == p && !a.Actor.HasTrait<BaseBuilding>()
 			&& !activeUnits.Contains(a.Actor))
 			.Select(a => a.Actor).ToArray();

OpenRA.Mods.RA/Activities/Teleport.cs

@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
@@ -34,7 +34,7 @@ namespace OpenRA.Mods.RA.Activities
 			Sound.Play(sound, self.CenterPosition);
 			Sound.Play(sound, destination.CenterPosition);
 
-			self.Trait<ITeleportable>().SetPosition(self, destination);
+			self.Trait<IPositionable>().SetPosition(self, destination);
 			self.Generation++;
 
 			if (killCargo && self.HasTrait<Cargo>())
@@ -68,7 +68,7 @@ namespace OpenRA.Mods.RA.Activities
 
 		public override Activity Tick(Actor self)
 		{
-			self.Trait<ITeleportable>().SetPosition(self, destination);
+			self.Trait<IPositionable>().SetPosition(self, destination);
 			self.Generation++;
 			return NextActivity;
 		}

OpenRA.Mods.RA/Air/Aircraft.cs

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.RA.Air
 		public int GetInitialFacing() { return InitialFacing; }
 	}
 
-	public class Aircraft : IFacing, ITeleportable, ISync, INotifyKilled, IIssueOrder, IOrderVoice
+	public class Aircraft : IFacing, IPositionable, ISync, INotifyKilled, IIssueOrder, IOrderVoice
 	{
 		public IDisposable reservation;
 

OpenRA.Mods.RA/Air/EjectOnDeath.cs

@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
@@ -30,7 +30,7 @@ namespace OpenRA.Mods.RA
 			var pilot = self.World.CreateActor(false, info.PilotActor.ToLowerInvariant(),
 				new TypeDictionary { new OwnerInit(self.Owner) });
 			var r = self.World.SharedRandom.Next(1, 100);
-			var aircraft = self.Trait<ITeleportable>();
+			var aircraft = self.Trait<IPositionable>();
 
 			if (IsSuitableCell(pilot, self.Location) && r > 100 - info.SuccessRate && aircraft.Altitude > 10
 				&& self.Owner.WinState != WinState.Lost)
@@ -44,7 +44,7 @@ namespace OpenRA.Mods.RA
 
 		bool IsSuitableCell(Actor actorToDrop, CPos p)
 		{
-			return actorToDrop.Trait<ITeleportable>().CanEnterCell(p);
+			return actorToDrop.Trait<IPositionable>().CanEnterCell(p);
 		}
 	}
 }

OpenRA.Mods.RA/Bridge.cs

@@ -158,7 +158,7 @@ namespace OpenRA.Mods.RA
 		{
 			foreach (var c in TileSprites[currentTemplate].Keys)
 				foreach (var a in self.World.ActorMap.GetUnitsAt(c))
-					if (a.HasTrait<ITeleportable>() && !a.Trait<ITeleportable>().CanEnterCell(c))
+					if (a.HasTrait<IPositionable>() && !a.Trait<IPositionable>().CanEnterCell(c))
 						a.Kill(self);
 		}
 

OpenRA.Mods.RA/ChronoshiftDeploy.cs

@@ -94,7 +94,7 @@ namespace OpenRA.Mods.RA
 
 		public bool CanJumpTo(CPos xy, bool ignoreVis)
 		{
-			var movement = self.TraitOrDefault<ITeleportable>();
+			var movement = self.TraitOrDefault<IPositionable>();
 
 			if (chargeTick <= 0 // Can jump
 				&& (self.Location - xy).Length <= Info.JumpDistance // Within jump range

OpenRA.Mods.RA/Chronoshiftable.cs

@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
@@ -58,7 +58,7 @@ namespace OpenRA.Mods.RA
 		public virtual bool CanChronoshiftTo(Actor self, CPos targetLocation)
 		{
 			// TODO: Allow enemy units to be chronoshifted into bad terrain to kill them
-			return (self.HasTrait<ITeleportable>() && self.Trait<ITeleportable>().CanEnterCell(targetLocation));
+			return (self.HasTrait<IPositionable>() && self.Trait<IPositionable>().CanEnterCell(targetLocation));
 		}
 
 		public virtual bool Teleport(Actor self, CPos targetLocation, int duration, bool killCargo, Actor chronosphere)

OpenRA.Mods.RA/Crate.cs

@@ -24,7 +24,7 @@ namespace OpenRA.Mods.RA
 	}
 
 	// ITeleportable is required for paradrop
-	class Crate : ITick, ITeleportable, ICrushable, ISync, INotifyParachuteLanded
+	class Crate : ITick, IPositionable, ICrushable, ISync, INotifyParachuteLanded
 	{
 		readonly Actor self;
 		[Sync] int ticks;

OpenRA.Mods.RA/Effects/Parachute.cs

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.RA.Effects
 				parachuteOffset = pai.Offset;
 
 			// Adjust x,y to match the target subcell
-			cargo.Trait<ITeleportable>().SetPosition(cargo, dropPosition.ToCPos());
+			cargo.Trait<IPositionable>().SetPosition(cargo, dropPosition.ToCPos());
 			var cp = cargo.CenterPosition;
 			pos = new WPos(cp.X, cp.Y, dropPosition.Z);
 		}

OpenRA.Mods.RA/Minelayer.cs

@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
@@ -60,7 +60,7 @@ namespace OpenRA.Mods.RA
 
 			if (order.OrderString == "PlaceMinefield")
 			{
-				var movement = self.Trait<ITeleportable>();
+				var movement = self.Trait<IPositionable>();
 
 				minefield = GetMinefieldCells(minefieldStart, order.TargetLocation,
 					self.Info.Traits.Get<MinelayerInfo>().MinefieldDepth)
@@ -130,7 +130,7 @@ namespace OpenRA.Mods.RA
 				if (!minelayer.IsInWorld)
 					return;
 
-				var movement = minelayer.Trait<ITeleportable>();
+				var movement = minelayer.Trait<IPositionable>();
 				var minefield = GetMinefieldCells(minefieldStart, lastMousePos,
 					minelayer.Info.Traits.Get<MinelayerInfo>().MinefieldDepth)
 					.Where(p => movement.CanEnterCell(p)).ToArray();

OpenRA.Mods.RA/Missions/Allies02Script.cs

@@ -170,7 +170,7 @@ namespace OpenRA.Mods.RA.Missions
 				if (yak == null || (yak != null && !yak.IsDead() && (yak.GetCurrentActivity() is FlyCircle || yak.IsIdle)))
 				{
 					var alliedUnitsNearYakPoint = world.FindAliveCombatantActorsInCircle(yakAttackPoint.CenterPosition, WRange.FromCells(10))
-						.Where(a => a.Owner != soviets && a.HasTrait<ITeleportable>() && a != tanya && a != einstein && a != engineer);
+						.Where(a => a.Owner != soviets && a.HasTrait<IPositionable>() && a != tanya && a != einstein && a != engineer);
 					if (alliedUnitsNearYakPoint.Any())
 						YakStrafe(alliedUnitsNearYakPoint);
 				}
@@ -384,7 +384,7 @@ namespace OpenRA.Mods.RA.Missions
 		bool AlliesNearTown()
 		{
 			return world.FindAliveCombatantActorsInCircle(townPoint.CenterPosition, WRange.FromCells(AlliedTownTransferRange))
-				.Any(a => a.Owner == allies1 && a.HasTrait<ITeleportable>());
+				.Any(a => a.Owner == allies1 && a.HasTrait<IPositionable>());
 		}
 
 		void TransferTownUnitsToAllies()
@@ -399,7 +399,7 @@ namespace OpenRA.Mods.RA.Missions
 			var sovietAttackUnits = world.FindAliveCombatantActorsInCircle(sovietTownAttackPoint1.CenterPosition, WRange.FromCells(SovietTownAttackGroupRange))
 				.Union(world.FindAliveCombatantActorsInCircle(sovietTownAttackPoint2.CenterPosition, WRange.FromCells(SovietTownAttackGroupRange)))
 				.Union(world.FindAliveCombatantActorsInCircle(townPoint.CenterPosition, WRange.FromCells(AlliedTownTransferRange)))
-				.Where(a => a.HasTrait<ITeleportable>() && a.Owner == soviets);
+				.Where(a => a.HasTrait<IPositionable>() && a.Owner == soviets);
 
 			foreach (var unit in sovietAttackUnits)
 				unit.QueueActivity(new AttackMove.AttackMoveActivity(unit, new Move.Move(townPoint.Location, SovietTownMoveNearEnough)));

OpenRA.Mods.RA/Missions/MissionUtils.cs

@@ -106,7 +106,7 @@ namespace OpenRA.Mods.RA.Missions
 
 		public static bool AreaSecuredWithUnits(World world, Player player, WPos location, WRange range)
 		{
-			var units = world.FindAliveCombatantActorsInCircle(location, range).Where(a => a.HasTrait<ITeleportable>());
+			var units = world.FindAliveCombatantActorsInCircle(location, range).Where(a => a.HasTrait<IPositionable>());
 			return units.Any() && units.All(a => a.Owner == player);
 		}
 

OpenRA.Mods.RA/Missions/Survival01Script.cs

@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
@@ -185,7 +185,7 @@ namespace OpenRA.Mods.RA.Missions
 				var units = world.CreateActor((sovietInfantry).Random(world.SharedRandom), new TypeDictionary { new LocationInit(sovietinfantryentry1.Location), new OwnerInit(soviets) });
 				units.QueueActivity(new Move.Move(sovietinfantryrally1.Location, 3));
 				var unitsincircle = world.FindAliveCombatantActorsInCircle(sovietinfantryrally1.CenterPosition, WRange.FromCells(10))
-					.Where(a => a.Owner == soviets && a.IsIdle && a.HasTrait<ITeleportable>());
+					.Where(a => a.Owner == soviets && a.IsIdle && a.HasTrait<IPositionable>());
 				if (unitsincircle.Count() >= sovietInfantryGroupSize)
 				{
 					foreach (var scatteredunits in unitsincircle)

OpenRA.Mods.RA/Missions/Survival02Script.cs

@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
@@ -299,7 +299,7 @@ namespace OpenRA.Mods.RA.Missions
 		void ManageSovietUnits()
 		{
 			var units = world.FindAliveCombatantActorsInCircle(sovietrally.CenterPosition, WRange.FromCells(3))
-					.Where(u => u.IsIdle && u.HasTrait<ITeleportable>() && u.HasTrait<AttackBase>() && u.Owner == soviets);
+					.Where(u => u.IsIdle && u.HasTrait<IPositionable>() && u.HasTrait<AttackBase>() && u.Owner == soviets);
 			if (units.Count() >= sovietAttackGroupSize)
 			{
 				foreach (var unit in units)

OpenRA.Mods.RA/Move/Mobile.cs

@@ -145,7 +145,7 @@ namespace OpenRA.Mods.RA.Move
 		public int GetInitialFacing() { return InitialFacing; }
 	}
 
-	public class Mobile : IIssueOrder, IResolveOrder, IOrderVoice, ITeleportable, IFacing, ISync
+	public class Mobile : IIssueOrder, IResolveOrder, IOrderVoice, IPositionable, IFacing, ISync
 	{
 		public readonly Actor self;
 		public readonly MobileInfo Info;

OpenRA.Mods.RA/Orders/SetChronoTankDestination.cs

@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
@@ -50,7 +50,7 @@ namespace OpenRA.Mods.RA.Orders
 			if (!world.LocalPlayer.Shroud.IsExplored(xy))
 				return "move-blocked";
 
-			var movement = self.TraitOrDefault<ITeleportable>();
+			var movement = self.TraitOrDefault<IPositionable>();
 			return (movement.CanEnterCell(xy)) ? "chrono-target" : "move-blocked";
 		}
 	}

OpenRA.Mods.RA/ParaDrop.cs

@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
@@ -60,7 +60,7 @@ namespace OpenRA.Mods.RA
 
 		bool IsSuitableCell(Actor actorToDrop, CPos p)
 		{
-			return actorToDrop.Trait<ITeleportable>().CanEnterCell(p);
+			return actorToDrop.Trait<IPositionable>().CanEnterCell(p);
 		}
 
 		void FinishedDropping(Actor self)

OpenRA.Mods.RA/Player/PlayerStatistics.cs

@@ -112,7 +112,7 @@ namespace OpenRA.Mods.RA
 				attackerStats.BuildingsKilled++;
 				defenderStats.BuildingsDead++;
 			}
-			else if (self.HasTrait<ITeleportable>())
+			else if (self.HasTrait<IPositionable>())
 			{
 				attackerStats.UnitsKilled++;
 				defenderStats.UnitsDead++;

OpenRA.Mods.RA/Production.cs

@@ -67,7 +67,7 @@ namespace OpenRA.Mods.RA
 
 			// TODO: Move this into an *Init
 			// TODO: We should be adjusting the actual position for aircraft, not just visuals.
-			var teleportable = newUnit.Trait<ITeleportable>();
+			var teleportable = newUnit.Trait<IPositionable>();
 			teleportable.AdjustPxPosition(newUnit, PPos.FromWPos(spawn));
 
 			// TODO: Generalize this for non-mobile (e.g. aircraft) too