Add a mission objectives GUI panel

This commit is contained in:
Oliver Brakmann
2014-07-27 13:25:58 +02:00
parent 2c22e5099f
commit 8cec848a0f
46 changed files with 1252 additions and 886 deletions

View File

@@ -3,122 +3,110 @@ Container@DEBUG_PANEL:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children:
Label@TITLE:
Width: PARENT_RIGHT
Y: 0-25
Font: BigBold
Contrast: true
Label@CHEATS_TITLE:
Y: 25
Font: Bold
Text: Cheats
Align: Center
Text: Debug Options
Background@bg:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Background: panel-black
Children:
Label@CHEATS_TITLE:
Y: 25
Font: Bold
Text: Cheats
Align: Center
Width: PARENT_RIGHT
Checkbox@INSTANT_BUILD:
X: 45
Y: 45
Width: 200
Height: 20
Font: Regular
Text: Instant Build Speed
Checkbox@ENABLE_TECH:
X: 45
Y: 75
Width: 200
Height: 20
Font: Regular
Text: Build Everything
Checkbox@BUILD_ANYWHERE:
X: 45
Y: 105
Width: 200
Height: 20
Font: Regular
Text: Build Anywhere
Checkbox@UNLIMITED_POWER:
X: 290
Y: 45
Width: 200
Height: 20
Font: Regular
Text: Unlimited Power
Checkbox@INSTANT_CHARGE:
X: 290
Y: 75
Width: 200
Height: 20
Font: Regular
Text: Instant Charge Time
Checkbox@DISABLE_SHROUD:
X: 290
Y: 105
Height: 20
Width: 200
Font: Regular
Text: Disable Shroud & Fog
Button@GIVE_CASH:
X: 90
Y: 145
Width: 140
Height: 35
Text: Give $20,000
Button@GROW_RESOURCES:
X: 271
Y: 145
Width: 140
Height: 35
Text: Grow Resources
Button@GIVE_EXPLORATION:
X: 90
Y: 195
Width: 140
Height: 35
Text: Clear Shroud
Button@RESET_EXPLORATION:
X: 271
Y: 195
Width: 140
Height: 35
Text: Reset Shroud
Label@VISUALIZATIONS_TITLE:
Y: 255
Font: Bold
Text: Visualizations
Align: Center
Width: PARENT_RIGHT
Checkbox@SHOW_UNIT_PATHS:
X: 45
Y: 285
Width: 200
Height: 20
Font: Regular
Text: Show Unit Paths
Checkbox@SHOW_ASTAR:
X: 45
Y: 315
Height: 20
Width: 200
Font: Regular
Text: Show A* Cost
Checkbox@SHOW_COMBATOVERLAY:
X: 290
Y: 285
Height: 20
Width: 200
Font: Regular
Text: Show Combat Geometry
Checkbox@SHOW_GEOMETRY:
X: 290
Y: 315
Height: 20
Width: 200
Font: Regular
Text: Show Render Geometry
Checkbox@INSTANT_BUILD:
X: 45
Y: 45
Width: 200
Height: 20
Font: Regular
Text: Instant Build Speed
Checkbox@ENABLE_TECH:
X: 45
Y: 75
Width: 200
Height: 20
Font: Regular
Text: Build Everything
Checkbox@BUILD_ANYWHERE:
X: 45
Y: 105
Width: 200
Height: 20
Font: Regular
Text: Build Anywhere
Checkbox@UNLIMITED_POWER:
X: 290
Y: 45
Width: 200
Height: 20
Font: Regular
Text: Unlimited Power
Checkbox@INSTANT_CHARGE:
X: 290
Y: 75
Width: 200
Height: 20
Font: Regular
Text: Instant Charge Time
Checkbox@DISABLE_SHROUD:
X: 290
Y: 105
Height: 20
Width: 200
Font: Regular
Text: Disable Shroud & Fog
Button@GIVE_CASH:
X: 90
Y: 145
Width: 140
Height: 35
Text: Give $20,000
Button@GROW_RESOURCES:
X: 271
Y: 145
Width: 140
Height: 35
Text: Grow Resources
Button@GIVE_EXPLORATION:
X: 90
Y: 195
Width: 140
Height: 35
Text: Clear Shroud
Button@RESET_EXPLORATION:
X: 271
Y: 195
Width: 140
Height: 35
Text: Reset Shroud
Label@VISUALIZATIONS_TITLE:
Y: 255
Font: Bold
Text: Visualizations
Align: Center
Width: PARENT_RIGHT
Checkbox@SHOW_UNIT_PATHS:
X: 45
Y: 285
Width: 200
Height: 20
Font: Regular
Text: Show Unit Paths
Checkbox@SHOW_ASTAR:
X: 45
Y: 315
Height: 20
Width: 200
Font: Regular
Text: Show A* Cost
Checkbox@SHOW_COMBATOVERLAY:
X: 290
Y: 285
Height: 20
Width: 200
Font: Regular
Text: Show Combat Geometry
Checkbox@SHOW_GEOMETRY:
X: 290
Y: 315
Height: 20
Width: 200
Font: Regular
Text: Show Render Geometry

