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

added ResourceType; mostly works, except for growth & consumption

Browse Source
This commit is contained in:
Chris Forbes
2010-03-02 21:55:32 +13:00
parent 45a4fa110e
commit 2c50d3baa7
8 changed files with 98 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
OpenRA.Game/Graphics/OverlayRenderer.cs
View File

@@ -25,22 +25,12 @@ namespace OpenRA.Graphics
{
class OverlayRenderer
{
static string[] overlaySpriteNames =
{
"sbag", "cycl", "brik", "fenc", "wood",
"gold01", "gold02", "gold03", "gold04",
"gem01", "gem02", "gem03", "gem04",
"v12", "v13", "v14", "v15", "v16", "v17", "v18",
"fpls", "wcrate", "scrate", "barb", "sbag",
};
static string[] smudgeSpriteNames =
{
"bib3", "bib2", "bib1", "sc1", "sc2", "sc3", "sc4", "sc5", "sc6",
"cr1", "cr2", "cr3", "cr4", "cr5", "cr6",
};
readonly Sprite[][] overlaySprites;
readonly Sprite[] smudgeSprites;
SpriteRenderer spriteRenderer;
@@ -51,7 +41,6 @@ namespace OpenRA.Graphics
this.spriteRenderer = new SpriteRenderer( renderer, true );
this.map = map;
overlaySprites = overlaySpriteNames.Select(f => SpriteSheetBuilder.LoadAllSprites(f)).ToArray();
smudgeSprites = smudgeSpriteNames.SelectMany(f => SpriteSheetBuilder.LoadAllSprites(f)).ToArray();
}
@@ -71,44 +60,9 @@ namespace OpenRA.Graphics
spriteRenderer.DrawSprite(smudgeSprites[tr.smudge - 1],
Game.CellSize * (float2)location, "terrain");
}
//var o = tr.overlay;
//if (o < overlaySprites.Length)
//{
// var location = new int2(x, y);
// var sprites = overlaySprites[o];
// var spriteIndex = 0;
// if (Ore.overlayIsFence[o]) spriteIndex = NearbyFences(x, y);
// else if (Ore.overlayIsOre[o]) spriteIndex = map.MapTiles[x,y].density - 1;
// else if (Ore.overlayIsGems[o]) spriteIndex = map.MapTiles[x,y].density - 1;
// spriteRenderer.DrawSprite(sprites[spriteIndex],
// Game.CellSize * (float2)location, "terrain");
//}
}
spriteRenderer.Flush();
}
bool IsFence( int x, int y )
{
var o = map.MapTiles[ x, y ].overlay;
if (o < Ore.overlayIsFence.Length)
return Ore.overlayIsFence[o];
return false;
}
int NearbyFences( int x, int y )
{
int ret = 0;
if( IsFence( x, y - 1 ) )
ret |= 1;
if( IsFence( x + 1, y ) )
ret |= 2;
if( IsFence( x, y + 1 ) )
ret |= 4;
if( IsFence( x - 1, y ) )
ret |= 8;
return ret;
}
}
}

1
OpenRA.Game/OpenRA.Game.csproj
View File

@@ -217,6 +217,7 @@
<Compile Include="Traits\Player\PlaceBuilding.cs" />
<Compile Include="Traits\World\PlayerColorPalette.cs" />
<Compile Include="Traits\World\ResourceLayer.cs" />
<Compile Include="Traits\World\ResourceType.cs" />
<Compile Include="Traits\World\ShroudPalette.cs" />
<Compile Include="Traits\SupportPowers\SupportPower.cs" />
<Compile Include="Traits\ProvidesRadar.cs" />

10
OpenRA.Game/Ore.cs
View File

@@ -101,16 +101,6 @@ namespace OpenRA
++map.MapTiles[i, j].density;
}
public static void InitOreDensity( this Map map )
{
for (int j = 0; j < 128; j++)
for (int i = 0; i < 128; i++)
{
if (map.ContainsOre(i, j)) map.MapTiles[i, j].density = map.GetOreDensity(i, j);
if (map.ContainsGem(i, j)) map.MapTiles[i, j].density = map.GetGemDensity(i, j);
}
}
static byte GetOreDensity(this Map map, int i, int j)
{
int sum = 0;

7
OpenRA.Game/Traits/World/OreGrowth.cs
View File

@@ -30,7 +30,7 @@ namespace OpenRA.Traits
public object Create(Actor self) { return new OreGrowth(); }
}
class OreGrowth : ITick, ILoadWorldHook
class OreGrowth : ITick
{
int remainingTicks;
@@ -52,10 +52,5 @@ namespace OpenRA.Traits
remainingTicks = (int)(info.Interval * 60 * 25);
}
}
public void WorldLoaded(World w)
{
Ore.InitOreDensity(w.Map);
}
}
}

59
OpenRA.Game/Traits/World/ResourceLayer.cs
View File

@@ -18,7 +18,6 @@
*/
#endregion
using System;
using System.Linq;
using OpenRA.Graphics;
@@ -26,23 +25,18 @@ namespace OpenRA.Traits
{
class ResourceLayerInfo : ITraitInfo
{
public readonly string[] SpriteNames = { };
public readonly int[] OverlayIndices = { };
public readonly string Palette = "terrain";
public object Create(Actor self) { return new ResourceLayer(self, this); }
public object Create(Actor self) { return new ResourceLayer(self); }
}
class ResourceLayer : IRenderOverlay, ILoadWorldHook
{
ResourceLayerInfo info;
Sprite[][] sprites;
CellContents[,] content = new CellContents[128,128];
SpriteRenderer sr;
public ResourceLayer(Actor self, ResourceLayerInfo info)
public ResourceTypeInfo[] resourceTypes;
public CellContents[,] content = new CellContents[128, 128];
public ResourceLayer(Actor self)
{
this.info = info;
sprites = info.SpriteNames.Select( f => SpriteSheetBuilder.LoadAllSprites(f)).ToArray();
sr = new SpriteRenderer( Game.renderer, true );
}
@@ -55,10 +49,12 @@ namespace OpenRA.Traits
for (int x = map.XOffset; x < map.XOffset + map.Width; x++)
{
if (!shroud.IsExplored(new int2(x, y))) continue;
if (content[x, y].contents != null)
sr.DrawSprite(content[x, y].contents[content[x, y].density],
var c = content[x, y];
if (c.image != null)
sr.DrawSprite(c.image[c.density],
Game.CellSize * new int2(x, y),
info.Palette);
c.type.Palette);
}
sr.Flush();
@@ -66,22 +62,47 @@ namespace OpenRA.Traits
public void WorldLoaded(World w)
{
resourceTypes = w.WorldActor.Info.Traits.WithInterface<ResourceTypeInfo>().ToArray();
foreach (var rt in resourceTypes)
rt.Sprites = rt.SpriteNames.Select(a => SpriteSheetBuilder.LoadAllSprites(a)).ToArray();
var map = w.Map;
for (int y = map.YOffset; y < map.YOffset + map.Height; y++)
for (int x = map.XOffset; x < map.XOffset + map.Width; x++)
if (info.OverlayIndices.Contains(w.Map.MapTiles[x, y].overlay))
content[x, y].contents = ChooseContent(w, w.Map.MapTiles[x, y].overlay);
{
content[x,y].type = resourceTypes.FirstOrDefault(
r => r.Overlays.Contains(w.Map.MapTiles[x, y].overlay));
if (content[x, y].type != null)
content[x, y].image = ChooseContent(w, content[x, y].type);
}
for (int y = map.YOffset; y < map.YOffset + map.Height; y++)
for (int x = map.XOffset; x < map.XOffset + map.Width; x++)
if (content[x, y].type != null)
content[x, y].density = (GetAdjacentCellsWith(content[x, y].type, x, y) *
content[x, y].image.Length) / 9;
}
Sprite[] ChooseContent(World w, int overlay)
public Sprite[] ChooseContent(World w, ResourceTypeInfo info)
{
return sprites[w.SharedRandom.Next(sprites.Length)];
return info.Sprites[w.SharedRandom.Next(info.Sprites.Length)];
}
public int GetAdjacentCellsWith(ResourceTypeInfo info, int i, int j)
{
int sum = 0;
for (var u = -1; u < 2; u++)
for (var v = -1; v < 2; v++)
if (content[i+u, j+v].type == info)
++sum;
return sum;
}
public struct CellContents
{
public Sprite[] contents;
public ResourceTypeInfo type;
public Sprite[] image;
public int density;
}
}

39
OpenRA.Game/Traits/World/ResourceType.cs Normal file
View File

@@ -0,0 +1,39 @@
#region Copyright & License Information
/*
* Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
* This file is part of OpenRA.
*
* OpenRA is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* OpenRA is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with OpenRA. If not, see <http://www.gnu.org/licenses/>.
*/
#endregion
using OpenRA.Graphics;
using System.Collections.Generic;
namespace OpenRA.Traits
{
class ResourceTypeInfo : ITraitInfo
{
public readonly int[] Overlays = { };
public readonly string[] SpriteNames = { };
public readonly string Palette = "terrain";
public readonly int ValuePerUnit = 0;
public readonly string Name = null;
public Sprite[][] Sprites;
public object Create(Actor self) { return new ResourceType(); }
}
class ResourceType { }
}

5
mods/cnc/system.yaml
View File

@@ -167,6 +167,9 @@ World:
SellButton:
RepairButton:
ResourceLayer:
OverlayIndices: 5,6,7,8,9,10,11,12
ResourceType@green-tib:
Overlays: 5,6,7,8,9,10,11,12
Palette: player
SpriteNames: ti1,ti2,ti3,ti4,ti5,ti6,ti7,ti8,ti9,ti10,ti11,ti12
ValuePerUnit: 30
Name: Tiberium

13
mods/ra/rules.yaml
View File

@@ -234,6 +234,19 @@ World:
WallLoadHook@barb:
ActorType: barb
OverlayIndices: 23
ResourceLayer:
ResourceType@ore:
Overlays: 5,6,7,8
Palette: terrain
SpriteNames: gold01,gold02,gold03,gold04
ValuePerUnit: 30
Name: Ore
ResourceType@gem:
Overlays: 9,10,11,12
Palette: terrain
SpriteNames: gem01,gem02,gem03,gem04
ValuePerUnit: 60
Name: Gems
MGG:
GeneratesGap: