diff --git a/mods/d2k/chrome.yaml b/mods/d2k/chrome.yaml index 19db424709..217eba2850 100644 --- a/mods/d2k/chrome.yaml +++ b/mods/d2k/chrome.yaml @@ -170,13 +170,13 @@ tabs-normal: tabs.png ordos-Starport: 214,200,27,41 flags: buttons.png - atreides: 0,86,22,21 - harkonnen: 22,86,23,21 - ordos: 45,86,22,21 - random: 67,86,23,21 - spectator: 67,86,23,21 + atreides: 0,114,22,21 + harkonnen: 22,114,23,21 + ordos: 45,114,22,21 + random: 67,114,23,21 + spectator: 67,114,23,21 -# Used for the menu +# Used for the menu dialog: dialog.png background: 0,0,480,480 border-r: 489,0,9,192 @@ -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-disabled: 68,56,34,28 - beacon-active: 34,56,34,28 + beacon: 0,84,34,28 + beacon-disabled: 68,84,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_pressed: 16,112,16,16 - up_arrow: 32,112,16,16 - up_pressed: 32,112,16,16 + down_arrow: 16,140,16,16 + down_pressed: 16,140,16,16 + up_arrow: 32,140,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 diff --git a/mods/d2k/chrome/ingame-player.yaml b/mods/d2k/chrome/ingame-player.yaml index 201dabcb74..510b9dce75 100644 --- a/mods/d2k/chrome/ingame-player.yaml +++ b/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 diff --git a/mods/d2k/uibits/buttons.png b/mods/d2k/uibits/buttons.png index 66ac266318..b2b4085580 100644 Binary files a/mods/d2k/uibits/buttons.png and b/mods/d2k/uibits/buttons.png differ diff --git a/mods/ra/chrome.yaml b/mods/ra/chrome.yaml index 857b98f650..5ece00106e 100644 --- a/mods/ra/chrome.yaml +++ b/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-disabled: 68,56,34,28 - beacon-active: 34,56,34,28 + beacon: 0,84,34,28 + beacon-disabled: 68,84,34,28 + beacon-active: 34,84,34,28 flags: buttons.png - allies: 30,84,30,15 - soviet: 0,84,30,15 - random: 60,84,30,15 - spectator: 60,84,30,15 + allies: 30,112,30,15 + soviet: 0,112,30,15 + random: 60,112,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_pressed: 16,112,16,16 - up_arrow: 32,112,16,16 - up_pressed: 32,112,16,16 + down_arrow: 16,140,16,16 + down_pressed: 16,140,16,16 + up_arrow: 32,140,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 diff --git a/mods/ra/chrome/ingame-player.yaml b/mods/ra/chrome/ingame-player.yaml index 3b9ac9449e..49f058e95e 100644 --- a/mods/ra/chrome/ingame-player.yaml +++ b/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 diff --git a/mods/ra/uibits/buttons.png b/mods/ra/uibits/buttons.png index dc205ab3fe..9e1491a049 100644 Binary files a/mods/ra/uibits/buttons.png and b/mods/ra/uibits/buttons.png differ diff --git a/mods/ts/chrome.yaml b/mods/ts/chrome.yaml index 21b442e888..91fb49929f 100644 --- a/mods/ts/chrome.yaml +++ b/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-disabled: 68,56,34,28 - beacon-active: 34,56,34,28 + beacon: 0,84,34,28 + beacon-disabled: 68,84,34,28 + beacon-active: 34,84,34,28 flags: buttons.png - gdi: 30,84,30,15 - nod: 0,84,30,15 - random: 60,84,30,15 - spectator: 60,84,30,15 + gdi: 30,112,30,15 + nod: 0,112,30,15 + random: 60,112,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_pressed: 16,112,16,16 - up_arrow: 32,112,16,16 - up_pressed: 32,112,16,16 + down_arrow: 16,140,16,16 + down_pressed: 16,140,16,16 + up_arrow: 32,140,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 diff --git a/mods/ts/uibits/buttons.png b/mods/ts/uibits/buttons.png index 1d43c97c0f..97cfe0e824 100644 Binary files a/mods/ts/uibits/buttons.png and b/mods/ts/uibits/buttons.png differ