From 2ebc6fc006faf3e1b2f121dce9a6cad6ab17aa0a Mon Sep 17 00:00:00 2001 From: Jessie Hildebrandt Date: Sun, 15 Jan 2023 02:47:13 -0500 Subject: [PATCH] Improve CTF UI (upstream) --- resource/ui/flagstatus.res | 52 ++--- resource/ui/hudobjectiveflagpanel.res | 262 +++++++++++--------------- 2 files changed, 134 insertions(+), 180 deletions(-) diff --git a/resource/ui/flagstatus.res b/resource/ui/flagstatus.res index ff515fe..b270e4a 100644 --- a/resource/ui/flagstatus.res +++ b/resource/ui/flagstatus.res @@ -1,33 +1,32 @@ "Resource/UI/FlagStatus.res" -{ +{ "Arrow" { "ControlName" "CTFArrowPanel" "fieldName" "Arrow" - "xpos" "40" - "ypos" "-5" + "xpos" "cs-0.5" + "ypos" "cs-0.5" "zpos" "1" - "wide" "35" - "tall" "35" + "wide" "f0" + "tall" "f0" "visible" "1" "enabled" "1" "scaleImage" "1" + "proportionaltoparent" "1" "if_mvm" { - "xpos" "38" - "ypos" "-15" - "wide" "45" - "tall" "45" + "wide" "40" + "tall" "40" } } - + "Briefcase" { "ControlName" "CTFImagePanel" "fieldName" "Briefcase" - "xpos" "68" - "ypos" "34" + "xpos" "cs-0.5" + "ypos" "cs-0.5" "zpos" "2" "wide" "0" "tall" "0" @@ -35,43 +34,32 @@ "enabled" "1" "image" "../hud/objectives_flagpanel_briefcase" "scaleImage" "1" + "proportionaltoparent" "1" "if_mvm" { - "xpos" "50" - "ypos" "-2" - "zpos" "2" - "wide" "22" - "tall" "22" - } - - "if_specialdelivery" - { - "visible" "0" + "wide" "20" + "tall" "20" } } - + "StatusIcon" { "ControlName" "CTFImagePanel" "fieldName" "StatusIcon" - "xpos" "0" - "ypos" "-8" + "xpos" "cs-0.5" + "ypos" "cs-0.5-1" "zpos" "3" - "wide" "18" - "tall" "18" + "wide" "f20" + "tall" "f20" "visible" "1" "enabled" "1" "image" "../hud/objectives_flagpanel_ico_flag_home" "scaleImage" "1" - "pin_to_sibling" "Arrow" - "pin_corner_to_sibling" "PIN_CENTER_TOP" - "pin_to_sibling_corner" "PIN_CENTER_TOP" + "proportionaltoparent" "1" "if_mvm" { - "xpos" "63" - "ypos" "13" "visible" "0" } } diff --git a/resource/ui/hudobjectiveflagpanel.res b/resource/ui/hudobjectiveflagpanel.res index 3b3f944..3362455 100644 --- a/resource/ui/hudobjectiveflagpanel.res +++ b/resource/ui/hudobjectiveflagpanel.res @@ -1,47 +1,39 @@ "Resource/UI/HudObjectiveFlagPanel.res" -{ +{ "ObjectiveStatusFlagPanel" { "ControlName" "EditablePanel" "fieldName" "ObjectiveStatusFlagPanel" - "xpos" "0" + "xpos" "0" "ypos" "0" "zpos" "1" "wide" "f0" "tall" "480" "visible" "1" "enabled" "1" - + "if_hybrid" { "zpos" "-1" } - - "if_mvm" - { - "xpos" "-7" - "ypos" "-8" - } } - + "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" - + "PaintBackground" "0" + "paintborder" "1" + "border" "MaterialTransparent50" + "if_hybrid" { "visible" "0" @@ -62,22 +54,21 @@ "xpos" "0" "ypos" "0" "zpos" "4" - "wide" "120" + "wide" "110" "tall" "16" "visible" "1" "enabled" "1" + "proportionaltoparent" "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" - + "if_hybrid" { "visible" "0" @@ -92,22 +83,22 @@ } } - "BlueScoreBG" + "BlueScoreBG" { - "ControlName" "CExImageButton" + "ControlName" "EditablePanel" "fieldName" "BlueScoreBG" "xpos" "0" "ypos" "-11" "zpos" "2" - "wide" "65" + "wide" "63" "tall" "20" - "autoResize" "0" - "pinCorner" "0" "visible" "1" "enabled" "1" + "proportionaltoparent" "1" "PaintBackground" "0" - "border_default" "MaterialBlue" - "textinsety" "99" + "PaintBorder" "1" + "border" "MaterialBlue" + "pin_to_sibling" "BlackTransparentBG" "pin_corner_to_sibling" "PIN_BOTTOMLEFT" "pin_to_sibling_corner" "PIN_TOPLEFT" @@ -116,18 +107,15 @@ { "visible" "0" } - "if_mvm" { "visible" "0" } - "if_specialdelivery" { "visible" "0" } } - "BlueScore" { "ControlName" "CExLabel" @@ -135,28 +123,28 @@ "xpos" "-5" "ypos" "0" "zpos" "10" - "wide" "59" + "wide" "25" "tall" "20" "visible" "1" "enabled" "1" - "textAlignment" "west" + "proportionaltoparent" "1" + "textAlignment" "west" "labelText" "%bluescore%" "font" "Size 18" "fgcolor" "White" + "pin_to_sibling" "BlueScoreBG" "pin_corner_to_sibling" "PIN_CENTER_LEFT" "pin_to_sibling_corner" "PIN_CENTER_LEFT" - + "if_hybrid" { "visible" "0" } - "if_mvm" { "visible" "0" } - "if_specialdelivery" { "visible" "0" @@ -169,48 +157,47 @@ "xpos" "-1" "ypos" "-1" "zpos" "9" - "wide" "59" + "wide" "25" "tall" "20" "visible" "1" "enabled" "1" - "textAlignment" "west" + "proportionaltoparent" "1" + "textAlignment" "west" "labelText" "%bluescore%" "font" "Size 18 Blur" "fgcolor" "Shadow" "pin_to_sibling" "BlueScore" - + "if_hybrid" { "visible" "0" } - "if_mvm" { "visible" "0" } - "if_specialdelivery" { "visible" "0" } } - - "RedScoreBG" + + "RedScoreBG" { - "ControlName" "CExImageButton" + "ControlName" "EditablePanel" "fieldName" "RedScoreBG" "xpos" "0" "ypos" "-11" "zpos" "2" - "wide" "65" + "wide" "64" "tall" "20" - "autoResize" "0" - "pinCorner" "0" "visible" "1" "enabled" "1" + "proportionaltoparent" "1" "PaintBackground" "0" - "border_default" "MaterialRed" - "textinsety" "99" + "paintborder" "1" + "border" "MaterialRed" + "pin_to_sibling" "BlackTransparentBG" "pin_corner_to_sibling" "PIN_BOTTOMRIGHT" "pin_to_sibling_corner" "PIN_TOPRIGHT" @@ -219,18 +206,16 @@ { "visible" "0" } - "if_mvm" { "visible" "0" } - "if_specialdelivery" { "visible" "0" } } - + "RedScore" { "ControlName" "CExLabel" @@ -238,28 +223,26 @@ "xpos" "-5" "ypos" "0" "zpos" "10" - "wide" "59" + "wide" "25" "tall" "20" "visible" "1" "enabled" "1" - "textAlignment" "east" + "textAlignment" "east" "labelText" "%redscore%" "font" "Size 18" "fgcolor" "White" "pin_to_sibling" "RedScoreBG" "pin_corner_to_sibling" "PIN_CENTER_RIGHT" "pin_to_sibling_corner" "PIN_CENTER_RIGHT" - + "if_hybrid" { "visible" "0" } - "if_mvm" { "visible" "0" } - "if_specialdelivery" { "visible" "0" @@ -272,26 +255,24 @@ "xpos" "-1" "ypos" "-1" "zpos" "9" - "wide" "59" + "wide" "25" "tall" "20" "visible" "1" "enabled" "1" - "textAlignment" "east" + "textAlignment" "east" "labelText" "%redscore%" "font" "Size 18 Blur" "fgcolor" "Shadow" "pin_to_sibling" "RedScore" - + "if_hybrid" { "visible" "0" } - "if_mvm" { "visible" "0" } - "if_specialdelivery" { "visible" "0" @@ -302,131 +283,128 @@ { "ControlName" "CTFFlagStatus" "fieldName" "BlueFlag" - "xpos" "c-74" - "ypos" "r40" + "xpos" "cs-0.5-17" + "ypos" "rs1-15" "zpos" "5" - "wide" "160" - "tall" "90" + "wide" "35" + "tall" "35" "visible" "1" "enabled" "1" - - "if_hybrid_single" - { - "xpos" "c-55" - "ypos" "r40" - } - - "if_specialdelivery" - { - "ypos" "r35" - } - - "if_no_flags" - { - "visible" "0" - } + "proportionaltoparent" "1" + "if_hybrid" { "visible" "0" } + "if_mvm" + { + "xpos" "cs-0.5-3" + "ypos" "rs1-17" + } + "if_hybrid_single" + { + "xpos" "cs-0.5" + } + "if_no_flags" + { + "visible" "0" + } + "if_specialdelivery" + { + "ypos" "rs1" + } } - + "RedFlag" { "ControlName" "CTFFlagStatus" "fieldName" "RedFlag" - "xpos" "c-36" - "ypos" "r40" + "xpos" "cs-0.5+17" + "ypos" "rs1-15" "zpos" "5" - "wide" "160" - "tall" "90" + "wide" "35" + "tall" "35" "visible" "1" "enabled" "1" - - "if_hybrid_single" - { - "xpos" "c-55" - "ypos" "r40" - } - - "if_specialdelivery" - { - "visible" "0" - } + "proportionaltoparent" "1" + "if_hybrid" { "visible" "0" } + "if_hybrid_single" + { + "xpos" "cs-0.5" + } "if_no_flags" { "visible" "0" } - } - + "if_specialdelivery" + { + "ypos" "rs1" + } + } + "CaptureFlag" { "ControlName" "CTFArrowPanel" "fieldName" "CaptureFlag" "xpos" "cs-0.5" - "ypos" "r44" + "ypos" "rs1-15" "zpos" "5" "wide" "35" "tall" "35" "visible" "0" "enabled" "1" "proportionaltoparent" "1" - - "if_hybrid" - { - "ypos" "r44" - } "if_specialdelivery" { - "visible" "1" - "ypos" "r44" - "wide" "38" - "tall" "38" + "ypos" "rs1" } } - + "CarriedImage" { "ControlName" "ImagePanel" "fieldName" "CarriedImage" - "xpos" "cs-.5" - "ypos" "r36" + "xpos" "cs-0.5" + "ypos" "rs1-25" "zpos" "10" - "wide" "18" - "tall" "18" + "wide" "15" + "tall" "15" "visible" "1" "enabled" "1" "image" "../hud/objectives_flagpanel_carried_red" "scaleImage" "1" "proportionaltoparent" "1" - + "if_hybrid" { "ypos" "r36" } - "if_specialdelivery" { "visible" "0" + "ypos" "rs1-7" + "wide" "18" + "tall" "18" } } - + "PoisonIcon" { "ControlName" "ImagePanel" "fieldName" "PoisonIcon" - "xpos" "cs-0.5" - "ypos" "r75" + "xpos" "cs-1" + "ypos" "rs1-55" "zpos" "6" - "wide" "40" + "wide" "15" "tall" "o1" "visible" "1" "enabled" "1" + "proportionaltoparent" "1" "image" "marked_for_death" "scaleImage" "1" } @@ -434,34 +412,22 @@ { "ControlName" "CExLabel" "fieldName" "PoisonTimeLabel" - "xpos" "cs-0.5" - "ypos" "r65" + "xpos" "5" + "ypos" "0" "zpos" "6" - "wide" "40" - "tall" "20" + "wide" "20" + "tall" "18" "visible" "0" "enabled" "1" - "textAlignment" "center" + "proportionaltoparent" "1" + "textAlignment" "west" "labelText" "%redscore%" - "font" "Size 24" + "font" "Size 18" "fgcolor" "White" - } - "PoisonTimeLabelShadow" - { - "ControlName" "CExLabel" - "fieldName" "PoisonTimeLabelShadow" - "xpos" "-1" - "ypos" "-1" - "zpos" "5" - "wide" "40" - "tall" "20" - "visible" "0" - "enabled" "1" - "textAlignment" "center" - "labelText" "%redscore%" - "font" "Size 24 Blur" - "fgcolor" "Shadow" - "pin_to_sibling" "PoisonTimeLabel" + + "pin_to_sibling" "PoisonIcon" + "pin_corner_to_sibling" "PIN_CENTER_LEFT" + "pin_to_sibling_corner" "PIN_CENTER_RIGHT" } "OutlineImage" @@ -479,13 +445,13 @@ "scaleImage" "1" "proportionaltoparent" "1" } - + "SpecCarriedImage" { "ControlName" "ImagePanel" "fieldName" "SpecCarriedImage" "xpos" "cs-0.5" - "ypos" "r95" + "ypos" "r85" "zpos" "10" "wide" "30" "tall" "30"