#109 fixed

OpenRa.Game/Chrome.cs

@@ -7,6 +7,7 @@ using IjwFramework.Collections;
 using IjwFramework.Types;
 using OpenRa.Game.Graphics;
 using OpenRa.Game.Support;
+using OpenRa.Game.GameRules;
 
 namespace OpenRa.Game
 {
@@ -17,6 +18,7 @@ namespace OpenRa.Game
 		readonly SpriteRenderer chromeRenderer;
 		readonly Sprite specialBinSprite;
 		readonly Sprite moneyBinSprite;
+		readonly Sprite tooltipSprite;
 		readonly SpriteRenderer buildPaletteRenderer;
 		readonly Animation cantBuild;
 		readonly Animation ready;
@@ -37,6 +39,7 @@ namespace OpenRa.Game
 
 			specialBinSprite = new Sprite(specialBin, new Rectangle(0, 0, 32, 192), TextureChannel.Alpha);
 			moneyBinSprite = new Sprite(specialBin, new Rectangle(512 - 320, 0, 320, 32), TextureChannel.Alpha);
+			tooltipSprite = new Sprite(specialBin, new Rectangle(0, 288, 272, 136), TextureChannel.Alpha);
 
 			blank = SheetBuilder.Add(new Size(64, 48), 16);
 
@@ -90,8 +93,8 @@ namespace OpenRa.Game
 				Game.orderManager.FrameNumber,
 				PerfHistory.items["render"].LastValue,
 				PerfHistory.items["tick_time"].LastValue,
-				Game.LocalPlayer.powerDrained,
-				Game.LocalPlayer.powerProvided,
+				Game.LocalPlayer.PowerDrained,
+				Game.LocalPlayer.PowerProvided,
 				Game.LocalPlayer.IsReady ? "Yes" : "No"
 				), new int2(140, 5), Color.White);
 
@@ -214,6 +217,9 @@ namespace OpenRa.Game
 
 			var overlayBits = new List<Pair<Sprite, float2>>();
 
+			string tooltipItem = null;
+			int2 tooltipPos = int2.Zero;
+
 			foreach (var item in allItems)
 			{
 				var rect = new Rectangle(Game.viewport.Width - (3 - x) * 64, 40 + 48 * y, 64, 48);
@@ -223,6 +229,12 @@ namespace OpenRa.Game
 
 				buildPaletteRenderer.DrawSprite(sprites[item], drawPos, 0);
 
+				if (rect.Contains(lastMousePos.ToPoint()))
+				{
+					tooltipItem = item;
+					tooltipPos = new int2(rect.Location);
+				}
+
 				if (!buildableItems.Contains(item) || isBuildingSomethingElse)
 					overlayBits.Add(Pair.New(cantBuild.Image, drawPos));
 
@@ -271,6 +283,9 @@ namespace OpenRa.Game
 			chromeRenderer.DrawSprite(shimSprites[0], new float2(Game.viewport.Width - 192 - 9, 40 - 9), 0);
 			chromeRenderer.DrawSprite(shimSprites[1], new float2(Game.viewport.Width - 192 - 9, 40 - 1 + 48 * y), 0);
 			chromeRenderer.Flush();
+
+			if (tooltipItem != null)
+				DrawProductionTooltip(tooltipItem, tooltipPos);
 		}
 
 		void HandleBuildPalette(string item, bool isLmb)
@@ -322,8 +337,12 @@ namespace OpenRa.Game
 			}
 		}
 
+		int2 lastMousePos;
 		public bool HandleInput(MouseInput mi)
 		{
+			if (mi.Event == MouseInputEvent.Move)
+				lastMousePos = mi.Location;
+
 			var action = buttons.Where(a => a.First.Contains(mi.Location.ToPoint()))
 				.Select(a => a.Second).FirstOrDefault();
 
@@ -340,5 +359,46 @@ namespace OpenRa.Game
 		{
 			return buttons.Any(a => a.First.Contains(mousePos.ToPoint()));
 		}
+
+		void DrawRightAligned(string text, int2 pos, Color c)
+		{
+			renderer.DrawText2(text, pos - new int2(renderer.MeasureText2(text).X, 0), c);
+		}
+
+		void DrawProductionTooltip(string unit, int2 pos)
+		{
+			var p = pos.ToFloat2() - new float2(tooltipSprite.size.X, 0);
+			chromeRenderer.DrawSprite(tooltipSprite, p, 0);
+			chromeRenderer.Flush();
+
+			var info = Rules.UnitInfo[unit];
+
+			renderer.DrawText2(info.Description, p.ToInt2() + new int2(5,5), Color.White);
+
+			DrawRightAligned( "${0}".F(info.Cost), pos + new int2(-5,5), 
+				Game.LocalPlayer.Cash + Game.LocalPlayer.Ore >= info.Cost ? Color.White : Color.Red);
+
+			var bi = info as BuildingInfo;
+			if (bi != null)
+				DrawRightAligned("ϟ{0}".F(bi.Power), pos + new int2(-5, 20),
+					Game.LocalPlayer.PowerProvided - Game.LocalPlayer.PowerDrained + bi.Power >= 0
+					? Color.White : Color.Red);
+
+			var buildings = Rules.TechTree.GatherBuildings( Game.LocalPlayer );
+			p += new int2(5, 5);
+			p += new int2(0, 15);
+			if (!Rules.TechTree.CanBuild(info, Game.LocalPlayer, buildings))
+			{
+				var prereqs = info.Prerequisite.Select(a => Rules.UnitInfo[a.ToLowerInvariant()].Description);
+				renderer.DrawText("Requires {0}".F( string.Join( ", ", prereqs.ToArray() ) ), p.ToInt2(),
+					Color.White);
+			}
+
+			if (info.LongDesc != null)
+			{
+				p += new int2(0, 15);
+				renderer.DrawText(info.LongDesc.Replace( "\\n", "\n" ), p.ToInt2(), Color.White);
+			}
+		}
 	}
 }

