Config: Utility slot equip priority

Choose between standard source engine bucket behavior or prioritizing the default class utility (default)

Author: sunzenshen

src/game/client/hl2/hud_weaponselection.cpp

@@ -13,6 +13,7 @@
 #ifdef NEO
 #include "c_neo_player.h"
 #include "neo_enums.h"
+#include "neo/ui/neo_root_settings.h"
 #endif // NEO
 
 #include "VGuiMatSurface/IMatSystemSurface.h"
@@ -29,6 +30,9 @@
 #include "tier0/memdbgon.h"
 
 ConVar hud_showemptyweaponslots( "hud_showemptyweaponslots", "1", FCVAR_ARCHIVE, "Shows slots for missing weapons when recieving weapons out of order" );
+#ifdef NEO
+extern ConVar cl_neo_equip_utility_priority;
+#endif // NEO
 
 #define SELECTION_TIMEOUT_THRESHOLD		0.5f	// Seconds
 #define SELECTION_FADEOUT_TIME			0.75f
@@ -1242,16 +1246,21 @@ void CHudWeaponSelection::CycleToNextWeapon( void )
 
 	m_pLastWeapon = pPlayer->GetActiveWeapon();
 
-#ifdef NEO
-	C_BaseCombatWeapon *pNextWeapon = FindAndSelectWeaponInCycle(
-		pPlayer,
-		&CHudWeaponSelection::FindNextWeaponInWeaponSelection,
-		1, // iDirection for GetNeoPrioritizedWeaponOnCycle
-		-1, // iWrapAroundSlot
-		-1  // iWrapAroundPosition
-	);
-#else // refactored into FindAndSelectWeaponInCycle
 	C_BaseCombatWeapon *pNextWeapon = NULL;
+#ifdef NEO
+	if ( cl_neo_equip_utility_priority.GetInt() == NeoSettings::EquipUtilityPriorityType::EQUIP_UTILITY_PRIORITY_CLASS_SPECIFIC )
+	{
+		pNextWeapon = FindAndSelectWeaponInCycle(
+			pPlayer,
+			&CHudWeaponSelection::FindNextWeaponInWeaponSelection,
+			1, // iDirection for GetNeoPrioritizedWeaponOnCycle
+			-1, // iWrapAroundSlot
+			-1  // iWrapAroundPosition
+		);
+	}
+	else // EQUIP_UTILITY_PRIORITY_FRAG_SMOKE_DETPACK
+	{
+#endif // NEO
 	if ( IsInSelectionMode() )
 	{
 		// find the next selection spot
@@ -1276,6 +1285,8 @@ void CHudWeaponSelection::CycleToNextWeapon( void )
 		// wrap around back to start
 		pNextWeapon = FindNextWeaponInWeaponSelection(-1, -1);
 	}
+#ifdef NEO
+	}
 #endif
 
 	if ( pNextWeapon )
@@ -1305,16 +1316,21 @@ void CHudWeaponSelection::CycleToPrevWeapon( void )
 
 	m_pLastWeapon = pPlayer->GetActiveWeapon();
 
-#ifdef NEO
-	C_BaseCombatWeapon *pNextWeapon = FindAndSelectWeaponInCycle(
-		pPlayer,
-		&CHudWeaponSelection::FindPrevWeaponInWeaponSelection,
-		-1, // iDirection for GetNeoPrioritizedWeaponOnCycle
-		MAX_WEAPON_SLOTS, // iWrapAroundSlot
-		MAX_WEAPON_POSITIONS  // iWrapAroundPosition
-	);
-#else // refactored into FindAndSelectWeaponInCycle
 	C_BaseCombatWeapon *pNextWeapon = NULL;
+#ifdef NEO
+	if ( cl_neo_equip_utility_priority.GetInt() == NeoSettings::EquipUtilityPriorityType::EQUIP_UTILITY_PRIORITY_CLASS_SPECIFIC )
+	{
+		pNextWeapon = FindAndSelectWeaponInCycle(
+			pPlayer,
+			&CHudWeaponSelection::FindPrevWeaponInWeaponSelection,
+			-1, // iDirection for GetNeoPrioritizedWeaponOnCycle
+			MAX_WEAPON_SLOTS, // iWrapAroundSlot
+			MAX_WEAPON_POSITIONS  // iWrapAroundPosition
+		);
+	}
+	else // EQUIP_UTILITY_PRIORITY_FRAG_SMOKE_DETPACK
+	{
+#endif // NEO
 	if ( IsInSelectionMode() )
 	{
 		// find the next selection spot
@@ -1339,6 +1355,8 @@ void CHudWeaponSelection::CycleToPrevWeapon( void )
 		// wrap around back to end of weapon list
 		pNextWeapon = FindPrevWeaponInWeaponSelection(MAX_WEAPON_SLOTS, MAX_WEAPON_POSITIONS);
 	}
+#ifdef NEO
+	}
 #endif
 
 	if ( pNextWeapon )
@@ -1524,13 +1542,16 @@ void CHudWeaponSelection::FastWeaponSwitch( int iWeaponSlot )
 	C_BaseCombatWeapon *pNextWeapon = NULL;
 	C_BaseCombatWeapon *pActiveWeapon = pPlayer->GetActiveWeapon();
 
-	// Check if the player is already in the target slot
-	bool bAlreadyInSlot = (pActiveWeapon && pActiveWeapon->GetSlot() == iWeaponSlot);
-
-	// Apply class-based prioritization only when switching into the slot
-	if (!bAlreadyInSlot)
+	if (cl_neo_equip_utility_priority.GetInt() == NeoSettings::EquipUtilityPriorityType::EQUIP_UTILITY_PRIORITY_CLASS_SPECIFIC)
 	{
-		pNextWeapon = GetNeoClassUtilityWeapon(iWeaponSlot, pPlayer);
+		// Check if the player is already in the target slot
+		bool bAlreadyInSlot = (pActiveWeapon && pActiveWeapon->GetSlot() == iWeaponSlot);
+
+		// Apply class-based prioritization only when switching into the slot
+		if (!bAlreadyInSlot)
+		{
+			pNextWeapon = GetNeoClassUtilityWeapon(iWeaponSlot, pPlayer);
+		}
 	}
 
 	// If no class-prioritized weapon was found, or if already in the slot, proceed with original cycling logic
@@ -1539,14 +1560,16 @@ void CHudWeaponSelection::FastWeaponSwitch( int iWeaponSlot )
 #endif // NEO
 	// see where we should start selection
 	int iPosition = -1;
+#ifndef NEO // avoid shadowing NEO pActiveWeapon above
 	C_BaseCombatWeapon *pActiveWeapon = pPlayer->GetActiveWeapon();
+#endif // if not defined NEO
 	if ( pActiveWeapon && pActiveWeapon->GetSlot() == iWeaponSlot )
 	{
 		// start after this weapon
 		iPosition = pActiveWeapon->GetPosition();
 	}
 
-#ifndef NEO // avoid shadowing NEO location above
+#ifndef NEO // avoid shadowing NEO pNextWeapon above
 	C_BaseCombatWeapon *pNextWeapon = NULL;
 #endif // if not defined NEO
 

src/game/client/neo/c_neo_player.cpp

@@ -140,6 +140,7 @@ ConVar cl_drawhud_quickinfo("cl_drawhud_quickinfo", "0", 0,
 
 ConVar cl_neo_streamermode("cl_neo_streamermode", "0", FCVAR_ARCHIVE | FCVAR_USERINFO, "Streamer mode turns player names into generic names and hide avatars.", true, 0.0f, true, 1.0f);
 ConVar cl_neo_streamermode_autodetect_obs("cl_neo_streamermode_autodetect_obs", "0", FCVAR_ARCHIVE, "Automatically turn cl_neo_streamermode on if OBS was detected on startup.", true, 0.0f, true, 1.0f);
+ConVar cl_neo_equip_utility_priority("cl_neo_equip_utility_priority", "1", FCVAR_ARCHIVE, "Utility slot equip priority. 0 = Frag,Smoke,Detpack, 1 = Class Specific First.", true, 0.0f, true, 1.0f);
 
 extern ConVar sv_neo_clantag_allow;
 extern ConVar sv_neo_dev_test_clantag;

src/game/client/neo/ui/neo_root_settings.cpp

@@ -417,6 +417,7 @@ void NeoSettingsRestore(NeoSettings *ns, const NeoSettings::Keys::Flags flagsKey
 		pGeneral->bExtendedKillfeed = cvr->cl_neo_hud_extended_killfeed.GetBool();
 		pGeneral->iBackground = clamp(cvr->sv_unlockedchapters.GetInt(), 0, ns->iCBListSize - 1);
 		pGeneral->iKdinfoToggletype = cvr->cl_neo_kdinfo_toggletype.GetInt();
+		pGeneral->iEquipUtilityPriority = cvr->cl_neo_equip_utility_priority.GetInt();
 		NeoSettingsBackgroundWrite(ns);
 		NeoUI::ResetTextures();
 	}
@@ -699,6 +700,7 @@ void NeoSettingsSave(const NeoSettings *ns)
 		cvr->cl_neo_hud_extended_killfeed.SetValue(pGeneral->bExtendedKillfeed);
 		cvr->sv_unlockedchapters.SetValue(pGeneral->iBackground);
 		cvr->cl_neo_kdinfo_toggletype.SetValue(pGeneral->iKdinfoToggletype);
+		cvr->cl_neo_equip_utility_priority.SetValue(pGeneral->iEquipUtilityPriority);
 		NeoSettingsBackgroundWrite(ns);
 	}
 	{
@@ -898,6 +900,11 @@ static const wchar_t *KDMGINFO_TOGGLETYPE_LABELS[KDMGINFO_TOGGLETYPE__TOTAL] = {
 	L"Never", // KDMGINFO_TOGGLETYPE_NEVER
 };
 
+static const wchar_t *EQUIP_UTILITY_PRIORITY_LABELS[NeoSettings::EquipUtilityPriorityType::EQUIP_UTILITY_PRIORITY__TOTAL] = {
+	L"Frag, Smoke, Detpack", // EQUIP_UTILITY_PRIORITY_FRAG_SMOKE_DETPACK
+	L"Class Specific First" // EQUIP_UTILITY_PRIORITY_CLASS_SPECIFIC
+};
+
 void NeoSettings_General(NeoSettings *ns)
 {
 	NeoSettings::General *pGeneral = &ns->general;
@@ -937,6 +944,7 @@ void NeoSettings_General(NeoSettings *ns)
 	NeoUI::RingBoxBool(L"Show rangefinder", &pGeneral->bEnableRangeFinder);
 	NeoUI::RingBoxBool(L"Extended Killfeed", &pGeneral->bExtendedKillfeed);
 	NeoUI::RingBox(L"Killer damage info auto show", KDMGINFO_TOGGLETYPE_LABELS, KDMGINFO_TOGGLETYPE__TOTAL, &pGeneral->iKdinfoToggletype);
+	NeoUI::RingBox(L"Utility slot equip priority", EQUIP_UTILITY_PRIORITY_LABELS, NeoSettings::EquipUtilityPriorityType::EQUIP_UTILITY_PRIORITY__TOTAL, &pGeneral->iEquipUtilityPriority);
 
 
 	NeoUI::HeadingLabel(L"MAIN MENU");

src/game/client/neo/ui/neo_root_settings.h

@@ -64,6 +64,7 @@ struct NeoSettings
 		bool bExtendedKillfeed;
 		int iBackground;
 		int iKdinfoToggletype;
+		int iEquipUtilityPriority;
 	};
 
 	struct Keys
@@ -175,6 +176,14 @@ struct NeoSettings
 		Texture arTextures[CROSSHAIR_STYLE__TOTAL];
 	};
 
