fix MAX_FOV cap for hl2mp, fix bhopping cap, change bhop speeds

Bitl · Bitl · commit 37fa303cfed2 · 2025-07-28T16:22:13.000-07:00
diff --git a/game/quiver/cfg/valve.rc b/game/quiver/cfg/valve.rc
@@ -15,6 +15,6 @@ stuffcmds
 
 // display the startup level
 startupmenu
-map_background background01
+//map_background background01
 
 sv_unlockedchapters 99
diff --git a/game/quiver/info_changelog.txt b/game/quiver/info_changelog.txt
@@ -72,6 +72,8 @@ Quiver Private Alpha 1.1.0 (WIP):
 - The Dragon's Fury now 100% crits vs players that just had their armor break, in return for 20 less max armor on the user.
 - The Dragon's Fury's unused pressure meter now shows up by default, allowing you to view its pressure when switching weapons.
 - Added additional repair cost rate attributes to weapons that add armor or improve armor durability.
+- Fine-tuned bhop jump speed.
+- Fixed bhop capping not applying properly.
 - Added the following Source SDK Pull Requests:
 	- #1437: MvM: Fix Explosive Headshot working on invulnerable target
 	- #1440: Treat being in background map as not in-game
diff --git a/game/quiver/scripts/playerclasses/demoman.txt b/game/quiver/scripts/playerclasses/demoman.txt
@@ -12,7 +12,7 @@ PlayerClass
 	"speed_max"		"315"
 	"health_max"		"175"
 	"armor_max"		"100"
-	"bhop_speed_boost" "0.085"
+	"bhop_speed_boost" "0.1"
 	"airspeed_cap_mult" "1.65"
 	
 	//armor stats
diff --git a/game/quiver/scripts/playerclasses/engineer.txt b/game/quiver/scripts/playerclasses/engineer.txt
@@ -14,7 +14,7 @@ PlayerClass
 //	"armor_max"		"50"
 	"health_max"		"125"
 	"armor_max"		"100"
-	"bhop_speed_boost" "0.095"
+	"bhop_speed_boost" "0.2"
 	"airspeed_cap_mult" "1.75"
 	
 	//armor stats
diff --git a/game/quiver/scripts/playerclasses/heavyweapons.txt b/game/quiver/scripts/playerclasses/heavyweapons.txt
@@ -14,7 +14,7 @@ PlayerClass
 //	"armor_max"		"400"
 	"health_max"		"300"
 	"armor_max"		"100"
-	"bhop_speed_boost" "0.075"
+	"bhop_speed_boost" "0.1"
 	"airspeed_cap_mult" "1.5"
 	"aimed_speed_mult" "0.50"
 	
diff --git a/game/quiver/scripts/playerclasses/medic.txt b/game/quiver/scripts/playerclasses/medic.txt
@@ -14,7 +14,7 @@ PlayerClass
 //	"armor_max"		"100"
 	"health_max"		"150"
 	"armor_max"		"100"
-	"bhop_speed_boost" "0.1"
+	"bhop_speed_boost" "0.3"
 	"airspeed_cap_mult" "1.85"
 	
 	//armor stats
diff --git a/game/quiver/scripts/playerclasses/pyro.txt b/game/quiver/scripts/playerclasses/pyro.txt
@@ -14,7 +14,7 @@ PlayerClass
 //	"armor_max"		"150"
 	"health_max"		"175"
 	"armor_max"		"100"
-	"bhop_speed_boost" "0.095"
+	"bhop_speed_boost" "0.2"
 	"airspeed_cap_mult" "1.75"
 	
 	//armor stats
diff --git a/game/quiver/scripts/playerclasses/scout.txt b/game/quiver/scripts/playerclasses/scout.txt
@@ -14,7 +14,7 @@ PlayerClass
 //	"armor_max"		"25"
 	"health_max"		"125"
 	"armor_max"		"100"
-	"bhop_speed_boost" "0.1"
+	"bhop_speed_boost" "0.3"
 	"airspeed_cap_mult" "1.95"
 	
 	//armor stats
