From 41833fd8b1c43abb2e5c67dbe2d1feb2b203a10a Mon Sep 17 00:00:00 2001 From: CriticalFlaw Date: Sun, 12 Aug 2018 16:55:45 -0400 Subject: Updated Item Effect Meters to use #base --- resource/ui/HudItemEffectMeter.res | 38 ++--- resource/ui/HudItemEffectMeter_Cleaver.res | 79 +-------- resource/ui/HudItemEffectMeter_Demoman.res | 42 ++--- resource/ui/HudItemEffectMeter_Engineer.res | 20 --- resource/ui/HudItemEffectMeter_Heavy.res | 77 +-------- resource/ui/HudItemEffectMeter_ParticleCannon.res | 79 ++------- resource/ui/HudItemEffectMeter_Pomson.res | 81 +--------- resource/ui/HudItemEffectMeter_PowerupBottle.res | 188 +++++++++++----------- resource/ui/HudItemEffectMeter_Raygun.res | 77 +-------- resource/ui/HudItemEffectMeter_Sapper.res | 43 ++--- resource/ui/HudItemEffectMeter_Scout.res | 77 +-------- resource/ui/HudItemEffectMeter_Sniper.res | 38 ++--- resource/ui/HudItemEffectMeter_SniperFocus.res | 78 +-------- resource/ui/HudItemEffectMeter_SodaPopper.res | 80 +-------- resource/ui/HudItemEffectMeter_Spy.res | 42 ++--- resource/ui/HudItemEffectMeter_SpyKnife.res | 71 +------- resource/ui/huditemeffectmeter_kartcharge.res | 6 +- resource/ui/huditemeffectmeter_organs.res | 2 +- resource/ui/huditemeffectmeter_pyro.res | 4 +- 19 files changed, 208 insertions(+), 914 deletions(-) (limited to 'resource/ui') diff --git a/resource/ui/HudItemEffectMeter.res b/resource/ui/HudItemEffectMeter.res index d7075f7..fc54b77 100644 --- a/resource/ui/HudItemEffectMeter.res +++ b/resource/ui/HudItemEffectMeter.res @@ -2,34 +2,16 @@ { HudItemEffectMeter { - "fieldName" "HudItemEffectMeter" - "visible" "1" - "enabled" "1" - "xpos" "c-75" - "ypos" "c123" - "ypos_minmode" "c60" - "wide" "200" - "tall" "500" - "MeterFG" "White" - "MeterBG" "Gray" - } - - "ItemEffectMeterBG" - { - "ControlName" "CTFImagePanel" - "fieldName" "ItemEffectMeterBG" - "xpos" "9999" - "ypos" "9999" - "zpos" "0" - "wide" "100" - "tall" "50" - "enabled" "1" - "image" "../hud/misc_ammo_area_horiz1_blue" - "scaleImage" "1" - "teambg_2" "../hud/misc_ammo_area_horiz1_red" - "teambg_2_lodef" "../hud/misc_ammo_area_red_lodef" - "teambg_3" "../hud/misc_ammo_area_horiz1_blue" - "teambg_3_lodef" "../hud/misc_ammo_area_blue_lodef" + "fieldName" "HudItemEffectMeter" + "visible" "1" + "enabled" "1" + "xpos" "c-75" + "ypos" "c123" + "ypos_minmode" "c60" + "wide" "200" + "tall" "500" + "MeterFG" "White" + "MeterBG" "Gray" } "ItemEffectMeterLabel" diff --git a/resource/ui/HudItemEffectMeter_Cleaver.res b/resource/ui/HudItemEffectMeter_Cleaver.res index 0caacc2..f798b59 100644 --- a/resource/ui/HudItemEffectMeter_Cleaver.res +++ b/resource/ui/HudItemEffectMeter_Cleaver.res @@ -1,80 +1,15 @@ +#base "huditemeffectmeter.res" + "Resource/UI/HudItemEffectMeter_Cleaver.res" { - HudItemEffectMeter - { - "fieldName" "HudItemEffectMeter" - "visible" "1" - "enabled" "1" - "xpos" "c-75" - "ypos" "c103" - "ypos_minmode" "c53" - "wide" "200" - "tall" "500" - "MeterFG" "White" - "MeterBG" "Gray" - } - - "ItemEffectMeterBG" + "HudItemEffectMeter" { - "ControlName" "CTFImagePanel" - "fieldName" "ItemEffectMeterBG" - "xpos" "9999" - "ypos" "9999" - "zpos" "0" - "wide" "100" - "tall" "50" - "enabled" "1" - "image" "../hud/misc_ammo_area_horiz2_blue" - "scaleImage" "1" - "teambg_2" "../hud/misc_ammo_area_horiz2_red" - "teambg_2_lodef" "../hud/misc_ammo_area_red_lodef" - "teambg_3" "../hud/misc_ammo_area_horiz2_blue" - "teambg_3_lodef" "../hud/misc_ammo_area_blue_lodef" + "ypos" "c103" + "ypos_minmode" "c53" } "ItemEffectMeterLabel" { - "ControlName" "CExLabel" - "fieldName" "ItemEffectMeterLabel" - "xpos" "125" - "ypos" "0" - "xpos_minmode" "9999" - "ypos_minmode" "9999" - "zpos" "3" - "wide" "80" - "tall" "8" - "autoResize" "1" - "pinCorner" "2" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "#TF_Cleaver" - "textAlignment" "west" - "dulltext" "0" - "brighttext" "0" - "font" "Cerbetica10" - "fgcolor_override" "150 150 150 255" - } - - "ItemEffectMeter" - { - "ControlName" "ContinuousProgressBar" - "fieldName" "ItemEffectMeter" - "font" "Default" - "xpos" "0" - "xpos_minmode" "15" - "ypos" "0" - "zpos" "2" - "wide" "120" - "tall" "8" - "wide_minmode" "120" - "tall_minmode" "5" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "textAlignment" "Center" - "dulltext" "0" - "brighttext" "0" - } + "labelText" "#TF_Cleaver" + } } \ No newline at end of file diff --git a/resource/ui/HudItemEffectMeter_Demoman.res b/resource/ui/HudItemEffectMeter_Demoman.res index 226a7c7..be5ec92 100644 --- a/resource/ui/HudItemEffectMeter_Demoman.res +++ b/resource/ui/HudItemEffectMeter_Demoman.res @@ -2,35 +2,15 @@ { HudItemEffectMeter { - "fieldName" "HudItemEffectMeter" - "visible" "1" - "enabled" "1" - "xpos" "c25" - "ypos" "355" - "wide" "500" - "tall" "500" - "MeterFG" "White" - "MeterBG" "Gray" - } - - "ItemEffectMeterBG" - { - "ControlName" "CTFImagePanel" - "fieldName" "ItemEffectMeterBG" - "xpos" "9999" - "ypos" "9999" - "zpos" "0" - "wide" "1000" - "tall" "1000" - "visible" "1" - "visible_minmode" "0" - "enabled" "1" - "image" "../hud/misc_ammo_area_blue" - "scaleImage" "1" - "teambg_2" "../hud/misc_ammo_area_red" - "teambg_2_lodef" "../hud/misc_ammo_area_red_lodef" - "teambg_3" "../hud/misc_ammo_area_blue" - "teambg_3_lodef" "../hud/misc_ammo_area_blue_lodef" + "fieldName" "HudItemEffectMeter" + "visible" "1" + "enabled" "1" + "xpos" "c25" + "ypos" "355" + "wide" "500" + "tall" "500" + "MeterFG" "White" + "MeterBG" "Gray" } "ItemEffectMeterLabel" @@ -100,10 +80,10 @@ "font_minmode" "CerbeticaBold16" } - "ItemEffectMeterCountBackground" + "ItemEffectMeterCountShadow" { "ControlName" "CExLabel" - "fieldName" "ItemEffectMeterCountBackground" + "fieldName" "ItemEffectMeterCountShadow" "xpos" "191" "ypos" "11" "xpos_minmode" "193" diff --git a/resource/ui/HudItemEffectMeter_Engineer.res b/resource/ui/HudItemEffectMeter_Engineer.res index 8916643..543e330 100644 --- a/resource/ui/HudItemEffectMeter_Engineer.res +++ b/resource/ui/HudItemEffectMeter_Engineer.res @@ -13,26 +13,6 @@ "MeterBG" "Gray" } - "ItemEffectMeterBG" - { - "ControlName" "CTFImagePanel" - "fieldName" "ItemEffectMeterBG" - "xpos" "9999" - "ypos" "9999" - "zpos" "0" - "wide" "12" - "tall" "12" - "visible" "1" - "visible_minmode" "0" - "enabled" "1" - "image" "../hud/misc_ammo_area_blue" - "scaleImage" "1" - "teambg_2" "../hud/misc_ammo_area_red" - "teambg_2_lodef" "../hud/misc_ammo_area_red_lodef" - "teambg_3" "../hud/misc_ammo_area_blue" - "teambg_3_lodef" "../hud/misc_ammo_area_blue_lodef" - } - "ItemEffectMeterLabel" { "ControlName" "CExLabel" diff --git a/resource/ui/HudItemEffectMeter_Heavy.res b/resource/ui/HudItemEffectMeter_Heavy.res index 0953ac1..4936ad7 100644 --- a/resource/ui/HudItemEffectMeter_Heavy.res +++ b/resource/ui/HudItemEffectMeter_Heavy.res @@ -1,80 +1,15 @@ +#base "huditemeffectmeter.res" + "Resource/UI/HudItemEffectMeter_Cleaver.res" { - HudItemEffectMeter - { - "fieldName" "HudItemEffectMeter" - "visible" "1" - "enabled" "1" - "xpos" "c-75" - "ypos" "c113" - "ypos_minmode" "c53" - "wide" "200" - "tall" "500" - "MeterFG" "White" - "MeterBG" "Gray" - } - - "ItemEffectMeterBG" + "HudItemEffectMeter" { - "ControlName" "CTFImagePanel" - "fieldName" "ItemEffectMeterBG" - "xpos" "9999" - "ypos" "9999" - "zpos" "0" - "wide" "100" - "tall" "50" - "enabled" "1" - "image" "../hud/misc_ammo_area_horiz2_blue" - "scaleImage" "1" - "teambg_2" "../hud/misc_ammo_area_horiz2_red" - "teambg_2_lodef" "../hud/misc_ammo_area_red_lodef" - "teambg_3" "../hud/misc_ammo_area_horiz2_blue" - "teambg_3_lodef" "../hud/misc_ammo_area_blue_lodef" + "ypos" "c113" + "ypos_minmode" "c53" } "ItemEffectMeterLabel" { - "ControlName" "CExLabel" - "fieldName" "ItemEffectMeterLabel" - "xpos" "125" - "ypos" "0" - "xpos_minmode" "9999" - "ypos_minmode" "9999" - "zpos" "3" - "wide" "80" - "tall" "8" - "autoResize" "1" - "pinCorner" "2" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "#TF_Cleaver" - "textAlignment" "west" - "dulltext" "0" - "brighttext" "0" - "font" "Cerbetica10" - "fgcolor_override" "150 150 150 255" - } - - "ItemEffectMeter" - { - "ControlName" "ContinuousProgressBar" - "fieldName" "ItemEffectMeter" - "font" "Default" - "xpos" "0" - "xpos_minmode" "15" - "ypos" "0" - "zpos" "2" - "wide" "120" - "tall" "8" - "wide_minmode" "120" - "tall_minmode" "5" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "textAlignment" "Center" - "dulltext" "0" - "brighttext" "0" + "labelText" "#TF_Cleaver" } } \ No newline at end of file diff --git a/resource/ui/HudItemEffectMeter_ParticleCannon.res b/resource/ui/HudItemEffectMeter_ParticleCannon.res index 2ec69de..b3c8814 100644 --- a/resource/ui/HudItemEffectMeter_ParticleCannon.res +++ b/resource/ui/HudItemEffectMeter_ParticleCannon.res @@ -1,82 +1,21 @@ +#base "huditemeffectmeter.res" + "Resource/UI/HudItemEffectMeter_ParticleCannon.res" { - HudItemEffectMeter + "HudItemEffectMeter" { - "fieldName" "HudItemEffectMeter" - "visible" "1" - "enabled" "1" - "xpos" "c-75" [$WIN32] - "ypos" "c113" [$WIN32] - "ypos_minmode" "c46" [$WIN32] - "wide" "200" - "tall" "500" - "MeterFG" "White" - "MeterBG" "Gray" - } - - "ItemEffectMeterBG" - { - "ControlName" "CTFImagePanel" - "fieldName" "ItemEffectMeterBG" - "xpos" "9999" - "ypos" "9999" - "zpos" "0" - "wide" "100" - "tall" "50" - "visible" "1" - "visible_minmode" "0" - "enabled" "1" - "image" "../hud/misc_ammo_area_horiz2_blue" - "scaleImage" "1" - "teambg_2" "../hud/misc_ammo_area_horiz2_red" - "teambg_2_lodef" "../hud/misc_ammo_area_red_lodef" - "teambg_3" "../hud/misc_ammo_area_horiz2_blue" - "teambg_3_lodef" "../hud/misc_ammo_area_blue_lodef" + "xpos" "c-75" [$WIN32] + "ypos" "c113" [$WIN32] + "ypos_minmode" "c46" [$WIN32] } "ItemEffectMeterLabel" { - "ControlName" "CExLabel" - "fieldName" "ItemEffectMeterLabel" - "xpos" "125" - "ypos" "0" - "xpos_minmode" "9999" - "ypos_minmode" "9999" - "zpos" "3" - "wide" "80" - "tall" "8" - "autoResize" "1" - "pinCorner" "2" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "#TF_ENERGYDRINK" - "textAlignment" "west" - "dulltext" "0" - "brighttext" "0" - "font" "Cerbetica10" - "fgcolor_override" "150 150 150 255" + "labelText" "#TF_ENERGYDRINK" } "ItemEffectMeter" - { - "ControlName" "ContinuousProgressBar" - "fieldName" "ItemEffectMeter" - "font" "Default" - "xpos" "0" - "xpos_minmode" "15" - "ypos" "0" - "zpos" "2" - "wide" "120" - "tall" "8" - "wide_minmode" "120" - "tall_minmode" "5" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "textAlignment" "Left" - "dulltext" "0" - "brighttext" "0" + { + "textAlignment" "Left" } } \ No newline at end of file diff --git a/resource/ui/HudItemEffectMeter_Pomson.res b/resource/ui/HudItemEffectMeter_Pomson.res index 41d2dc8..dbab866 100644 --- a/resource/ui/HudItemEffectMeter_Pomson.res +++ b/resource/ui/HudItemEffectMeter_Pomson.res @@ -1,83 +1,16 @@ +#base "huditemeffectmeter.res" + "Resource/UI/HudItemEffectMeter_Pomson.res" { - HudItemEffectMeter - { - "fieldName" "HudItemEffectMeter" - "visible" "1" - "enabled" "1" - "xpos" "c-75" - "ypos" "c113" - "ypos_minmode" "c46" - "wide" "200" - "tall" "500" - "MeterFG" "White" - "MeterBG" "Gray" - } - - "ItemEffectMeterBG" + "HudItemEffectMeter" { - "ControlName" "CTFImagePanel" - "fieldName" "ItemEffectMeterBG" - "xpos" "9999" - "ypos" "9999" - "zpos" "0" - "wide" "100" - "tall" "50" - "visible" "1" - "visible_minmode" "0" - "enabled" "1" - "image" "../hud/misc_ammo_area_horiz3_blue" - "scaleImage" "1" - "teambg_2" "../hud/misc_ammo_area_horiz3_red" - "teambg_2_lodef" "../hud/misc_ammo_area_red_lodef" - "teambg_3" "../hud/misc_ammo_area_horiz3_blue" - "teambg_3_lodef" "../hud/misc_ammo_area_blue_lodef" + "ypos" "c113" + "ypos_minmode" "c46" } "ItemEffectMeterLabel" { - "ControlName" "CExLabel" - "fieldName" "ItemEffectMeterLabel" - "xpos" "125" - "ypos" "0" - "xpos_minmode" "9999" - "ypos_minmode" "9999" - "zpos" "3" - "wide" "150" - "tall" "8" - "autoResize" "1" - "pinCorner" "2" - "visible" "1" - "visible_minmode" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "#TF_ENERGYDRINK" - "textAlignment" "west" - "dulltext" "0" - "brighttext" "0" - "font" "Cerbetica10" - "fgcolor_override" "150 150 150 255" - } - - "ItemEffectMeter" - { - "ControlName" "ContinuousProgressBar" - "fieldName" "ItemEffectMeter" - "font" "Default" - "xpos" "0" - "xpos_minmode" "15" - "ypos" "0" - "zpos" "2" - "wide" "120" - "tall" "8" - "wide_minmode" "120" - "tall_minmode" "5" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "textAlignment" "Center" - "dulltext" "0" - "brighttext" "0" + "wide" "150" + "labelText" "#TF_ENERGYDRINK" } } \ No newline at end of file diff --git a/resource/ui/HudItemEffectMeter_PowerupBottle.res b/resource/ui/HudItemEffectMeter_PowerupBottle.res index 5235d6a..4acc099 100644 --- a/resource/ui/HudItemEffectMeter_PowerupBottle.res +++ b/resource/ui/HudItemEffectMeter_PowerupBottle.res @@ -2,123 +2,123 @@ { HudItemEffectMeter { - "fieldName" "HudItemEffectMeter" - "visible" "1" - "enabled" "1" - "xpos" "c-190" - "ypos" "r41" - "wide" "100" - "tall" "60" - "MeterFG" "White" - "MeterBG" "Gray" + "fieldName" "HudItemEffectMeter" + "visible" "1" + "enabled" "1" + "xpos" "c-190" + "ypos" "r41" + "wide" "100" + "tall" "60" + "MeterFG" "White" + "MeterBG" "Gray" } "PowerupBG" { - "ControlName" "ImagePanel" - "fieldName" "PowerupBG" - "xpos" "0" - "ypos" "0" - "zpos" "0" - "wide" "100" - "tall" "20" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "fillcolor" "0 0 0 100" + "ControlName" "ImagePanel" + "fieldName" "PowerupBG" + "xpos" "0" + "ypos" "0" + "zpos" "0" + "wide" "100" + "tall" "20" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "fillcolor" "0 0 0 100" } "ItemEffectIcon" { - "ControlName" "CTFImagePanel" - "fieldName" "ItemEffectIcon" - "xpos" "60" - "ypos" "2" - "zpos" "1" - "wide" "18" - "tall" "18" - "visible" "1" - "enabled" "1" - "image" "../hud/ico_powerup_critboost_red" - "scaleImage" "1" + "ControlName" "CTFImagePanel" + "fieldName" "ItemEffectIcon" + "xpos" "60" + "ypos" "2" + "zpos" "1" + "wide" "18" + "tall" "18" + "visible" "1" + "enabled" "1" + "image" "../hud/ico_powerup_critboost_red" + "scaleImage" "1" } "ItemEffectMeterLabel" { - "ControlName" "CExLabel" - "fieldName" "ItemEffectMeterLabel" - "xpos" "9999" - "ypos" "9999" - "zpos" "2" - "wide" "80" - "tall" "40" - "autoResize" "1" - "pinCorner" "2" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "#TF_Ball" - "textAlignment" "center" - "centerwrap" "1" - "dulltext" "0" - "brighttext" "0" - "font" "Cerbetica12" + "ControlName" "CExLabel" + "fieldName" "ItemEffectMeterLabel" + "xpos" "9999" + "ypos" "9999" + "zpos" "2" + "wide" "80" + "tall" "40" + "autoResize" "1" + "pinCorner" "2" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "#TF_Ball" + "textAlignment" "center" + "centerwrap" "1" + "dulltext" "0" + "brighttext" "0" + "font" "Cerbetica12" } "CanteenLabel" { - "ControlName" "CExLabel" - "fieldName" "CanteenLabel" - "font" "Cerbetica14" - "fgcolor" "TanLight" - "xpos" "5" - "ypos" "0" - "zpos" "3" - "wide" "60" - "tall" "20" - "visible" "1" - "enabled" "1" - "textAlignment" "west" - "labelText" "Powerups" + "ControlName" "CExLabel" + "fieldName" "CanteenLabel" + "font" "Cerbetica14" + "fgcolor" "TanLight" + "xpos" "5" + "ypos" "0" + "zpos" "3" + "wide" "60" + "tall" "20" + "visible" "1" + "enabled" "1" + "textAlignment" "west" + "labelText" "Powerups" } "ItemEffectMeter" { - "ControlName" "ContinuousProgressBar" - "fieldName" "ItemEffectMeter" - "font" "Default" - "xpos" "25" - "ypos" "23" - "zpos" "2" - "wide" "40" - "tall" "6" - "autoResize" "0" - "pinCorner" "0" - "visible" "0" - "enabled" "0" - "textAlignment" "Left" - "dulltext" "0" - "brighttext" "0" + "ControlName" "ContinuousProgressBar" + "fieldName" "ItemEffectMeter" + "font" "Default" + "xpos" "25" + "ypos" "23" + "zpos" "2" + "wide" "40" + "tall" "6" + "autoResize" "0" + "pinCorner" "0" + "visible" "0" + "enabled" "0" + "textAlignment" "Left" + "dulltext" "0" + "brighttext" "0" } "ItemEffectMeterCount" { - "ControlName" "CExLabel" - "fieldName" "ItemEffectMeterCount" - "xpos" "54" - "ypos" "1" - "zpos" "2" - "wide" "40" - "tall" "20" - "pinCorner" "2" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "%progresscount%" - "textAlignment" "east" - "dulltext" "0" - "brighttext" "0" - "font" "Cerbetica16" + "ControlName" "CExLabel" + "fieldName" "ItemEffectMeterCount" + "xpos" "54" + "ypos" "1" + "zpos" "2" + "wide" "40" + "tall" "20" + "pinCorner" "2" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "%progresscount%" + "textAlignment" "east" + "dulltext" "0" + "brighttext" "0" + "font" "Cerbetica16" } } \ No newline at end of file diff --git a/resource/ui/HudItemEffectMeter_Raygun.res b/resource/ui/HudItemEffectMeter_Raygun.res index 2529307..86cc8f5 100644 --- a/resource/ui/HudItemEffectMeter_Raygun.res +++ b/resource/ui/HudItemEffectMeter_Raygun.res @@ -1,80 +1,15 @@ +#base "huditemeffectmeter.res" + "Resource/UI/HudItemEffectMeter_Raygun.res" { - HudItemEffectMeter - { - "fieldName" "HudItemEffectMeter" - "visible" "1" - "enabled" "1" - "xpos" "c-75" - "ypos" "c123" - "ypos_minmode" "c54" - "wide" "200" - "tall" "500" - "MeterFG" "White" - "MeterBG" "Gray" - } - - "ItemEffectMeterBG" + "HudItemEffectMeter" { - "ControlName" "CTFImagePanel" - "fieldName" "ItemEffectMeterBG" - "xpos" "9999" - "ypos" "9999" - "zpos" "0" - "wide" "100" - "tall" "50" - "enabled" "1" - "image" "../hud/misc_ammo_area_horiz2_blue" - "scaleImage" "1" - "teambg_2" "../hud/misc_ammo_area_horiz2_red" - "teambg_2_lodef" "../hud/misc_ammo_area_red_lodef" - "teambg_3" "../hud/misc_ammo_area_horiz2_blue" - "teambg_3_lodef" "../hud/misc_ammo_area_blue_lodef" + "ypos_minmode" "c54" } "ItemEffectMeterLabel" { - "ControlName" "CExLabel" - "fieldName" "ItemEffectMeterLabel" - "xpos" "125" - "ypos" "0" - "xpos_minmode" "9999" - "ypos_minmode" "9999" - "zpos" "3" - "wide" "150" - "tall" "8" - "autoResize" "1" - "pinCorner" "2" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "#TF_ENERGYDRINK" - "textAlignment" "west" - "dulltext" "0" - "brighttext" "0" - "font" "Cerbetica10" - "fgcolor_override" "150 150 150 255" - } - - "ItemEffectMeter" - { - "ControlName" "ContinuousProgressBar" - "fieldName" "ItemEffectMeter" - "font" "Default" - "xpos" "0" - "xpos_minmode" "15" - "ypos" "0" - "zpos" "2" - "wide" "120" - "tall" "8" - "wide_minmode" "120" - "tall_minmode" "5" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "textAlignment" "Center" - "dulltext" "0" - "brighttext" "0" + "wide" "150" + "labelText" "#TF_ENERGYDRINK" } } \ No newline at end of file diff --git a/resource/ui/HudItemEffectMeter_Sapper.res b/resource/ui/HudItemEffectMeter_Sapper.res index 60b8c9c..34c072a 100644 --- a/resource/ui/HudItemEffectMeter_Sapper.res +++ b/resource/ui/HudItemEffectMeter_Sapper.res @@ -2,36 +2,16 @@ { HudItemEffectMeter { - "fieldName" "HudItemEffectMeter" - "visible" "1" - "enabled" "1" - "xpos" "c-75" - "ypos" "c103" - "ypos_minmode" "c53" - "wide" "200" - "tall" "500" - "MeterFG" "White" - "MeterBG" "Gray" - } - - "ItemEffectMeterBG" - { - "ControlName" "CTFImagePanel" - "fieldName" "ItemEffectMeterBG" - "xpos" "9999" - "ypos" "9999" - "zpos" "0" - "wide" "100" - "tall" "50" - "visible" "1" - "visible_minmode" "0" - "enabled" "1" - "image" "../hud/misc_ammo_area_horiz3_blue" - "scaleImage" "1" - "teambg_2" "../hud/misc_ammo_area_horiz3_red" - "teambg_2_lodef" "../hud/misc_ammo_area_red_lodef" - "teambg_3" "../hud/misc_ammo_area_horiz3_blue" - "teambg_3_lodef" "../hud/misc_ammo_area_blue_lodef" + "fieldName" "HudItemEffectMeter" + "visible" "1" + "enabled" "1" + "xpos" "c-75" + "ypos" "c103" + "ypos_minmode" "c53" + "wide" "200" + "tall" "500" + "MeterFG" "White" + "MeterBG" "Gray" } "ItemEffectMeterLabel" @@ -68,13 +48,10 @@ "fieldName" "ItemEffectMeter" "font" "Default" "xpos" "15" - "xpos" "15" "ypos" "0" "zpos" "2" - "wide" "120" "tall" "5" "wide" "120" - "tall" "5" "autoResize" "0" "pinCorner" "0" "visible" "1" diff --git a/resource/ui/HudItemEffectMeter_Scout.res b/resource/ui/HudItemEffectMeter_Scout.res index a1f8629..4e679cd 100644 --- a/resource/ui/HudItemEffectMeter_Scout.res +++ b/resource/ui/HudItemEffectMeter_Scout.res @@ -1,80 +1,15 @@ +#base "huditemeffectmeter.res" + "Resource/UI/HudItemEffectMeter_Scout.res" { - HudItemEffectMeter - { - "fieldName" "HudItemEffectMeter" - "visible" "1" - "enabled" "1" - "xpos" "c-75" - "ypos" "c103" - "ypos_minmode" "c53" - "wide" "200" - "tall" "500" - "MeterFG" "White" - "MeterBG" "Gray" - } - - "ItemEffectMeterBG" + "HudItemEffectMeter" { - "ControlName" "CTFImagePanel" - "fieldName" "ItemEffectMeterBG" - "xpos" "9999" - "ypos" "9999" - "zpos" "0" - "wide" "100" - "tall" "50" - "enabled" "1" - "image" "../hud/misc_ammo_area_horiz2_blue" - "scaleImage" "1" - "teambg_2" "../hud/misc_ammo_area_horiz2_red" - "teambg_2_lodef" "../hud/misc_ammo_area_red_lodef" - "teambg_3" "../hud/misc_ammo_area_horiz2_blue" - "teambg_3_lodef" "../hud/misc_ammo_area_blue_lodef" + "ypos" "c103" + "ypos_minmode" "c53" } "ItemEffectMeterLabel" { - "ControlName" "CExLabel" - "fieldName" "ItemEffectMeterLabel" - "xpos" "125" - "ypos" "0" - "xpos_minmode" "9999" - "ypos_minmode" "9999" - "zpos" "3" - "wide" "80" - "tall" "8" - "autoResize" "1" - "pinCorner" "2" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "#TF_ENERGYDRINK" - "textAlignment" "west" - "dulltext" "0" - "brighttext" "0" - "font" "Cerbetica10" - "fgcolor_override" "150 150 150 255" - } - - "ItemEffectMeter" - { - "ControlName" "ContinuousProgressBar" - "fieldName" "ItemEffectMeter" - "font" "Default" - "xpos" "0" - "xpos_minmode" "15" - "ypos" "0" - "zpos" "2" - "wide" "120" - "tall" "8" - "wide_minmode" "120" - "tall_minmode" "5" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "textAlignment" "Center" - "dulltext" "0" - "brighttext" "0" + "labelText" "#TF_ENERGYDRINK" } } \ No newline at end of file diff --git a/resource/ui/HudItemEffectMeter_Sniper.res b/resource/ui/HudItemEffectMeter_Sniper.res index c59de2e..ed8e5dc 100644 --- a/resource/ui/HudItemEffectMeter_Sniper.res +++ b/resource/ui/HudItemEffectMeter_Sniper.res @@ -2,35 +2,15 @@ { HudItemEffectMeter { - "fieldName" "HudItemEffectMeter" - "visible" "1" - "enabled" "1" - "xpos" "c25" - "ypos" "355" - "wide" "500" - "tall" "500" - "MeterFG" "White" - "MeterBG" "Gray" - } - - "ItemEffectMeterBG" - { - "ControlName" "CTFImagePanel" - "fieldName" "ItemEffectMeterBG" - "xpos" "9999" - "ypos" "9999" - "zpos" "0" - "wide" "12" - "tall" "12" - "visible" "1" - "visible_minmode" "0" - "enabled" "1" - "image" "../hud/misc_ammo_area_blue" - "scaleImage" "1" - "teambg_2" "../hud/misc_ammo_area_red" - "teambg_2_lodef" "../hud/misc_ammo_area_red_lodef" - "teambg_3" "../hud/misc_ammo_area_blue" - "teambg_3_lodef" "../hud/misc_ammo_area_blue_lodef" + "fieldName" "HudItemEffectMeter" + "visible" "1" + "enabled" "1" + "xpos" "c25" + "ypos" "355" + "wide" "500" + "tall" "500" + "MeterFG" "White" + "MeterBG" "Gray" } "ItemEffectMeterLabel" diff --git a/resource/ui/HudItemEffectMeter_SniperFocus.res b/resource/ui/HudItemEffectMeter_SniperFocus.res index 4281b84..4124c74 100644 --- a/resource/ui/HudItemEffectMeter_SniperFocus.res +++ b/resource/ui/HudItemEffectMeter_SniperFocus.res @@ -1,81 +1,15 @@ +#base "huditemeffectmeter.res" + "Resource/UI/HudItemEffectMeter_SodaPopper.res" { - HudItemEffectMeter - { - "fieldName" "HudItemEffectMeter" - "visible" "1" - "enabled" "1" - "xpos" "c-75" - "ypos" "c111" - "ypos_minmode" "c46" - "wide" "200" - "tall" "500" - "MeterFG" "White" - "MeterBG" "Gray" - } - - "ItemEffectMeterBG" + "HudItemEffectMeter" { - "ControlName" "CTFImagePanel" - "fieldName" "ItemEffectMeterBG" - "xpos" "9999" - "ypos" "9999" - "zpos" "0" - "wide" "100" - "tall" "50" - "enabled" "1" - "image" "../hud/misc_ammo_area_horiz3_blue" - "scaleImage" "1" - "teambg_2" "../hud/misc_ammo_area_horiz3_red" - "teambg_2_lodef" "../hud/misc_ammo_area_red_lodef" - "teambg_3" "../hud/misc_ammo_area_horiz3_blue" - "teambg_3_lodef" "../hud/misc_ammo_area_blue_lodef" + "ypos" "c111" + "ypos_minmode" "c46" } "ItemEffectMeterLabel" { - "ControlName" "CExLabel" - "fieldName" "ItemEffectMeterLabel" - "xpos" "125" - "ypos" "0" - "xpos_minmode" "9999" - "ypos_minmode" "9999" - "zpos" "3" - "wide" "80" - "tall" "8" - "autoResize" "1" - "pinCorner" "2" - "visible" "1" - "visible_minmode" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "#TF_ENERGYDRINK" - "textAlignment" "west" - "dulltext" "0" - "brighttext" "0" - "font" "Cerbetica10" - "fgcolor_override" "150 150 150 255" - } - - "ItemEffectMeter" - { - "ControlName" "ContinuousProgressBar" - "fieldName" "ItemEffectMeter" - "font" "Default" - "xpos" "0" - "xpos_minmode" "15" - "ypos" "0" - "zpos" "2" - "wide" "120" - "tall" "8" - "wide_minmode" "120" - "tall_minmode" "5" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "textAlignment" "Center" - "dulltext" "0" - "brighttext" "0" + "labelText" "#TF_ENERGYDRINK" } } \ No newline at end of file diff --git a/resource/ui/HudItemEffectMeter_SodaPopper.res b/resource/ui/HudItemEffectMeter_SodaPopper.res index 9384adc..fe63e43 100644 --- a/resource/ui/HudItemEffectMeter_SodaPopper.res +++ b/resource/ui/HudItemEffectMeter_SodaPopper.res @@ -1,81 +1,15 @@ +#base "huditemeffectmeter.res" + "Resource/UI/HudItemEffectMeter_SodaPopper.res" { - HudItemEffectMeter - { - "fieldName" "HudItemEffectMeter" - "visible" "1" - "enabled" "1" - "xpos" "c-75" - "ypos" "c113" - "ypos_minmode" "c46" - "wide" "200" - "tall" "500" - "MeterFG" "White" - "MeterBG" "Gray" - } - - "ItemEffectMeterBG" - { - "ControlName" "CTFImagePanel" - "fieldName" "ItemEffectMeterBG" - "xpos" "9999" - "ypos" "9999" - "zpos" "0" - "wide" "100" - "tall" "50" - "enabled" "1" - "image" "../hud/misc_ammo_area_horiz3_blue" - "scaleImage" "1" - "teambg_2" "../hud/misc_ammo_area_horiz3_red" - "teambg_2_lodef" "../hud/misc_ammo_area_red_lodef" - "teambg_3" "../hud/misc_ammo_area_horiz3_blue" - "teambg_3_lodef" "../hud/misc_ammo_area_blue_lodef" + "HudItemEffectMeter" + { + "ypos" "c113" + "ypos_minmode" "c46" } "ItemEffectMeterLabel" { - "ControlName" "CExLabel" - "fieldName" "ItemEffectMeterLabel" - "xpos" "125" - "ypos" "0" - "xpos_minmode" "9999" - "ypos_minmode" "9999" - "zpos" "3" - "wide" "80" - "tall" "8" - "autoResize" "1" - "pinCorner" "2" - "visible" "1" - "visible_minmode" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "#TF_ENERGYDRINK" - "textAlignment" "west" - "dulltext" "0" - "brighttext" "0" - "font" "Cerbetica10" - "fgcolor_override" "150 150 150 255" - } - - "ItemEffectMeter" - { - "ControlName" "ContinuousProgressBar" - "fieldName" "ItemEffectMeter" - "font" "Default" - "xpos" "0" - "xpos_minmode" "15" - "ypos" "0" - "zpos" "2" - "wide" "120" - "tall" "8" - "wide_minmode" "120" - "tall_minmode" "5" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "textAlignment" "Center" - "dulltext" "0" - "brighttext" "0" + "labelText" "#TF_ENERGYDRINK" } } \ No newline at end of file diff --git a/resource/ui/HudItemEffectMeter_Spy.res b/resource/ui/HudItemEffectMeter_Spy.res index 1bba4a9..f2375e3 100644 --- a/resource/ui/HudItemEffectMeter_Spy.res +++ b/resource/ui/HudItemEffectMeter_Spy.res @@ -2,35 +2,15 @@ { HudItemEffectMeter { - "fieldName" "HudItemEffectMeter" - "visible" "1" - "enabled" "1" - "xpos" "c25" - "ypos" "355" - "wide" "500" - "tall" "500" - "MeterFG" "White" - "MeterBG" "Gray" - } - - "ItemEffectMeterBG" - { - "ControlName" "CTFImagePanel" - "fieldName" "ItemEffectMeterBG" - "xpos" "9999" - "ypos" "9999" - "zpos" "0" - "wide" "12" - "tall" "12" - "visible" "1" - "visible_minmode" "0" - "enabled" "1" - "image" "../hud/misc_ammo_area_blue" - "scaleImage" "1" - "teambg_2" "../hud/misc_ammo_area_red" - "teambg_2_lodef" "../hud/misc_ammo_area_red_lodef" - "teambg_3" "../hud/misc_ammo_area_blue" - "teambg_3_lodef" "../hud/misc_ammo_area_blue_lodef" + "fieldName" "HudItemEffectMeter" + "visible" "1" + "enabled" "1" + "xpos" "c25" + "ypos" "355" + "wide" "500" + "tall" "500" + "MeterFG" "White" + "MeterBG" "Gray" } "ItemEffectMeterLabel" @@ -83,8 +63,8 @@ "fieldName" "ItemEffectMeterCount" "xpos" "190" "ypos" "10" - "xpos" "192" - "ypos" "5" + "xpos_minmode" "192" + "ypos_minmode" "5" "zpos" "2" "wide" "40" "tall" "20" diff --git a/resource/ui/HudItemEffectMeter_SpyKnife.res b/resource/ui/HudItemEffectMeter_SpyKnife.res index 759df4b..81d4b2d 100644 --- a/resource/ui/HudItemEffectMeter_SpyKnife.res +++ b/resource/ui/HudItemEffectMeter_SpyKnife.res @@ -1,80 +1,15 @@ +#base "huditemeffectmeter.res" + "Resource/UI/HudItemEffectMeter_SpyKnife.res" { - HudItemEffectMeter + "HudItemEffectMeter" { - "fieldName" "HudItemEffectMeter" - "visible" "1" - "enabled" "1" - "xpos" "c-75" "ypos" "c113" "ypos_minmode" "c53" - "wide" "200" - "tall" "500" - "MeterFG" "White" - "MeterBG" "Gray" - } - - "ItemEffectMeterBG" - { - "ControlName" "CTFImagePanel" - "fieldName" "ItemEffectMeterBG" - "xpos" "9999" - "ypos" "9999" - "zpos" "0" - "wide" "100" - "tall" "50" - "enabled" "1" - "image" "../hud/misc_ammo_area_horiz2_blue" - "scaleImage" "1" - "teambg_2" "../hud/misc_ammo_area_horiz2_red" - "teambg_2_lodef" "../hud/misc_ammo_area_red_lodef" - "teambg_3" "../hud/misc_ammo_area_horiz2_blue" - "teambg_3_lodef" "../hud/misc_ammo_area_blue_lodef" } "ItemEffectMeterLabel" { - "ControlName" "CExLabel" - "fieldName" "ItemEffectMeterLabel" - "xpos" "125" - "ypos" "0" - "xpos_minmode" "9999" - "ypos_minmode" "9999" - "zpos" "3" - "wide" "80" - "tall" "8" - "autoResize" "1" - "pinCorner" "2" - "visible" "1" - "enabled" "1" - "tabPosition" "0" "labelText" "#TF_ENERGYDRINK" - "textAlignment" "west" - "dulltext" "0" - "brighttext" "0" - "font" "Cerbetica10" - "fgcolor_override" "150 150 150 255" } - - "ItemEffectMeter" - { - "ControlName" "ContinuousProgressBar" - "fieldName" "ItemEffectMeter" - "font" "Default" - "xpos" "0" - "xpos_minmode" "15" - "ypos" "0" - "zpos" "2" - "wide" "120" - "tall" "8" - "wide_minmode" "120" - "tall_minmode" "5" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "textAlignment" "Center" - "dulltext" "0" - "brighttext" "0" - } } \ No newline at end of file diff --git a/resource/ui/huditemeffectmeter_kartcharge.res b/resource/ui/huditemeffectmeter_kartcharge.res index 7d576e4..4dcf37d 100644 --- a/resource/ui/huditemeffectmeter_kartcharge.res +++ b/resource/ui/huditemeffectmeter_kartcharge.res @@ -102,16 +102,16 @@ "font_minmode" "CerbeticaBold20" } - "ItemEffectMeterCountBG" + "ItemEffectMeterCountShadow" { "ControlName" "CExLabel" - "fieldName" "ItemEffectMeterCount" + "fieldName" "ItemEffectMeterCountShadow" "xpos" "2" "ypos" "2" "ypos_minmode" "6" "zpos" "2" "wide" "150" - "tall" "30" + "tall" "30" "pinCorner" "2" "visible" "1" "enabled" "1" diff --git a/resource/ui/huditemeffectmeter_organs.res b/resource/ui/huditemeffectmeter_organs.res index bc6f031..8ee7703 100644 --- a/resource/ui/huditemeffectmeter_organs.res +++ b/resource/ui/huditemeffectmeter_organs.res @@ -1,6 +1,6 @@ "Resource/UI/HudItemEffectMeter_Scout.res" { - HudItemEffectMeter + "HudItemEffectMeter" { "fieldName" "HudItemEffectMeter" "visible" "1" diff --git a/resource/ui/huditemeffectmeter_pyro.res b/resource/ui/huditemeffectmeter_pyro.res index 8c7c4fc..4125694 100644 --- a/resource/ui/huditemeffectmeter_pyro.res +++ b/resource/ui/huditemeffectmeter_pyro.res @@ -1,8 +1,8 @@ -#base "HudItemEffectMeter.res" +#base "huditemeffectmeter.res" "Resource/UI/HudItemEffectMeter_Pyro.res" { - HudItemEffectMeter + "HudItemEffectMeter" { "fieldName" "HudItemEffectMeter" "ypos" "c113" -- cgit v1.2.3