View File

@@ -0,0 +1,55 @@
Container@GAME_INFO_PANEL:
X: (WINDOW_RIGHT - WIDTH) / 2
Y: (WINDOW_BOTTOM - HEIGHT) / 2
Width: 512
Height: 375
Logic: GameInfoLogic
Visible: False
Children:
Label@TITLE:
Width: PARENT_RIGHT
Y: 0 - 20
Text: Game Information
Align: Center
Font: BigBold
Contrast: true
Label@TITLE_NO_TABS:
Width: PARENT_RIGHT
Y: 15
Text: Game Information
Align: Center
Font: BigBold
Contrast: true
Container@TAB_CONTAINER:
Children:
Button@BUTTON1:
Y: 5
Width: 140
Height: 35
Visible: False
Button@BUTTON2:
X: 150
Y: 5
Width: 140
Height: 35
Visible: False
Button@BUTTON3:
X: 300
Y: 5
Width: 140
Height: 35
Visible: False
Background@BACKGROUND:
Y: 39
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Background: panel-black
Children:
Container@STATS_PANEL:
Container@MAP_PANEL:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Container@OBJECTIVES_PANEL:
Container@DEBUG_PANEL:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM

View File

@@ -0,0 +1,32 @@
Container@MAP_PANEL:
Height: PARENT_BOTTOM
Width: PARENT_RIGHT
Logic: GameInfoBriefingLogic
Children:
Background@PREVIEW_BG:
X: (PARENT_RIGHT - WIDTH) / 2
Y: 15
Width: 324
Height: 160
Background: panel-gray
Children:
MapPreview@MAP_PREVIEW:
Width: 320
Height: 156
X: 2
Y: 2
IgnoreMouseOver: True
IgnoreMouseInput: True
ShowSpawnPoints: False
ScrollPanel@MAP_DESCRIPTION_PANEL:
X: 15
Y: 190
Width: 482
Height: 170
Children:
Label@MAP_DESCRIPTION:
X: 5
Y: 195
Width: 452
Height: 160

View File

@@ -0,0 +1,40 @@
Container@MISSION_OBJECTIVES:
Height: PARENT_BOTTOM
Width: PARENT_RIGHT
Logic: GameInfoObjectivesLogic
Children:
Label@MISSION:
X: 15
Y: 15
Width: 80
Height: 20
Font: MediumBold
Text: Mission:
Label@MISSION_STATUS:
X: 95
Y: 15
Width: PARENT_RIGHT - 110
Height: 20
Font: MediumBold
ScrollPanel@OBJECTIVES_PANEL:
X: 15
Y: 50
Width: 482
Height: 310
ItemSpacing: 35
Children:
Container@OBJECTIVE_TEMPLATE:
Children:
Label@OBJECTIVE_TYPE:
X: 10
Y: 0 - 20
Height: 20
Width: 70
Align: Center
Checkbox@OBJECTIVE_STATUS:
X: 90
Y: 0 - 20
Width: PARENT_RIGHT - 100
Height: 20
Disabled: True
TextColorDisabled: 255,255,255