OpenRa.Game/GameRules/UnitInfo.cs

@@ -50,6 +50,7 @@ namespace OpenRa.Game.GameRules
 		public readonly int InitialFacing = 128;
 		public readonly bool Selectable = true;
 		public readonly int FireDelay = 0;
+		public readonly string LongDesc = null;
 
 		public UnitInfo(string name) { Name = name; }
 	}

OpenRa.Game/Graphics/Renderer.cs

@@ -17,7 +17,7 @@ namespace OpenRa.Game.Graphics
 		public Shader RgbaSpriteShader { get; private set; }
 
 		readonly SpriteHelper sh;
-		readonly FontHelper fhDebug;
+		readonly FontHelper fhDebug, fhTitle;
 
 		public void BuildPalette(Map map)
 		{
@@ -44,6 +44,7 @@ namespace OpenRa.Game.Graphics
 
 			sh = new SpriteHelper(device);
 			fhDebug = new FontHelper(device, "Tahoma", 10, false);
+			fhTitle = new FontHelper(device, "Tahoma", 10, true);
 		}
 
 		public GraphicsDevice Device { get { return device; } }
@@ -107,9 +108,21 @@ namespace OpenRa.Game.Graphics
 			sh.End();
 		}
 
+		public void DrawText2(string text, int2 pos, Color c)
+		{
+			sh.Begin();
+			fhTitle.Draw(sh, text, pos.X, pos.Y, c.ToArgb());
+			sh.End();
+		}
+
 		public int2 MeasureText(string text)
 		{
 			return new int2(fhDebug.MeasureText(sh, text));
 		}
+
+		public int2 MeasureText2(string text)
+		{
+			return new int2(fhTitle.MeasureText(sh, text));
+		}
 	}
 }

OpenRa.Game/Player.cs

@@ -19,8 +19,8 @@ namespace OpenRa.Game
 		public int Cash;
 		public int Ore;
 		public int DisplayCash;
-		public int powerProvided;
-		public int powerDrained;
+		public int PowerProvided;
+		public int PowerDrained;
 
 		public bool IsReady;
 
@@ -34,15 +34,15 @@ namespace OpenRa.Game
 			this.Cash = 10000;
 			this.Ore = 0;
 			this.DisplayCash = 0;
-			this.powerProvided = this.powerDrained = 0;
+			this.PowerProvided = this.PowerDrained = 0;
 		}
 
 		void UpdatePower()
 		{
-			var oldBalance = powerProvided - powerDrained;
+			var oldBalance = PowerProvided - PowerDrained;
 
-			powerProvided = 0;
-			powerDrained = 0;
+			PowerProvided = 0;
+			PowerDrained = 0;
 
 			var myBuildings = Game.world.Actors
 				.Where(a => a.Owner == this && a.traits.Contains<Building>());
@@ -51,13 +51,13 @@ namespace OpenRa.Game
 			{
 				var bi = a.Info as BuildingInfo;
 				if (bi.Power > 0)		/* todo: is this how real-ra scales it? */
-					powerProvided += (a.Health * bi.Power) / bi.Strength;
+					PowerProvided += (a.Health * bi.Power) / bi.Strength;
 				else 
-					powerDrained -= bi.Power;
+					PowerDrained -= bi.Power;
 			}
 
-			if (powerProvided - powerDrained < 0)
-				if (powerProvided - powerDrained  != oldBalance)
+			if (PowerProvided - PowerDrained < 0)
+				if (PowerProvided - PowerDrained  != oldBalance)
 					GiveAdvice("lopower1.aud");
 		}
 
@@ -68,8 +68,8 @@ namespace OpenRa.Game
 
 		public PowerState GetPowerState()
 		{
-			if (powerProvided >= powerDrained) return PowerState.Normal;
-			if (powerProvided > powerDrained / 2) return PowerState.Low;
+			if (PowerProvided >= PowerDrained) return PowerState.Normal;
+			if (PowerProvided > PowerDrained / 2) return PowerState.Low;
 			return PowerState.Critical;
 		}