Skip to content

[TF2] Improve meter consistency and fix missing Dragon's Fury meter #1275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[TF2] Improve meter consistency and fix missing Dragon's Fury meter #1275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 102 additions & 0 deletions game/mod_tf/resource/ui/huditemeffectmeter_flaregun.res
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
"Resource/UI/HUDItemEffectMeter_Flaregun.res"
{
HudItemEffectMeter
{
"fieldName" "HudItemEffectMeter"
"visible" "1"
"enabled" "1"
"xpos" "r162" [$WIN32]
"ypos" "r92" [$WIN32]
"xpos_minmode" "r70" [$WIN32]
"ypos_minmode" "r74" [$WIN32]
"xpos" "r194" [$X360]
"ypos" "r74" [$X360]
"wide" "100"
"tall" "50"
"MeterFG" "White"
"MeterBG" "Gray"
}

"ItemEffectMeterBG"
{
"ControlName" "CTFImagePanel"
"fieldName" "ItemEffectMeterBG"
"xpos" "12"
"ypos" "0"
"zpos" "0"
"wide" "76"
"tall" "44"
"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"
"fieldName" "ItemEffectMeterLabel"
"xpos" "25"
"ypos" "27"
"zpos" "2"
"wide" "41"
"tall" "15"
"autoResize" "1"
"pinCorner" "2"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"labelText" "#TF_Ball"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
"font" "TFFontSmall"
}

"ItemEffectMeter"
{
"ControlName" "ContinuousProgressBar"
"fieldName" "ItemEffectMeter"
"font" "Default"
"xpos" "25"
"ypos" "23"
"ypos_minmode" "0"
"xpos_minmode" "0"
"zpos" "2"
"wide" "40"
"wide_minmode" "50"
"tall" "6"
"autoResize" "0"
"pinCorner" "0"
"visible" "0"
"enabled" "0"
"textAlignment" "Left"
"dulltext" "0"
"brighttext" "0"
}

"ItemEffectMeterCount"
{
"ControlName" "CExLabel"
"fieldName" "ItemEffectMeterCount"
"xpos" "25"
"ypos" "10"
"zpos" "2"
"wide" "40"
"tall" "20"
"pinCorner" "2"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"labelText" "%progresscount%"
"textAlignment" "north"
"dulltext" "0"
"brighttext" "0"
"font" "HudFontMedium"
}
}
88 changes: 88 additions & 0 deletions game/mod_tf/resource/ui/huditemeffectmeter_medic.res
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
"Resource/UI/HudItemEffectMeter_Medic.res"
{
HudItemEffectMeter
{
"fieldName" "HudItemEffectMeter"
"visible" "1"
"enabled" "1"
"x_offset" "40"
"xpos" "r174" [$WIN32]
"ypos" "r57" [$WIN32]
"xpos_minmode" "r52" [$WIN32]
"ypos_minmode" "r68" [$WIN32]
"x_offset_minmode" "0" [$WIN32]
"xpos" "r194" [$X360]
"ypos" "r124" [$X360]
"wide" "100"
"tall" "50"
"MeterFG" "White"
"MeterBG" "Gray"
}

"ItemEffectMeterBG"
{
"ControlName" "CTFImagePanel"
"fieldName" "ItemEffectMeterBG"
"xpos" "12"
"ypos" "0"
"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"
}

"ItemEffectMeterLabel"
{
"ControlName" "CExLabel"
"fieldName" "ItemEffectMeterLabel"
"xpos" "40"
"ypos" "25"
"zpos" "2"
"wide" "41"
"tall" "15"
"autoResize" "1"
"pinCorner" "2"
"visible" "1"
"visible_minmode" "1"
"ypos_minmode" "1"
"xpos_minmode" "0"
"textAlignment_minmode" "west"
"enabled" "1"
"tabPosition" "0"
"labelText" "#TF_ENERGYDRINK"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
"font" "TFFontSmall"
}

"ItemEffectMeter"
{
"ControlName" "ContinuousProgressBar"
"fieldName" "ItemEffectMeter"
"font" "Default"
"xpos" "45"
"ypos" "23"
"ypos_minmode" "0"
"xpos_minmode" "0"
"zpos" "2"
"wide" "30"
"wide_minmode" "50"
"tall" "5"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
"enabled" "1"
"textAlignment" "Left"
"dulltext" "0"
"brighttext" "0"
}
}
102 changes: 102 additions & 0 deletions game/mod_tf/resource/ui/huditemeffectmeter_soldier.res
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
"Resource/UI/HUDItemEffectMeter_Soldier.res"
{
HudItemEffectMeter
{
"fieldName" "HudItemEffectMeter"
"visible" "1"
"enabled" "1"
"xpos" "r162" [$WIN32]
"ypos" "r92" [$WIN32]
"xpos_minmode" "r70" [$WIN32]
"ypos_minmode" "r74" [$WIN32]
"xpos" "r194" [$X360]
"ypos" "r74" [$X360]
"wide" "100"
"tall" "50"
"MeterFG" "White"
"MeterBG" "Gray"
}

"ItemEffectMeterBG"
{
"ControlName" "CTFImagePanel"
"fieldName" "ItemEffectMeterBG"
"xpos" "12"
"ypos" "0"
"zpos" "0"
"wide" "76"
"tall" "44"
"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"
"fieldName" "ItemEffectMeterLabel"
"xpos" "25"
"ypos" "27"
"zpos" "2"
"wide" "41"
"tall" "15"
"autoResize" "1"
"pinCorner" "2"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"labelText" "#TF_Ball"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
"font" "TFFontSmall"
}

"ItemEffectMeter"
{
"ControlName" "ContinuousProgressBar"
"fieldName" "ItemEffectMeter"
"font" "Default"
"xpos" "25"
"ypos" "23"
"ypos_minmode" "0"
"xpos_minmode" "0"
"zpos" "2"
"wide" "40"
"wide_minmode" "50"
"tall" "6"
"autoResize" "0"
"pinCorner" "0"
"visible" "0"
"enabled" "0"
"textAlignment" "Left"
"dulltext" "0"
"brighttext" "0"
}

"ItemEffectMeterCount"
{
"ControlName" "CExLabel"
"fieldName" "ItemEffectMeterCount"
"xpos" "25"
"ypos" "10"
"zpos" "2"
"wide" "40"
"tall" "20"
"pinCorner" "2"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"labelText" "%progresscount%"
"textAlignment" "north"
"dulltext" "0"
"brighttext" "0"
"font" "HudFontMedium"
}
}
35 changes: 20 additions & 15 deletions src/game/client/tf/tf_hud_itemeffectmeter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "tf_weapon_flaregun.h"
#include "tf_weapon_revolver.h"
#include "tf_weapon_flamethrower.h"
#include "tf_weapon_dragons_fury.h"
#include "tf_weapon_knife.h"
#include "tf_item_powerup_bottle.h"
#include "tf_imagepanel.h"
Expand Down Expand Up @@ -304,7 +305,7 @@ void CHudItemEffectMeter::CreateHudElementsForClass( C_TFPlayer* pPlayer, CUtlVe
DECLARE_ITEM_EFFECT_METER( CTFBuffItem, TF_WEAPON_BUFF_ITEM, true, NULL );
DECLARE_ITEM_EFFECT_METER( CTFParticleCannon, TF_WEAPON_PARTICLE_CANNON, false, "resource/UI/HUDItemEffectMeter_ParticleCannon.res" );
DECLARE_ITEM_EFFECT_METER( CTFRaygun, TF_WEAPON_RAYGUN, false, "resource/UI/HUDItemEffectMeter_Raygun.res" );
DECLARE_ITEM_EFFECT_METER( CTFRocketLauncher_AirStrike, TF_WEAPON_ROCKETLAUNCHER, false, "resource/UI/HudItemEffectMeter_Demoman.res" );
DECLARE_ITEM_EFFECT_METER( CTFRocketLauncher_AirStrike, TF_WEAPON_ROCKETLAUNCHER, false, "resource/UI/HUDItemEffectMeter_Soldier.res" ); // respect shared meter language
break;

case TF_CLASS_SPY:
Expand All @@ -326,20 +327,20 @@ void CHudItemEffectMeter::CreateHudElementsForClass( C_TFPlayer* pPlayer, CUtlVe
case TF_CLASS_ENGINEER:
DECLARE_ITEM_EFFECT_METER( CTFShotgun_Revenge, TF_WEAPON_SENTRY_REVENGE, false, "resource/UI/HUDItemEffectMeter_Engineer.res" );
DECLARE_ITEM_EFFECT_METER( CTFDRGPomson, TF_WEAPON_DRG_POMSON, false, "resource/UI/HUDItemEffectMeter_Pomson.res" );
DECLARE_ITEM_EFFECT_METER( CTFRevolver, TF_WEAPON_REVOLVER, false, "resource/UI/HUDItemEffectMeter_Spy.res" );
DECLARE_ITEM_EFFECT_METER( CTFRevolver, TF_WEAPON_REVOLVER, false, "resource/UI/HUDItemEffectMeter_Engineer.res" ); // respect shared meter language
break;

case TF_CLASS_PYRO:
{
DECLARE_ITEM_EFFECT_METER( CTFFlameThrower, TF_WEAPON_FLAMETHROWER, true, "resource/UI/HudItemEffectMeter_Pyro.res" );
DECLARE_ITEM_EFFECT_METER( CTFFlareGun_Revenge, TF_WEAPON_FLAREGUN_REVENGE, false, "resource/UI/HUDItemEffectMeter_Engineer.res" );
DECLARE_ITEM_EFFECT_METER( CTFFlareGun_Revenge, TF_WEAPON_FLAREGUN_REVENGE, false, "resource/UI/HUDItemEffectMeter_Flaregun.res" ); // respect shared meter language
DECLARE_ITEM_EFFECT_METER( CTFRocketPack, TF_WEAPON_ROCKETPACK, false, "resource/UI/HudRocketPack.res" );
DECLARE_ITEM_EFFECT_METER( CTFWeaponFlameBall, TF_WEAPON_FLAME_BALL, false, "resource/UI/HudItemEffectMeter_Pyro.res" );
lambdaAddItemEffectMeter( "tf_weapon_jar_gas", true );
lambdaAddItemEffectMeter( "tf_weapon_rocketlauncher_fireball", false );
break;
}
case TF_CLASS_MEDIC:
DECLARE_ITEM_EFFECT_METER( CWeaponMedigun, TF_WEAPON_MEDIGUN, true, "resource/UI/HudItemEffectMeter_Scout.res" );
DECLARE_ITEM_EFFECT_METER( CWeaponMedigun, TF_WEAPON_MEDIGUN, true, "resource/UI/HudItemEffectMeter_Medic.res" ); // respect shared meter language
DECLARE_ITEM_EFFECT_METER( CTFBonesaw, TF_WEAPON_BONESAW, false, "resource/UI/HUDItemEffectMeter_Organs.res" );
break;
}
Expand Down Expand Up @@ -870,6 +871,20 @@ bool CHudItemEffectMeter_Weapon<CTFFlameThrower>::ShouldFlash( void )
}
}

//-----------------------------------------------------------------------------
template <>
bool CHudItemEffectMeter_Weapon<CTFWeaponFlameBall>::IsEnabled( void )
{
if ( !m_pPlayer )
return false;

CTFWeaponFlameBall *pWeapon = GetWeapon();
if ( !pWeapon )
return false;

return pWeapon->ShouldDrawMeter();
}

//-----------------------------------------------------------------------------
// Soda Popper Flash
//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -1020,16 +1035,6 @@ int CHudItemEffectMeter_Weapon<CTFShotgun_Revenge>::GetCount( void )
}
}

template <>
bool CHudItemEffectMeter_Weapon<CTFFlareGun_Revenge>::IsEnabled( void )
{
if ( !m_pPlayer )
return false;

CTFFlareGun_Revenge *pWeapon = GetWeapon();
return pWeapon && pWeapon->IsActiveByLocalPlayer();
}

template <>
int CHudItemEffectMeter_Weapon<CTFFlareGun_Revenge>::GetCount( void )
{
Expand Down
Loading