View File

@@ -0,0 +1,108 @@
Container@SKIRMISH_STATS:
Height: PARENT_BOTTOM
Width: PARENT_RIGHT
Logic: GameInfoStatsLogic
Children:
Label@STATS_OBJECTIVE:
X: 15
Y: 10
Width: 85
Height: 25
Font: MediumBold
Text: Mission:
Label@STATS_STATUS:
X: 100
Y: 10
Width: PARENT_RIGHT - 10
Height: 25
Font: MediumBold
Checkbox@STATS_CHECKBOX:
X: 15
Y: 45
Width: 482
Height: 20
Font: Bold
Text: Destroy all opposition!
Disabled: yes
TextColorDisabled: 255,255,255
Container@STATS_HEADERS:
X: 17
Y: 80
Width: 393
Children:
Label@NAME:
X: 10
Width: 150
Height: 25
Text: Player
Font: Bold
Label@RACE:
X: 150
Width: 80
Height: 25
Text: Faction
Font: Bold
Align: Center
Label@STANCE:
X: 240
Width: 70
Height: 25
Text: Team
Font: Bold
Align: Center
Label@KILLS:
X: 310
Width: 70
Height: 25
Text: Kills
Font: Bold
Align: Center
Label@DEATHS:
X: 380
Width: 70
Height: 25
Text: Deaths
Font: Bold
Align: Center
ScrollPanel@PLAYER_LIST:
X: 15
Y: 105
Width: 482
Height: 250
ItemSpacing: 5
Children:
Container@PLAYER_TEMPLATE:
Width: PARENT_RIGHT-27
Height: 25
X: 2
Y: 0
Children:
Label@NAME:
X: 10
Width: 150
Height: 25
Image@FACTIONFLAG:
X: 159
Y: 6
Width: 32
Height: 16
Label@FACTION:
X: 195
Width: 40
Height: 25
Label@TEAM:
X: 240
Width: 70
Height: 25
Align: Center
Label@KILLS:
X: 310
Width: 70
Height: 25
Align: Center
Label@DEATHS:
X: 380
Width: 70
Height: 25
Align: Center

View File

@@ -1,27 +1,7 @@
Container@INGAME_MENU_PANEL:
X: (WINDOW_RIGHT - WIDTH)/2
Y: (WINDOW_BOTTOM - HEIGHT)/2
Width: 512
Height: 370
Children:
Button@OBJECTIVES_BUTTON:
Y: PARENT_BOTTOM - 1
Width: 140
Height: 35
Text: Objectives
Visible: false
Button@DEBUG_BUTTON:
X: 150
Y: PARENT_BOTTOM - 1
Width: 140
Height: 35
Text: Debug
Visible: false
Container@INGAME_MENU:
Width: WINDOW_RIGHT
Height: WINDOW_BOTTOM
Logic: CncIngameMenuLogic
Logic: IngameMenuLogic
Children:
Image@EVA:
X: WINDOW_RIGHT-128-43
@@ -46,31 +26,31 @@ Container@INGAME_MENU:
Width: 740
Height: 35
Children:
Button@QUIT_BUTTON:
Button@ABORT_MISSION:
X: 0
Y: 0
Width: 140
Height: 35
Text: Abort Mission
Button@SURRENDER_BUTTON:
Button@SURRENDER:
X: 150
Y: 0
Width: 140
Height: 35
Text: Surrender
Button@MUSIC_BUTTON:
Button@MUSIC:
X: 300
Y: 0
Width: 140
Height: 35
Text: Music
Button@SETTINGS_BUTTON:
Button@SETTINGS:
X: 450
Y: 0
Width: 140
Height: 35
Text: Settings
Button@RESUME_BUTTON:
Button@RESUME:
Key: escape
X: 600
Y: 0

