refactor how models are handled.

Author: Bitl

game/quiver/info_changelog.txt

@@ -43,7 +43,7 @@ Quiver Private Alpha 1.1.0 (WIP):
 - Set tf_mm_next_map_vote_time from 30s to 15s (From the Summer 2025 update).
 - Updated the item schema to support Summer 2025 items.
 - Added Goldsource-styled viewmodel bobbing.
-- Added the ConVar tf_bot_force_robot_models that makes TFBots look like MVM bots.
+- Added the ConVar tf_bot_models_override that makes TFBots look like MVM bots (when set to 1) or zombies (when set to 2).
 - Fixed ragdolls sometimes spawning in random places.
 - Changed the default Grenade Launcher ammo count from 4 to 6.
 - The Axtinguisher now fully crits against burning targets, at the expense of 33% less damage against non-burning players.

src/game/server/tf/bot/tf_bot.cpp

@@ -1513,44 +1513,57 @@ void CTFBot::Spawn()
 	GetVisionInterface()->ForgetAllKnownEntities();
 
 #ifdef BDSBASE
-	if (TFGameRules() && !TFGameRules()->IsMannVsMachineMode())
-	{
-		if ((tf_bot_difficulty.GetInt() == CTFBot::UNDEFINED || tf_bot_difficulty.GetInt() > CTFBot::EXPERT) && m_difficulty == CTFBot::UNDEFINED)
-		{
-			int m_nRandomSeed = RandomInt(0, 9999);
-			CUniformRandomStream randomize;
-			randomize.SetSeed(m_nRandomSeed);
+	ManageModelOverride();
+#endif
+}
 
-			SetDifficulty((CTFBot::DifficultyType)randomize.RandomInt(CTFBot::EASY, CTFBot::EXPERT));
-		}
+#ifdef BDSBASE
+void CTFBot::ManageModelOverride(void)
+{
+	if (TFGameRules() && TFGameRules()->IsMannVsMachineMode())
+		return;
 
-		DevMsg("%s chooses skill %s\n", GetPlayerName(), DifficultyLevelToString(m_difficulty));
+	int nClassIndex = (GetPlayerClass() ? GetPlayerClass()->GetClassIndex() : TF_CLASS_UNDEFINED);
 
-		if (IsServerUsingTheFunnyMVMCvar())
+	if (IsServerUsingTheFunnyMVMCvar())
+	{
+		// use the nifty new robot model
+		if (nClassIndex >= TF_CLASS_SCOUT && nClassIndex <= TF_CLASS_ENGINEER)
 		{
-			// use the nifty new robot model
-			int nClassIndex = (GetPlayerClass() ? GetPlayerClass()->GetClassIndex() : TF_CLASS_UNDEFINED);
-			if (nClassIndex >= TF_CLASS_SCOUT && nClassIndex <= TF_CLASS_ENGINEER)
+			if (g_pFullFileSystem->FileExists(g_szBotModels[nClassIndex]))
 			{
-				if (g_pFullFileSystem->FileExists(g_szBotModels[nClassIndex]))
-				{
-					GetPlayerClass()->SetCustomModel(g_szBotModels[nClassIndex], USE_CLASS_ANIMATIONS);
-					UpdateModel();
-					SetBloodColor(DONT_BLEED);
-				}
+				GetPlayerClass()->SetCustomModel(g_szBotModels[nClassIndex], USE_CLASS_ANIMATIONS);
+				UpdateModel();
+				SetBloodColor(DONT_BLEED);
 			}
 		}
-		else
+	}
+	else if (DoesServerWantBrainz())
+	{
+		//set to old model if needed
+		if (GetPlayerClass()->HasCustomModel())
+		{
+			GetPlayerClass()->SetCustomModel(NULL);
+			UpdateModel();
+			SetBloodColor(BLOOD_COLOR_RED);
+		}
+
+		// zombies use the original player models
+		m_nSkin = 4;
+		const char* name = g_aRawPlayerClassNamesShort[nClassIndex];
+		AddItem(CFmtStr("Zombie %s", name));
+	}
+	else
+	{
+		if (GetPlayerClass()->HasCustomModel())
 		{
 			GetPlayerClass()->SetCustomModel(NULL);
 			UpdateModel();
 			SetBloodColor(BLOOD_COLOR_RED);
 		}
 	}
-#endif
 }
 
-#ifdef BDSBASE
 void CTFBot::Regenerate(bool bRefillHealthAndAmmo)
 {
 	BaseClass::Regenerate(bRefillHealthAndAmmo);
@@ -1566,48 +1579,7 @@ void CTFBot::HandleCommand_JoinClass(const char* pClassName, bool bAllowSpawn)
 
 	m_InitialLoadoutLoadTimer.Start(RandomFloat(TFBOT_MIN_LOADOUT_WAIT, TFBOT_MAX_LOADOUT_WAIT) + TFBOT_CLASSSWITCH_LOADOUT_DELAY);
 
-	if (TFGameRules() && !TFGameRules()->IsMannVsMachineMode())
-	{
-		int nClassIndex = (GetPlayerClass() ? GetPlayerClass()->GetClassIndex() : TF_CLASS_UNDEFINED);
-
-		if (IsServerUsingTheFunnyMVMCvar())
-		{
-			// use the nifty new robot model
-			if (nClassIndex >= TF_CLASS_SCOUT && nClassIndex <= TF_CLASS_ENGINEER)
-			{
-				if (g_pFullFileSystem->FileExists(g_szBotModels[nClassIndex]))
-				{
-					GetPlayerClass()->SetCustomModel(g_szBotModels[nClassIndex], USE_CLASS_ANIMATIONS);
-					UpdateModel();
-					SetBloodColor(DONT_BLEED);
-				}
-			}
-		}
-		else if (DoesServerWantBrainz())
-		{
-			//set to old model if needed
-			if (GetPlayerClass()->HasCustomModel())
-			{
-				GetPlayerClass()->SetCustomModel(NULL);
-				UpdateModel();
-				SetBloodColor(BLOOD_COLOR_RED);
-			}
-
-			// zombies use the original player models
-			m_nSkin = 4;
-			const char* name = g_aRawPlayerClassNamesShort[nClassIndex];
-			AddItem(CFmtStr("Zombie %s", name));
-		}
-		else
-		{
-			if (GetPlayerClass()->HasCustomModel())
-			{
-				GetPlayerClass()->SetCustomModel(NULL);
-				UpdateModel();
-				SetBloodColor(BLOOD_COLOR_RED);
-			}
-		}
-	}
+	ManageModelOverride();
 }
 #endif
 

src/game/server/tf/bot/tf_bot.h

@@ -366,6 +366,7 @@ class CTFBot: public NextBotPlayer< CTFPlayer >, public CGameEventListener
 	void ScriptHandleLoadout(void) { HandleLoadout(); }
 	void Regenerate(bool bRefillHealthAndAmmo) OVERRIDE;
 	void HandleCommand_JoinClass(const char* pClassName, bool bAllowSpawn = true) OVERRIDE;
+	void ManageModelOverride(void);
 #endif
 	void ScriptGenerateAndWearItem( const char *pszItemName ) { if ( pszItemName ) BotGenerateAndWearItem( this, pszItemName ); }