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

unhardcode and self-document more resource/smudge parameters

Browse Source
This commit is contained in:
Matthias Mailänder
2014-08-23 20:24:54 +02:00
parent f0fc63b15d
commit 5b4f8d1446
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Traits/World/ResourceType.cs
View File

@@ -17,8 +17,10 @@ namespace OpenRA.Traits
{
// HACK: The editor is getting really unmaintanable...
public readonly string EditorSprite;
public readonly string[] Variants = { };
public readonly string Palette = "terrain";
public readonly string Sequence = "resources";
public readonly int ResourceType = 1;
public readonly int ValuePerUnit = 0;
@@ -47,7 +49,7 @@ namespace OpenRA.Traits
Variants = new Dictionary<string, Sprite[]>();
foreach (var v in info.Variants)
{
var seq = world.Map.SequenceProvider.GetSequence("resources", v);
var seq = world.Map.SequenceProvider.GetSequence(Info.Sequence, v);
var sprites = Exts.MakeArray(seq.Length, x => seq.GetSprite(x));
Variants.Add(v, sprites);
}

8
OpenRA.Mods.RA/World/SmudgeLayer.cs
View File

@@ -19,11 +19,17 @@ namespace OpenRA.Mods.RA
public class SmudgeLayerInfo : ITraitInfo
{
public readonly string Type = "Scorch";
[Desc("Sprite sequence name")]
public readonly string Sequence = "scorch";
public readonly int SmokePercentage = 25;
[Desc("Sprite sequence name")]
public readonly string SmokeType = "smoke_m";
public readonly string Palette = "terrain";
public object Create(ActorInitializer init) { return new SmudgeLayer(this); }
}
@@ -120,7 +126,7 @@ namespace OpenRA.Mods.RA
public void Render(WorldRenderer wr)
{
var pal = wr.Palette("terrain");
var pal = wr.Palette(Info.Palette);
foreach (var kv in tiles)
{