diff --git a/mods/cnc/chrome.yaml b/mods/cnc/chrome.yaml index 9a2fc2709e..ac3e4faed9 100644 --- a/mods/cnc/chrome.yaml +++ b/mods/cnc/chrome.yaml @@ -519,9 +519,87 @@ order-icons: chrome.png beacon: 400,48,16,16 beacon-disabled: 400,64,16,16 beacon-active: 400,80,16,16 - stats: 480,96,16,16 - stats-disabled: 480,112,16,16 - stats-active: 480,128,16,16 + stats: 464,96,16,16 + stats-disabled: 480,96,16,16 + stats-active: 496,96,16,16 + +command-icons: chrome.png + attack-move: 320,128,24,24 + attack-move-disabled: 320,152,24,24 + force-move: 344,128,24,24 + force-move-disabled: 344,152,24,24 + force-attack: 368,128,24,24 + force-attack-disabled: 368,152,24,24 + guard: 392,128,24,24 + guard-disabled: 392,152,24,24 + deploy: 416,128,24,24 + deploy-disabled: 416,152,24,24 + scatter: 440,128,24,24 + scatter-disabled: 440,152,24,24 + stop: 464,128,24,24 + stop-disabled: 464,152,24,24 + queue-orders: 488,128,24,24 + queue-orders-disabled: 488,152,24,24 + +stance-icons: chrome.png + attack-anything: 320,176,16,16 + attack-anything-disabled: 336,176,16,16 + attack-anything-active: 352,176,16,16 + defend: 368,176,16,16 + defend-disabled: 384,176,16,16 + defend-active: 400,176,16,16 + return-fire: 416,176,16,16 + return-fire-disabled: 432,176,16,16 + return-fire-active: 448,176,16,16 + hold-fire: 464,176,16,16 + hold-fire-disabled: 480,176,16,16 + hold-fire-active: 496,176,16,16 dropdown: chrome.png - separator: 64,1,1,19 + separator: 64,1,1,19 + +command-button: chrome.png + +command-button-hover: chrome.png + background: 2,130,60,60 + +command-button-disabled: chrome.png + +command-button-pressed: chrome.png + background: 66,194,60,60 + +command-button-highlighted: chrome.png + background: 257,129,30,30 + +command-button-highlighted-hover: chrome.png + background: 289,129,30,30 + +command-button-highlighted-pressed: chrome.png + background: 257,161,30,30 + +command-button-highlighted-disabled: chrome.png + background: 289,161,30,30 + +stance-button: chrome.png + background: 2,194,60,60 + +stance-button-hover: chrome.png + background: 2,130,60,60 + +stance-button-disabled: chrome.png + background: 66,130,60,60 + +stance-button-pressed: chrome.png + background: 66,194,60,60 + +stance-button-highlighted: chrome.png + background: 257,129,30,30 + +stance-button-highlighted-hover: chrome.png + background: 289,129,30,30 + +stance-button-highlighted-pressed: chrome.png + background: 257,161,30,30 + +stance-button-highlighted-disabled: chrome.png + background: 289,161,30,30 diff --git a/mods/cnc/chrome/ingame-chat.yaml b/mods/cnc/chrome/ingame-chat.yaml index 3a1fe7d8ee..7589b5cffd 100644 --- a/mods/cnc/chrome/ingame-chat.yaml +++ b/mods/cnc/chrome/ingame-chat.yaml @@ -1,6 +1,6 @@ Container@CHAT_PANEL: X: (WINDOW_RIGHT - WIDTH) / 2 - Y: WINDOW_BOTTOM - HEIGHT - 15 + Y: WINDOW_BOTTOM - HEIGHT - 45 Width: 550 Height: 194 Logic: IngameChatLogic diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml index c7ce8b153f..4981525441 100644 --- a/mods/cnc/chrome/ingame.yaml +++ b/mods/cnc/chrome/ingame.yaml @@ -68,8 +68,8 @@ Container@PERF_WIDGETS: Contrast: true VAlign: Top Background@GRAPH_BG: - X: 10 - Y: WINDOW_BOTTOM - HEIGHT - 10 + X: 5 + Y: WINDOW_BOTTOM - HEIGHT - 45 Width: 220 Height: 220 Background: panel-black @@ -238,9 +238,6 @@ Container@PLAYER_WIDGETS: LogicKeyListener@CONTROLGROUP_KEYHANDLER: Logic: ControlGroupLogic LogicTicker@SIDEBAR_TICKER: - UnitCommand: - Width: WINDOW_RIGHT - Height: WINDOW_BOTTOM Container@SUPPORT_POWERS: Logic: SupportPowerBinLogic X: 10 @@ -259,6 +256,214 @@ Container@PLAYER_WIDGETS: TooltipContainer: TOOLTIP_CONTAINER ReadyText: Ready HoldText: On Hold + Background@COMMAND_BAR: + Logic: CommandBarLogic + X: 5 + Y: WINDOW_BOTTOM - HEIGHT - 5 + Background: panel-black + Width: 275 + Height: 36 + Children: + Button@ATTACK_MOVE: + X: 1 + Y: 1 + Width: 34 + Height: 34 + Background: command-button + DisableKeyRepeat: true + TooltipText: Attack Move + TooltipDesc: Selected units will move to the desired location\nand attack any enemies they encounter en route.\n\nLeft-click icon then right-click on target location. + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 5 + Y: 5 + ImageCollection: command-icons + ImageName: attack-move + Button@FORCE_MOVE: + X: 35 + Y: 1 + Width: 34 + Height: 34 + Background: command-button + TooltipText: Force Move + TooltipDesc: Selected units will move to the desired location\n - Default activity for the target is suppressed\n - Vehicles will attempt to crush enemies at the target location\n - Units entering transports will consider nearby alternatives\n\nLeft-click icon then right-click on target.\nHold {(Alt)} to activate temporarily while commanding units. + TooltipContainer: TOOLTIP_CONTAINER + TooltipTemplate: BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP + Children: + Image@ICON: + X: 5 + Y: 5 + ImageCollection: command-icons + ImageName: force-move + Button@FORCE_ATTACK: + X: 69 + Y: 1 + Width: 34 + Height: 34 + Background: command-button + TooltipText: Force Attack + TooltipDesc: Selected units will attack the targeted unit or location\nignoring their default activity for the target.\n\nLeft-click icon then right-click on target.\nHold {(Ctrl)} to activate temporarily while commanding units. + TooltipContainer: TOOLTIP_CONTAINER + TooltipTemplate: BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP + Children: + Image@ICON: + X: 5 + Y: 5 + ImageCollection: command-icons + ImageName: force-attack + Button@GUARD: + X: 104 + Y: 1 + Width: 35 + Height: 35 + Background: command-button + DisableKeyRepeat: true + TooltipText: Guard + TooltipDesc: Selected units will follow the targeted unit.\n\nLeft-click icon then right-click on target unit. + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 5 + Y: 5 + ImageCollection: command-icons + ImageName: guard + Button@DEPLOY: + X: 138 + Y: 1 + Width: 34 + Height: 34 + Background: command-button + DisableKeyRepeat: true + TooltipText: Deploy + TooltipDesc: Selected units will perform their default deploy activity\n - MCVs will unpack into a Construction Yard\n - Construction Yards will re-pack into a MCV\n - Transports will unload their passengers\n - Helicopters will return to base\n\nActs immediately on selected units. + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 5 + Y: 5 + ImageCollection: command-icons + ImageName: deploy + Button@SCATTER: + X: 172 + Y: 1 + Width: 34 + Height: 34 + Background: command-button + DisableKeyRepeat: true + TooltipText: Scatter + TooltipDesc: Selected units will stop their current activity\nand move to a nearby location.\n\nActs immediately on selected units. + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 5 + Y: 5 + ImageCollection: command-icons + ImageName: scatter + Button@STOP: + X: 206 + Y: 1 + Width: 34 + Height: 34 + Background: command-button + DisableKeyRepeat: true + TooltipText: Stop + TooltipDesc: Selected units will stop their current activity.\n\nActs immediately on selected units. + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 5 + Y: 5 + ImageCollection: command-icons + ImageName: stop + Button@QUEUE_ORDERS: + X: 240 + Y: 1 + Width: 34 + Height: 34 + Background: command-button + TooltipText: Waypoint Mode + TooltipDesc: Use Waypoint Mode to give multiple linking commands\nto the selected units. Units will execute the commands\nimmediately upon receiving them.\n\nLeft-click icon then give commands in the game world.\nHold {(Shift)} to activate temporarily while commanding units. + TooltipContainer: TOOLTIP_CONTAINER + TooltipTemplate: BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP + Children: + Image@ICON: + X: 5 + Y: 5 + ImageCollection: command-icons + ImageName: queue-orders + Background@COMMAND_BAR: + Logic: StanceSelectorLogic + X: 279 + Y: WINDOW_BOTTOM - HEIGHT - 5 + Background: panel-black + Width: 138 + Height: 28 + Children: + Button@STANCE_ATTACKANYTHING: + X: 1 + Y: 1 + Width: 34 + Height: 26 + Background: stance-button + DisableKeyRepeat: true + TooltipText: Attack Anything Stance + TooltipDesc: Set the selected units to Attack Anything stance:\n - Units will attack enemy units and structures on sight\n - Units will persue attackers across the battlefield + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 9 + Y: 5 + ImageCollection: stance-icons + ImageName: attack-anything + Button@STANCE_DEFEND: + X: 35 + Y: 1 + Width: 34 + Height: 26 + Background: stance-button + DisableKeyRepeat: true + TooltipText: Defend Stance + TooltipDesc: Set the selected units to Defend stance:\n - Units will attack enemy units and structures on sight\n - Units will not move or persue enemies + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 9 + Y: 5 + ImageCollection: stance-icons + ImageName: defend + Button@STANCE_RETURNFIRE: + X: 69 + Y: 1 + Width: 34 + Height: 26 + Background: stance-button + DisableKeyRepeat: true + TooltipText: Return Fire Stance + TooltipDesc: Set the selected units to Return Fire stance:\n - Units will retaliate against enemies that attack them\n - Units will not move or persue enemies + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 9 + Y: 5 + ImageCollection: stance-icons + ImageName: return-fire + Button@STANCE_HOLDFIRE: + X: 103 + Y: 1 + Width: 34 + Height: 26 + Background: stance-button + DisableKeyRepeat: true + TooltipText: Hold Fire Stance + TooltipDesc: Set the selected units to Hold Fire stance:\n - Units will not fire upon enemies\n - Units will not move or persue enemies + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 9 + Y: 5 + ImageCollection: stance-icons + ImageName: hold-fire Background@SIDEBAR_BACKGROUND: Logic: MenuButtonsChromeLogic X: WINDOW_RIGHT - 204 diff --git a/mods/cnc/chrome/tooltips.yaml b/mods/cnc/chrome/tooltips.yaml index 9b3cf74863..eb77bdca1a 100644 --- a/mods/cnc/chrome/tooltips.yaml +++ b/mods/cnc/chrome/tooltips.yaml @@ -26,6 +26,34 @@ Background@BUTTON_TOOLTIP: TextColor: FFFF00 Height: 23 Font: Bold + Label@DESC: + X: 5 + Y: 23 + Height: 12 + Font: TinyBold + VAlign: Top + +Background@BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP: + Logic: ButtonTooltipWithDescHighlightLogic + Highlight: FFFF00 + Background: panel-black + Height: 25 + Children: + Label@LABEL: + X: 5 + Height: 23 + Font: Bold + Label@HOTKEY: + Visible: false + TextColor: FFFF00 + Height: 23 + Font: Bold + Label@DESC: + X: 5 + Y: 23 + Height: 12 + Font: TinyBold + VAlign: Top Background@WORLD_TOOLTIP: Logic: WorldTooltipLogic diff --git a/mods/cnc/uibits/chrome.png b/mods/cnc/uibits/chrome.png index 7080da5ef0..8ba022c816 100644 Binary files a/mods/cnc/uibits/chrome.png and b/mods/cnc/uibits/chrome.png differ