diff --git a/game/quiver/scripts/playerclasses/sniper.txt b/game/quiver/scripts/playerclasses/sniper.txt
@@ -14,7 +14,7 @@ PlayerClass
 //	"armor_max"		"25"
 	"health_max"		"125"
 	"armor_max"		"100"
-	"bhop_speed_boost" "0.095"
+	"bhop_speed_boost" "0.2"
 	"airspeed_cap_mult" "1.75"
 	"aimed_speed_mult" "0.34"
 	
diff --git a/game/quiver/scripts/playerclasses/soldier.txt b/game/quiver/scripts/playerclasses/soldier.txt
@@ -14,7 +14,7 @@ PlayerClass
 //	"armor_max"		"250"
 	"health_max"		"200"
 	"armor_max"		"100"
-	"bhop_speed_boost" "0.085"
+	"bhop_speed_boost" "0.1"
 	"airspeed_cap_mult" "1.65"
 	
 	//armor stats
diff --git a/game/quiver/scripts/playerclasses/spy.txt b/game/quiver/scripts/playerclasses/spy.txt
@@ -14,7 +14,7 @@ PlayerClass
 //	"armor_max"		"100"
 	"health_max"		"125"
 	"armor_max"		"100"
-	"bhop_speed_boost" "0.095"
+	"bhop_speed_boost" "0.2"
 	"airspeed_cap_mult" "1.75"
 	
 	//armor stats
diff --git a/src/game/shared/gamemovement.cpp b/src/game/shared/gamemovement.cpp
@@ -71,12 +71,11 @@ ConVar option_duck_method("option_duck_method", "1", FCVAR_REPLICATED|FCVAR_ARCH
 #if defined(QUIVER_DLL)
 ConVar sv_bhop("sv_bhop", "1", FCVAR_REPLICATED | FCVAR_NOTIFY);
 ConVar sv_bhop_mode("sv_bhop_mode", "1", FCVAR_DEVELOPMENTONLY, "1 = 2006 bhopping, 2 = orangebox accelerated backhopping");
-// quiver doesn't use sv_bhop_boost as that's defined per class.
 #else
 ConVar sv_bhop("sv_bhop", "0", FCVAR_REPLICATED | FCVAR_NOTIFY);
 ConVar sv_bhop_mode("sv_bhop_mode", "1", FCVAR_REPLICATED | FCVAR_NOTIFY, "1 = 2006 bhopping, 2 = orangebox accelerated backhopping");
-ConVar sv_bhop_boost("sv_bhop_boost", "0.1", FCVAR_REPLICATED | FCVAR_NOTIFY);
 #endif
+ConVar sv_bhop_boost("sv_bhop_boost", "0.1", FCVAR_REPLICATED | FCVAR_NOTIFY);
 ConVar sv_wallstrafe("sv_wallstrafe", "1", FCVAR_REPLICATED | FCVAR_NOTIFY);
 #endif
 
diff --git a/src/game/shared/tf/tf_gamemovement.cpp b/src/game/shared/tf/tf_gamemovement.cpp
@@ -98,12 +98,11 @@ extern ConVar mp_tournament_readymode_countdown;
 #ifdef BDSBASE
 extern ConVar sv_bhop;
 extern ConVar sv_bhop_mode;
-#if !defined(QUIVER_DLL)
 extern ConVar sv_bhop_boost;
-#endif
 ConVar sv_bhop_tf_cap("sv_bhop_tf_cap", "1", FCVAR_REPLICATED | FCVAR_NOTIFY);
 #if defined(QUIVER_DLL)
 ConVar sv_bhop_tf_cap_boost("sv_bhop_tf_cap_boost", "2", FCVAR_REPLICATED | FCVAR_NOTIFY);
+ConVar sv_bhop_qf_classboost_disable("sv_bhop_qf_classboost_disable", "0", FCVAR_REPLICATED | FCVAR_NOTIFY);
 #else
 ConVar sv_bhop_tf_cap_boost("sv_bhop_tf_cap_boost", "1.2", FCVAR_REPLICATED | FCVAR_NOTIFY);
 #endif
@@ -180,6 +179,9 @@ class CTFGameMovement : public CGameMovement
 	bool		CheckWaterJumpButton( void );
 	void		AirDash( void );
 	void		PreventBunnyJumping();
+#ifdef BDSBASE
+	Vector		CapBunnyJumping(Vector &src);
+#endif
 	void		ToggleParachute( void );
 	void		CheckKartWallBumping();
 
@@ -1163,15 +1165,14 @@ void CTFGameMovement::AirDash( void )
 //-----------------------------------------------------------------------------
 void CTFGameMovement::PreventBunnyJumping()
 {
+#ifdef BDSBASE
+	CapBunnyJumping(mv->m_vecVelocity);
+#else
 	if ( m_pTFPlayer->m_Shared.InCond( TF_COND_HALLOWEEN_KART ) )
 		return;
 
 	// Speed at which bunny jumping is limited
-#ifdef BDSBASE
-	float maxscaledspeed = sv_bhop_tf_cap_boost.GetFloat() * player->m_flMaxspeed;
-#else
 	float maxscaledspeed = BUNNYJUMP_MAX_SPEED_FACTOR * player->m_flMaxspeed;
-#endif
 	if ( maxscaledspeed <= 0.0f )
 		return;
 
@@ -1185,7 +1186,35 @@ void CTFGameMovement::PreventBunnyJumping()
 
 
 	mv->m_vecVelocity *= fraction;
+#endif
+}
+
+#ifdef BDSBASE
+Vector CTFGameMovement::CapBunnyJumping(Vector& src)
+{
+	if (m_pTFPlayer->m_Shared.InCond(TF_COND_HALLOWEEN_KART))
+		return src;
+
+	// Speed at which bunny jumping is limited
+	float maxscaledspeed = sv_bhop_tf_cap_boost.GetFloat() * player->m_flMaxspeed;
+	if (maxscaledspeed <= 0.0f)
+		return src;
+
+	// Current player speed
+	float spd = src.Length();
+	if (spd <= maxscaledspeed)
+		return src;
+
+	Vector result = src;
+
+	// Apply this cropping fraction to velocity
+	float fraction = (maxscaledspeed / spd);
+
+	result *= fraction;
+
+	return result;
 }
+#endif
 
 //-----------------------------------------------------------------------------
 // Purpose: 
@@ -1350,7 +1379,83 @@ bool CTFGameMovement::CheckJumpButton()
 	}
 
 #ifdef BDSBASE
-	if (sv_bhop_tf_cap.GetBool())
+#if defined(QUIVER_DLL)
+	float flBhopBoost = (sv_bhop_qf_classboost_disable.GetBool() ? sv_bhop_boost.GetFloat() : m_pTFPlayer->GetPlayerClass()->GetBhopSpeedBoost());
+#else
+	float flBhopBoost = sv_bhop_boost.GetFloat();
+#endif
+	bool canBHop = ((sv_bhop.GetBool()) ? true : (gpGlobals->maxClients == 1));
+
+	if (canBHop)
+	{
+		Vector vecAdjusted = vec3_origin;
+
+		if (sv_bhop_mode.GetInt() == 1)
+		{
+			Vector vecForward;
+			AngleVectors(mv->m_vecViewAngles, &vecForward);
+			vecForward.z = 0;
+			VectorNormalize(vecForward);
+			for (int iAxis = 0; iAxis < 2; ++iAxis)
+			{
+				vecForward[iAxis] *= (mv->m_flForwardMove * flBhopBoost);
+			}
+
+			vecAdjusted = vecForward;
+		}
+		else
+		{
+			Vector vecForward;
+			AngleVectors(mv->m_vecViewAngles, &vecForward);
+			vecForward.z = 0;
+			VectorNormalize(vecForward);
+
+			// We give a certain percentage of the current forward movement as a bonus to the jump speed.  That bonus is clipped
+			// to not accumulate over time.
+			float flSpeedBoostPerc = flBhopBoost;
+			float flSpeedAddition = fabs(mv->m_flForwardMove * flSpeedBoostPerc);
+			float flMaxSpeed = mv->m_flMaxSpeed + (mv->m_flMaxSpeed * flSpeedBoostPerc);
+			float flNewSpeed = (flSpeedAddition + mv->m_vecVelocity.Length2D());
+
+			// If we're over the maximum, we want to only boost as much as will get us to the goal speed
+			if (flNewSpeed > flMaxSpeed)
+			{
+				flSpeedAddition -= flNewSpeed - flMaxSpeed;
+			}
+
+			if (mv->m_flForwardMove < 0.0f)
+				flSpeedAddition *= -1.0f;
+
+			// if we CAN bhop, slow down the speed velocity.
+			Vector result = (vecForward * flSpeedAddition);
+
+			vecAdjusted = result;
+		}
+
+		if (sv_bhop_tf_cap.GetBool())
+		{
+			//then create a fake vector and cap it.
+			Vector fakeVector = mv->m_vecVelocity;
+			VectorAdd(vecAdjusted, fakeVector, fakeVector);
+
+			if (fakeVector != CapBunnyJumping(fakeVector))
+			{
+				vecAdjusted = CapBunnyJumping(fakeVector);
+				mv->m_vecVelocity = vecAdjusted;
+			}
+			else
+			{
+				// Add it on
+				VectorAdd(vecAdjusted, mv->m_vecVelocity, mv->m_vecVelocity);
+			}
+		}
+		else
+		{
+			// Add it on
+			VectorAdd(vecAdjusted, mv->m_vecVelocity, mv->m_vecVelocity);
+		}
+	}
+	else if (sv_bhop_tf_cap.GetBool())
 	{
 		PreventBunnyJumping();
 	}
