From b818f85b38c963db620fe0ff078104d84dd300ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 20 Apr 2013 23:00:11 +0200 Subject: [PATCH] per tileset configurable selection overlays don't use a white one for more contrast on snow, closes #2050 --- .../Orders/PlaceBuildingOrderGenerator.cs | 3 ++- OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs | 3 ++- mods/cnc/sequences/misc.yaml | 16 ++++++++++++++-- mods/d2k/sequences.yaml | 4 ++-- mods/ra/sequences.yaml | 16 ++++++++++++++-- 5 files changed, 34 insertions(+), 8 deletions(-) diff --git a/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs b/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs index d630adba81..9289d45d02 100755 --- a/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs +++ b/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs @@ -30,9 +30,10 @@ namespace OpenRA.Mods.RA.Orders { Producer = producer; Building = name; + var tileset = producer.World.TileSet.Id.ToLower(); BuildingInfo = Rules.Info[Building].Traits.Get(); - buildOk = SequenceProvider.GetSequence("overlay", "build-valid").GetSprite(0); + buildOk = SequenceProvider.GetSequence("overlay", "build-valid-{0}".F(tileset)).GetSprite(0); buildBlocked = SequenceProvider.GetSequence("overlay", "build-invalid").GetSprite(0); } diff --git a/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs b/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs index b4459b961b..22aa83c5df 100755 --- a/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs +++ b/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs @@ -178,7 +178,8 @@ namespace OpenRA.Mods.RA this.sourceLocation = sourceLocation; this.range = (power.Info as ChronoshiftPowerInfo).Range; - validTile = SequenceProvider.GetSequence("overlay", "target-valid").GetSprite(0); + var tileset = manager.self.World.TileSet.Id.ToLower(); + validTile = SequenceProvider.GetSequence("overlay", "target-valid-{0}".F(tileset)).GetSprite(0); invalidTile = SequenceProvider.GetSequence("overlay", "target-invalid").GetSprite(0); sourceTile = SequenceProvider.GetSequence("overlay", "target-select").GetSprite(0); } diff --git a/mods/cnc/sequences/misc.yaml b/mods/cnc/sequences/misc.yaml index 77cf1be8dd..abfd980b51 100644 --- a/mods/cnc/sequences/misc.yaml +++ b/mods/cnc/sequences/misc.yaml @@ -264,13 +264,25 @@ pips: Length: * overlay: - build-valid: + build-valid-desert: + Start: 0 + build-valid-snow: + Start: 2 + build-valid-temperat: + Start: 0 + build-valid-winter: Start: 0 build-invalid: Start: 1 target-select: + Start: 3 + target-valid-desert: + Start: 0 + target-valid-snow: Start: 2 - target-valid: + target-valid-temperat: + Start: 0 + target-valid-winter: Start: 0 target-invalid: Start: 1 diff --git a/mods/d2k/sequences.yaml b/mods/d2k/sequences.yaml index 4090ac56a3..ac784dc707 100644 --- a/mods/d2k/sequences.yaml +++ b/mods/d2k/sequences.yaml @@ -1080,13 +1080,13 @@ rank: Length: * overlay: - build-valid: + build-valid-arrakis: Start: 0 build-invalid: Start: 1 target-select: Start: 2 - target-valid: + target-valid-arrakis: Start: 0 target-invalid: Start: 1 diff --git a/mods/ra/sequences.yaml b/mods/ra/sequences.yaml index a332dc2f17..7ba50983f4 100644 --- a/mods/ra/sequences.yaml +++ b/mods/ra/sequences.yaml @@ -2559,13 +2559,25 @@ gpsdot: Start: 5 overlay: - build-valid: + build-valid-desert: + Start: 0 + build-valid-interior: + Start: 0 + build-valid-snow: + Start: 2 + build-valid-temperat: Start: 0 build-invalid: Start: 1 target-select: Start: 2 - target-valid: + target-valid-desert: + Start: 0 + target-valid-interior: + Start: 0 + target-valid-snow: + Start: 2 + target-valid-temperat: Start: 0 target-invalid: Start: 1