View File

@@ -1,120 +0,0 @@
Container@CONQUEST_OBJECTIVES:
Logic: CncConquestObjectivesLogic
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children:
Label@TITLE:
Width: PARENT_RIGHT
Y: 0-25
Font: BigBold
Contrast: true
Align: Center
Background@bg:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Background: panel-black
Children:
Label@PRIMARY:
X: 15
Y: 10
Width: 482
Height: 25
Font: MediumBold
Text: Primary Objectives:
Label@STATUS:
X: 190
Y: 10
Width: 482
Height: 25
Font: MediumBold
Text: Incomplete
Checkbox@1:
X: 25
Y: 45
Width: 482
Height: 20
Font: Bold
Text: Crush all opposition!
Disabled: yes
Container@LABEL_CONTAINER:
X: 17
Y: 80
Width: 393
Children:
Label@NAME:
X: 10
Width: 150
Height: 25
Text: Player
Align: Center
Font: Bold
Label@RACE:
X: 150
Width: 80
Height: 25
Text: Faction
Font: Bold
Align: Center
Label@STANCE:
X: 240
Width: 70
Height: 25
Text: Team
Font: Bold
Align: Center
Label@KILLS:
X: 310
Width: 70
Height: 25
Text: Kills
Font: Bold
Align: Center
Label@DEATHS:
X: 380
Width: 70
Height: 25
Text: Deaths
Font: Bold
Align: Center
ScrollPanel@PLAYER_LIST:
X: 15
Y: 105
Width: 482
Height: 250
ItemSpacing: 5
Children:
Container@PLAYER_TEMPLATE:
Width: PARENT_RIGHT-27
Height: 25
X: 2
Y: 0
Children:
Label@NAME:
X: 10
Width: 150
Height: 25
Image@FACTIONFLAG:
X: 159
Y: 6
Width: 32
Height: 16
Label@FACTION:
X: 195
Width: 40
Height: 25
Label@TEAM:
X: 240
Width: 70
Height: 25
Align: Center
Label@KILLS:
X: 310
Width: 70
Height: 25
Align: Center
Label@DEATHS:
X: 380
Width: 70
Height: 25
Align: Center

View File

@@ -88,13 +88,16 @@ ChromeLayout:
mods/cnc/chrome/replaybrowser.yaml
mods/cnc/chrome/ingame.yaml
mods/cnc/chrome/ingame-chat.yaml
mods/cnc/chrome/ingame-debug.yaml
mods/cnc/chrome/ingame-menu.yaml
mods/cnc/chrome/ingame-debug.yaml
mods/cnc/chrome/ingame-info.yaml
mods/cnc/chrome/ingame-infobriefing.yaml
mods/cnc/chrome/ingame-infoobjectives.yaml
mods/cnc/chrome/ingame-infostats.yaml
mods/cnc/chrome/music.yaml
mods/cnc/chrome/settings.yaml
mods/cnc/chrome/credits.yaml
mods/cnc/chrome/dialogs.yaml
mods/cnc/chrome/objectives.yaml
mods/cnc/chrome/tooltips.yaml
mods/cnc/chrome/irc.yaml
mods/cnc/chrome/assetbrowser.yaml

View File

@@ -8,6 +8,7 @@ World:
LoadWidgetAtGameStart:
Widget: INGAME_ROOT
MenuPaletteEffect:
MenuEffect: Desaturated
CloakPaletteEffect:
ScreenShaker:
NukePaletteEffect:
@@ -185,7 +186,7 @@ World:
PathFinder:
ValidateOrder:
DebugPauseState:
ConquestObjectivesPanel:
ObjectivesPanel: CONQUEST_OBJECTIVES
ObjectivesPanel:
PanelName: SKIRMISH_STATS
RadarPings: