check palette references

This commit is contained in:
Matthias Mailänder
2015-07-19 18:08:17 +02:00
parent ba8e292b71
commit 118782a85e
55 changed files with 191 additions and 58 deletions

View File

@@ -18,11 +18,13 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Loads the palette specified in the tileset definition")]
class PaletteFromCurrentTilesetInfo : ITraitInfo
{
[FieldLoader.Require]
[FieldLoader.Require, PaletteDefinition]
[Desc("internal palette name")]
public readonly string Name = null;
[Desc("Map listed indices to shadow. Ignores previous color.")]
public readonly int[] ShadowIndex = { };
public readonly bool AllowModifiers = true;
public object Create(ActorInitializer init) { return new PaletteFromCurrentTileset(init.World, this); }

View File

@@ -17,16 +17,20 @@ namespace OpenRA.Mods.Common.Traits
{
class PaletteFromFileInfo : ITraitInfo
{
[FieldLoader.Require]
[FieldLoader.Require, PaletteDefinition]
[Desc("internal palette name")]
public readonly string Name = null;
[Desc("If defined, load the palette only for this tileset.")]
public readonly string Tileset = null;
[FieldLoader.Require]
[Desc("filename to load")]
public readonly string Filename = null;
[Desc("Map listed indices to shadow. Ignores previous color.")]
public readonly int[] ShadowIndex = { };
public readonly bool AllowModifiers = true;
public object Create(ActorInitializer init) { return new PaletteFromFile(init.World, this); }

View File

@@ -19,11 +19,11 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Create a palette by applying alpha transparency to another palette.")]
class PaletteFromPaletteWithAlphaInfo : ITraitInfo
{
[FieldLoader.Require]
[FieldLoader.Require, PaletteDefinition]
[Desc("Internal palette name")]
public readonly string Name = null;
[FieldLoader.Require]
[FieldLoader.Require, PaletteReference]
[Desc("The name of the palette to base off.")]
public readonly string BasePalette = null;

View File

@@ -18,19 +18,25 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Creates a single color palette without any base palette file.")]
class PaletteFromRGBAInfo : ITraitInfo
{
[FieldLoader.Require]
[FieldLoader.Require, PaletteDefinition]
[Desc("internal palette name")]
public readonly string Name = null;
[Desc("If defined, load the palette only for this tileset.")]
public readonly string Tileset = null;
[Desc("red color component")]
public readonly int R = 0;
[Desc("green color component")]
public readonly int G = 0;
[Desc("blue color component")]
public readonly int B = 0;
[Desc("alpha channel (transparency)")]
public readonly int A = 255;
public readonly bool AllowModifiers = true;
public object Create(ActorInitializer init) { return new PaletteFromRGBA(init.World, this); }

View File

@@ -16,7 +16,7 @@ namespace OpenRA.Mods.Common.Traits
{
class PlayerPaletteFromCurrentTilesetInfo : ITraitInfo
{
[FieldLoader.Require]
[FieldLoader.Require, PaletteDefinition]
[Desc("internal palette name")]
public readonly string Name = null;
[Desc("Map listed indices to shadow.")]

View File

@@ -20,6 +20,7 @@ namespace OpenRA.Mods.Common.Traits
class ShroudPaletteInfo : ITraitInfo
{
[Desc("Internal palette name")]
[FieldLoader.Require, PaletteDefinition]
public readonly string Name = "shroud";
[Desc("Palette type")]

View File

@@ -26,8 +26,8 @@ namespace OpenRA.Mods.Common.Traits
public readonly string[] ShroudVariants = new[] { "shroud" };
public readonly string[] FogVariants = new[] { "fog" };
public readonly string ShroudPalette = "shroud";
public readonly string FogPalette = "fog";
[PaletteReference] public readonly string ShroudPalette = "shroud";
[PaletteReference] public readonly string FogPalette = "fog";
[Desc("Bitfield of shroud directions for each frame. Lower four bits are",
"corners clockwise from TL; upper four are edges clockwise from top")]

View File

@@ -31,9 +31,9 @@ namespace OpenRA.Mods.Common.Traits
public readonly string SmokeType = "smoke_m";
[SequenceReference("SmokeType")] public readonly string SmokeSequence = "idle";
public readonly string SmokePalette = "effect";
[PaletteReference] public readonly string SmokePalette = "effect";
public readonly string Palette = "terrain";
[PaletteReference] public readonly string Palette = "terrain";
public object Create(ActorInitializer init) { return new SmudgeLayer(init.Self, this); }
}

View File

@@ -16,6 +16,7 @@ namespace OpenRA.Mods.Common.Traits
{
public class VoxelNormalsPaletteInfo : ITraitInfo
{
[PaletteDefinition]
public readonly string Name = "normals";
[Desc("Can be TiberianSun or RedAlert2")]