diff --git a/OpenRA.Mods.D2k/Traits/World/D2kResourceRenderer.cs b/OpenRA.Mods.D2k/Traits/World/D2kResourceRenderer.cs index e3cf3582ac..bcf092aaea 100644 --- a/OpenRA.Mods.D2k/Traits/World/D2kResourceRenderer.cs +++ b/OpenRA.Mods.D2k/Traits/World/D2kResourceRenderer.cs @@ -41,17 +41,8 @@ namespace OpenRA.Mods.D2k.Traits All = 0xFF } - public static readonly Dictionary Variants = new Dictionary() - { - { "cleara", new[] { 0, 50 } }, - { "clearb", new[] { 1, 51 } }, - { "clearc", new[] { 43, 52 } }, - { "cleard", new[] { 0, 53 } }, - }; - public static readonly Dictionary SpriteMap = new Dictionary() { - { ClearSides.None, 0 }, { ClearSides.Left | ClearSides.Top | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomLeft | ClearSides.BottomRight, 2 }, { ClearSides.Top | ClearSides.Right | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomLeft | ClearSides.BottomRight, 3 }, { ClearSides.Left | ClearSides.Bottom | ClearSides.TopLeft | ClearSides.TopRight | ClearSides.BottomLeft | ClearSides.BottomRight, 4 }, @@ -169,10 +160,10 @@ namespace OpenRA.Mods.D2k.Traits if (clear == ClearSides.None) { - var sprites = Variants[content.Variant]; + var sprites = renderType.Variants[content.Variant]; var frame = density > renderType.Info.MaxDensity / 2 ? 1 : 0; - UpdateSpriteLayers(cell, renderType.Variants.First().Value, sprites[frame], renderType.Palette); + UpdateSpriteLayers(cell, sprites, frame, renderType.Palette); } else if (SpriteMap.TryGetValue(clear, out var index)) { @@ -184,10 +175,5 @@ namespace OpenRA.Mods.D2k.Traits else UpdateSpriteLayers(cell, null, 0, null); } - - protected override string ChooseRandomVariant(ResourceType t) - { - return Variants.Keys.Random(Game.CosmeticRandom); - } } } diff --git a/mods/d2k/rules/world.yaml b/mods/d2k/rules/world.yaml index b0c1a287ad..23ed0bf743 100644 --- a/mods/d2k/rules/world.yaml +++ b/mods/d2k/rules/world.yaml @@ -113,7 +113,7 @@ ResourceType: 1 Palette: d2k TerrainType: Spice - Sequences: spice + Sequences: spicea, spiceb, spicec, spiced MaxDensity: 20 ValuePerUnit: 25 AllowedTerrainTypes: SpiceSand diff --git a/mods/d2k/sequences/misc.yaml b/mods/d2k/sequences/misc.yaml index c345ae72af..4c20b0640a 100644 --- a/mods/d2k/sequences/misc.yaml +++ b/mods/d2k/sequences/misc.yaml @@ -444,9 +444,21 @@ moveflsh: EmbeddedPalette: moveflash resources: - spice: BLOXBASE.R8 - Frames: 748, 749, 750, 751, 752, 753, 754, 755, 756, 757, 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, 795, 796, 797, 798, 799, 300, 301, 320, 321 - Length: 54 + spicea: BLOXBASE.R8 + Frames: 748, 300, 750, 751, 752, 753, 754, 755, 756, 757, 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, 795, 796, 797, 798, 799, 300 + Length: * + Offset: -16,-16 + spiceb: BLOXBASE.R8 + Frames: 749, 301, 750, 751, 752, 753, 754, 755, 756, 757, 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, 795, 796, 797, 798, 799, 301 + Length: * + Offset: -16,-16 + spicec: BLOXBASE.R8 + Frames: 793, 320, 750, 751, 752, 753, 754, 755, 756, 757, 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, 795, 796, 797, 798, 799, 320 + Length: * + Offset: -16,-16 + spiced: BLOXBASE.R8 + Frames: 748, 321, 750, 751, 752, 753, 754, 755, 756, 757, 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, 795, 796, 797, 798, 799, 321 + Length: * Offset: -16,-16 shroud: