Added widget showing the army for players in spec

This commit is contained in:
teinarss
2019-06-18 18:44:28 +02:00
committed by abcdefg30
parent 6ab0ace9e1
commit b81ede2d64
14 changed files with 754 additions and 10 deletions

View File

@@ -267,6 +267,7 @@ Container@OBSERVER_WIDGETS:
StatisticsProductionKey: StatisticsProduction
StatisticsSupportPowersKey: StatisticsSupportPowers
StatisticsCombatKey: StatisticsCombat
StatisticsArmyKey: StatisticsArmy
StatisticsGraphKey: StatisticsGraph
StatisticsArmyGraphKey: StatisticsArmyGraph
X: 5
@@ -542,6 +543,42 @@ Container@OBSERVER_WIDGETS:
Font: Bold
Text: Support Powers
Shadow: True
Container@ARMY_HEADERS:
X: 0
Y: 0
Width: 400
Height: PARENT_BOTTOM
Children:
ColorBlock@HEADER_COLOR:
X: 0
Y: 0
Color: 00000090
Width: PARENT_RIGHT - 200
Height: PARENT_BOTTOM
GradientColorBlock@HEADER_GRADIENT:
X: PARENT_RIGHT - 200
Y: 0
TopLeftColor: 00000090
BottomLeftColor: 00000090
Width: 200
Height: PARENT_BOTTOM
Label@PLAYER_HEADER:
X: 40
Y: 0
Width: 120
Height: PARENT_BOTTOM
Font: Bold
Text: Player
Align: Left
Shadow: True
Label@ARMY_HEADER:
X: 160
Y: 0
Width: 100
Height: PARENT_BOTTOM
Font: Bold
Text: Army
Shadow: True
Container@COMBAT_STATS_HEADERS:
X: 0
Y: 0
@@ -911,6 +948,43 @@ Container@OBSERVER_WIDGETS:
Width: 0
Height: PARENT_BOTTOM
TooltipContainer: TOOLTIP_CONTAINER
ScrollItem@ARMY_PLAYER_TEMPLATE:
X: 0
Y: 0
Width: 400
Height: 24
BaseName: scrollitem-nohover
Children:
ColorBlock@PLAYER_COLOR:
X: 0
Y: 0
Width: PARENT_RIGHT - 200
Height: PARENT_BOTTOM
GradientColorBlock@PLAYER_GRADIENT:
X: PARENT_RIGHT - 200
Y: 0
Width: 200
Height: PARENT_BOTTOM
Image@FLAG:
X: 5
Y: 4
Width: 35
Height: PARENT_BOTTOM - 4
ImageName: random
ImageCollection: flags
Label@PLAYER:
X: 40
Y: 0
Width: 120
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
ObserverArmyIcons@ARMY_ICONS:
X: 160
Y: 0
Width: 0
Height: PARENT_BOTTOM
TooltipContainer: TOOLTIP_CONTAINER
ScrollItem@COMBAT_PLAYER_TEMPLATE:
X: 0
Y: 0

View File

@@ -353,6 +353,24 @@ Background@SUPPORT_POWER_TOOLTIP_FACTIONSUFFIX:
Font: TinyBold
VAlign: Top
Background@ARMY_TOOLTIP:
Logic: ArmyTooltipLogic
Background: panel-black
Width: 200
Height: 65
Children:
Label@NAME:
X: 5
Y: 1
Height: 23
Font: Bold
Label@DESC:
X: 5
Y: 20
Height: 5
Font: TinyBold
VAlign: Top
Background@SPAWN_TOOLTIP:
Logic: SpawnSelectorTooltipLogic
Background: panel-black

View File

@@ -167,6 +167,7 @@ Container@OBSERVER_WIDGETS:
StatisticsProductionKey: StatisticsProduction
StatisticsSupportPowersKey: StatisticsSupportPowers
StatisticsCombatKey: StatisticsCombat
StatisticsArmyKey: StatisticsArmy
StatisticsGraphKey: StatisticsGraph
StatisticsArmyGraphKey: StatisticsArmyGraph
X: 5
@@ -434,6 +435,42 @@ Container@OBSERVER_WIDGETS:
Font: Bold
Text: Support Powers
Shadow: True
Container@ARMY_HEADERS:
X: 0
Y: 0
Width: 400
Height: PARENT_BOTTOM
Children:
ColorBlock@HEADER_COLOR:
X: 0
Y: 0
Color: 00000090
Width: PARENT_RIGHT - 200
Height: PARENT_BOTTOM
GradientColorBlock@HEADER_GRADIENT:
X: PARENT_RIGHT - 200
Y: 0
TopLeftColor: 00000090
BottomLeftColor: 00000090
Width: 200
Height: PARENT_BOTTOM
Label@PLAYER_HEADER:
X: 40
Y: 0
Width: 120
Height: PARENT_BOTTOM
Font: Bold
Text: Player
Align: Left
Shadow: True
Label@ARMY_HEADER:
X: 160
Y: 0
Width: 100
Height: PARENT_BOTTOM
Font: Bold
Text: Army
Shadow: True
Container@COMBAT_STATS_HEADERS:
X: 0
Y: 0
@@ -788,6 +825,43 @@ Container@OBSERVER_WIDGETS:
Width: 0
Height: PARENT_BOTTOM
TooltipContainer: TOOLTIP_CONTAINER
ScrollItem@ARMY_PLAYER_TEMPLATE:
X: 0
Y: 0
Width: 400
Height: 25
BaseName: scrollitem-nohover
Children:
ColorBlock@PLAYER_COLOR:
X: 0
Y: 0
Width: PARENT_RIGHT - 200
Height: PARENT_BOTTOM
GradientColorBlock@PLAYER_GRADIENT:
X: PARENT_RIGHT - 200
Y: 0
Width: 200
Height: PARENT_BOTTOM
Image@FLAG:
X: 5
Y: 4
Width: 35
Height: PARENT_BOTTOM - 4
ImageName: random
ImageCollection: flags
Label@PLAYER:
X: 35
Y: 0
Width: 120
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
ObserverArmyIcons@ARMY_ICONS:
X: 155
Y: 0
Width: 0
Height: PARENT_BOTTOM
TooltipContainer: TOOLTIP_CONTAINER
ScrollItem@COMBAT_PLAYER_TEMPLATE:
X: 0
Y: 0

View File

@@ -319,3 +319,21 @@ Background@SUPPORT_POWER_TOOLTIP:
Y: 24
Font: TinyBold
VAlign: Top
Background@ARMY_TOOLTIP:
Logic: ArmyTooltipLogic
Background: dialog4
Width: 200
Height: 65
Children:
Label@NAME:
X: 7
Y: 3
Height: 23
Font: Bold
Label@DESC:
X: 7
Y: 27
Height: 2
Font: TinyBold
VAlign: Top

View File

@@ -46,10 +46,14 @@ StatisticsCombat: F6
Description: Combat statistics
Types: Observer, Replay, Spectator
StatisticsGraph: F7
StatisticsArmy: F7
Description: Army statistics
Types: Observer, Replay, Spectator
StatisticsGraph:
Description: Statistics graph
Types: Observer, Replay, Spectator
StatisticsArmyGraph: F8
StatisticsArmyGraph:
Description: Army value graph
Types: Observer, Replay, Spectator

View File

@@ -321,3 +321,21 @@ Background@SUPPORT_POWER_TOOLTIP:
Y: 30
Font: TinyBold
VAlign: Top
Background@ARMY_TOOLTIP:
Logic: ArmyTooltipLogic
Background: dialog3
Width: 200
Height: 65
Children:
Label@NAME:
X: 7
Y: 3
Height: 23
Font: Bold
Label@DESC:
X: 7
Y: 23
Height: 3
Font: TinyBold
VAlign: Top

View File

