epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged

Browse Source
This commit is contained in:
Chris Forbes
2009-11-04 20:31:59 +13:00
parent 86111b9e91 0251cb3e1c
commit f84d756570
3 changed files with 63 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRa.FileFormats/Map.cs
View File

@@ -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 )
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);
&& r.NextDouble() < oreRate )
newOverlay[i, j] = (byte)r.Next(5,9);
}
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++)

6
OpenRa.Game/Game.cs
View File

@@ -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);
oreTicks = oreFrequency;
map.GrowOre(p => IsCellBuildable(p, UnitMovementType.Wheel), SharedRandom);
oreTicks = oreFrequency;
}
world.Tick();
UnitInfluence.Tick();

116
OpenRa.Game/UiOverlay.cs
View File

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