merged

OpenRa.FileFormats/Map.cs

@@ -151,12 +151,8 @@ namespace OpenRa.FileFormats
 				{
 					newOverlay[i,j] = 0xff;
 					if (!HasOverlay(i, j) && GetOreDensity(i, j) > 0 && canSpreadIntoCell(new int2(i,j)) 
-						&& r.NextDouble() < oreRate )
+					    && r.NextDouble() < oreRate )
-						newOverlay[i, j] = (byte)r.Next(5,9);
+					    newOverlay[i, j] = (byte)r.Next(5,9);
-
-					if (!HasOverlay(i, j) && GetGemDensity(i, j) > 0 && canSpreadIntoCell(new int2(i, j))
-						&& r.NextDouble() < gemRate )
-						newOverlay[i, j] = (byte)r.Next(9, 13);
 				}
 
 			for (int j = 1; j < 127; j++)
@@ -168,10 +164,7 @@ namespace OpenRa.FileFormats
 			var newDensity = new byte[128, 128];
 			for (int j = 1; j < 127; j++)
 				for (int i = 1; i < 127; i++)
-				{
 					if (ContainsOre(i, j)) newDensity[i,j] = GetOreDensity(i, j);
-					if (ContainsGem(i, j)) newDensity[i,j] = GetGemDensity(i, j);
-				}
 
 			for (int j = 1; j < 127; j++)
 				for (int i = 1; i < 127; i++)

OpenRa.Game/Game.cs

@@ -136,7 +136,7 @@ namespace OpenRa.Game
 			lastTime = Environment.TickCount;
 		}
 
-		const int oreFrequency = 20;
+		const int oreFrequency = 1;
 		static int oreTicks = oreFrequency;
 		public static int RenderFrame = 0;
 
@@ -155,8 +155,8 @@ namespace OpenRa.Game
 
 					if (--oreTicks == 0)
 					{
-						map.GrowOre(p => IsCellBuildable(p, UnitMovementType.Wheel), SharedRandom);
+						map.GrowOre(p => IsCellBuildable(p, UnitMovementType.Wheel), SharedRandom);
-						oreTicks = oreFrequency;
+						oreTicks = oreFrequency;
 					}
 					world.Tick();
 					UnitInfluence.Tick();

OpenRa.Game/UiOverlay.cs

