diff --git a/mods/common/chrome/ingame-chat.yaml b/mods/common/chrome/ingame-chat.yaml index 6c3366df47..801a57e105 100644 --- a/mods/common/chrome/ingame-chat.yaml +++ b/mods/common/chrome/ingame-chat.yaml @@ -1,6 +1,6 @@ Container@CHAT_PANEL: X: (WINDOW_RIGHT - WIDTH) / 2 - Y: WINDOW_BOTTOM - HEIGHT - 50 + Y: WINDOW_BOTTOM - HEIGHT - 56 Width: 550 Height: 194 Logic: IngameChatLogic diff --git a/mods/d2k/chrome.yaml b/mods/d2k/chrome.yaml index c032cbfaea..0588474a55 100644 --- a/mods/d2k/chrome.yaml +++ b/mods/d2k/chrome.yaml @@ -25,6 +25,7 @@ sidebar-bits: chrome.png production-tooltip-time: 480,112,16,16 production-tooltip-power: 496,112,16,16 production-tooltip-cost: 464,112,16,16 + commandbar-background: 0,469,454,43 minimap-overlay: chrome.png top-left: 236,15,7,7 @@ -95,6 +96,55 @@ order-icons: chrome.png diplomacy-disabled: 288,393,34,35 diplomacy-active: 288,430,34,35 +command-button: chrome.png + background: 332,428,34,41 +command-button-hover: chrome.png + background: 332,428,34,41 +command-button-pressed: chrome.png + background: 400,428,34,41 +command-button-highlighted: chrome.png + background: 400,428,34,41 +command-button-highlighted-hover: chrome.png + background: 400,428,34,41 +command-button-highlighted-pressed: chrome.png + background: 400,428,34,41 +command-button-disabled: chrome.png + background: 366,428,34,41 +command-button-highlighted-disabled: chrome.png + background: 366,428,34,41 + +command-icons: chrome.png + attack-move: 408,144,26,26 + attack-move-disabled: 408,170,26,26 + force-move: 434,144,24,24 + force-move-disabled: 434,170,26,26 + force-attack: 460,144,26,26 + force-attack-disabled: 460,170,26,26 + guard: 486,144,24,24 + guard-disabled: 486,170,26,26 + deploy: 408,196,24,24 + deploy-disabled: 408,222,26,26 + scatter: 434,196,26,26 + scatter-disabled: 434,222,26,26 + stop: 460,196,26,26 + stop-disabled: 460,222,26,26 + queue-orders: 486,196,26,26 + queue-orders-disabled: 486,222,26,26 + +stance-icons: chrome.png + attack-anything: 416,248,16,16 + attack-anything-disabled: 432,248,16,16 + attack-anything-active: 448,248,16,16 + defend: 464,248,16,16 + defend-disabled: 480,248,16,16 + defend-active: 496,248,16,16 + return-fire: 416,264,16,16 + return-fire-disabled: 432,264,16,16 + return-fire-active: 448,264,16,16 + hold-fire: 464,264,16,16 + hold-fire-disabled: 480,264,16,16 + hold-fire-active: 496,264,16,16 + flags: buttons.png atreides: 0,114,22,21 harkonnen: 22,114,23,21 diff --git a/mods/d2k/chrome/ingame-player.yaml b/mods/d2k/chrome/ingame-player.yaml index c5e2f2294f..0c5ae30dd3 100644 --- a/mods/d2k/chrome/ingame-player.yaml +++ b/mods/d2k/chrome/ingame-player.yaml @@ -3,9 +3,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 @@ -27,6 +24,217 @@ Container@PLAYER_WIDGETS: IgnoreMouseOver: true ImageCollection: sidebar ImageName: background-supportoverlay + Image@COMMAND_BAR_BACKGROUND: + X: 0 + Y: WINDOW_BOTTOM - HEIGHT + Width: 416 + Height: 43 + ImageCollection: sidebar-bits + ImageName: commandbar-background + Container@COMMAND_BAR: + Logic: CommandBarLogic + X: 24 + Y: WINDOW_BOTTOM - HEIGHT - 9 + Width: 275 + Height: 41 + Children: + Button@ATTACK_MOVE: + Width: 34 + Height: 41 + VisualHeight: 0 + 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: 4 + Y: 8 + ImageCollection: command-icons + ImageName: attack-move + Button@FORCE_MOVE: + X: 35 + Width: 34 + Height: 41 + VisualHeight: 0 + 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\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: 4 + Y: 8 + ImageCollection: command-icons + ImageName: force-move + Button@FORCE_ATTACK: + X: 70 + Width: 34 + Height: 41 + VisualHeight: 0 + 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: 4 + Y: 8 + ImageCollection: command-icons + ImageName: force-attack + Button@GUARD: + X: 105 + Width: 34 + Height: 41 + VisualHeight: 0 + 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: 4 + Y: 8 + ImageCollection: command-icons + ImageName: guard + Button@DEPLOY: + X: 140 + Width: 34 + Height: 41 + VisualHeight: 0 + 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 - Thumpers will start or stop attracting worms\n\nActs immediately on selected units. + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 4 + Y: 8 + ImageCollection: command-icons + ImageName: deploy + Button@SCATTER: + X: 175 + Width: 34 + Height: 41 + VisualHeight: 0 + 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: 4 + Y: 8 + ImageCollection: command-icons + ImageName: scatter + Button@STOP: + X: 210 + Width: 34 + Height: 41 + VisualHeight: 0 + 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: 4 + Y: 8 + ImageCollection: command-icons + ImageName: stop + Button@QUEUE_ORDERS: + X: 245 + Width: 34 + Height: 41 + VisualHeight: 0 + 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: 4 + Y: 8 + ImageCollection: command-icons + ImageName: queue-orders + Container@STANCE_BAR: + Logic: StanceSelectorLogic + X: 316 + Y: WINDOW_BOTTOM - HEIGHT - 11 + Width: 138 + Height: 26 + Children: + Button@STANCE_ATTACKANYTHING: + Width: 29 + Height: 26 + VisualHeight: 0 + Background: + 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 pursue attackers across the battlefield + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 6 + Y: 5 + ImageCollection: stance-icons + ImageName: attack-anything + Button@STANCE_DEFEND: + X: 29 + Width: 29 + Height: 26 + VisualHeight: 0 + Background: + DisableKeyRepeat: true + TooltipText: Defend Stance + TooltipDesc: Set the selected units to Defend stance:\n - Units will attack enemy units on sight\n - Units will not move or pursue enemies + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 6 + Y: 5 + ImageCollection: stance-icons + ImageName: defend + Button@STANCE_RETURNFIRE: + X: 58 + Width: 29 + Height: 26 + VisualHeight: 0 + Background: + 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 pursue enemies + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 6 + Y: 5 + ImageCollection: stance-icons + ImageName: return-fire + Button@STANCE_HOLDFIRE: + X: 87 + Width: 29 + Height: 26 + VisualHeight: 0 + Background: + 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 pursue enemies + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 6 + Y: 5 + ImageCollection: stance-icons + ImageName: hold-fire Image@SIDEBAR_BACKGROUND_TOP: X: WINDOW_RIGHT - 226 Y: 0 diff --git a/mods/d2k/chrome/tooltips.yaml b/mods/d2k/chrome/tooltips.yaml index 5777a33f4f..c5fde2e1ef 100644 --- a/mods/d2k/chrome/tooltips.yaml +++ b/mods/d2k/chrome/tooltips.yaml @@ -35,6 +35,30 @@ Background@BUTTON_TOOLTIP: Font: TinyBold VAlign: Top +Background@BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP: + Logic: ButtonTooltipWithDescHighlightLogic + Highlight: FFFF00 + Background: dialog3 + Height: 31 + Children: + Label@LABEL: + X: 5 + Y: 3 + Height: 23 + Font: Bold + Label@HOTKEY: + Y: 3 + Visible: false + TextColor: FFFF00 + Height: 23 + Font: Bold + Label@DESC: + X: 5 + Y: 26 + Height: 12 + Font: TinyBold + VAlign: Top + Background@WORLD_TOOLTIP: Logic: WorldTooltipLogic Background: dialog3 diff --git a/mods/d2k/uibits/chrome.png b/mods/d2k/uibits/chrome.png index 8824a114f6..50a4557e03 100644 Binary files a/mods/d2k/uibits/chrome.png and b/mods/d2k/uibits/chrome.png differ