Merge pull request #5093 from Mailaender/beacon-buttons

Added the Beacon button artwork for Red Alert, Dune 2000 and Tiberian Sun

mods/d2k/chrome.yaml

@@ -170,11 +170,11 @@ tabs-normal: tabs.png
 	ordos-Starport: 214,200,27,41
 
 flags: buttons.png
-	atreides: 0,86,22,21
+	atreides: 0,114,22,21
-	harkonnen: 22,86,23,21
+	harkonnen: 22,114,23,21
-	ordos: 45,86,22,21
+	ordos: 45,114,22,21
-	random: 67,86,23,21
+	random: 67,114,23,21
-	spectator: 67,86,23,21
+	spectator: 67,114,23,21
 
 # Used for the menu
 dialog: dialog.png
@@ -247,9 +247,9 @@ order-icons: buttons.png
 	power: 0,56,34,28
 	power-disabled: 68,56,34,28
 	power-active: 34,56,34,28
-	beacon: 0,56,34,28
+	beacon: 0,84,34,28
-	beacon-disabled: 68,56,34,28
+	beacon-disabled: 68,84,34,28
-	beacon-active: 34,56,34,28
+	beacon-active: 34,84,34,28
 
 music: musicplayer.png
 	pause: 0,0,25,25
@@ -261,10 +261,10 @@ music: musicplayer.png
 	slowmo: 168,0,25,25
 
 scrollbar: buttons.png
-	down_arrow: 16,112,16,16
+	down_arrow: 16,140,16,16
-	down_pressed: 16,112,16,16
+	down_pressed: 16,140,16,16
-	up_arrow: 32,112,16,16
+	up_arrow: 32,140,16,16
-	up_pressed: 32,112,16,16
+	up_pressed: 32,140,16,16
 
 # A copy of dialog3 (pressed button)
 progressbar-bg: dialog.png
@@ -521,7 +521,7 @@ checkbox: dialog.png
 	corner-br: 767,127,1,1
 
 checkbox-bits: buttons.png
-	checked: 0,112,16,16
+	checked: 0,140,16,16
 
 checkbox-hover: dialog.png
 	background: 641,129,126,126

mods/d2k/chrome/ingame-player.yaml

@@ -59,6 +59,16 @@ Container@PLAYER_WIDGETS:
 			Width:320
 			Height: 32
 			Children:
+				Button@BEACON_BUTTON:
+					X:3-36
+					Width:34
+					Height:28
+					TooltipText: Place Beacon
+					TooltipContainer:TOOLTIP_CONTAINER
+					VisualHeight:0
+					Children:
+						Image@ICON:
+							ImageCollection:order-icons
 				Button@SELL_BUTTON:
 					X:3
 					Width:34
@@ -89,19 +99,6 @@ Container@PLAYER_WIDGETS:
 					Children:
 						Image@ICON:
 							ImageCollection:order-icons
-				Button@BEACON_BUTTON:
-					X:75
-					# Hidden offscreen so that the shortcut still works
-					# while we wait for new button art to be created
-					Y:0-100
-					Width:34
-					Height:28
-					TooltipText: Place Beacon
-					TooltipContainer:TOOLTIP_CONTAINER
-					VisualHeight:0
-					Children:
-						Image@ICON:
-							ImageCollection:order-icons
 		SupportPowerBin@INGAME_POWERS_BIN:
 			X:0
 			Y:25

mods/d2k/cursors.yaml

@@ -1,7 +1,6 @@
 ShadowIndex: 1
 
 Palettes:
-	cursor: cursor.pal
 	mouse: d2k.pal
 
 Cursors:
@@ -262,7 +261,7 @@ Cursors:
 			x: 24
 			y: 24
 
-	nopower.shp: cursor
+	nopower.shp: mouse
 		powerdown-blocked:
 			start:0
 			length: 1

mods/d2k/rules/structures.yaml

@@ -2,7 +2,8 @@
 	Building:
 		Adjacent: 4
 		TerrainTypes: Rock
-		BuildSounds: BUILD1.WAV
+		BuildSounds: CHUNG.WAV
+		SellSounds: CHUNG.WAV
 		AllowInvalidPlacement: true
 	LaysTerrain:
 		Template: 88

mods/ra/chrome.yaml

@@ -191,15 +191,15 @@ order-icons: buttons.png
 	power: 0,56,34,28
 	power-disabled: 68,56,34,28
 	power-active: 34,56,34,28
