- Added "Save Default" buttons so people can edit the defaults withou…

…t much trouble. - Made it so that quantity panels will collapse/expand if the last bars are hidden/shown - Removed the global use default checkbox (might as well just have individual use defaults) - Fixed quantity panels being limited to holding 6 items - Fixed a bug where updating the header text size wouldn't recalculate the on screen (height/width) sizes for panel resize calculations - Fixed a bug in arrangement preset options which would read a wrong size value (+1) for text & icons - Fixed a bug where I didn't check the presets existed when loading (changes wouldn't properly apply in some senarios) - Fixed a bug in assignments where the initial load wouldn't select the chosen presets - Added build/upgrade cell counters for sg & dispenser - Added "building..." text (rather than showing the bars which mean nothing) - Added detpack & mancannon buildstates (should these still show when we have no ammo?) NOT ADDED NEW FILES TO 2003 vcproj.. I gave up on that a long time ago but feel I shoul still state it in my commits # Conflicts: # cl_dll/client_scratch-2005.vcproj # cl_dll/client_scratch-2008.vcproj
fortressforever · Oct 26, 2020 · 309f709 · 309f709
1 parent 7501e08
commit 309f709
Show file tree

Hide file tree

Showing 25 changed files with 1,590 additions and 425 deletions.
diff --git a/cl_dll/client_scratch-2005.vcproj b/cl_dll/client_scratch-2005.vcproj
@@ -674,6 +674,14 @@
 					RelativePath=".\ff\ff_hud_buildstate.h"
 					>
 				</File>
+				<File
+					RelativePath=".\ff\ff_hud_buildstate_detpack.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\ff\ff_hud_buildstate_detpack.h"
+					>
+				</File>
 				<File
 					RelativePath=".\ff\ff_hud_buildstate_dispenser.cpp"
 					>
@@ -682,6 +690,14 @@
 					RelativePath=".\ff\ff_hud_buildstate_dispenser.h"
 					>
 				</File>
+				<File
+					RelativePath=".\ff\ff_hud_buildstate_mancannon.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\ff\ff_hud_buildstate_mancannon.h"
+					>
+				</File>
 				<File
 					RelativePath=".\ff\ff_hud_buildstate_sentry.cpp"
 					>

diff --git a/cl_dll/ff/ff_hud_buildstate_detpack.cpp b/cl_dll/ff/ff_hud_buildstate_detpack.cpp
@@ -0,0 +1,274 @@
+#include "cbase.h"
+#include "ff_hud_buildstate_detpack.h"
+
+DECLARE_HUDELEMENT(CHudBuildStateDetpack);
+DECLARE_HUD_MESSAGE(CHudBuildStateDetpack, DetpackMsg);
+
+CHudBuildStateDetpack::CHudBuildStateDetpack(const char *pElementName) : CHudElement(pElementName), BaseClass(NULL, "HudBuildStateDetpack")
+{
+	SetParent(g_pClientMode->GetViewport());
+
+	// Hide when player is dead
+	SetHiddenBits( HIDEHUD_PLAYERDEAD );
+
+	SetUseToggleText(true);
+
+	m_bBuilt = false;
+	m_bBuilding = false;
+}
+
+CHudBuildStateDetpack::~CHudBuildStateDetpack() 
+{
+}
+
+KeyValues* CHudBuildStateDetpack::GetDefaultStyleData()
+{
+	KeyValues *kvPreset = new KeyValues("StyleData");
+
+	kvPreset->SetInt("x", 480);
+	kvPreset->SetInt("y", 330);
+	kvPreset->SetInt("alignH", 0);
+	kvPreset->SetInt("alignV", 0);
+
+	kvPreset->SetInt("columns", 1);
+	kvPreset->SetInt("headerTextX", 27);
+	kvPreset->SetInt("headerTextY", 8);
+	kvPreset->SetInt("headerIconX", 5);
+	kvPreset->SetInt("headerIconY", 3);
+	kvPreset->SetInt("textX", 25);
+	kvPreset->SetInt("textY", 22);
+	kvPreset->SetInt("itemsX", 5);
+	kvPreset->SetInt("itemsY", 22);
+	kvPreset->SetInt("showHeaderText", 1);
+	kvPreset->SetInt("showHeaderIcon", 1);
+	kvPreset->SetInt("showText", 1);
+	kvPreset->SetInt("headerTextShadow", 0);
+	kvPreset->SetInt("headerIconShadow", 0);
+	kvPreset->SetInt("textShadow", 0);
+	kvPreset->SetInt("headerTextSize", 2);
+	kvPreset->SetInt("headerIconSize", 6);
+	kvPreset->SetInt("textSize", 3);
+	kvPreset->SetInt("showPanel", 1);
+	kvPreset->SetInt("panelColorCustom", 0);
+	kvPreset->SetInt("panelRed", 255);
+	kvPreset->SetInt("panelGreen", 255);
+	kvPreset->SetInt("panelBlue", 255);
+	kvPreset->SetInt("panelAlpha", 255);
+
+	kvPreset->SetInt("barWidth", 60);
+	kvPreset->SetInt("barHeight", 10);
+	kvPreset->SetInt("barBorderWidth", 1);
+	kvPreset->SetInt("barMarginHorizontal", 0);
+	kvPreset->SetInt("barMarginVertical", 0);
+	kvPreset->SetInt("barOrientation", ORIENTATION_HORIZONTAL_INVERTED);
+
+	KeyValues *kvComponent = new KeyValues("Bar");
+	kvComponent->SetInt("show", 1);
+	kvComponent->SetInt("colorMode", COLOR_MODE_FADED);
+	kvComponent->SetInt("red", 255);
+	kvComponent->SetInt("green", 255);
+	kvComponent->SetInt("blue", 255);
+	kvComponent->SetInt("alpha", 93);
+
+	kvPreset->AddSubKey(kvComponent);
+
+	kvComponent = new KeyValues("BarBorder");
+	kvComponent->SetInt("show", 1);
+	kvComponent->SetInt("colorMode", COLOR_MODE_CUSTOM);
+	kvComponent->SetInt("red", 255);
+	kvComponent->SetInt("green", 255);
+	kvComponent->SetInt("blue", 255);
+	kvComponent->SetInt("alpha", 155);
+
+	kvPreset->AddSubKey(kvComponent);
+
+	kvComponent = new KeyValues("BarBackground");
+	kvComponent->SetInt("show", 1);
+	kvComponent->SetInt("colorMode", COLOR_MODE_FADED);
+	kvComponent->SetInt("red", 255);
+	kvComponent->SetInt("green", 255);
+	kvComponent->SetInt("blue", 255);
+	kvComponent->SetInt("alpha", 65);
+
+	kvPreset->AddSubKey(kvComponent);
+
+	kvComponent = new KeyValues("Icon");
+	kvComponent->SetInt("show", 0);
+	kvComponent->SetInt("colorMode", COLOR_MODE_CUSTOM);
+	kvComponent->SetInt("red", 255);
+	kvComponent->SetInt("green", 255);
+	kvComponent->SetInt("blue", 255);
+	kvComponent->SetInt("alpha", 255);
+	kvComponent->SetInt("shadow", 0);
+	kvComponent->SetInt("size", 2);
+	kvComponent->SetInt("alignH", ALIGN_CENTER);
+	kvComponent->SetInt("alignV", ALIGN_MIDDLE);
+	kvComponent->SetInt("offsetX", 5);
+	kvComponent->SetInt("offsetY", 0);
+
+	kvPreset->AddSubKey(kvComponent);
+
+	kvComponent = new KeyValues("Label");
+	kvComponent->SetInt("show", 1);
+	kvComponent->SetInt("colorMode", COLOR_MODE_CUSTOM);
+	kvComponent->SetInt("red", 255);
+	kvComponent->SetInt("green", 255);
+	kvComponent->SetInt("blue", 255);
+	kvComponent->SetInt("alpha", 255);
+	kvComponent->SetInt("shadow", 1);
+	kvComponent->SetInt("size", 1);
+	kvComponent->SetInt("alignH", ALIGN_LEFT);
+	kvComponent->SetInt("alignV", ALIGN_MIDDLE);
+	kvComponent->SetInt("offsetX", 54);
+	kvComponent->SetInt("offsetY", 0);
+	kvComponent->SetInt("fontTahoma", 1);
+
+	kvPreset->AddSubKey(kvComponent);
+
+	kvComponent = new KeyValues("Amount");
+	kvComponent->SetInt("show", 1);
+	kvComponent->SetInt("colorMode", COLOR_MODE_FADED);
+	kvComponent->SetInt("red", 255);
+	kvComponent->SetInt("green", 255);
+	kvComponent->SetInt("blue", 255);
+	kvComponent->SetInt("alpha", 255);
+	kvComponent->SetInt("shadow", 0);
+	kvComponent->SetInt("size", 0);
+	kvComponent->SetInt("alignH", ALIGN_RIGHT);
+	kvComponent->SetInt("alignV", ALIGN_CENTER);
+	kvComponent->SetInt("offsetX", 3);
+	kvComponent->SetInt("offsetY", 1);
+	kvComponent->SetInt("fontTahoma", 0);
+
+	kvPreset->AddSubKey(kvComponent);
+
+	return kvPreset;
+}
+
+void CHudBuildStateDetpack::VidInit()
+{
+	wchar_t *tempString = vgui::localize()->Find("#FF_PLAYER_DETPACK");
+
+	if (!tempString) 
+		tempString = L"DETPACK";
+
+	SetHeaderText(tempString, false);
+	SetHeaderIconChar("5", false);
+
+	m_wszNotBuiltText = vgui::localize()->Find("#HudPanel_NotBuilt"); 
+
+	if (!m_wszNotBuiltText) 
+		m_wszNotBuiltText = L"Not Built";
+	SetText(m_wszNotBuiltText);
+
+	m_wszBuildingText = vgui::localize()->Find("#HudPanel_Building"); 
+
+	if (!m_wszBuildingText) 
+		m_wszBuildingText = L"Building...";
+
+	m_qbDetpackTimeLeft->SetLabelText("#FF_ITEM_TIMELEFT", false);
+	m_qbDetpackTimeLeft->SetIconChar("f", false);
+	m_qbDetpackTimeLeft->SetIntensityAmountScaled(true);//max changes (is not 100) so we need to scale to a percentage amount for calculation
+	m_qbDetpackTimeLeft->SetAmount(0);
+
+	SetToggleTextVisible(true);
+}
+
+void CHudBuildStateDetpack::Init() 
+{
+	ivgui()->AddTickSignal(GetVPanel(), 250); //only update 4 times a second
+	HOOK_HUD_MESSAGE(CHudBuildStateDetpack, DetpackMsg);
+
+	m_qbDetpackTimeLeft = AddItem("BuildStateDetpackTimeLeft"); 
+
+	AddPanelToHudOptions("Detpack", "#HudPanel_Detpack", "BuildState", "#HudPanel_BuildableState");
+}
+
+void CHudBuildStateDetpack::OnTick() 
+{
+	BaseClass::OnTick();
+
+	if (!engine->IsInGame()) 
+		return;
+
+	// Get the local player
+	C_FFPlayer *pPlayer = C_FFPlayer::GetLocalFFPlayer();
+
+
+	// If the player is not an FFPlayer or is not an Scout
+	if (!pPlayer || pPlayer->GetClassSlot() != CLASS_DEMOMAN)
+	//hide the panel
+	{
+		m_bDraw = false;
+		SetVisible(false);
+		m_qbDetpackTimeLeft->SetVisible(false);
+		return; //return and don't continue
+	}
+	else if(!m_bDraw)
+	//show the panel
+	{
+		m_bDraw = true;
+	}
+
+	bool bBuilt = pPlayer->GetDetpack() && pPlayer->GetDetpack()->IsBuilt();
+	bool bBuilding = pPlayer->GetDetpack() && !bBuilt;
+
+	//small optimisation by comparing building with what it was previously
+	//if building
+	if(bBuilding && !m_bBuilding)
+	//show building text
+	{
+		SetText(m_wszBuildingText);
+		m_bBuilding = bBuilding;
+	}
+	//if not building
+	else if(!bBuilding && m_bBuilding)
+	//show not built text
+	{
+		SetText(m_wszNotBuiltText);
+		m_bBuilding = bBuilding;
+	}
+
+	//small optimisation by comparing build with what it was previously
+	//if not built
+	if(!bBuilt && m_bBuilt)
+	//hide quantity bars
+	{
+		m_bBuilt = false;
+		SetVisible(false);
+		m_qbDetpackTimeLeft->SetVisible(false);
+		SetToggleTextVisible(true);
+	}
+	else if(bBuilt && !m_bBuilt)
+	//show quantity bars
+	{
+		m_bBuilt = true;
+		SetVisible(true);
+		m_qbDetpackTimeLeft->SetVisible(true);
+		SetToggleTextVisible(false);
+	}
+}
+
+void CHudBuildStateDetpack::Paint() 
+{
+	if(m_bDraw)
+	{
+		if(m_bBuilt)
+		{
+			float flCurTime = gpGlobals->curtime;
+			int iDetpackTimeLeft = (int)(m_flDetonateTime - gpGlobals->curtime + 1);
+			if(iDetpackTimeLeft < 0)
+				m_qbDetpackTimeLeft->SetAmount(m_flDetonateTime - flCurTime);
+			else
+				m_qbDetpackTimeLeft->SetAmount(iDetpackTimeLeft);
+		}
+		//paint header
+		BaseClass::Paint();
+	}
+}
+
+void CHudBuildStateDetpack::MsgFunc_DetpackMsg(bf_read &msg)
+{
+	m_flDetonateTime = msg.ReadFloat();
+	m_qbDetpackTimeLeft->SetAmountMax((int) msg.ReadByte());
+}
diff --git a/cl_dll/ff/ff_hud_buildstate_detpack.h b/cl_dll/ff/ff_hud_buildstate_detpack.h
@@ -0,0 +1,44 @@
+#ifndef FF_HUDBUILDSTATEDETPACK_H
+#define FF_HUDBUILDSTATEDETPACK_H
+
+#include "ff_quantitypanel.h"
+#include "hudelement.h"
+
+#include "hud_macros.h"
+
+#include "iclientmode.h" //to set panel parent as the clients viewport
+#include "c_ff_player.h" //required to cast base player
+
+#include <vgui/ISurface.h>
+#include <vgui/IVGui.h>
+#include <vgui/ILocalize.h>
+
+using namespace vgui;
+
+class CHudBuildStateDetpack : public CHudElement, public FFQuantityPanel
+{
+private:
+	DECLARE_CLASS_SIMPLE( CHudBuildStateDetpack, FFQuantityPanel );
+
+	FFQuantityBar *m_qbDetpackTimeLeft;
+
+	bool	m_bBuilt;
+	bool	m_bBuilding;
+	float	m_flDetonateTime;
+	wchar_t* m_wszNotBuiltText;
+	wchar_t* m_wszBuildingText;
+public:
+	CHudBuildStateDetpack(const char *pElementName);
+	~CHudBuildStateDetpack();
+
+	KeyValues* GetDefaultStyleData();
+
+	void Init( void );
+	void VidInit( void );
+	void OnTick( void );
+	void Paint( void );
+
+	void	MsgFunc_DetpackMsg(bf_read &msg);
+};
+
+#endif