From 763da40092bf4775575090fb763e75fa3102e528 Mon Sep 17 00:00:00 2001 From: Mustafa Alperen Seki Date: Mon, 12 Feb 2018 10:53:33 +0300 Subject: [PATCH] Fix palette of Oil Pump, Ice, Boxes, Hedgehogs and Utility Poles on Desert Tileset --- mods/ra/rules/civilian.yaml | 8 ++--- mods/ra/rules/decoration.yaml | 64 +++++++++++++++++++++++------------ mods/ra/rules/defaults.yaml | 6 ++-- mods/ra/rules/palettes.yaml | 4 +++ 4 files changed, 54 insertions(+), 28 deletions(-) diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml index df5e39186e..538534f4ed 100644 --- a/mods/ra/rules/civilian.yaml +++ b/mods/ra/rules/civilian.yaml @@ -265,8 +265,8 @@ V18: V19: Inherits: ^CivBuilding - EditorTilesetFilter: - ExcludeTilesets: DESERT + RenderSprites: + Palette: player Tooltip: Name: Oil Pump -SpawnActorOnDeath@1: @@ -279,8 +279,8 @@ V19: V19.Husk: Inherits: ^CivBuilding - EditorTilesetFilter: - ExcludeTilesets: DESERT + RenderSprites: + Palette: player Tooltip: Name: Husk (Oil Pump) RenderSprites: diff --git a/mods/ra/rules/decoration.yaml b/mods/ra/rules/decoration.yaml index 86fa7fde14..39d42cf0e1 100644 --- a/mods/ra/rules/decoration.yaml +++ b/mods/ra/rules/decoration.yaml @@ -215,123 +215,141 @@ TC05: BOXES01: Inherits: ^Tree + RenderSprites: + Palette: player Tooltip: Name: Boxes - EditorTilesetFilter: - ExcludeTilesets: DESERT Categories: Decoration BOXES02: Inherits: ^Tree + RenderSprites: + Palette: player Tooltip: Name: Boxes EditorTilesetFilter: - ExcludeTilesets: DESERT Categories: Decoration BOXES03: Inherits: ^Tree + RenderSprites: + Palette: player Tooltip: Name: Boxes EditorTilesetFilter: - ExcludeTilesets: DESERT Categories: Decoration BOXES04: Inherits: ^Tree + RenderSprites: + Palette: player Tooltip: Name: Boxes EditorTilesetFilter: - ExcludeTilesets: DESERT Categories: Decoration BOXES05: Inherits: ^Tree + RenderSprites: + Palette: player Tooltip: Name: Boxes EditorTilesetFilter: - ExcludeTilesets: DESERT Categories: Decoration BOXES06: Inherits: ^Tree + RenderSprites: + Palette: player Tooltip: Name: Boxes EditorTilesetFilter: - ExcludeTilesets: DESERT Categories: Decoration BOXES07: Inherits: ^Tree + RenderSprites: + Palette: player Tooltip: Name: Boxes EditorTilesetFilter: - ExcludeTilesets: DESERT Categories: Decoration BOXES08: Inherits: ^Tree + RenderSprites: + Palette: player Tooltip: Name: Boxes EditorTilesetFilter: - ExcludeTilesets: DESERT Categories: Decoration BOXES09: Inherits: ^Tree + RenderSprites: + Palette: player Tooltip: Name: Boxes EditorTilesetFilter: - ExcludeTilesets: DESERT Categories: Decoration ICE01: Inherits: ^Tree + RenderSprites: + Palette: player Building: Footprint: xx xx Dimensions: 2,2 Tooltip: Name: Ice Floe EditorTilesetFilter: - ExcludeTilesets: DESERT, INTERIOR + RequireTilesets: SNOW Categories: Decoration ICE02: Inherits: ^Tree + RenderSprites: + Palette: player Building: Footprint: x x Dimensions: 1,2 Tooltip: Name: Ice Floe EditorTilesetFilter: - ExcludeTilesets: DESERT, INTERIOR + RequireTilesets: SNOW Categories: Decoration ICE03: Inherits: ^Tree + RenderSprites: + Palette: player Building: Footprint: xx Dimensions: 2,1 Tooltip: Name: Ice Floe EditorTilesetFilter: - ExcludeTilesets: DESERT, INTERIOR + RequireTilesets: SNOW Categories: Decoration ICE04: Inherits: ^Tree + RenderSprites: + Palette: player Tooltip: Name: Ice Floe EditorTilesetFilter: - ExcludeTilesets: DESERT, INTERIOR + RequireTilesets: SNOW Categories: Decoration ICE05: Inherits: ^Tree + RenderSprites: + Palette: player Tooltip: Name: Ice Floe EditorTilesetFilter: - ExcludeTilesets: DESERT, INTERIOR + RequireTilesets: SNOW Categories: Decoration ROCK1: @@ -378,38 +396,42 @@ ROCK7: UTILPOL1: Inherits: ^Tree + RenderSprites: + Palette: player Tooltip: Name: Utility Pole EditorTilesetFilter: - ExcludeTilesets: DESERT Categories: Decoration UTILPOL2: Inherits: ^Tree + RenderSprites: + Palette: player Tooltip: Name: Utility Pole EditorTilesetFilter: - ExcludeTilesets: DESERT Categories: Decoration TANKTRAP1: Inherits: ^Rock + RenderSprites: + Palette: player Building: Footprint: x Dimensions: 1,1 Tooltip: Name: Tank Trap EditorTilesetFilter: - ExcludeTilesets: DESERT - RequireTilesets: TEMPERAT, SNOW, INTERIOR + RequireTilesets: TEMPERAT, SNOW, DESERT, INTERIOR TANKTRAP2: Inherits: ^Rock + RenderSprites: + Palette: player Building: Footprint: x Dimensions: 1,1 Tooltip: Name: Tank Trap EditorTilesetFilter: - ExcludeTilesets: DESERT - RequireTilesets: TEMPERAT, SNOW, INTERIOR + RequireTilesets: TEMPERAT, SNOW, DESERT, INTERIOR diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 5f62dd749e..fe91aceb52 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -796,7 +796,7 @@ ^CivBuilding: Inherits: ^TechBuilding RenderSprites: - Palette: terrain + Palette: player EditorTilesetFilter: ExcludeTilesets: INTERIOR Categories: Civilian building @@ -997,7 +997,7 @@ Name: Rock ShowOwnerRow: false RenderSprites: - Palette: terrain + Palette: desert WithSpriteBody: Building: Footprint: __ x_ @@ -1014,7 +1014,7 @@ ^DesertCivBuilding: Inherits: ^CivBuilding RenderSprites: - Palette: terrain + Palette: desert EditorTilesetFilter: RequireTilesets: DESERT diff --git a/mods/ra/rules/palettes.yaml b/mods/ra/rules/palettes.yaml index 336aa3b3fd..58952c913a 100644 --- a/mods/ra/rules/palettes.yaml +++ b/mods/ra/rules/palettes.yaml @@ -20,6 +20,10 @@ Filename: temperat.pal ShadowIndex: 4 AllowModifiers: false + PaletteFromFile@desert: + Name: desert + Filename: desert.pal + ShadowIndex: 4 PaletteFromRGBA@shadow: Name: shadow R: 0