From b6b107de46c7c79dc8abbb47968b1788d59bdf53 Mon Sep 17 00:00:00 2001 From: Pavel Penev Date: Mon, 17 Aug 2015 00:28:06 +0300 Subject: [PATCH] Rename RenderSpritesInfo.RaceImages --- .../Traits/Render/RenderSprites.cs | 14 ++++---- .../UtilityCommands/UpgradeRules.cs | 9 ++++++ mods/d2k/rules/misc.yaml | 8 ++--- mods/d2k/rules/structures.yaml | 32 +++++++++---------- mods/ts/rules/gdi-structures.yaml | 2 +- mods/ts/rules/shared-infantry.yaml | 4 +-- mods/ts/rules/shared-structures.yaml | 4 +-- mods/ts/rules/shared-support.yaml | 2 +- mods/ts/rules/shared-vehicles.yaml | 6 ++-- 9 files changed, 45 insertions(+), 36 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Render/RenderSprites.cs b/OpenRA.Mods.Common/Traits/Render/RenderSprites.cs index 480f733565..cba57c843f 100644 --- a/OpenRA.Mods.Common/Traits/Render/RenderSprites.cs +++ b/OpenRA.Mods.Common/Traits/Render/RenderSprites.cs @@ -29,9 +29,9 @@ namespace OpenRA.Mods.Common.Traits [Desc("The sequence name that defines the actor sprites. Defaults to the actor name.")] public readonly string Image = null; - [FieldLoader.LoadUsing("LoadRaceImages")] - [Desc("A dictionary of race-specific image overrides.")] - public readonly Dictionary RaceImages = null; + [FieldLoader.LoadUsing("LoadFactionImages")] + [Desc("A dictionary of faction-specific image overrides.")] + public readonly Dictionary FactionImages = null; [Desc("Custom palette name")] [PaletteReference] public readonly string Palette = null; @@ -42,11 +42,11 @@ namespace OpenRA.Mods.Common.Traits [Desc("Change the sprite image size.")] public readonly float Scale = 1f; - protected static object LoadRaceImages(MiniYaml y) + protected static object LoadFactionImages(MiniYaml y) { MiniYaml images; - if (!y.ToDictionary().TryGetValue("RaceImages", out images)) + if (!y.ToDictionary().TryGetValue("FactionImages", out images)) return null; return images.Nodes.ToDictionary(kv => kv.Key, kv => kv.Value.Value); @@ -82,10 +82,10 @@ namespace OpenRA.Mods.Common.Traits public string GetImage(ActorInfo actor, SequenceProvider sequenceProvider, string race) { - if (RaceImages != null && !string.IsNullOrEmpty(race)) + if (FactionImages != null && !string.IsNullOrEmpty(race)) { string raceImage = null; - if (RaceImages.TryGetValue(race, out raceImage) && sequenceProvider.HasSequence(raceImage)) + if (FactionImages.TryGetValue(race, out raceImage) && sequenceProvider.HasSequence(raceImage)) return raceImage; } diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs index 1d7f01ee82..e91feb2aba 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs +++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs @@ -1768,6 +1768,15 @@ namespace OpenRA.Mods.Common.UtilityCommands } } + if (engineVersion < 20150816) + { + // Rename RenderSprites.RaceImages + if (depth == 2 && node.Key == "RaceImages") + node.Key = "FactionImages"; + if (depth == 2 && node.Key == "-RaceImages") + node.Key = "-FactionImages"; + } + UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1); } } diff --git a/mods/d2k/rules/misc.yaml b/mods/d2k/rules/misc.yaml index 5f550faa74..edd2d39bcf 100644 --- a/mods/d2k/rules/misc.yaml +++ b/mods/d2k/rules/misc.yaml @@ -167,7 +167,7 @@ upgrade.conyard: Cost: 1000 RenderSprites: Image: conyard.harkonnen - RaceImages: + FactionImages: atreides: conyard.atreides ordos: conyard.ordos corrino: conyard.corrino @@ -187,7 +187,7 @@ upgrade.barracks: Cost: 500 RenderSprites: Image: barracks.harkonnen - RaceImages: + FactionImages: atreides: barracks.atreides ordos: barracks.ordos ProvidesPrerequisite@upgradename: @@ -206,7 +206,7 @@ upgrade.light: Cost: 400 RenderSprites: Image: light.harkonnen - RaceImages: + FactionImages: atreides: light.atreides ordos: light.ordos ProvidesPrerequisite@upgradename: @@ -225,7 +225,7 @@ upgrade.heavy: Cost: 800 RenderSprites: Image: heavy.harkonnen - RaceImages: + FactionImages: atreides: heavy.atreides ordos: heavy.ordos corrino: heavy.corrino diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 0c3e8b00ff..067043cf12 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -70,7 +70,7 @@ conyard: Amount: 20 RenderBuilding: Image: conyard.harkonnen - RaceImages: + FactionImages: atreides: conyard.atreides ordos: conyard.ordos corrino: conyard.corrino @@ -102,7 +102,7 @@ power: Range: 4c0 RenderBuilding: Image: power.harkonnen - RaceImages: + FactionImages: atreides: power.atreides ordos: power.ordos WithIdleOverlay@ZAPS: @@ -163,7 +163,7 @@ barracks: Amount: -20 RenderBuilding: Image: barracks.harkonnen - RaceImages: + FactionImages: atreides: barracks.atreides ordos: barracks.ordos ProvidesPrerequisite@buildingname: @@ -208,7 +208,7 @@ refinery: Facing: 160 RenderBuilding: Image: refinery.harkonnen - RaceImages: + FactionImages: atreides: refinery.atreides ordos: refinery.ordos WithDockingOverlay@SMOKE: @@ -245,7 +245,7 @@ silo: -RenderBuilding: RenderBuildingSilo: Image: silo.harkonnen - RaceImages: + FactionImages: atreides: silo.atreides ordos: silo.ordos StoresResources: @@ -283,7 +283,7 @@ light: Range: 4c0 RenderBuilding: Image: light.harkonnen - RaceImages: + FactionImages: atreides: light.atreides ordos: light.ordos RallyPoint: @@ -361,7 +361,7 @@ heavy: Factions: atreides, harkonnen RenderBuilding: Image: heavy.harkonnen - RaceImages: + FactionImages: atreides: heavy.atreides ordos: heavy.ordos corrino: heavy.corrino @@ -407,7 +407,7 @@ radar: RenderDetectionCircle: RenderBuilding: Image: radar.harkonnen - RaceImages: + FactionImages: atreides: radar.atreides ordos: radar.ordos WithIdleOverlay@DISH: @@ -452,7 +452,7 @@ starport: ActorType: frigate RenderBuilding: Image: starport.harkonnen - RaceImages: + FactionImages: atreides: starport.atreides ordos: starport.ordos corrino: starport.corrino @@ -668,7 +668,7 @@ repair: Offset: 1,3 RenderBuilding: Image: repair.harkonnen - RaceImages: + FactionImages: atreides: repair.atreides ordos: repair.ordos WithRepairOverlay: @@ -707,7 +707,7 @@ hightech: Range: 4c0 RenderBuilding: Image: hightech.harkonnen - RaceImages: + FactionImages: atreides: hightech.atreides ordos: hightech.ordos ProvidesPrerequisite@upgrade: @@ -768,7 +768,7 @@ research: Range: 4c0 RenderBuilding: Image: research.harkonnen - RaceImages: + FactionImages: atreides: research.atreides ordos: research.ordos WithIdleOverlay@LIGHTS: @@ -805,7 +805,7 @@ palace: Range: 8c0 RenderBuilding: Image: palace.harkonnen - RaceImages: + FactionImages: atreides: palace.atreides ordos: palace.ordos corrino: palace.corrino @@ -849,7 +849,7 @@ conyard.atreides: ForceFaction: atreides RenderBuilding: Image: conyard.atreides - -RaceImages: + -FactionImages: conyard.harkonnen: Inherits: conyard @@ -860,7 +860,7 @@ conyard.harkonnen: ForceFaction: harkonnen RenderBuilding: Image: conyard.harkonnen - -RaceImages: + -FactionImages: conyard.ordos: Inherits: conyard @@ -871,5 +871,5 @@ conyard.ordos: ForceFaction: ordos RenderBuilding: Image: conyard.ordos - -RaceImages: + -FactionImages: diff --git a/mods/ts/rules/gdi-structures.yaml b/mods/ts/rules/gdi-structures.yaml index 0648bd7b0c..5be2744b0b 100644 --- a/mods/ts/rules/gdi-structures.yaml +++ b/mods/ts/rules/gdi-structures.yaml @@ -249,7 +249,7 @@ GADEPT: VisualBounds: 98, 68, -6, -6 RenderBuilding: Image: gadept.gdi - RaceImages: + FactionImages: gdi: gadept.gdi nod: gadept.nod diff --git a/mods/ts/rules/shared-infantry.yaml b/mods/ts/rules/shared-infantry.yaml index 0fccc6af14..ce4501b5f7 100644 --- a/mods/ts/rules/shared-infantry.yaml +++ b/mods/ts/rules/shared-infantry.yaml @@ -30,7 +30,7 @@ E1: Prerequisites: barracks.upgraded RenderSprites: Image: e1.gdi - RaceImages: + FactionImages: gdi: e1.gdi nod: e1.nod @@ -61,7 +61,7 @@ ENGINEER: -GainsExperience: RenderSprites: Image: engineer.gdi - RaceImages: + FactionImages: gdi: engineer.gdi nod: engineer.nod diff --git a/mods/ts/rules/shared-structures.yaml b/mods/ts/rules/shared-structures.yaml index 2ceecb6bed..ff6b9f2d33 100644 --- a/mods/ts/rules/shared-structures.yaml +++ b/mods/ts/rules/shared-structures.yaml @@ -99,7 +99,7 @@ PROC: VisualBounds: 134, 122, 0, -18 RenderBuilding: Image: proc.gdi - RaceImages: + FactionImages: gdi: proc.gdi nod: proc.nod @@ -129,7 +129,7 @@ GASILO: -RenderBuilding: RenderBuildingSilo: Image: gasilo.gdi - RaceImages: + FactionImages: gdi: gasilo.gdi nod: gasilo.nod WithIdleOverlay@UNDERLAY: diff --git a/mods/ts/rules/shared-support.yaml b/mods/ts/rules/shared-support.yaml index 3ae05356e7..270b240a39 100644 --- a/mods/ts/rules/shared-support.yaml +++ b/mods/ts/rules/shared-support.yaml @@ -81,7 +81,7 @@ NAPULS: VisualBounds: 78, 54, 0, -12 RenderBuilding: Image: napuls.gdi - RaceImages: + FactionImages: gdi: napuls.gdi nod: napuls.nod diff --git a/mods/ts/rules/shared-vehicles.yaml b/mods/ts/rules/shared-vehicles.yaml index 3fc6029fd4..215df07cfc 100644 --- a/mods/ts/rules/shared-vehicles.yaml +++ b/mods/ts/rules/shared-vehicles.yaml @@ -34,7 +34,7 @@ MCV: VisualBounds: 42,42 RenderSprites: Image: mcv.gdi - RaceImages: + FactionImages: gdi: mcv.gdi nod: mcv.nod @@ -94,7 +94,7 @@ HARV: VisualBounds: 36,36 RenderSprites: Image: harv.gdi - RaceImages: + FactionImages: gdi: harv.gdi nod: harv.nod @@ -126,7 +126,7 @@ LPST: Voice: Move RenderSprites: Image: lpst.gdi - RaceImages: + FactionImages: gdi: lpst.gdi nod: lpst.nod