+	enum EquipUtilityPriorityType
+	{
+		EQUIP_UTILITY_PRIORITY_FRAG_SMOKE_DETPACK = 0,
+		EQUIP_UTILITY_PRIORITY_CLASS_SPECIFIC,
+
+		EQUIP_UTILITY_PRIORITY__TOTAL,
+	};
+
 	General general;
 	Keys keys;
 	Mouse mouse;
@@ -220,6 +229,7 @@ struct NeoSettings
 		CONVARREF_DEF(cl_neo_hud_rangefinder_enabled);
 		CONVARREF_DEF(sv_unlockedchapters);
 		CONVARREF_DEF(cl_neo_kdinfo_toggletype);
+		CONVARREF_DEF(cl_neo_equip_utility_priority);
 
 		// Multiplayer
 		CONVARREF_DEF(cl_spraydisable);

src/game/server/neo/neo_player.cpp

@@ -2894,9 +2894,9 @@ void GiveDet(CNEO_Player* pPlayer)
 			auto pWeapon = assert_cast<CNEOBaseCombatWeapon*>((CBaseEntity*)pent);
 			if (pWeapon)
 			{
-				const int detXpCost = pWeapon->GetNeoWepXPCost(pPlayer->GetClass());
+				const int detXpCost = -1;
 				// Cost of -1 XP means no XP cost.
-				const bool canHaveDet = (detXpCost < 0 || pPlayer->m_iXP >= detXpCost);
+				const bool canHaveDet = true;
 
 				pWeapon->SetSubType(0);
 				if (canHaveDet)
@@ -2924,17 +2924,23 @@ void CNEO_Player::GiveDefaultItems(void)
 	case NEO_CLASS_RECON:
 		GiveNamedItem("weapon_knife");
 		GiveNamedItem("weapon_milso");
-		if (this->m_iXP >= 4) { GiveDet(this); }
+		GiveNamedItem("weapon_smokegrenade");
+		GiveNamedItem("weapon_grenade");
+		GiveDet(this); 
 		Weapon_Switch(Weapon_OwnsThisType("weapon_milso"));
 		break;
 	case NEO_CLASS_ASSAULT:
 		GiveNamedItem("weapon_knife");
 		GiveNamedItem("weapon_tachi");
+		GiveDet(this); 
+		GiveNamedItem("weapon_smokegrenade");
 		GiveNamedItem("weapon_grenade");
 		Weapon_Switch(Weapon_OwnsThisType("weapon_tachi"));
 		break;
 	case NEO_CLASS_SUPPORT:
 		GiveNamedItem("weapon_kyla");
+		GiveDet(this); 
+		GiveNamedItem("weapon_grenade");
 		GiveNamedItem("weapon_smokegrenade");
 		Weapon_Switch(Weapon_OwnsThisType("weapon_kyla"));
 		break;