@@ -1444,57 +1549,6 @@ bool CTFGameMovement::CheckJumpButton()
 		mv->m_vecVelocity[2] += flMul;  // 2 * gravity * jump_height * ground_factor
 	}
 
-#ifdef BDSBASE
-#if defined(QUIVER_DLL)
-	float flBhopBoost = m_pTFPlayer->GetPlayerClass()->GetBhopSpeedBoost();
-#else
-	float flBhopBoost = sv_bhop_boost.GetFloat();
-#endif
-	bool canBHop = ((sv_bhop.GetBool()) ? true : (gpGlobals->maxClients == 1));
-
-	if (canBHop)
-	{
-		if (sv_bhop_mode.GetInt() == 1)
-		{
-			Vector vecForward;
-			AngleVectors(mv->m_vecViewAngles, &vecForward);
-			vecForward.z = 0;
-			VectorNormalize(vecForward);
-			for (int iAxis = 0; iAxis < 2; ++iAxis)
-			{
-				vecForward[iAxis] *= (mv->m_flForwardMove * flBhopBoost);
-			}
-			VectorAdd(vecForward, mv->m_vecVelocity, mv->m_vecVelocity);
-		}
-		else
-		{
-			Vector vecForward;
-			AngleVectors(mv->m_vecViewAngles, &vecForward);
-			vecForward.z = 0;
-			VectorNormalize(vecForward);
-
-			// We give a certain percentage of the current forward movement as a bonus to the jump speed.  That bonus is clipped
-			// to not accumulate over time.
-			float flSpeedBoostPerc = flBhopBoost;
-			float flSpeedAddition = fabs(mv->m_flForwardMove * flSpeedBoostPerc);
-			float flMaxSpeed = mv->m_flMaxSpeed + (mv->m_flMaxSpeed * flSpeedBoostPerc);
-			float flNewSpeed = (flSpeedAddition + mv->m_vecVelocity.Length2D());
-
-			// If we're over the maximum, we want to only boost as much as will get us to the goal speed
-			if (flNewSpeed > flMaxSpeed)
-			{
-				flSpeedAddition -= flNewSpeed - flMaxSpeed;
-			}
-
-			if (mv->m_flForwardMove < 0.0f)
-				flSpeedAddition *= -1.0f;
-
-			// Add it on
-			VectorAdd((vecForward * flSpeedAddition), mv->m_vecVelocity, mv->m_vecVelocity);
-		}
-	}
-#endif
-
 	// Apply gravity.
 	FinishGravity();
 
