From e066c893eb447c7134eba532071bde75edc0d2f6 Mon Sep 17 00:00:00 2001 From: Taryn Hill Date: Tue, 31 Mar 2015 21:36:15 -0500 Subject: [PATCH 1/3] Remove unnecessary image references in ts/sequences/misc. --- mods/ts/sequences/misc.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml index fad83cdc02..d24d070424 100644 --- a/mods/ts/sequences/misc.yaml +++ b/mods/ts/sequences/misc.yaml @@ -8,7 +8,7 @@ overlay: target-select: place poweroff: - offline: poweroff + offline: Length: * Tick: 160 @@ -236,7 +236,7 @@ resources: tib20: tib20 shroud: - shroud: shroud + shroud: Length: * fog: fog Length: * From f41497b4215d319d58ed8ed70a289690e6aa847d Mon Sep 17 00:00:00 2001 From: Taryn Hill Date: Tue, 31 Mar 2015 21:36:50 -0500 Subject: [PATCH 2/3] Allow `Defaults: image` in sequence definitions. --- OpenRA.Mods.Common/Graphics/DefaultSpriteSequence.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenRA.Mods.Common/Graphics/DefaultSpriteSequence.cs b/OpenRA.Mods.Common/Graphics/DefaultSpriteSequence.cs index e8c7197b7a..89cbdcdad2 100644 --- a/OpenRA.Mods.Common/Graphics/DefaultSpriteSequence.cs +++ b/OpenRA.Mods.Common/Graphics/DefaultSpriteSequence.cs @@ -36,6 +36,9 @@ namespace OpenRA.Mods.Common.Graphics { nodes.Remove("Defaults"); nodes = nodes.ToDictionary(kv => kv.Key, kv => MiniYaml.MergeStrict(kv.Value, defaults)); + + foreach (var n in nodes) + n.Value.Value = n.Value.Value ?? defaults.Value; } foreach (var kvp in nodes) From 32083344aab35d4c7501b8b496c2d10e6d54b73d Mon Sep 17 00:00:00 2001 From: Taryn Hill Date: Tue, 31 Mar 2015 21:37:28 -0500 Subject: [PATCH 3/3] =?UTF-8?q?Set=20`place`=20to=20default=20image=20for?= =?UTF-8?q?=20TS=E2=80=99=20overlay=20sequence.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/ts/sequences/misc.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml index d24d070424..256fb03fc4 100644 --- a/mods/ts/sequences/misc.yaml +++ b/mods/ts/sequences/misc.yaml @@ -1,11 +1,11 @@ overlay: - Defaults: + Defaults: place Offset: 0, -12 - build-valid-snow: place - build-valid-temperat: place - build-invalid: place + build-valid-snow: + build-valid-temperat: + build-invalid: Start: 1 - target-select: place + target-select: poweroff: offline: