Merge pull request #2801 from Mailaender/hotkey-cleanup

Remove inconsistencies that crash C&C mod
2013-03-26 14:28:49 -07:00
parent ead0da4161 7f6eaf8d5e
commit 28f24cd03a
12 changed files with 39 additions and 32 deletions
--- a/mods/cnc/bits/nopower.shp
+++ b/mods/cnc/bits/nopower.shp
--- a/mods/cnc/bits/poweroff.shp
+++ b/mods/cnc/bits/poweroff.shp
--- a/mods/cnc/chrome/ingame.yaml
+++ b/mods/cnc/chrome/ingame.yaml
@@ -112,7 +112,6 @@ Container@PLAYER_WIDGETS:
 							ImageCollection:order-icons
 							ImageName:options
 				ToggleButton@SELL_BUTTON:
-					Key: [
 					X:82
 					Y:0-24
 					Width:30
@@ -126,7 +125,6 @@ Container@PLAYER_WIDGETS:
 							Y:5
 							ImageCollection:order-icons
 				ToggleButton@REPAIR_BUTTON:
-					Key: ]
 					X:122
 					Y:0-24
 					Width:30
--- a/mods/cnc/cursors.yaml
+++ b/mods/cnc/cursors.yaml
@@ -272,4 +272,16 @@ Cursors:
 			start:213
 			length:1
 			x:12
-			y:12
+			y:12
+
+	nopower: cursor
+		powerdown-blocked:
+			start:0
+			length: 1
+			x: 12
+			y: 12
+		powerdown:
+			start:1
+			length: 3
+			x: 12
+			y: 12
--- a/mods/cnc/notifications.yaml
+++ b/mods/cnc/notifications.yaml
@@ -29,6 +29,8 @@ Sounds:
 		CashTickUp:
 		CashTickDown:
 		LevelUp: text2
+		DisablePower: bleep11
+		EnablePower: bleep12
 		ChatLine: scold1
 		TabClick: button
 		ClickSound: button
--- a/mods/cnc/sequences/misc.yaml
+++ b/mods/cnc/sequences/misc.yaml
@@ -269,3 +269,13 @@ overlay:
 		Start: 0
 	target-invalid:
 		Start: 1
+
+powerdown:
+	disabled: speed
+		Start: 3
+
+poweroff:
+	offline:
+		Start: 0
+		Length: *
+		Tick: 160