@@ -8,6 +8,8 @@ mcv.starport:
-MapEditorData:
RenderSprites:
Image: mcv
UpdatesPlayerStatistics:
OverrideActor: mcv
harvester.starport:
Inherits: harvester
@@ -19,6 +21,8 @@ harvester.starport:
-MapEditorData:
RenderSprites:
Image: harvester
UpdatesPlayerStatistics:
OverrideActor: harvester
trike.starport:
Inherits: trike
@@ -30,6 +34,8 @@ trike.starport:
-MapEditorData:
RenderSprites:
Image: trike
UpdatesPlayerStatistics:
OverrideActor: trike
quad.starport:
Inherits: quad
@@ -41,6 +47,8 @@ quad.starport:
-MapEditorData:
RenderSprites:
Image: quad
UpdatesPlayerStatistics:
OverrideActor: quad
siege_tank.starport:
Inherits: siege_tank
@@ -52,6 +60,8 @@ siege_tank.starport:
-MapEditorData:
RenderSprites:
Image: siege_tank
UpdatesPlayerStatistics:
OverrideActor: siege_tank
missile_tank.starport:
Inherits: missile_tank
@@ -63,6 +73,8 @@ missile_tank.starport:
-MapEditorData:
RenderSprites:
Image: missile_tank
UpdatesPlayerStatistics:
OverrideActor: missile_tank
combat_tank_a.starport:
Inherits: combat_tank_a
@@ -74,6 +86,8 @@ combat_tank_a.starport:
-MapEditorData:
RenderSprites:
Image: combat_tank_a
UpdatesPlayerStatistics:
OverrideActor: combat_tank_a
combat_tank_h.starport:
Inherits: combat_tank_h
@@ -85,6 +99,8 @@ combat_tank_h.starport:
-MapEditorData:
RenderSprites:
Image: combat_tank_h
UpdatesPlayerStatistics:
OverrideActor: combat_tank_h
combat_tank_o.starport:
Inherits: combat_tank_o
@@ -96,6 +112,8 @@ combat_tank_o.starport:
-MapEditorData:
RenderSprites:
Image: combat_tank_o
UpdatesPlayerStatistics:
OverrideActor: combat_tank_o
carryall.starport:
Inherits: carryall
@@ -105,3 +123,5 @@ carryall.starport:
Valued:
Cost: 1500
-MapEditorData:
UpdatesPlayerStatistics:
OverrideActor: carryall

View File

@@ -203,6 +203,7 @@ Container@OBSERVER_WIDGETS:
StatisticsProductionKey: StatisticsProduction
StatisticsSupportPowersKey: StatisticsSupportPowers
StatisticsCombatKey: StatisticsCombat
StatisticsArmyKey: StatisticsArmy
StatisticsGraphKey: StatisticsGraph
StatisticsArmyGraphKey: StatisticsArmyGraph
StatsDropDownPanelTemplate: SPECTATOR_LABEL_DROPDOWN_TEMPLATE
@@ -481,6 +482,42 @@ Container@OBSERVER_WIDGETS:
Font: Bold
Text: Support Powers
Shadow: True
Container@ARMY_HEADERS:
X: 0
Y: 0
Width: 400
Height: PARENT_BOTTOM
Children:
ColorBlock@HEADER_COLOR:
X: 0
Y: 0
Color: 00000090
Width: PARENT_RIGHT - 200
Height: PARENT_BOTTOM
GradientColorBlock@HEADER_GRADIENT:
X: PARENT_RIGHT - 200
Y: 0
TopLeftColor: 00000090
BottomLeftColor: 00000090
Width: 200
Height: PARENT_BOTTOM
Label@PLAYER_HEADER:
X: 40
Y: 0
Width: 120
Height: PARENT_BOTTOM
Font: Bold
Text: Player
Align: Left
Shadow: True
Label@ARMY_HEADER:
X: 160
Y: 0
Width: 100
Height: PARENT_BOTTOM
Font: Bold
Text: Army
Shadow: True
Container@COMBAT_STATS_HEADERS:
X: 0
Y: 0
@@ -852,6 +889,43 @@ Container@OBSERVER_WIDGETS:
Width: 0
Height: PARENT_BOTTOM
TooltipContainer: TOOLTIP_CONTAINER
ScrollItem@ARMY_PLAYER_TEMPLATE:
X: 0
Y: 0
Width: 400
Height: 24
BaseName: scrollitem-nohover
Children:
ColorBlock@PLAYER_COLOR:
X: 0
Y: 0
Width: PARENT_RIGHT - 200
Height: PARENT_BOTTOM
GradientColorBlock@PLAYER_GRADIENT:
X: PARENT_RIGHT - 200
Y: 0
Width: 200
Height: PARENT_BOTTOM
Image@FLAG:
X: 5
Y: 4
Width: 35
Height: PARENT_BOTTOM - 4
ImageName: random
ImageCollection: flags
Label@PLAYER:
X: 40
Y: 0
Width: 120
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
ObserverArmyIcons@ARMY_ICONS:
X: 160
Y: 0
Width: 0
Height: PARENT_BOTTOM
TooltipContainer: TOOLTIP_CONTAINER
ScrollItem@COMBAT_PLAYER_TEMPLATE:
X: 0
Y: 0