-	beacon: 0,56,34,28
+	beacon: 0,84,34,28
-	beacon-disabled: 68,56,34,28
+	beacon-disabled: 68,84,34,28
-	beacon-active: 34,56,34,28
+	beacon-active: 34,84,34,28
 
 flags: buttons.png
-	allies: 30,84,30,15
+	allies: 30,112,30,15
-	soviet: 0,84,30,15
+	soviet: 0,112,30,15
-	random: 60,84,30,15
+	random: 60,112,30,15
-	spectator: 60,84,30,15
+	spectator: 60,112,30,15
 
 music: musicplayer.png
 	pause: 0,0,25,25
@@ -211,10 +211,10 @@ music: musicplayer.png
 	slowmo: 168,0,25,25
 
 scrollbar: buttons.png
-	down_arrow: 16,112,16,16
+	down_arrow: 16,140,16,16
-	down_pressed: 16,112,16,16
+	down_pressed: 16,140,16,16
-	up_arrow: 32,112,16,16
+	up_arrow: 32,140,16,16
-	up_pressed: 32,112,16,16
+	up_pressed: 32,140,16,16
 
 # A copy of dialog3 (pressed button)
 progressbar-bg: dialog.png
@@ -471,7 +471,7 @@ checkbox: dialog.png
 	corner-br: 767,127,1,1
 
 checkbox-bits: buttons.png
-	checked: 0,112,16,16
+	checked: 0,140,16,16
 
 checkbox-hover: dialog.png
 	background: 641,129,126,126

mods/ra/chrome/ingame-player.yaml

@@ -59,6 +59,16 @@ Container@PLAYER_WIDGETS:
 			Width:320
 			Height:32
 			Children:
+				Button@BEACON_BUTTON:
+					X:3-36
+					Width:34
+					Height:28
+					TooltipText: Place Beacon
+					TooltipContainer:TOOLTIP_CONTAINER
+					VisualHeight:0
+					Children:
+						Image@ICON:
+							ImageCollection:order-icons
 				Button@SELL_BUTTON:
 					X:3
 					Width:34
@@ -89,19 +99,6 @@ Container@PLAYER_WIDGETS:
 					Children:
 						Image@ICON:
 							ImageCollection:order-icons
-				Button@BEACON_BUTTON:
-					X:75
-					# Hidden offscreen so that the shortcut still works
-					# while we wait for new button art to be created
-					Y:0-100
-					Width:34
-					Height:28
-					TooltipText: Place Beacon
-					TooltipContainer:TOOLTIP_CONTAINER
-					VisualHeight:0
-					Children:
-						Image@ICON:
-							ImageCollection:order-icons
 		SupportPowerBin@INGAME_POWERS_BIN:
 			X:0
 			Y:25

mods/ts/chrome.yaml

@@ -185,15 +185,15 @@ order-icons: buttons.png
 	power: 0,56,34,28
 	power-disabled: 68,56,34,28
 	power-active: 34,56,34,28
-	beacon: 0,56,34,28
+	beacon: 0,84,34,28
-	beacon-disabled: 68,56,34,28
+	beacon-disabled: 68,84,34,28
-	beacon-active: 34,56,34,28
+	beacon-active: 34,84,34,28
 
 flags: buttons.png
-	gdi: 30,84,30,15
+	gdi: 30,112,30,15
-	nod: 0,84,30,15
+	nod: 0,112,30,15
-	random: 60,84,30,15
+	random: 60,112,30,15
-	spectator: 60,84,30,15
+	spectator: 60,112,30,15
 
 music: musicplayer.png
 	pause: 0,0,25,25
@@ -205,10 +205,10 @@ music: musicplayer.png
 	slowmo: 168,0,25,25
 
 scrollbar: buttons.png
-	down_arrow: 16,112,16,16
+	down_arrow: 16,140,16,16
-	down_pressed: 16,112,16,16
+	down_pressed: 16,140,16,16
-	up_arrow: 32,112,16,16
+	up_arrow: 32,140,16,16
-	up_pressed: 32,112,16,16
+	up_pressed: 32,140,16,16
 
 # A copy of dialog3 (pressed button)
 progressbar-bg: dialog.png
@@ -465,7 +465,7 @@ checkbox: dialog.png
 	corner-br: 767,127,1,1
 
 checkbox-bits: buttons.png
-	checked: 0,112,16,16
+	checked: 0,140,16,16
 
 checkbox-hover: dialog.png
 	background: 641,129,126,126