diff --git a/mods/common/chrome/ingame-chat.yaml b/mods/common/chrome/ingame-chat.yaml index 1ccadc679c..6c3366df47 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 - 15 + Y: WINDOW_BOTTOM - HEIGHT - 50 Width: 550 Height: 194 Logic: IngameChatLogic diff --git a/mods/common/chrome/tooltips.yaml b/mods/common/chrome/tooltips.yaml index 6bb447a86b..ec84c43250 100644 --- a/mods/common/chrome/tooltips.yaml +++ b/mods/common/chrome/tooltips.yaml @@ -28,6 +28,36 @@ Background@BUTTON_TOOLTIP: Height: 23 TextColor: FFFF00 Font: Bold + Label@DESC: + X: 7 + Y: 25 + Height: 12 + Font: TinyBold + VAlign: Top + +Background@BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP: + Logic: ButtonTooltipWithDescHighlightLogic + Highlight: FFFF00 + Background: dialog4 + Height: 29 + Children: + Label@LABEL: + X: 7 + Y: 2 + Height: 23 + Font: Bold + Label@HOTKEY: + Y: 2 + Visible: false + TextColor: FFFF00 + Height: 23 + Font: Bold + Label@DESC: + X: 7 + Y: 25 + Height: 12 + Font: TinyBold + VAlign: Top Background@WORLD_TOOLTIP: Logic: WorldTooltipLogic diff --git a/mods/ra/chrome.yaml b/mods/ra/chrome.yaml index f4b3148169..7949c6843c 100644 --- a/mods/ra/chrome.yaml +++ b/mods/ra/chrome.yaml @@ -2,7 +2,7 @@ sidebar-allies: chrome.png background-top: 0,167,238,290 background-iconrow: 0,457,238,47 background-bottom: 0,504,238,8 - background-supportoverlay: 184,118,64,48 + background-supportoverlay: 0,75,64,48 sidebar-button-allies: chrome.png background: 59,31,22,22 @@ -85,11 +85,28 @@ sidebar-button-allies-highlighted-disabled: chrome.png corner-bl: 168,25,3,3 corner-br: 193,25,3,3 +command-button-allies: chrome.png + background: 59,31,22,22 +command-button-allies-hover: chrome.png + background: 59,3,22,22 +command-button-allies-pressed: chrome.png + background: 59,31,22,22 +command-button-allies-highlighted: chrome.png + background: 87,31,22,22 +command-button-allies-highlighted-hover: chrome.png + background: 87,3,22,22 +command-button-allies-highlighted-pressed: chrome.png + background: 87,31,22,22 +command-button-allies-disabled: chrome.png + background: 59,31,22,22 +command-button-allies-highlighted-disabled: chrome.png + background: 87,31,22,22 + sidebar-soviet: chrome.png background-top: 274,167,238,290 background-iconrow: 274,457,238,47 background-bottom: 274,504,238,8 - background-supportoverlay: 249,118,64,48 + background-supportoverlay: 64,75,64,48 sidebar-button-soviet: chrome.png background: 3,31,22,22 @@ -172,11 +189,29 @@ sidebar-button-soviet-highlighted-disabled: chrome.png corner-bl: 168,25,3,3 corner-br: 193,25,3,3 +command-button-soviet: chrome.png + background: 3,31,22,22 +command-button-soviet-hover: chrome.png + background: 3,3,22,22 +command-button-soviet-pressed: chrome.png + background: 3,31,22,22 +command-button-soviet-highlighted: chrome.png + background: 31,31,22,22 +command-button-soviet-highlighted-hover: chrome.png + background: 31,3,22,22 +command-button-soviet-highlighted-pressed: chrome.png + background: 31,31,22,22 +command-button-soviet-disabled: chrome.png + background: 3,31,22,22 +command-button-soviet-highlighted-disabled: chrome.png + background: 31,31,22,22 + sidebar-bits: chrome.png production-tooltip-time: 416, 80, 16, 16 production-tooltip-power: 432, 80, 16, 16 production-tooltip-cost: 448, 80, 16, 16 - production-iconoverlay: 314,118,238,48 + production-iconoverlay: 128,75,238,48 + commandbar-background: 0,123,434,44 power-icons: chrome.png power-normal: 350,0,12,18 @@ -228,6 +263,38 @@ order-icons: chrome.png stats-disabled: 368,64,16,16 stats-active: 368,80,16,16 +command-icons: chrome.png + attack-move: 512,0,24,24 + attack-move-disabled: 512,24,24,24 + force-move: 536,0,24,24 + force-move-disabled: 536,24,24,24 + force-attack: 560,0,24,24 + force-attack-disabled: 560,24,24,24 + guard: 584,0,24,24 + guard-disabled: 584,24,24,24 + deploy: 608,0,24,24 + deploy-disabled: 608,24,24,24 + scatter: 632,0,24,24 + scatter-disabled: 632,24,24,24 + stop: 656,0,24,24 + stop-disabled: 656,24,24,24 + queue-orders: 680,0,24,24 + queue-orders-disabled: 680,24,24,24 + +stance-icons: chrome.png + attack-anything: 512,48,16,16 + attack-anything-disabled: 528,48,16,16 + attack-anything-active: 544,48,16,16 + defend: 560,48,16,16 + defend-disabled: 576,48,16,16 + defend-active: 592,48,16,16 + return-fire: 608,48,16,16 + return-fire-disabled: 624,48,16,16 + return-fire-active: 640,48,16,16 + hold-fire: 656,48,16,16 + hold-fire-disabled: 672,48,16,16 + hold-fire-active: 688,48,16,16 + sidebar-observer: chrome.png background: 512,167,238,287 replay-bottom: 512,454,238,40 diff --git a/mods/common/chrome/ingame-player.yaml b/mods/ra/chrome/ingame-player.yaml similarity index 56% rename from mods/common/chrome/ingame-player.yaml rename to mods/ra/chrome/ingame-player.yaml index a2d676ef01..f156e6e783 100644 --- a/mods/common/chrome/ingame-player.yaml +++ b/mods/ra/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 @@ -32,6 +29,217 @@ Container@PLAYER_WIDGETS: X: 80 Y: 10 Order: Descending + Image@COMMAND_BAR_BACKGROUND: + X: 5 + Y: WINDOW_BOTTOM - HEIGHT - 5 + Width: 416 + Height: 44 + ImageCollection: sidebar-bits + ImageName: commandbar-background + Container@COMMAND_BAR: + Logic: CommandBarLogic + X: 14 + Y: WINDOW_BOTTOM - HEIGHT - 14 + Width: 275 + Height: 26 + Children: + Button@ATTACK_MOVE: + Logic: AddFactionSuffixLogic + Width: 34 + Height: 26 + 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: 1 + ImageCollection: command-icons + ImageName: attack-move + Button@FORCE_MOVE: + Logic: AddFactionSuffixLogic + X: 34 + Width: 34 + Height: 26 + 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 - Chrono Tanks will teleport towards 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: 5 + Y: 1 + ImageCollection: command-icons + ImageName: force-move + Button@FORCE_ATTACK: + Logic: AddFactionSuffixLogic + X: 68 + Width: 34 + Height: 26 + 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: 1 + ImageCollection: command-icons + ImageName: force-attack + Button@GUARD: + Logic: AddFactionSuffixLogic + X: 102 + Width: 34 + Height: 26 + 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: 1 + ImageCollection: command-icons + ImageName: guard + Button@DEPLOY: + Logic: AddFactionSuffixLogic + X: 136 + Width: 34 + Height: 26 + 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 - Aircraft will return to base\n\nActs immediately on selected units. + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 5 + Y: 1 + ImageCollection: command-icons + ImageName: deploy + Button@SCATTER: + Logic: AddFactionSuffixLogic + X: 170 + Width: 34 + Height: 26 + 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: 1 + ImageCollection: command-icons + ImageName: scatter + Button@STOP: + Logic: AddFactionSuffixLogic + X: 204 + Width: 34 + Height: 26 + 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: 1 + ImageCollection: command-icons + ImageName: stop + Button@QUEUE_ORDERS: + Logic: AddFactionSuffixLogic + X: 238 + Width: 34 + Height: 26 + 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: 1 + ImageCollection: command-icons + ImageName: queue-orders + Container@STANCE_BAR: + Logic: StanceSelectorLogic + X: 294 + Y: WINDOW_BOTTOM - HEIGHT - 14 + Width: 138 + Height: 26 + Children: + Button@STANCE_ATTACKANYTHING: + Logic: AddFactionSuffixLogic + Width: 34 + Height: 26 + Background: command-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 pursue attackers across the battlefield + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 9 + Y: 5 + ImageCollection: stance-icons + ImageName: attack-anything + Button@STANCE_DEFEND: + Logic: AddFactionSuffixLogic + X: 34 + Width: 34 + Height: 26 + Background: command-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 pursue enemies + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 9 + Y: 5 + ImageCollection: stance-icons + ImageName: defend + Button@STANCE_RETURNFIRE: + Logic: AddFactionSuffixLogic + X: 68 + Width: 34 + Height: 26 + Background: command-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 pursue enemies + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 9 + Y: 5 + ImageCollection: stance-icons + ImageName: return-fire + Button@STANCE_HOLDFIRE: + Logic: AddFactionSuffixLogic + X: 102 + Width: 34 + Height: 26 + Background: command-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 pursue enemies + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 9 + Y: 5 + ImageCollection: stance-icons + ImageName: hold-fire Image@SIDEBAR_BACKGROUND_TOP: Logic: AddFactionSuffixLogic X: WINDOW_RIGHT - 250 diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml index 34a6ae3a3c..7a0ec89396 100644 --- a/mods/ra/mod.yaml +++ b/mods/ra/mod.yaml @@ -90,7 +90,7 @@ ChromeLayout: common|chrome/ingame-menu.yaml ra|chrome/ingame-observer.yaml common|chrome/ingame-observerstats.yaml - common|chrome/ingame-player.yaml + ra|chrome/ingame-player.yaml common|chrome/ingame-perf.yaml common|chrome/ingame-debug.yaml common|chrome/mainmenu.yaml diff --git a/mods/ra/uibits/chrome.png b/mods/ra/uibits/chrome.png index 4b3f6a3a53..df4bc7d750 100644 Binary files a/mods/ra/uibits/chrome.png and b/mods/ra/uibits/chrome.png differ