fix TS power down palette

OpenRA · Apr 16, 2015 · 18fda23 · 18fda23
1 parent af1dfd3
commit 18fda23
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/OpenRA.Mods.Common/Effects/PowerdownIndicator.cs b/OpenRA.Mods.Common/Effects/PowerdownIndicator.cs
@@ -26,8 +26,8 @@ public PowerdownIndicator(Actor a)
 			this.a = a;
 			canPowerDown = a.Trait<CanPowerDown>();
 
-			anim = new Animation(a.World, "poweroff");
-			anim.PlayRepeating("offline");
+			anim = new Animation(a.World, canPowerDown.Info.IndicatorImage);
+			anim.PlayRepeating(canPowerDown.Info.IndicatorSequence);
 		}
 
 		public void Tick(World world)
@@ -43,7 +43,7 @@ public IEnumerable<IRenderable> Render(WorldRenderer wr)
 			if (a.Destroyed || wr.World.FogObscures(a))
 				return SpriteRenderable.None;
 
-			return anim.Render(a.CenterPosition, wr.Palette("chrome"));
+			return anim.Render(a.CenterPosition, wr.Palette(canPowerDown.Info.IndicatorPalette));
 		}
 	}
 }
diff --git a/OpenRA.Mods.Common/Traits/Power/CanPowerDown.cs b/OpenRA.Mods.Common/Traits/Power/CanPowerDown.cs
@@ -19,6 +19,11 @@ public class CanPowerDownInfo : UpgradableTraitInfo, ITraitInfo, Requires<PowerI
 		[Desc("Restore power when this trait is disabled.")]
 		public readonly bool CancelWhenDisabled = false;
 
+		public readonly string IndicatorImage = "poweroff";
+		public readonly string IndicatorSequence = "offline";
+
+		public readonly string IndicatorPalette = "chrome";
+
 		public object Create(ActorInitializer init) { return new CanPowerDown(init.Self, this); }
 	}
 

diff --git a/mods/ts/rules/structures.yaml b/mods/ts/rules/structures.yaml
@@ -682,6 +682,7 @@ GARADR:
 		Type: Wood
 	RequiresPower:
 	CanPowerDown:
+		IndicatorPalette: mouse
 	ProvidesRadar:
 	InfiltrateForExploration:
 	DetectCloaked:
@@ -721,6 +722,7 @@ NARADR:
 		Type: Wood
 	RequiresPower:
 	CanPowerDown:
+		IndicatorPalette: mouse
 	ProvidesRadar:
 	InfiltrateForExploration:
 	DetectCloaked:
@@ -941,6 +943,7 @@ NASTLH:
 		Amount: -350
 	RequiresPower:
 	CanPowerDown:
+		IndicatorPalette: mouse
 	UpgradeActorsNear:
 		Upgrades: cloakgenerator
 		Range: 12c0
@@ -988,6 +991,7 @@ GACTWR:
 		UpgradeTypes: tower
 		UpgradeMinEnabledLevel: 1
 	CanPowerDown:
+		IndicatorPalette: mouse
 	WithTurret@VULC:
 		UpgradeTypes: tower.vulcan
 		UpgradeMinEnabledLevel: 1
@@ -1299,6 +1303,7 @@ NAMISL:
 	Power:
 		Amount: -50
 	CanPowerDown:
+		IndicatorPalette: mouse
 	RequiresPower:
 	DisabledOverlay:
 	SupportPowerChargeBar:
@@ -1339,6 +1344,7 @@ GAPLUG:
 		Dimensions: 2,3
 	RequiresPower:
 	CanPowerDown:
+		IndicatorPalette: mouse
 	DisabledOverlay:
 	RenderBuilding:
 	WithIdleOverlay@DISH:

diff --git a/mods/ts/rules/world.yaml b/mods/ts/rules/world.yaml
@@ -10,6 +10,9 @@ World:
 	BuildingInfluence:
 	ProductionQueueFromSelection:
 		ProductionPaletteWidget: PRODUCTION_PALETTE
+	PaletteFromFile@mouse:
+		Name: mouse
+		Filename: mousepal.pal
 	PaletteFromFile@playersno:
 		Name: player
 		Tileset: SNOW