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

Allow resource placement outside the map cordon.

Browse Source
This commit is contained in:
Paul Chote
2015-06-07 22:59:40 +01:00
parent 55cea73cf4
commit 6e09c62fdd
6 changed files with 52 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenRA.Mods.D2k/Traits/World/D2kEditorResourceLayer.cs
View File

@@ -65,31 +65,36 @@ namespace OpenRA.Mods.D2k.Traits
return D2kResourceLayer.Variants.Keys.Random(Game.CosmeticRandom);
}
bool CellContains(CPos c, ResourceType t)
{
return Tiles.Contains(c) && Tiles[c].Type == t;
}
ClearSides FindClearSides(ResourceType t, CPos p)
{
var ret = ClearSides.None;
if (Tiles[p + new CVec(0, -1)].Type != t)
if (!CellContains(p + new CVec(0, -1), t))
ret |= ClearSides.Top | ClearSides.TopLeft | ClearSides.TopRight;
if (Tiles[p + new CVec(-1, 0)].Type != t)
if (!CellContains(p + new CVec(-1, 0), t))
ret |= ClearSides.Left | ClearSides.TopLeft | ClearSides.BottomLeft;
if (Tiles[p + new CVec(1, 0)].Type != t)
if (!CellContains(p + new CVec(1, 0), t))
ret |= ClearSides.Right | ClearSides.TopRight | ClearSides.BottomRight;
if (Tiles[p + new CVec(0, 1)].Type != t)
if (!CellContains(p + new CVec(0, 1), t))
ret |= ClearSides.Bottom | ClearSides.BottomLeft | ClearSides.BottomRight;
if (Tiles[p + new CVec(-1, -1)].Type != t)
if (!CellContains(p + new CVec(-1, -1), t))
ret |= ClearSides.TopLeft;
if (Tiles[p + new CVec(1, -1)].Type != t)
if (!CellContains(p + new CVec(1, -1), t))
ret |= ClearSides.TopRight;
if (Tiles[p + new CVec(-1, 1)].Type != t)
if (!CellContains(p + new CVec(-1, 1), t))
ret |= ClearSides.BottomLeft;
if (Tiles[p + new CVec(1, 1)].Type != t)
if (!CellContains(p + new CVec(1, 1), t))
ret |= ClearSides.BottomRight;
return ret;

24
OpenRA.Mods.D2k/Traits/World/D2kResourceLayer.cs
View File

@@ -96,31 +96,36 @@ namespace OpenRA.Mods.D2k.Traits
{ ClearSides.Bottom | ClearSides.TopLeft | ClearSides.BottomLeft | ClearSides.BottomRight, 49 },
};
bool CellContains(CPos c, ResourceType t)
{
return render.Contains(c) && render[c].Type == t;
}
ClearSides FindClearSides(ResourceType t, CPos p)
{
var ret = ClearSides.None;
if (render[p + new CVec(0, -1)].Type != t)
if (!CellContains(p + new CVec(0, -1), t))
ret |= ClearSides.Top | ClearSides.TopLeft | ClearSides.TopRight;
if (render[p + new CVec(-1, 0)].Type != t)
if (!CellContains(p + new CVec(-1, 0), t))
ret |= ClearSides.Left | ClearSides.TopLeft | ClearSides.BottomLeft;
if (render[p + new CVec(1, 0)].Type != t)
if (!CellContains(p + new CVec(1, 0), t))
ret |= ClearSides.Right | ClearSides.TopRight | ClearSides.BottomRight;
if (render[p + new CVec(0, 1)].Type != t)
if (!CellContains(p + new CVec(0, 1), t))
ret |= ClearSides.Bottom | ClearSides.BottomLeft | ClearSides.BottomRight;
if (render[p + new CVec(-1, -1)].Type != t)
if (!CellContains(p + new CVec(-1, -1), t))
ret |= ClearSides.TopLeft;
if (render[p + new CVec(1, -1)].Type != t)
if (!CellContains(p + new CVec(1, -1), t))
ret |= ClearSides.TopRight;
if (render[p + new CVec(-1, 1)].Type != t)
if (!CellContains(p + new CVec(-1, 1), t))
ret |= ClearSides.BottomLeft;
if (render[p + new CVec(1, 1)].Type != t)
if (!CellContains(p + new CVec(1, 1), t))
ret |= ClearSides.BottomRight;
return ret;
@@ -128,6 +133,9 @@ namespace OpenRA.Mods.D2k.Traits
void UpdateRenderedTileInner(CPos p)
{
if (!render.Contains(p))
return;
var t = render[p];
if (t.Density > 0)
{