View File

@@ -106,6 +106,8 @@ E1R1:
ProducibleWithLevel:
Prerequisites: techlevel.infonly
InitialLevels: 1
UpdatesPlayerStatistics:
OverrideActor: e1
-Buildable:
E2:
@@ -199,6 +201,8 @@ E3R1:
ProducibleWithLevel:
Prerequisites: techlevel.infonly
InitialLevels: 1
UpdatesPlayerStatistics:
OverrideActor: e3
-Buildable:
E4:

View File

@@ -167,6 +167,7 @@ Container@OBSERVER_WIDGETS:
StatisticsProductionKey: StatisticsProduction
StatisticsSupportPowersKey: StatisticsSupportPowers
StatisticsCombatKey: StatisticsCombat
StatisticsArmyKey: StatisticsArmy
StatisticsGraphKey: StatisticsGraph
StatisticsArmyGraphKey: StatisticsArmyGraph
X: 5
@@ -434,6 +435,42 @@ Container@OBSERVER_WIDGETS:
Font: Bold
Text: Support Powers
Shadow: True
Container@ARMY_HEADERS:
X: 0
Y: 0
Width: 400
Height: PARENT_BOTTOM
Children:
ColorBlock@HEADER_COLOR:
X: 0
Y: 0
Color: 00000090
Width: PARENT_RIGHT - 200
Height: PARENT_BOTTOM
GradientColorBlock@HEADER_GRADIENT:
X: PARENT_RIGHT - 200
Y: 0
TopLeftColor: 00000090
BottomLeftColor: 00000090
Width: 200
Height: PARENT_BOTTOM
Label@PLAYER_HEADER:
X: 40
Y: 0
Width: 120
Height: PARENT_BOTTOM
Font: Bold
Text: Player
Align: Left
Shadow: True
Label@ARMY_HEADER:
X: 160
Y: 0
Width: 100
Height: PARENT_BOTTOM
Font: Bold
Text: Army
Shadow: True
Container@COMBAT_STATS_HEADERS:
X: 0
Y: 0
@@ -798,6 +835,43 @@ Container@OBSERVER_WIDGETS:
Height: PARENT_BOTTOM
ClockPalette: iconclock
TooltipContainer: TOOLTIP_CONTAINER
ScrollItem@ARMY_PLAYER_TEMPLATE:
X: 0
Y: 0
Width: 400
Height: 24
BaseName: scrollitem-nohover
Children:
ColorBlock@PLAYER_COLOR:
X: 0
Y: 0
Width: PARENT_RIGHT - 200
Height: PARENT_BOTTOM
GradientColorBlock@PLAYER_GRADIENT:
X: PARENT_RIGHT - 200
Y: 0
Width: 200
Height: PARENT_BOTTOM
Image@FLAG:
X: 5
Y: 4
Width: 35
Height: PARENT_BOTTOM - 4
ImageName: random
ImageCollection: flags
Label@PLAYER:
X: 40
Y: 0
Width: 120
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
ObserverArmyIcons@ARMY_ICONS:
X: 160
Y: 0
Width: 0
Height: PARENT_BOTTOM
TooltipContainer: TOOLTIP_CONTAINER
ScrollItem@COMBAT_PLAYER_TEMPLATE:
X: 0
Y: 0