Merge pull request #9605 from Mailaender/nod-poweroffline

Added support for speech variants to CanPowerDown
2015-12-27 20:10:27 +01:00
parent 14b6034e9d fcdf32015e
commit 23dc6f64ac
10 changed files with 68 additions and 6 deletions
--- a/mods/ts/audio/sounds-generic.yaml
+++ b/mods/ts/audio/sounds-generic.yaml
@@ -13,8 +13,6 @@ Sounds:
 		ChatLine: message1
 		ClickDisabledSound: wrong1
 		ClickSound: clicky1
-		DisablePower: 00-i232
-		EnablePower: 00-i230
 		GameForming: gamefrm1
 		Gdiclose: gdiclose
 		Gdiopen: gdiopen
--- a/mods/ts/audio/speech-generic.yaml
+++ b/mods/ts/audio/speech-generic.yaml
@@ -25,6 +25,8 @@ Speech:
 		ConstructionComplete: 00-i018
 		CriticalStructureLost: 00-i196
 		CriticalUnitLost: 00-i194
+		DisablePower: 00-i232
+		EnablePower: 00-i230
 		EmPulseCannonReady: 00-i158
 		EstablishingBattleControlStandBy: 01-n006
 		FireStormDefenseOffline: 00-i170
--- a/mods/ts/rules/gdi-structures.yaml
+++ b/mods/ts/rules/gdi-structures.yaml
@@ -305,6 +305,8 @@ GARADR:
 	RequiresPower:
 	CanPowerDown:
 		IndicatorPalette: mouse
+		PowerupSpeech: EnablePower
+		PowerdownSpeech: DisablePower
 	ProvidesRadar:
 	InfiltrateForExploration:
 	DetectCloaked:
@@ -374,6 +376,8 @@ GAPLUG:
 	RequiresPower:
 	CanPowerDown:
 		IndicatorPalette: mouse
+		PowerupSpeech: EnablePower
+		PowerdownSpeech: DisablePower
 	DisabledOverlay:
 	WithIdleOverlay@DISH:
 		Sequence: idle-dish
--- a/mods/ts/rules/gdi-support.yaml
+++ b/mods/ts/rules/gdi-support.yaml
@@ -62,6 +62,8 @@ GACTWR:
 		UpgradeMinEnabledLevel: 1
 	CanPowerDown:
 		IndicatorPalette: mouse
+		PowerupSpeech: EnablePower
+		PowerdownSpeech: DisablePower
 	WithSpriteTurret@VULC:
 		UpgradeTypes: tower.vulcan
 		UpgradeMinEnabledLevel: 1
--- a/mods/ts/rules/nod-structures.yaml
+++ b/mods/ts/rules/nod-structures.yaml
@@ -260,6 +260,8 @@ NARADR:
 	RequiresPower:
 	CanPowerDown:
 		IndicatorPalette: mouse
+		PowerupSpeech: EnablePower
+		PowerdownSpeech: DisablePower
 	ProvidesRadar:
 	InfiltrateForExploration:
 	DetectCloaked:
@@ -379,6 +381,8 @@ NASTLH:
 		Amount: -350
 	RequiresPower:
 	CanPowerDown:
+		PowerupSpeech: EnablePower
+		PowerdownSpeech: DisablePower
 		IndicatorPalette: mouse
 	UpgradeActorsNear:
 		Upgrades: cloakgenerator
--- a/mods/ts/rules/nod-support.yaml
+++ b/mods/ts/rules/nod-support.yaml
@@ -253,6 +253,8 @@ NAMISL:
 		Amount: -50
 	CanPowerDown:
 		IndicatorPalette: mouse
+		PowerupSpeech: EnablePower
+		PowerdownSpeech: DisablePower
 	RequiresPower:
 	DisabledOverlay:
 	ProvidesPrerequisite@buildingname: