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

Merge pull request #7814 from Phrohdoh/default-image

Browse Source 
Image reference in 'Defaults' sequence block.
This commit is contained in:
Matthias Mailänder
2015-04-03 10:36:29 +02:00
parent 39b42a35a0 32083344aa
commit de2860358f
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/Graphics/DefaultSpriteSequence.cs
View File

@@ -36,6 +36,9 @@ namespace OpenRA.Mods.Common.Graphics
{ {
nodes.Remove("Defaults"); nodes.Remove("Defaults");
nodes = nodes.ToDictionary(kv => kv.Key, kv => MiniYaml.MergeStrict(kv.Value, 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) foreach (var kvp in nodes)

14
mods/ts/sequences/misc.yaml
View File

@@ -1,14 +1,14 @@
overlay: overlay:
Defaults: Defaults: place
Offset: 0, -12 Offset: 0, -12
build-valid-snow: place build-valid-snow:
build-valid-temperat: place build-valid-temperat:
build-invalid: place build-invalid:
Start: 1 Start: 1
target-select: place target-select:
poweroff: poweroff:
offline: poweroff offline:
Length: * Length: *
Tick: 160 Tick: 160
@@ -236,7 +236,7 @@ resources:
tib20: tib20 tib20: tib20
shroud: shroud:
shroud: shroud shroud:
Length: * Length: *
fog: fog fog: fog
Length: * Length: *