merged

OpenRa.Game/Traits/AttackBase.cs

@@ -180,9 +180,19 @@ namespace OpenRa.Traits
 			if (self == underCursor) return null;
 
 			var isHeal = self.GetPrimaryWeapon().Damage < 0;
-			if (((underCursor.Owner == self.Owner) ^ isHeal) 
-				&& !mi.Modifiers.HasModifier( Modifiers.Ctrl )) return null;
+			var forceFire = mi.Modifiers.HasModifier(Modifiers.Ctrl);
 
+			if (isHeal)
+			{
+				if (underCursor.Owner == null)
+					return null;
+				if (underCursor.Owner != self.Owner && !forceFire)
+					return null;
+			}
+			else
+				if ((underCursor.Owner == self.Owner || underCursor.Owner == null) && !forceFire)
+					return null;
+			
 			if (!Combat.HasAnyValidWeapons(self, underCursor)) return null;
 
 			return new Order(isHeal ? "Heal" : "Attack", self, underCursor, int2.Zero, null);

OpenRa.Game/Traits/Bridge.cs

@@ -0,0 +1,158 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using OpenRa.Graphics;
+using OpenRa.FileFormats;
+using IjwFramework.Collections;
+using System.Drawing;
+
+namespace OpenRa.Traits
+{
+	class BridgeInfo : ITraitInfo
+	{
+		public readonly bool Long = false;
+		public readonly bool UseAlternateNames = false;
+		public readonly int[] NorthOffset = null;
+		public readonly int[] SouthOffset = null;
+		public object Create(Actor self) { return new Bridge(self); }
+	}
+
+	class Bridge : IRender, ICustomTerrain, INotifyDamage
+	{
+		Dictionary<int2, int> Tiles;
+		List<Dictionary<int2, Sprite>> TileSprites = new List<Dictionary<int2,Sprite>>();
+		List<TileTemplate> Templates = new List<TileTemplate>();
+		Actor self;
+		int state;
+
+		Bridge northNeighbour, southNeighbour;
+
+		public Bridge(Actor self) { this.self = self; self.RemoveOnDeath = false; }
+
+		static string cachedTheater;
+		static Cache<TileReference, Sprite> sprites;
+
+		public IEnumerable<Renderable> Render(Actor self)
+		{
+			foreach (var t in TileSprites[state])
+				yield return new Renderable(t.Value, Game.CellSize * t.Key, PaletteType.Gold);
+		}
+
+		public int StateFromTemplate(TileTemplate t)
+		{
+			var info = self.Info.Traits.Get<BridgeInfo>();
+			if (info.UseAlternateNames)
+			{
+				if (t.Name.EndsWith("d")) return 2;
+				if (t.Name.EndsWith("h")) return 1;
+				return 0;
+			}
+			else
+				return t.Name[t.Name.Length - 1] - 'a';
+		}
+
+		public string NameFromState(TileTemplate t, int state)
+		{
+			var info = self.Info.Traits.Get<BridgeInfo>();
+			if (info.UseAlternateNames)
+				return t.Bridge + new[] { "", "h", "d" }[state];
+			else
+				return t.Bridge + (char)(state + 'a');
+		}
+
+		public void SetTiles(World world, TileTemplate template, Dictionary<int2, int> replacedTiles)
+		{
+			Tiles = replacedTiles;
+			state = StateFromTemplate(template);
+
+			foreach (var t in replacedTiles.Keys)
+				world.customTerrain[t.X, t.Y] = this;
+
+			if (cachedTheater != world.Map.Theater)
+			{
+				cachedTheater = world.Map.Theater;
+				sprites = new Cache<TileReference, Sprite>(
+				x => SheetBuilder.Add(world.TileSet.GetBytes(x),
+					new Size(Game.CellSize, Game.CellSize)));
+			}
+
+			var numStates = self.Info.Traits.Get<BridgeInfo>().Long ? 6 : 3;
+			for (var n = 0; n < numStates; n++)
+			{
+				var stateTemplate = world.TileSet.Walkability.GetWalkability(NameFromState(template, n));
+				Templates.Add( stateTemplate );
+
+				TileSprites.Add(replacedTiles.ToDictionary(
+					a => a.Key,
+					a => sprites[new TileReference { tile = (ushort)stateTemplate.Index, image = (byte)a.Value }]));
+			}
+
+			self.Health = (int)(self.GetMaxHP() * template.HP);
+		}
+
+		Bridge GetNeighbor(World world, int[] offset)
+		{
+			if (offset == null) return null;
+			var pos = self.Location + new int2(offset[0], offset[1]);
+			if (!world.Map.IsInMap(pos.X, pos.Y)) return null;
+			return world.customTerrain[pos.X, pos.Y] as Bridge;
+		}
+
+		public void FinalizeBridges(World world)
+		{
+			// go looking for our neighbors, if this is a long bridge.
+			var info = self.Info.Traits.Get<BridgeInfo>();
+			if (info.NorthOffset != null)
+				northNeighbour = GetNeighbor(world, info.NorthOffset);
+			if (info.SouthOffset != null)
+				southNeighbour = GetNeighbor(world, info.SouthOffset);
+		}
+
+		public float GetCost(int2 p, UnitMovementType umt)
+		{
+			// just use the standard walkability from templates.ini. no hackery.
+
+			return TerrainCosts.Cost(umt, 
+				Templates[state].TerrainType[Tiles[p]]);
+		}
+
+		bool IsIntact(Bridge b)
+		{
+			return b != null && b.self.IsInWorld && b.self.Health > 0;
+		}
+
+		bool IsLong(Bridge b)
+		{
+			return b != null && b.self.IsInWorld && b.self.Info.Traits.Get<BridgeInfo>().Long;
+		}
+
+		void UpdateState()
+		{
+			var ds = self.GetDamageState();
+			if (!self.Info.Traits.Get<BridgeInfo>().Long)
+			{
+				state = (int)ds; 
+				return;
+			}
+
+			bool waterToSouth = !IsIntact(southNeighbour) && (!IsLong(southNeighbour) || !IsIntact(this));
+			bool waterToNorth = !IsIntact(northNeighbour) && (!IsLong(northNeighbour) || !IsIntact(this));
+
+			if (waterToSouth && waterToNorth) { state = 5; return; }
+			if (waterToNorth) { state = 4; return; }
+			if (waterToSouth) { state = 3; return; }
+			state = (int)ds;
+		}
+
+		public void Damaged(Actor self, AttackInfo e)
+		{
+			if (e.DamageStateChanged)
+			{
+				UpdateState();
+				if (northNeighbour != null) northNeighbour.UpdateState();
+				if (southNeighbour != null) southNeighbour.UpdateState();
+			}
+		}
+	}
+}

OpenRa.Game/Traits/Production.cs

@@ -9,7 +9,7 @@ namespace OpenRa.Traits
 		public readonly int[] SpawnOffset = null;
 		public readonly string[] Produces = { };
 
-		public object Create(Actor self) { return new Production(self); }
+		public virtual object Create(Actor self) { return new Production(self); }
 	}
 
 	class Production : IIssueOrder, IResolveOrder, IProducer, ITags

OpenRa.Game/Traits/ProductionSurround.cs

@@ -3,9 +3,9 @@ using OpenRa.GameRules;
 
 namespace OpenRa.Traits
 {
-	class ProductionSurroundInfo : ITraitInfo
+	class ProductionSurroundInfo : ProductionInfo
 	{
-		public object Create(Actor self) { return new ProductionSurround(self); }
+		public override object Create(Actor self) { return new ProductionSurround(self); }
 	}
 
 	class ProductionSurround : Production

OpenRa.Game/Traits/TraitsInterfaces.cs

@@ -25,6 +25,8 @@ namespace OpenRa.Traits
 	public interface IAcceptThief { void OnSteal(Actor self, Actor thief); }
 	public interface IAcceptSpy { void OnInfiltrate(Actor self, Actor spy); }
 
+	public interface ICustomTerrain { float GetCost(int2 p, UnitMovementType umt); }
+
 	interface IProducer
 	{
 		bool Produce( Actor self, ActorInfo producee );