From 5698a8abf5cb1de44901d781d5be98ae982ef52f Mon Sep 17 00:00:00 2001 From: Jessie Hildebrandt Date: Sun, 15 Jan 2023 02:36:12 -0500 Subject: [PATCH] Improve player/robot destruction UI (upstream) --- resource/ui/hudobjectiveplayerdestruction.res | 541 +++++------------- resource/ui/hudobjectiverobotdestruction.res | 300 +++++----- .../ui/tfhudrobotdestruction_activestate.res | 8 +- .../ui/tfhudrobotdestruction_deadstate.res | 10 +- .../tfhudrobotdestruction_robotindicator.res | 4 +- .../tfhudrobotdestruction_shieldedstate.res | 6 +- 6 files changed, 298 insertions(+), 571 deletions(-) diff --git a/resource/ui/hudobjectiveplayerdestruction.res b/resource/ui/hudobjectiveplayerdestruction.res index 3de5c74..fa1ff43 100644 --- a/resource/ui/hudobjectiveplayerdestruction.res +++ b/resource/ui/hudobjectiveplayerdestruction.res @@ -1,5 +1,5 @@ "Resource/UI/HudObjectivePlayerDestruction.res" -{ +{ "ObjectiveStatusRobotDestruction" { "ControlName" "EditablePanel" @@ -18,7 +18,7 @@ "robot_y_offset" "47" "robot_x_step" "23" "robot_y_step" "0" - + "color_blue" "92 173 255 255" "color_red" "255 61 61 255" @@ -43,24 +43,21 @@ "skip_autoresize" "1" } } - + "BlackTransparentBG" { - "ControlName" "CExImageButton" + "ControlName" "EditablePanel" "fieldName" "BlackTransparentBG" "xpos" "cs-0.5" - "ypos" "r19" + "ypos" "rs1" "zpos" "1" "wide" "120" "tall" "22" - "autoResize" "0" - "pinCorner" "0" "visible" "1" "enabled" "1" - "PaintBackground" "0" - "border_default" "MaterialTransparent50" - "textinsety" "99" "proportionaltoparent" "1" + "PaintBorder" "1" + "border" "MaterialTransparent50" } "PlayingTo" { @@ -69,92 +66,75 @@ "xpos" "0" "ypos" "0" "zpos" "4" - "wide" "120" + "wide" "110" "tall" "16" "visible" "1" "enabled" "1" "labelText" "#TF_PlayingTo" "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" "AllCaps" "1" "font" "Size 8" "fgcolor" "White" - + "pin_to_sibling" "BlackTransparentBG" "pin_corner_to_sibling" "PIN_CENTER_BOTTOM" "pin_to_sibling_corner" "PIN_CENTER_BOTTOM" } - - "BlueScoreBG" + + "BlueScoreBG" { - "ControlName" "CExImageButton" + "ControlName" "EditablePanel" "fieldName" "BlueScoreBG" "xpos" "0" "ypos" "-11" "zpos" "2" - "wide" "65" + "wide" "64" "tall" "20" - "autoResize" "0" - "pinCorner" "0" "visible" "1" "enabled" "1" - "PaintBackground" "0" - "border_default" "MaterialBlue" - "textinsety" "99" + "proportionaltoparent" "1" + "PaintBorder" "1" + "border" "MaterialBlue" + "pin_to_sibling" "BlackTransparentBG" "pin_corner_to_sibling" "PIN_BOTTOMLEFT" "pin_to_sibling_corner" "PIN_TOPLEFT" } - "RedScoreBG" + "RedScoreBG" { - "ControlName" "CExImageButton" + "ControlName" "EditablePanel" "fieldName" "RedScoreBG" "xpos" "0" "ypos" "-11" "zpos" "2" - "wide" "65" + "wide" "63" "tall" "20" - "autoResize" "0" - "pinCorner" "0" "visible" "1" "enabled" "1" - "PaintBackground" "0" - "border_default" "MaterialRed" - "textinsety" "99" + "proportionaltoparent" "1" + "PaintBorder" "1" + "border" "MaterialRed" + "pin_to_sibling" "BlackTransparentBG" "pin_corner_to_sibling" "PIN_BOTTOMRIGHT" "pin_to_sibling_corner" "PIN_TOPRIGHT" } - + "CarriedContainer" { "ControlName" "EditablePanel" "fieldName" "CarriedContainer" "xpos" "c-80" - "ypos" "r28" + "ypos" "rs1" "zpos" "1" "wide" "24" - "tall" "30" + "tall" "31" "visible" "0" "enabled" "1" "paintbackground" "0" - - "GreenBG" - { - "ControlName" "EditablePanel" - "fieldName" "GreenBG" - "xpos" "0" - "ypos" "0" - "zpos" "2" - "wide" "24" - "tall" "30" - "visible" "1" - "enabled" "1" - "paintbackground" "0" - "border" "MaterialGreen" - } - + "paintborder" "1" + "border" "MaterialTransparentGreen70" + "CarriedImage" { "ControlName" "ImagePanel" @@ -169,18 +149,7 @@ "image" "../hud/hud_obj_status_ammo_64" "scaleImage" "1" "proportionalToParent" "1" - } - - "CarriedProgressBar" - { - "fieldName" "CarriedProgressBar" - "ControlName" "ImagePanel" - "wide" "0" - "tall" "0" - "visible" "0" - "enabled" "0" } - "FlagValue" { "ControlName" "CExLabel" @@ -192,11 +161,11 @@ "tall" "15" "visible" "1" "enabled" "1" - "textAlignment" "center" + "textAlignment" "center" "labelText" "%flagvalue%" "font" "Size 12" - "fgcolor" "White" - "proportionalToParent" "1" + "fgcolor" "White" + "proportionalToParent" "1" } "FlagValueShadow" { @@ -209,40 +178,37 @@ "tall" "15" "visible" "1" "enabled" "1" - "textAlignment" "center" + "textAlignment" "center" "labelText" "%flagvalue%" "font" "Size 12 Blur" - "fgcolor" "Shadow" - "proportionalToParent" "1" + "fgcolor" "Shadow" + "proportionalToParent" "1" "pin_to_sibling" "FlagValue" } - + + "CarriedProgressBar" + { + "fieldName" "CarriedProgressBar" + "ControlName" "ImagePanel" + "xpos" "9999" + } "TeamLeaderImage" { "ControlName" "CTFImagePanel" "fieldName" "TeamLeaderImage" - "wide" "0" - "tall" "0" - "visible" "0" - "enabled" "0" + "xpos" "9999" } "FlagValueShadow" { "ControlName" "CExLabel" "fieldName" "FlagValueShadow" - "wide" "0" - "tall" "0" - "visible" "0" - "enabled" "0" + "xpos" "9999" } "WhiteBG" { "ControlName" "EditablePanel" "fieldName" "WhiteBG" - "wide" "0" - "tall" "0" - "visible" "0" - "enabled" "0" + "xpos" "9999" } } @@ -255,7 +221,6 @@ "zpos" "5" "wide" "f0" "tall" "480" - "scaleimage" "0" "visible" "1" "enabled" "1" @@ -271,23 +236,20 @@ "visible" "1" "enabled" "1" "proportionalToParent" "1" - + "ScoreOutline" { "fieldName" "ScoreOutline" "ControlName" "ImagePanel" - "wide" "0" - "tall" "0" - "visible" "0" - "enabled" "0" + "xpos" "9999" } "FlagImageBlue" { "ControlName" "ImagePanel" "fieldName" "FlagImageBlue" - "xpos" "c-56" - "ypos" "r41" + "xpos" "c-57" + "ypos" "rs1-32" "zpos" "4" "wide" "12" "tall" "12" @@ -297,29 +259,27 @@ "scaleImage" "1" "proportionalToParent" "1" } - "EscrowBlue" { "ControlName" "CExLabel" "fieldName" "EscrowBlue" - "xpos" "10" - "ypos" "2" + "xpos" "6" + "ypos" "0" "zpos" "4" "wide" "25" "tall" "16" "visible" "1" "enabled" "1" - "textAlignment" "west" + "textAlignment" "west" "labelText" "%blue_escrow%" "font" "Size 16" - "fgcolor" "White" + "fgcolor" "White" "proportionalToParent" "1" - + "pin_to_sibling" "FlagImageBlue" - "pin_corner_to_sibling" "PIN_TOPLEFT" - "pin_to_sibling_corner" "PIN_TOPRIGHT" + "pin_corner_to_sibling" "PIN_CENTER_LEFT" + "pin_to_sibling_corner" "PIN_CENTER_RIGHT" } - "EscrowBlueShadow" { "ControlName" "CExLabel" @@ -331,12 +291,12 @@ "tall" "16" "visible" "1" "enabled" "1" - "textAlignment" "west" + "textAlignment" "west" "labelText" "%blue_escrow%" "font" "Size 16 Blur" - "fgcolor" "Shadow" + "fgcolor" "Shadow" "proportionalToParent" "1" - + "pin_to_sibling" "EscrowBlue" } @@ -345,7 +305,7 @@ "ControlName" "ImagePanel" "fieldName" "FlagImageRed" "xpos" "c44" - "ypos" "r41" + "ypos" "rs1-32" "zpos" "4" "wide" "12" "tall" "12" @@ -355,29 +315,27 @@ "scaleImage" "1" "proportionalToParent" "1" } - "EscrowRed" { "ControlName" "CExLabel" "fieldName" "EscrowRed" - "xpos" "7" - "ypos" "2" + "xpos" "6" + "ypos" "0" "zpos" "4" "wide" "25" "tall" "16" "visible" "1" "enabled" "1" - "textAlignment" "east" + "textAlignment" "east" "labelText" "%red_escrow%" "font" "Size 16" - "fgcolor" "White" + "fgcolor" "White" "proportionalToParent" "1" - + "pin_to_sibling" "FlagImageRed" - "pin_corner_to_sibling" "PIN_TOPRIGHT" - "pin_to_sibling_corner" "PIN_TOPLEFT" + "pin_corner_to_sibling" "PIN_CENTER_RIGHT" + "pin_to_sibling_corner" "PIN_CENTER_LEFT" } - "EscrowRedShadow" { "ControlName" "CExLabel" @@ -389,12 +347,12 @@ "tall" "16" "visible" "1" "enabled" "1" - "textAlignment" "east" + "textAlignment" "east" "labelText" "%red_escrow%" "font" "Size 16 Blur" - "fgcolor" "Shadow" + "fgcolor" "Shadow" "proportionalToParent" "1" - + "pin_to_sibling" "EscrowRed" } @@ -402,24 +360,24 @@ { "fieldName" "BlueVictoryContainer" "ControlName" "EditablePanel" - "xpos" "c-59" - "ypos" "r29" + "xpos" "c-57" + "ypos" "rs1-14" "zpos" "10" - "wide" "60" - "tall" "30" + "wide" "58" + "tall" "15" "visible" "0" "enabled" "1" "proportionalToParent" "1" - + "VictoryLabel2" { "ControlName" "CExLabel" "fieldName" "VictoryLabel2" - "xpos" "5" - "ypos" "1" + "xpos" "2" + "ypos" "0" "zpos" "8" "wide" "30" - "tall" "20" + "tall" "f1" "visible" "1" "enabled" "1" "textAlignment" "west" @@ -436,7 +394,7 @@ "ypos" "-1" "zpos" "7" "wide" "30" - "tall" "20" + "tall" "f1" "visible" "1" "enabled" "1" "textAlignment" "west" @@ -446,7 +404,7 @@ "proportionalToParent" "1" "pin_to_sibling" "VictoryLabel2" } - + "VictoryLabelTime" { "ControlName" "CExLabel" @@ -455,15 +413,15 @@ "ypos" "0" "zpos" "8" "wide" "20" - "tall" "20" + "tall" "f1" "visible" "1" "enabled" "1" - "textAlignment" "east" + "textAlignment" "east" "labelText" "%victorytime%" "font" "Size 18" - "fgcolor" "White" + "fgcolor" "White" "proportionalToParent" "1" - + "pin_to_sibling" "VictoryLabel2" "pin_corner_to_sibling" "PIN_TOPLEFT" "pin_to_sibling_corner" "PIN_TOPRIGHT" @@ -476,13 +434,13 @@ "ypos" "-1" "zpos" "7" "wide" "20" - "tall" "20" + "tall" "f1" "visible" "1" "enabled" "1" "textAlignment" "east" "labelText" "%victorytime%" "font" "Size 18 Blur" - "fgcolor" "Shadow" + "fgcolor" "Shadow" "proportionalToParent" "1" "pin_to_sibling" "VictoryLabelTime" } @@ -509,7 +467,6 @@ "tall" "0" "visible" "0" } - "BlueProgressBarEscrow" { "fieldName" "BlueProgressBarEscrow" @@ -523,11 +480,11 @@ { "fieldName" "RedVictoryContainer" "ControlName" "EditablePanel" - "xpos" "c-2" - "ypos" "r29" + "xpos" "c1" + "ypos" "rs1-14" "zpos" "10" - "wide" "60" - "tall" "20" + "wide" "56" + "tall" "15" "visible" "0" "enabled" "1" "proportionalToParent" "1" @@ -536,11 +493,11 @@ { "ControlName" "CExLabel" "fieldName" "VictoryLabel2" - "xpos" "5" - "ypos" "1" + "xpos" "2" + "ypos" "0" "zpos" "8" "wide" "30" - "tall" "20" + "tall" "f1" "visible" "1" "enabled" "1" "textAlignment" "west" @@ -557,7 +514,7 @@ "ypos" "-1" "zpos" "7" "wide" "30" - "tall" "20" + "tall" "f1" "visible" "1" "enabled" "1" "textAlignment" "west" @@ -567,7 +524,7 @@ "proportionalToParent" "1" "pin_to_sibling" "VictoryLabel2" } - + "VictoryLabelTime" { "ControlName" "CExLabel" @@ -576,15 +533,15 @@ "ypos" "0" "zpos" "8" "wide" "20" - "tall" "20" + "tall" "f1" "visible" "1" "enabled" "1" "textAlignment" "east" "labelText" "%victorytime%" "font" "Size 18" - "fgcolor" "White" + "fgcolor" "White" "proportionalToParent" "1" - + "pin_to_sibling" "VictoryLabel2" "pin_corner_to_sibling" "PIN_TOPLEFT" "pin_to_sibling_corner" "PIN_TOPRIGHT" @@ -597,13 +554,13 @@ "ypos" "-1" "zpos" "7" "wide" "20" - "tall" "20" + "tall" "f1" "visible" "1" "enabled" "1" "textAlignment" "east" "labelText" "%victorytime%" "font" "Size 18 Blur" - "fgcolor" "Shadow" + "fgcolor" "Shadow" "proportionalToParent" "1" "pin_to_sibling" "VictoryLabelTime" } @@ -630,7 +587,6 @@ "tall" "0" "visible" "0" } - "RedProgressBarEscrow" { "fieldName" "RedProgressBarEscrow" @@ -645,27 +601,27 @@ { "ControlName" "EditablePanel" "fieldName" "BlueScoreValueContainer" - "xpos" "c-59" - "ypos" "r28" + "xpos" "c-57" + "ypos" "rs1-14" "zpos" "10" - "wide" "60" - "tall" "19" + "wide" "58" + "tall" "15" "visible" "1" "enabled" "1" "proportionalToParent" "1" - + "Score" { "ControlName" "CExLabel" "fieldName" "Score" - "xpos" "5" - "ypos" "0" + "xpos" "2" + "ypos" "cs-0.5" "zpos" "8" - "wide" "60" - "tall" "20" + "wide" "f0" + "tall" "f1" "visible" "1" "enabled" "1" - "textAlignment" "west" + "textAlignment" "west" "labelText" "%score%" "font" "Size 18" "fgcolor" "White" @@ -678,18 +634,18 @@ "xpos" "-1" "ypos" "-1" "zpos" "7" - "wide" "60" - "tall" "20" + "wide" "f0" + "tall" "f1" "visible" "1" "enabled" "1" - "textAlignment" "west" + "textAlignment" "west" "labelText" "%score%" "font" "Size 18 Blur" "fgcolor" "Shadow" "proportionalToParent" "1" "pin_to_sibling" "Score" } - + "WhiteBG" { "ControlName" "EditableLabel" @@ -708,28 +664,27 @@ { "ControlName" "EditablePanel" "fieldName" "RedScoreValueContainer" - "xpos" "c0" - "ypos" "r28" + "xpos" "c1" + "ypos" "rs1-14" "zpos" "10" - "wide" "58" - "tall" "18" + "wide" "56" + "tall" "15" "visible" "1" "enabled" "1" - "bgcolor_override" "Blank" "proportionalToParent" "1" "Score" { "ControlName" "CExLabel" "fieldName" "Score" - "xpos" "-6" - "ypos" "0" + "xpos" "rs1-2" + "ypos" "cs-0.5" "zpos" "8" - "wide" "60" - "tall" "20" + "wide" "f0" + "tall" "f1" "visible" "1" "enabled" "1" - "textAlignment" "east" + "textAlignment" "east" "labelText" "%score%" "font" "Size 18" "fgcolor" "White" @@ -742,18 +697,18 @@ "xpos" "-1" "ypos" "-1" "zpos" "7" - "wide" "60" - "tall" "20" + "wide" "f0" + "tall" "f1" "visible" "1" "enabled" "1" - "textAlignment" "east" + "textAlignment" "east" "labelText" "%score%" "font" "Size 18 Blur" "fgcolor" "Shadow" "proportionalToParent" "1" "pin_to_sibling" "Score" } - + "WhiteBG" { "ControlName" "EditableLabel" @@ -763,7 +718,7 @@ "RedBar" { "ControlName" "EditableLabel" - "fieldName" "BlueBar" + "fieldName" "RedBar" "xpos" "9999" } } @@ -772,198 +727,13 @@ { "ControlName" "EditablePanel" "fieldName" "BlueStolenContainer" - "xpos" "c-100" - "ypos" "r41" - "zpos" "1" - "wide" "30" - "tall" "40" - "visible" "1" - "enabled" "1" - "paintbackground" "0" - "proportionalToParent" "1" - - "IntelImage" - { - "ControlName" "ImagePanel" - "fieldName" "IntelImage" - "xpos" "5" - "ypos" "19" - "zpos" "10" - "wide" "21" - "tall" "21" - "visible" "0" - "enabled" "1" - "image" "../HUD/obj_thief_red" - "scaleImage" "1" - "proportionalToParent" "1" - } - - "DroppedIntelContainer" - { - "ControlName" "EditablePanel" - "fieldName" "DroppedIntelContainer" - "xpos" "0" - "ypos" "20" - "zpos" "1" - "wide" "f0" - "tall" "f0" - "visible" "1" - "enabled" "1" - "paintbackground" "0" - - "proportionalToParent" "1" - - "DroppedIntelImage" - { - "ControlName" "ImagePanel" - "fieldName" "DroppedIntelImage" - "xpos" "0" - "ypos" "0" - "zpos" "0" - "wide" "f0" - "tall" "20" - "visible" "1" - "enabled" "1" - "image" "../HUD/obj_rd_thief_dropped_blue" - "scaleImage" "1" - "proportionalToParent" "1" - } - } - - "IntelValue" - { - "ControlName" "CExLabel" - "fieldName" "IntelValue" - "xpos" "0" - "ypos" "0" - "zpos" "12" - "wide" "f0" - "tall" "20" - "visible" "1" - "enabled" "1" - "textAlignment" "center" - "labelText" "%intelvalue%" - "font" "Size 16" - "fgcolor" "White" - "proportionalToParent" "1" - } - "IntelValueShadow" - { - "ControlName" "CExLabel" - "fieldName" "IntelValueShadow" - "xpos" "-1" - "ypos" "-1" - "zpos" "11" - "wide" "f0" - "tall" "20" - "visible" "1" - "enabled" "1" - "textAlignment" "center" - "labelText" "%intelvalue%" - "font" "Size 16 Blur" - "fgcolor" "Shadow" - "proportionalToParent" "1" - "pin_to_sibling" "IntelValue" - } + "xpos" "9999" } - "RedStolenContainer" { "ControlName" "EditablePanel" "fieldName" "RedStolenContainer" - "xpos" "c70" - "ypos" "r41" - "zpos" "1" - "wide" "30" - "tall" "40" - "visible" "1" - "enabled" "1" - "paintbackground" "0" - "proportionalToParent" "1" - - "IntelImage" - { - "ControlName" "ImagePanel" - "fieldName" "IntelImage" - "xpos" "5" - "ypos" "19" - "zpos" "10" - "wide" "21" - "tall" "21" - "visible" "0" - "enabled" "1" - "image" "../HUD/obj_thief_blue" - "scaleImage" "1" - "proportionalToParent" "1" - } - - "DroppedIntelContainer" - { - "ControlName" "EditablePanel" - "fieldName" "DroppedIntelContainer" - "xpos" "0" - "ypos" "20" - "zpos" "1" - "wide" "f0" - "tall" "f0" - "visible" "1" - "enabled" "1" - "paintbackground" "0" - - "proportionalToParent" "1" - - "DroppedIntelImage" - { - "ControlName" "ImagePanel" - "fieldName" "DroppedIntelImage" - "xpos" "0" - "ypos" "0" - "zpos" "0" - "wide" "f0" - "tall" "20" - "visible" "1" - "enabled" "1" - "image" "../HUD/obj_rd_thief_dropped_red" - "scaleImage" "1" - "proportionalToParent" "1" - } - } - - "IntelValue" - { - "ControlName" "CExLabel" - "fieldName" "IntelValue" - "xpos" "0" - "ypos" "0" - "zpos" "12" - "wide" "f0" - "tall" "20" - "visible" "1" - "enabled" "1" - "textAlignment" "center" - "labelText" "%intelvalue%" - "font" "Size 16" - "fgcolor" "White" - "proportionalToParent" "1" - } - "IntelValueShadow" - { - "ControlName" "CExLabel" - "fieldName" "IntelValueShadow" - "xpos" "-1" - "ypos" "-1" - "zpos" "11" - "wide" "f0" - "tall" "20" - "visible" "1" - "enabled" "1" - "textAlignment" "center" - "labelText" "%intelvalue%" - "font" "Size 16 Blur" - "fgcolor" "Shadow" - "proportionalToParent" "1" - "pin_to_sibling" "IntelValue" - } + "xpos" "9999" } } @@ -979,38 +749,18 @@ "visible" "0" "enabled" "1" - "Background" - { - "ControlName" "CTFImagePanel" - "fieldName" "Background" - "wide" "0" - "tall" "0" - "visible" "0" - "enabled" "0" - } - - "CountdownImage" - { - "ControlName" "ImagePanel" - "fieldName" "CountdownImage" - "wide" "0" - "tall" "0" - "visible" "0" - "enabled" "0" - } - "CountdownLabelTime" { "ControlName" "CExLabel" "fieldName" "CountdownLabelTime" "xpos" "cs-0.5" - "ypos" "r55" + "ypos" "rs1-30" "zpos" "8" "wide" "40" - "tall" "40" + "tall" "16" "visible" "1" "enabled" "1" - "textAlignment" "center" + "textAlignment" "center" "labelText" "%countdowntime%" "font" "Size 16" "fgcolor" "White" @@ -1025,19 +775,32 @@ "ypos" "-1" "zpos" "7" "wide" "40" - "tall" "40" + "tall" "16" "visible" "1" "enabled" "1" - "textAlignment" "center" + "textAlignment" "center" "labelText" "%countdowntime%" "font" "Size 16 Blur" - "fgcolor" "Shadow" + "fgcolor" "Shadow" "proportionalToParent" "1" - + "pin_to_sibling" "CountdownLabelTime" } + + "Background" + { + "ControlName" "CTFImagePanel" + "fieldName" "Background" + "xpos" "9999" + } + "CountdownImage" + { + "ControlName" "ImagePanel" + "fieldName" "CountdownImage" + "xpos" "9999" + } } - + //REMOVED STUFF "PlayingToBG" { diff --git a/resource/ui/hudobjectiverobotdestruction.res b/resource/ui/hudobjectiverobotdestruction.res index ad87a08..ebae5e6 100644 --- a/resource/ui/hudobjectiverobotdestruction.res +++ b/resource/ui/hudobjectiverobotdestruction.res @@ -1,5 +1,5 @@ -"Resource/UI/HudObjectiveFlagPanel.res" -{ +"Resource/UI/HudObjectiveRobotDestruction.res" +{ "ObjectiveStatusRobotDestruction" { "ControlName" "EditablePanel" @@ -14,11 +14,11 @@ "left_steal_edge_offset" "97" "right_steal_edge_offset" "97" - "robot_x_offset" "0" - "robot_y_offset" "25" - "robot_x_step" "20" + "robot_x_offset" "2" + "robot_y_offset" "4" + "robot_x_step" "16" "robot_y_step" "0" - + "color_blue" "92 173 255 255" "color_red" "255 61 61 255" @@ -33,40 +33,37 @@ "ControlName" "CTFHudRobotDestruction_RobotIndicator" "xpos" "0" "ypos" "0" - "wide" "20" - "tall" "20" + "wide" "14" + "tall" "14" "visible" "1" "paintbackground" "0" "paintborder" "0" "AutoResize" "1" "skip_autoresize" "1" } - } - + } + "BlackTransparentBG" { - "ControlName" "CExImageButton" + "ControlName" "EditablePanel" "fieldName" "BlackTransparentBG" "xpos" "cs-0.5" - "ypos" "r19" - "zpos" "1" - "wide" "120" - "tall" "22" - "autoResize" "0" - "pinCorner" "0" + "ypos" "rs1" + "zpos" "-1" + "wide" "110" + "tall" "26" "visible" "1" "enabled" "1" - "PaintBackground" "0" - "border_default" "MaterialTransparent50" - "textinsety" "99" "proportionaltoparent" "1" + "PaintBorder" "1" + "border" "MaterialTransparent50" } "PlayingTo" { "ControlName" "CExLabel" "fieldName" "PlayingTo" "xpos" "0" - "ypos" "0" + "ypos" "8" "zpos" "4" "wide" "120" "tall" "16" @@ -74,15 +71,13 @@ "enabled" "1" "labelText" "#TF_PlayingTo" "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" "AllCaps" "1" "font" "Size 8" "fgcolor" "White" - + "pin_to_sibling" "BlackTransparentBG" "pin_corner_to_sibling" "PIN_CENTER_BOTTOM" - "pin_to_sibling_corner" "PIN_CENTER_BOTTOM" + "pin_to_sibling_corner" "PIN_CENTER_TOP" } "CarriedContainer" @@ -90,71 +85,30 @@ "ControlName" "EditablePanel" "fieldName" "CarriedContainer" "xpos" "cs-0.5" - "ypos" "r79" + "ypos" "rs1-50" "zpos" "1" "wide" "150" - "tall" "80" + "tall" "20" "visible" "0" "enabled" "1" - "proportionalToParent" "1" - "paintbackground" "0" - - "CarriedImage" - { - "ControlName" "ImagePanel" - "fieldName" "CarriedImage" - "xpos" "0" - "ypos" "0" - "zpos" "10" - "wide" "f0" - "tall" "f0" - "visible" "1" - "enabled" "1" - "image" "../hud/obj_rd_powersupply_outline" - "scaleImage" "1" - "proportionalToParent" "1" - } - - "CarriedProgressBar" - { - "fieldName" "CarriedProgressBar" - "ControlName" "ImagePanel" - "xpos" "0" - "ypos" "0" - "zpos" "10" - "wide" "f0" - "tall" "480" - "scaleimage" "0" - "visible" "1" - "proportionalToParent" "1" - "positionImage" "0" - "drawcolor" "84 111 127 255" - "Image" "../HUD/obj_rd_powersupply_meter" - - "left_offset" "30" - "right_offset" "30" - "standard_color" "84 111 127 255" - "bright_color" "110 159 189 255" - "left_to_right" "1" - } "FlagValue" { "ControlName" "CExLabel" "fieldName" "FlagValue" - "xpos" "c-50" - "ypos" "23" + "xpos" "cs-0.5" + "ypos" "cs-0.5" "zpos" "11" - "wide" "100" - "tall" "35" + "wide" "f0" + "tall" "f0" "visible" "1" "enabled" "1" - "textAlignment" "center" + "textAlignment" "center" "labelText" "%flagvalue%" - "font" "Size 24" - "fgcolor" "White" - "proportionalToParent" "1" - } + "font" "Size 20" + "fgcolor" "White" + "proportionalToParent" "1" + } "FlagValueShadow" { "ControlName" "CExLabel" @@ -162,17 +116,30 @@ "xpos" "-1" "ypos" "-1" "zpos" "10" - "wide" "100" - "tall" "35" + "wide" "f0" + "tall" "f0" "visible" "1" "enabled" "1" - "textAlignment" "center" + "textAlignment" "center" "labelText" "%flagvalue%" - "font" "Size 24 Blur" - "fgcolor" "Shadow" - "proportionalToParent" "1" + "font" "Size 20" + "fgcolor" "Shadow" + "proportionalToParent" "1" "pin_to_sibling" "FlagValue" } + + "CarriedImage" + { + "ControlName" "ImagePanel" + "fieldName" "CarriedImage" + "xpos" "9999" + } + "CarriedProgressBar" + { + "fieldName" "CarriedProgressBar" + "ControlName" "ImagePanel" + "xpos" "9999" + } } "ScoreContainer" @@ -184,7 +151,6 @@ "zpos" "2" "wide" "f0" "tall" "480" - "scaleimage" "0" "visible" "1" "enabled" "1" @@ -199,29 +165,31 @@ { "ControlName" "EditablePanel" "fieldName" "BlueScoreValueContainer" - "xpos" "c-60" - "ypos" "r29" - "zpos" "10" - "wide" "65" + "xpos" "c-55" + "ypos" "rs1-18" + "zpos" "9" + "wide" "59" "tall" "20" "visible" "1" "enabled" "1" - "PaintBackground" "0" - "border" "MaterialBlue" + "visible" "1" + "enabled" "1" "proportionalToParent" "1" + "PaintBorder" "1" + "border" "MaterialBlue" "Score" { "ControlName" "CExLabel" "fieldName" "Score" "xpos" "5" - "ypos" "0" + "ypos" "cs-0.5-1" "zpos" "8" - "wide" "60" - "tall" "20" + "wide" "50" + "tall" "15" "visible" "1" "enabled" "1" - "textAlignment" "west" + "textAlignment" "west" "labelText" "%score%" "font" "Size 18" "fgcolor" "White" @@ -234,11 +202,11 @@ "xpos" "-1" "ypos" "-1" "zpos" "7" - "wide" "60" - "tall" "20" + "wide" "50" + "tall" "15" "visible" "1" "enabled" "1" - "textAlignment" "west" + "textAlignment" "west" "labelText" "%score%" "font" "Size 18 Blur" "fgcolor" "Shadow" @@ -251,29 +219,29 @@ { "ControlName" "EditablePanel" "fieldName" "RedScoreValueContainer" - "xpos" "c-5" - "ypos" "r29" + "xpos" "c-3" + "ypos" "rs1-18" "zpos" "10" - "wide" "65" + "wide" "58" "tall" "20" "visible" "1" "enabled" "1" - "PaintBackground" "0" - "border" "MaterialRed" "proportionalToParent" "1" + "PaintBorder" "1" + "border" "MaterialRed" "Score" { "ControlName" "CExLabel" "fieldName" "Score" - "xpos" "0" - "ypos" "0" + "xpos" "rs1-5" + "ypos" "cs-0.5-1" "zpos" "8" - "wide" "60" - "tall" "20" + "wide" "50" + "tall" "15" "visible" "1" "enabled" "1" - "textAlignment" "east" + "textAlignment" "east" "labelText" "%score%" "font" "Size 18" "fgcolor" "White" @@ -286,11 +254,11 @@ "xpos" "-1" "ypos" "-1" "zpos" "7" - "wide" "60" - "tall" "20" + "wide" "50" + "tall" "15" "visible" "1" "enabled" "1" - "textAlignment" "east" + "textAlignment" "east" "labelText" "%score%" "font" "Size 18 Blur" "fgcolor" "Shadow" @@ -303,28 +271,27 @@ { "ControlName" "EditablePanel" "fieldName" "BlueStolenContainer" - "xpos" "c-100" - "ypos" "r41" + "xpos" "c-52" + "ypos" "rs1-37" "zpos" "1" - "wide" "30" - "tall" "40" + "wide" "36" + "tall" "16" "visible" "1" "enabled" "1" - "paintbackground" "0" "proportionalToParent" "1" "IntelImage" { "ControlName" "ImagePanel" "fieldName" "IntelImage" - "xpos" "5" - "ypos" "19" + "xpos" "0" + "ypos" "cs-0.5" "zpos" "10" - "wide" "21" - "tall" "21" + "wide" "14" + "tall" "14" "visible" "0" "enabled" "1" - "image" "../HUD/obj_thief_red" + "image" "replay/thumbnails/rd_icons/obj_thief" "scaleImage" "1" "proportionalToParent" "1" } @@ -334,28 +301,27 @@ "ControlName" "EditablePanel" "fieldName" "DroppedIntelContainer" "xpos" "0" - "ypos" "20" + "ypos" "cs-0.5" "zpos" "1" - "wide" "f0" - "tall" "f0" + "wide" "14" + "tall" "14" "visible" "1" "enabled" "1" - "paintbackground" "0" - + "proportionalToParent" "1" "DroppedIntelImage" { "ControlName" "ImagePanel" "fieldName" "DroppedIntelImage" - "xpos" "0" - "ypos" "0" + "xpos" "cs-0.5" + "ypos" "cs-0.5" "zpos" "0" "wide" "f0" - "tall" "20" + "tall" "f0" "visible" "1" "enabled" "1" - "image" "../HUD/obj_rd_thief_dropped_blue" + "image" "replay/thumbnails/rd_icons/obj_rd_thief_dropped" "scaleImage" "1" "proportionalToParent" "1" } @@ -365,14 +331,14 @@ { "ControlName" "CExLabel" "fieldName" "IntelValue" - "xpos" "0" - "ypos" "0" + "xpos" "rs1" + "ypos" "cs-0.5" "zpos" "12" - "wide" "f0" - "tall" "20" + "wide" "f15" + "tall" "f0" "visible" "1" "enabled" "1" - "textAlignment" "center" + "textAlignment" "west" "labelText" "%intelvalue%" "font" "Size 16" "fgcolor" "White" @@ -385,16 +351,16 @@ "xpos" "-1" "ypos" "-1" "zpos" "11" - "wide" "f0" - "tall" "20" + "wide" "f15" + "tall" "f0" "visible" "1" "enabled" "1" - "textAlignment" "center" + "textAlignment" "west" "labelText" "%intelvalue%" - "font" "Size 16 Blur" + "font" "Size 16" "fgcolor" "Shadow" "proportionalToParent" "1" - "pin_to_sibling" "IntelValue" + "pin_to_sibling" "IntelValue" } } @@ -402,28 +368,27 @@ { "ControlName" "EditablePanel" "fieldName" "RedStolenContainer" - "xpos" "c70" - "ypos" "r41" + "xpos" "c16" + "ypos" "rs1-37" "zpos" "1" - "wide" "30" - "tall" "40" + "wide" "36" + "tall" "16" "visible" "1" "enabled" "1" - "paintbackground" "0" "proportionalToParent" "1" "IntelImage" { "ControlName" "ImagePanel" "fieldName" "IntelImage" - "xpos" "5" - "ypos" "19" + "xpos" "rs1" + "ypos" "cs-0.5" "zpos" "10" - "wide" "21" - "tall" "21" + "wide" "14" + "tall" "14" "visible" "0" "enabled" "1" - "image" "../HUD/obj_thief_blue" + "image" "replay/thumbnails/rd_icons/obj_thief" "scaleImage" "1" "proportionalToParent" "1" } @@ -432,29 +397,28 @@ { "ControlName" "EditablePanel" "fieldName" "DroppedIntelContainer" - "xpos" "0" - "ypos" "20" + "xpos" "rs1" + "ypos" "cs-0.5" "zpos" "1" - "wide" "f0" - "tall" "f0" + "wide" "14" + "tall" "14" "visible" "1" "enabled" "1" - "paintbackground" "0" - + "proportionalToParent" "1" "DroppedIntelImage" { "ControlName" "ImagePanel" "fieldName" "DroppedIntelImage" - "xpos" "0" - "ypos" "0" + "xpos" "cs-0.5" + "ypos" "cs-0.5" "zpos" "0" "wide" "f0" - "tall" "20" + "tall" "f0" "visible" "1" "enabled" "1" - "image" "../HUD/obj_rd_thief_dropped_red" + "image" "replay/thumbnails/rd_icons/obj_rd_thief_dropped" "scaleImage" "1" "proportionalToParent" "1" } @@ -465,13 +429,13 @@ "ControlName" "CExLabel" "fieldName" "IntelValue" "xpos" "0" - "ypos" "0" + "ypos" "cs-0.5" "zpos" "12" - "wide" "f0" - "tall" "20" + "wide" "f15" + "tall" "f0" "visible" "1" "enabled" "1" - "textAlignment" "center" + "textAlignment" "east" "labelText" "%intelvalue%" "font" "Size 16" "fgcolor" "White" @@ -484,16 +448,16 @@ "xpos" "-1" "ypos" "-1" "zpos" "11" - "wide" "f0" - "tall" "20" + "wide" "f15" + "tall" "f0" "visible" "1" "enabled" "1" - "textAlignment" "center" + "textAlignment" "east" "labelText" "%intelvalue%" - "font" "Size 16 Blur" + "font" "Size 16" "fgcolor" "Shadow" "proportionalToParent" "1" - "pin_to_sibling" "IntelValue" + "pin_to_sibling" "IntelValue" } } } diff --git a/resource/ui/tfhudrobotdestruction_activestate.res b/resource/ui/tfhudrobotdestruction_activestate.res index e476b2a..02eacaa 100644 --- a/resource/ui/tfhudrobotdestruction_activestate.res +++ b/resource/ui/tfhudrobotdestruction_activestate.res @@ -1,4 +1,4 @@ -"Resource/UI/TFHudRobotDestruction_RobotIndicator.res" +"Resource/UI/TFHudRobotDestruction_ActiveState.res" { "ActiveState" { @@ -7,8 +7,8 @@ "xpos" "0" "ypos" "0" "zpos" "5" - "wide" "18" - "tall" "18" + "wide" "14" + "tall" "14" "scaleimage" "1" "visible" "1" "redimage" "../HUD/obj_circle_red" @@ -59,4 +59,4 @@ "proportionalToParent" "1" } } -} +} \ No newline at end of file diff --git a/resource/ui/tfhudrobotdestruction_deadstate.res b/resource/ui/tfhudrobotdestruction_deadstate.res index 9a18ca4..86a3cb2 100644 --- a/resource/ui/tfhudrobotdestruction_deadstate.res +++ b/resource/ui/tfhudrobotdestruction_deadstate.res @@ -1,4 +1,4 @@ -"Resource/UI/TFHudRobotDestruction_RobotIndicator.res" +"Resource/UI/TFHudRobotDestruction_DeadState.res" { "DeadState" { @@ -7,8 +7,8 @@ "xpos" "0" "ypos" "0" "zpos" "5" - "wide" "18" - "tall" "18" + "wide" "14" + "tall" "14" "scaleimage" "1" "visible" "1" "redimage" "../HUD/obj_circle_red" @@ -51,9 +51,9 @@ "fieldName" "RespawnProgressBar" "xpos" "-1" "ypos" "-1" - "zpos" "4" + "zpos" "4" "wide" "f-2" - "tall" "f-2" + "tall" "f-2" "visible" "1" "visible_minmode" "0" "enabled" "1" diff --git a/resource/ui/tfhudrobotdestruction_robotindicator.res b/resource/ui/tfhudrobotdestruction_robotindicator.res index 097abd2..ba23d87 100644 --- a/resource/ui/tfhudrobotdestruction_robotindicator.res +++ b/resource/ui/tfhudrobotdestruction_robotindicator.res @@ -7,8 +7,8 @@ "proportionalToParent" "1" "xpos" "0" "ypos" "0" - "wide" "18" - "tall" "18" + "wide" "14" + "tall" "14" "visible" "0" "DeadState" diff --git a/resource/ui/tfhudrobotdestruction_shieldedstate.res b/resource/ui/tfhudrobotdestruction_shieldedstate.res index 7d0b600..58d285e 100644 --- a/resource/ui/tfhudrobotdestruction_shieldedstate.res +++ b/resource/ui/tfhudrobotdestruction_shieldedstate.res @@ -1,4 +1,4 @@ -"Resource/UI/TFHudRobotDestruction_RobotIndicator.res" +"Resource/UI/TFHudRobotDestruction_ShieldState.res" { "ShieldedState" { @@ -7,8 +7,8 @@ "xpos" "0" "ypos" "0" "zpos" "5" - "wide" "18" - "tall" "18" + "wide" "14" + "tall" "14" "scaleimage" "1" "visible" "1" "redimage" "../HUD/obj_circle_grey"