Merge pull request #8104 from penev92/bleed_factionDescriptions

Add D2k faction description tooltips
This commit is contained in:
Scott
2015-05-09 13:13:22 +12:00
3 changed files with 41 additions and 0 deletions

View File

@@ -63,6 +63,9 @@ ScrollPanel@LOBBY_PLAYER_BIN:
Width: 130 Width: 130
Height: 25 Height: 25
IgnoreChildMouseOver: true 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: Children:
Image@FACTIONFLAG: Image@FACTIONFLAG:
Width: 23 Width: 23
@@ -328,12 +331,27 @@ ScrollPanel@LOBBY_PLAYER_BIN:
ScrollPanel@RACE_DROPDOWN_TEMPLATE: ScrollPanel@RACE_DROPDOWN_TEMPLATE:
Width: DROPDOWN_WIDTH Width: DROPDOWN_WIDTH
Children: 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: ScrollItem@TEMPLATE:
Width: PARENT_RIGHT-27 Width: PARENT_RIGHT-27
Height: 25 Height: 25
X: 2 X: 2
Y: 0 Y: 0
Visible: false Visible: false
TooltipContainer: TOOLTIP_CONTAINER
TooltipTemplate: FACTION_DESCRIPTION_TOOLTIP
Children: Children:
Image@FLAG: Image@FLAG:
X: 2 X: 2

View File

@@ -196,3 +196,22 @@ Background@SUPPORT_POWER_TOOLTIP:
Y: 22 Y: 22
Font: TinyBold Font: TinyBold
VAlign: Top VAlign: Top
Background@FACTION_DESCRIPTION_TOOLTIP:
Logic: CountryTooltipLogic
Background: dialog4
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

View File

@@ -98,15 +98,19 @@ World:
Name: Any Name: Any
Race: Random Race: Random
RandomRaceMembers: atreides, harkonnen, ordos RandomRaceMembers: atreides, harkonnen, ordos
Description: Select a random House.
Country@Atreides: Country@Atreides:
Name: Atreides Name: Atreides
Race: atreides Race: atreides
Description: House Atreides\nThe noble Atreides, from the water world of Caladan,\nrely on their ornithopters to ensure air superiority.\nThey have allied themselves with the Fremen, the fearsome\nnative warriors of Dune that can move undetected in battle.
Country@Harkonnen: Country@Harkonnen:
Name: Harkonnen Name: Harkonnen
Race: harkonnen Race: harkonnen
Description: House Harkonnen\nThe evil Harkonnen will stop at nothing to gain control of the spice.\nThey rely on brute force and atomic weapons to achieve their goals:\nwealth, and the destruction of House Atreides.
Country@Ordos: Country@Ordos:
Name: Ordos Name: Ordos
Race: ordos Race: ordos
Description: House Ordos\nThe insidious Ordos of the icy planet Sigma Draconis IV\nare known for their wealth, greed and treachery.\nRelying heavily on mercenaries they often resort\nto sabotage and forbidden Ixian technologies.
Country@Corrino: Country@Corrino:
Name: Corrino Name: Corrino
Race: corrino Race: corrino