diff --git a/mods/cnc/chrome/dialogs.yaml b/mods/cnc/chrome/dialogs.yaml index c76c96b8dc..3974db7ae3 100644 --- a/mods/cnc/chrome/dialogs.yaml +++ b/mods/cnc/chrome/dialogs.yaml @@ -30,12 +30,27 @@ ScrollPanel@RACE_DROPDOWN_TEMPLATE: Width: DROPDOWN_WIDTH Background: panel-black Children: + ScrollItem@HEADER: + BaseName: scrollheader + Width: PARENT_RIGHT-27 + Height: 13 + X: 2 + Y: 0 + Visible: false + Children: + Label@LABEL: + Font: TinyBold + Width: PARENT_RIGHT + Height: 10 + Align: Center ScrollItem@TEMPLATE: Width: PARENT_RIGHT-27 Height: 25 X: 2 Y: 0 Visible: false + TooltipContainer: TOOLTIP_CONTAINER + TooltipTemplate: FACTION_DESCRIPTION_TOOLTIP Children: Image@FLAG: X: 4 diff --git a/mods/cnc/chrome/lobby-playerbin.yaml b/mods/cnc/chrome/lobby-playerbin.yaml index da291307f3..035cf1b718 100644 --- a/mods/cnc/chrome/lobby-playerbin.yaml +++ b/mods/cnc/chrome/lobby-playerbin.yaml @@ -67,6 +67,9 @@ ScrollPanel@LOBBY_PLAYER_BIN: X: 285 Font: Regular IgnoreChildMouseOver: true + TooltipContainer: TOOLTIP_CONTAINER + TooltipTemplate: FACTION_DESCRIPTION_TOOLTIP + PanelRoot: FACTION_DROPDOWN_PANEL_ROOT # ensure that tooltips for the options are on top of the dropdown panel Children: Image@FACTIONFLAG: Width: 32 diff --git a/mods/cnc/chrome/lobby.yaml b/mods/cnc/chrome/lobby.yaml index b1b3e06efe..32939f7469 100644 --- a/mods/cnc/chrome/lobby.yaml +++ b/mods/cnc/chrome/lobby.yaml @@ -149,5 +149,6 @@ Container@SERVER_LOBBY: Width: 140 Height: 35 Text: Music + Container@FACTION_DROPDOWN_PANEL_ROOT: TooltipContainer@TOOLTIP_CONTAINER: diff --git a/mods/cnc/chrome/tooltips.yaml b/mods/cnc/chrome/tooltips.yaml index 402d6592c8..e14da3f3f6 100644 --- a/mods/cnc/chrome/tooltips.yaml +++ b/mods/cnc/chrome/tooltips.yaml @@ -189,3 +189,21 @@ Background@CLIENT_TOOLTIP: Height: 10 Font: TinyBold +Background@FACTION_DESCRIPTION_TOOLTIP: + Logic: CountryTooltipLogic + Background: panel-black + Children: + Label@HEADER: + X: 7 + Y: 6 + Width: 8 + Height: 12 + Font: Bold + VAlign: Top + Label@DESCRIPTION: + X: 14 + Y: 0 + Width: 15 + Height: 14 + Font: TinyBold + VAlign: Top diff --git a/mods/cnc/rules/world.yaml b/mods/cnc/rules/world.yaml index a03f02204f..67426dead2 100644 --- a/mods/cnc/rules/world.yaml +++ b/mods/cnc/rules/world.yaml @@ -21,12 +21,15 @@ World: Name: Any Race: Random RandomRaceMembers: gdi, nod + Description: Select a random faction. Country@gdi: Name: GDI Race: gdi + Description: Global Defense Initiative\nThe GDI is an international military branch of the United Nations tasked\nwith keeping world peace. Commanding the combined forces of the world's\nmost powerful nations, they possess an unmatched arsenal of high-tech weaponry. Country@nod: Name: Nod Race: nod + Description: Brotherhood of Nod\nThe Brotherhood is a religious cult centered around their leader Kane\nand the alien substance Tiberium. They utilize stealth technology\nand guerilla tactics to defeat those who oppose them. ProductionQueueFromSelection: ProductionTabsWidget: PRODUCTION_TABS DomainIndex: