diff --git a/resource/ui/objectivestatusescort.res b/resource/ui/objectivestatusescort.res index 8464a97..a6d7abe 100644 --- a/resource/ui/objectivestatusescort.res +++ b/resource/ui/objectivestatusescort.res @@ -1,123 +1,108 @@ "Resource/UI/ObjectiveStatusEscort.res" -{ +{ "ObjectiveStatusEscort" { "ControlName" "EditablePanel" "fieldName" "ObjectiveStatusEscort" "xpos" "cs-0.5" - "ypos" "r15" + "ypos" "rs1-5" "zpos" "1" - "wide" "143" - "tall" "8" + "wide" "155" + "tall" "10" "visible" "1" "enabled" "1" "progress_xpos" "" "progress_wide" "" } - + + "TrackBG" + { + "ControlName" "EditablePanel" + "fieldName" "TrackBG" + "xpos" "13" + "ypos" "cs-0.5" + "zpos" "-1" + "wide" "140" + "tall" "8" + "visible" "1" + "enabled" "1" + "paintbackground" "1" + "paintbackgroundtype" "0" + "bgcolor_override" "TransparentLightBlack" + "proportionaltoparent" "1" + } + "ProgressBar" { "ControlName" "CTFHudEscortProgressBar" - "fieldName" "ProgressBar" - "xpos" "2" - "ypos" "0" - "zpos" "8" + "fieldName" "ProgressBar" + "xpos" "13" + "ypos" "cs-0.5" + "zpos" "0" "wide" "140" "tall" "8" "visible" "1" "enabled" "1" "scaleImage" "1" - - "proportionaltoparent" "1" - - "if_multiple_trains" - { - "tall" "0" - } - } - - "TrackBG" - { - "ControlName" "EditablePanel" - "fieldName" "TrackBG" - "xpos" "2" - "ypos" "0" - "zpos" "0" - "wide" "140" - "tall" "8" - "visible" "1" - "enabled" "1" - "bgcolor_override" "TransparentLightBlack" - "scaleImage" "1" "proportionaltoparent" "1" } - + "LevelBar" { "ControlName" "ImagePanel" - "fieldName" "LevelBar" - "xpos" "2" - "ypos" "0" + "fieldName" "LevelBar" + "xpos" "13" + "ypos" "cs-0.5" "zpos" "1" "wide" "140" "tall" "8" "visible" "1" "enabled" "1" - "labelText" "" "image" "" - "fillcolor" "Blank" - "drawcolor" "Blank" "scaleImage" "1" "proportionaltoparent" "1" } - + "HomeCPIcon" { "ControlName" "ImagePanel" "fieldName" "HomeCPIcon" "xpos" "0" - "ypos" "0" - "zpos" "1" - "wide" "2" - "tall" "8" - "autoResize" "0" - "pinCorner" "0" + "ypos" "cs-0.5" + "zpos" "5" + "wide" "3" + "tall" "10" "visible" "1" "enabled" "1" - "tabPosition" "0" - "labelText" "" - "scaleImage" "1" + "image" "../hud/cart_home_blue" + "scaleImage" "1" "proportionaltoparent" "1" - + "if_team_red" { - "fillcolor" "Red" + "image" "../hud/cart_home_red" } "if_multiple_trains_red" { - "fillcolor" "Red" + "image" "../hud/cart_home_red" } "if_multiple_trains_blue" { - "fillcolor" "Blue" + "image" "../hud/cart_home_blue" } } - + "SimpleControlPointTemplate" { "ControlName" "ImagePanel" "fieldName" "SimpleControlPointTemplate" - "xpos" "0" - "ypos" "0" - "zpos" "1" - "wide" "2" - "tall" "8" - "autoResize" "0" - "pinCorner" "0" + "xpos" "13" + "ypos" "cs-0.5" + "zpos" "3" + "wide" "3" + "tall" "10" "visible" "0" "enabled" "1" - "tabPosition" "0" - "labelText" "" "image" "" "scaleImage" "1" "proportionaltoparent" "1" @@ -127,150 +112,166 @@ { "ControlName" "EditablePanel" "fieldName" "EscortItemPanel" - "xpos" "2" + "xpos" "0" "ypos" "0" - "zpos" "2" - "wide" "280" - "tall" "8" + "zpos" "4" + "wide" "310" + "tall" "f0" "visible" "1" "enabled" "1" "proportionaltoparent" "1" - - "EscortItemImageCustom" + + "FillBar" { "ControlName" "ImagePanel" - "fieldName" "EscortItemImageCustom" + "fieldName" "FillBar" "xpos" "0" - "ypos" "0" - "zpos" "23" - "wide" "140" + "ypos" "cs-0.5" + "zpos" "0" + "wide" "155" "tall" "8" - "autoResize" "0" - "pinCorner" "0" "visible" "1" "enabled" "1" - "tabPosition" "0" "labelText" "" "fillcolor" "Blue" "scaleImage" "1" "proportionaltoparent" "1" - + "if_multiple_trains_red" { - "fillcolor" "Red" } } - - "CapNumPlayers" - { - "ControlName" "CExLabel" - "fieldName" "CapNumPlayers" - "font" "Size 9" - "xpos" "125" - "ypos" "0" - "zpos" "30" - "wide" "20" + + "EscortItemImage" + { + "ControlName" "ImagePanel" + "fieldName" "EscortItemImage" + "xpos" "144" + "ypos" "cs-0.5" + "zpos" "1" + "wide" "11" "tall" "8" - "AllCaps" "0" - "autoResize" "0" - "pinCorner" "0" - "visible" "0" - "enabled" "1" - "labelText" "#ControlPointIconCappers" - "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" - "fgcolor" "white" - "paintbackground" "0" - "proportionaltoparent" "1" - "use_proportional_insets" "1" - } - - "RecedeTime" - { - "ControlName" "CExLabel" - "fieldName" "RecedeTime" - "font" "Size 9" - "xpos" "122" - "ypos" "0" - "zpos" "30" - "wide" "20" - "tall" "8" - "autoResize" "0" - "pinCorner" "0" "visible" "1" "enabled" "1" - "labelText" "%recede%" + "proportionaltoparent" "1" + "image" "../hud/cart_neutral" + "scaleImage" "1" + + "if_team_blue" + { + "image" "../hud/cart_blue" + } + "if_team_red" + { + "image" "../hud/cart_red" + } + } + + "EscortItemImageBottom" + { + "ControlName" "ImagePanel" + "fieldName" "EscortItemImageBottom" + "xpos" "144" + "ypos" "cs-0.5" + "zpos" "1" + "wide" "11" + "tall" "8" + "visible" "0" + "enabled" "1" + "proportionaltoparent" "1" + "image" "../hud/cart_neutral" + "scaleImage" "1" + + "if_team_blue" + { + "image" "../hud/cart_blue" + } + "if_team_red" + { + "image" "../hud/cart_red" + } + } + + "CapNumPlayers" + { + "ControlName" "CExLabel" + "fieldName" "CapNumPlayers" + "xpos" "144" + "ypos" "cs-0.5" + "zpos" "2" + "wide" "11" + "tall" "8" + "visible" "0" + "enabled" "1" + "font" "Size 8" + "labelText" "#ControlPointIconCappers" "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" "fgcolor" "white" - "paintbackground" "0" "proportionaltoparent" "1" "use_proportional_insets" "1" - "textinsetx" "0" } - + + "RecedeTime" + { + "ControlName" "CExLabel" + "fieldName" "RecedeTime" + "xpos" "144" + "ypos" "cs-0.5" + "zpos" "2" + "wide" "11" + "tall" "8" + "visible" "1" + "enabled" "1" + "font" "Size 8" + "labelText" "%recede%" + "textAlignment" "center" + "fgcolor" "White" + "proportionaltoparent" "1" + } + "Speed_Backwards" { "ControlName" "ImagePanel" - "fieldName" "Speed_Backwards" - "xpos" "134" - "ypos" "1" - "zpos" "30" + "fieldName" "Speed_Backwards" + "xpos" "146" + "ypos" "cs-0.5" + "zpos" "2" "wide" "6" "tall" "6" - "autoResize" "0" - "pinCorner" "0" "visible" "0" "enabled" "1" - "tabPosition" "0" + "proportionaltoparent" "1" "labelText" "" "image" "replay\thumbnails\cart_icons\cart_arrow_left" - "scaleImage" "1" + "scaleImage" "1" } "Blocked" { "ControlName" "ImagePanel" - "fieldName" "Blocked" - "xpos" "132" - "ypos" "1" - "zpos" "30" - "wide" "6" - "tall" "6" - "autoResize" "0" - "pinCorner" "0" + "fieldName" "Blocked" + "xpos" "146" + "ypos" "cs-0.5" + "zpos" "2" + "wide" "7" + "tall" "7" "visible" "0" "enabled" "1" - "tabPosition" "0" - "labelText" "" + "proportionaltoparent" "1" "image" "../hud/cart_blocked" "scaleImage" "1" } - - "EscortItemImage" - { - "ControlName" "ImagePanel" - "fieldName" "EscortItemImage" - "xpos" "9999" - } - "EscortItemImageBottom" - { - "ControlName" "ImagePanel" - "fieldName" "EscortItemImageBottom" - "xpos" "9999" - } + "EscortItemImageAlert" { "ControlName" "ImagePanel" - "fieldName" "EscortItemImageAlert" + "fieldName" "EscortItemImageAlert" "xpos" "9999" } "CapPlayerImage" { - "ControlName" "ImagePanel" + "ControlName" "ImagePanel" "fieldName" "CapPlayerImage" "xpos" "9999" } diff --git a/resource/ui/objectivestatusmultipleescort.res b/resource/ui/objectivestatusmultipleescort.res index ee35148..bf330f1 100644 --- a/resource/ui/objectivestatusmultipleescort.res +++ b/resource/ui/objectivestatusmultipleescort.res @@ -1,17 +1,17 @@ "Resource/UI/ObjectiveStatusMultipleEscort.res" -{ +{ "ObjectiveStatusMultipleEscort" { "ControlName" "EditablePanel" "fieldName" "ObjectiveStatusMultipleEscort" "xpos" "cs-0.5" "ypos" "r30" - "wide" "143" - "tall" "21" + "wide" "155" + "tall" "30" "visible" "1" "enabled" "1" } - + "BlueEscortPanel" { "ControlName" "CTFHudEscort" @@ -19,16 +19,16 @@ "xpos" "0" "ypos" "0" "zpos" "1" - "wide" "143" - "tall" "8" + "wide" "155" + "tall" "10" "visible" "1" "enabled" "1" "progress_xpos" "" "progress_wide" "" - + "if_blue_is_top" { - "ypos" "12" + "ypos" "14" } } @@ -39,16 +39,16 @@ "xpos" "0" "ypos" "0" "zpos" "1" - "wide" "143" - "tall" "8" + "wide" "155" + "tall" "10" "visible" "1" "enabled" "1" "progress_xpos" "" "progress_wide" "" - + "if_red_is_top" { - "ypos" "12" + "ypos" "14" } } } \ No newline at end of file