@@ -1,54 +1,54 @@
-using System.Drawing;
+using System.Drawing;
-using OpenRa.Game.Graphics;
+using OpenRa.Game.Graphics;
-using System;
+using System;
-using OpenRa.Game.GameRules;
+using OpenRa.Game.GameRules;
-using System.Linq;
+using System.Linq;
-
+
-namespace OpenRa.Game
+namespace OpenRa.Game
-{
+{
-	class UiOverlay
+	class UiOverlay
-	{
+	{
-		SpriteRenderer spriteRenderer;
+		SpriteRenderer spriteRenderer;
-		Sprite buildOk, buildBlocked, unitDebug;
+		Sprite buildOk, buildBlocked, unitDebug;
-
+
 		public static bool ShowUnitDebug = false;
-		public static bool ShowBuildDebug = false;
+		public static bool ShowBuildDebug = false;
-
+
-		public UiOverlay(SpriteRenderer spriteRenderer)
+		public UiOverlay(SpriteRenderer spriteRenderer)
-		{
+		{
-			this.spriteRenderer = spriteRenderer;
+			this.spriteRenderer = spriteRenderer;
-
+
-			buildOk = SynthesizeTile(0x80);
+			buildOk = SynthesizeTile(0x80);
-			buildBlocked = SynthesizeTile(0xe6);
+			buildBlocked = SynthesizeTile(0xe6);
-			unitDebug = SynthesizeTile(0x7c);
+			unitDebug = SynthesizeTile(0x7c);
-		}
+		}
-
+
-		static Sprite SynthesizeTile(byte paletteIndex)
+		static Sprite SynthesizeTile(byte paletteIndex)
-		{
+		{
-			byte[] data = new byte[Game.CellSize * Game.CellSize];
+			byte[] data = new byte[Game.CellSize * Game.CellSize];
-
+
-			for (int i = 0; i < Game.CellSize; i++)
+			for (int i = 0; i < Game.CellSize; i++)
-				for (int j = 0; j < Game.CellSize; j++)
+				for (int j = 0; j < Game.CellSize; j++)
-					data[i * Game.CellSize + j] = ((i + j) % 4 < 2) ? (byte)0 : paletteIndex;
+					data[i * Game.CellSize + j] = ((i + j) % 4 < 2) ? (byte)0 : paletteIndex;
-
+
-			return SheetBuilder.Add( data, new Size(Game.CellSize,Game.CellSize) );
+			return SheetBuilder.Add( data, new Size(Game.CellSize,Game.CellSize) );
-		}
+		}
-
+
-		public void Draw()
+		public void Draw()
-		{
+		{
-			if (ShowUnitDebug)
+			if (ShowUnitDebug)
-				for (var j = 0; j < 128; j++)
+				for (var j = 0; j < 128; j++)
-					for (var i = 0; i < 128; i++)
+					for (var i = 0; i < 128; i++)
-						if (Game.UnitInfluence.GetUnitAt(new int2(i, j)) != null)
+						if (Game.UnitInfluence.GetUnitAt(new int2(i, j)) != null)
 							spriteRenderer.DrawSprite(unitDebug, Game.CellSize * new float2(i, j), 0);
 
 			var placeBuilding = Game.controller.orderGenerator as PlaceBuilding;
 			if (placeBuilding == null) return;
 
-			var position = Game.controller.MousePosition.ToInt2();
+			var position = Game.controller.MousePosition.ToInt2();
-
+
-			var bi = (UnitInfo.BuildingInfo)Rules.UnitInfo[placeBuilding.Name];
+			var bi = (UnitInfo.BuildingInfo)Rules.UnitInfo[placeBuilding.Name];
-			
+			
 			var maxDistance = bi.Adjacent + 2;	/* real-ra is weird. this is 1 GAP. */
 
 			if (ShowBuildDebug)
@@ -57,16 +57,16 @@ namespace OpenRa.Game
 						if (Game.GetDistanceToBase(new int2(i, j), Game.LocalPlayer) < maxDistance)
 							if (Game.IsCellBuildable(new int2(i, j), bi.WaterBound ? UnitMovementType.Float : UnitMovementType.Wheel))
 								spriteRenderer.DrawSprite(unitDebug, Game.CellSize * new float2(i, j), 0);
-			
+			
-			var tooFarFromBase = !Footprint.Tiles(bi, position).Any(
+			var tooFarFromBase = !Footprint.Tiles(bi, position).Any(
-				t => Game.GetDistanceToBase(t, Game.LocalPlayer) < maxDistance);
+				t => Game.GetDistanceToBase(t, Game.LocalPlayer) < maxDistance);
-
+
-			foreach( var t in Footprint.Tiles( bi, position ) )
+			foreach( var t in Footprint.Tiles( bi, position ) )
-				spriteRenderer.DrawSprite( !tooFarFromBase && Game.IsCellBuildable( t, bi.WaterBound 
+				spriteRenderer.DrawSprite( !tooFarFromBase && Game.IsCellBuildable( t, bi.WaterBound 
-					? UnitMovementType.Float : UnitMovementType.Wheel )
+					? UnitMovementType.Float : UnitMovementType.Wheel )
-					? buildOk : buildBlocked, Game.CellSize * t, 0 );
+					? buildOk : buildBlocked, Game.CellSize * t, 0 );
-
+
-			spriteRenderer.Flush();
+			spriteRenderer.Flush();
-		}
+		}
-	}
+	}
-}
+}