fixes/speed changes

Bitl · Bitl · commit 47f56314bcb0 · 2025-07-22T19:03:23.000-07:00
diff --git a/game/quiver/cfg/user.scr b/game/quiver/cfg/user.scr
diff --git a/game/quiver/info_changelog.txt b/game/quiver/info_changelog.txt
@@ -18,7 +18,6 @@ Quiver Private Alpha 1.1.0 (WIP):
 - The Artillery Cannon: Removed the bullets per shot penalty, re-enabled the revving penalties. nerfed the damage potential from 150% to 100%, and buffed the weapon's accuracy slightly from 80% to 85%.
 - Reverted the "infinite sandviches" fix as that fix reverted a feature of the Sandvich that's in Live TF2.
 - Decreased Mini-Sentry range from 1100 hammer units to 825 hammer units.
-- Decreased Mini-Sentry build rate from 150% to 130%.
 - Team Deathmatch: Each un-wrangled Sentry kill will now count as half of a kill. Every 2 sentry kills will count as 1 player kill. Wrangled and mini-sentry kills are the only exception.
 - Improved model panel lighting.
 - Increased the Heavy's speed from 270 to 280.
@@ -30,8 +29,11 @@ Quiver Private Alpha 1.1.0 (WIP):
 - Fixed the Vitality Gliitch's 50% lower armor durability penalty.
 - The Backburner now has a small move speed penalty when active. This was done as the Pyro's speed buff allowed the user to get up to player's backs extremely quickly, making the weapon incredibly effective.
 - Added a 10% move penalty when carrying buildings, regardless if they are being built or moved.
-- The Ludmila no longer pierces through armor, in favor of it having a 35% damage bonus against armor.
+- The Ludmila no longer pierces through armor, in favor of it having a 20% damage bonus against armor.
 - Added an option for Quake 3 hit sounds.
+- Minigun/Sniper rifle aiming now considers movespeed when calculating the aiming move speed.
+- Added 8 seconds of spawn protection in TDM mode. 
+- Fixed another bug where the TDM HUD is overlayed over other gamemode's HUD elements.
 - Added the following Source SDK Pull Requests:
 	-  #1437: MvM: Fix Explosive Headshot working on invulnerable target
 
diff --git a/game/quiver/info_highlights.txt b/game/quiver/info_highlights.txt
@@ -44,6 +44,8 @@ Stock weapon balance changes:
 - All Sniper Rifles now fire tracer rounds.
 - Cloak drain now increases 3.5x if you're jumping/bunnyhopping.
 - Added a 10% move penalty when carrying buildings, regardless if they are being built or moved.
+- Minigun/Sniper rifle aiming now considers movespeed when calculating the aiming move speed.
+- Slightly increased aiming move speed to be more consistent with the main move speed.
 
 Unlockable weapon balance changes:
 - The Wrangler's shield has been disabled. Its sole function is now purely to control your sentry gun.
@@ -62,6 +64,7 @@ Unlockable weapon balance changes:
 - When using the Cloak and Dagger, the jumping/bunnyhopping cloak drain increases to 4x.
 - The Quick Fix now can heal surrounding teammates with its Ubercharge.
 - The Backburner now has a small move speed penalty when active.
+- Decreased Mini-Sentry range from 1100 hammer units to 825 hammer units.
 
 MvM Changes:
 - Added armor-related upgrades to MvM (max armor, pierces damage resistances, and armor resistance).
diff --git a/game/quiver/info_whitelist.txt b/game/quiver/info_whitelist.txt
@@ -28,7 +28,7 @@
 - The Ubersaw
 - The Amputator
 - The Vita-Saw
-- The Huntsman/Fortified Compound
+- The Huntsman/Fortified Compound (w/ balance changes)
 - The Killing Gloves of Boxing
 - The Cloak and Dagger (w/ balance changes)
 - The Big Earner
diff --git a/game/quiver/scripts/items/items_custom.txt b/game/quiver/scripts/items/items_custom.txt
@@ -565,7 +565,7 @@
 				"armor damage increased on target"
 				{
 					"attribute_class"	"mult_armor_onhit"
-					"value"	"1.35"
+					"value"	"1.20"
 				}
 				"aiming knockback resistance heavy ver"
 				{
diff --git a/game/quiver/scripts/items/items_game.txt b/game/quiver/scripts/items/items_game.txt
@@ -18589,6 +18589,11 @@
 					"attribute_class"	"allowed_in_medieval_mode"
 					"value"	"1"
 				}
+				"aiming movespeed increased"
+				{
+					"attribute_class"	"mult_player_aiming_movespeed"
+					"value" "1.65"
+				}
 			}
 			"visuals"
 			{
@@ -25713,7 +25718,7 @@
 				"engineer sentry build rate multiplier"
 				{
 					"attribute_class"	"sentry_build_rate_multiplier"
-					"value"		"2.3"
+					"value"		"2.5"
 				}
 				"engy sentry radius decreased"
 				{
diff --git a/game/quiver/scripts/playerclasses/heavyweapons.txt b/game/quiver/scripts/playerclasses/heavyweapons.txt
@@ -16,6 +16,7 @@ PlayerClass
 	"armor_max"		"100"
 	"bhop_speed_boost" "0.075"
 	"airspeed_cap_mult" "1.5"
+	"aimed_speed_mult" "0.50"
 	
 	//armor stats
 	//heavy armor
diff --git a/game/quiver/scripts/playerclasses/sniper.txt b/game/quiver/scripts/playerclasses/sniper.txt
@@ -16,6 +16,7 @@ PlayerClass
 	"armor_max"		"100"
 	"bhop_speed_boost" "0.095"
 	"airspeed_cap_mult" "1.75"
+	"aimed_speed_mult" "0.34"
 	
 	//armor stats
 	//light armor
diff --git a/src/game/client/tf/tf_hud_objectivestatus.cpp b/src/game/client/tf/tf_hud_objectivestatus.cpp
@@ -327,7 +327,7 @@ void CTFHudObjectiveStatus::SetVisiblePanels( void )
 #if defined(QUIVER_CLIENT_DLL)
 	bool bTDMVisible = TFGameRules()->IsInTDMMode();
 
-	if (m_pTDMPanel && m_pFlagPanel->IsVisible() != bTDMVisible)
+	if (m_pTDMPanel && m_pTDMPanel->IsVisible() != bTDMVisible)
 	{
 		m_pTDMPanel->SetVisible(bTDMVisible);
 	}
diff --git a/src/game/server/tf/tf_player.cpp b/src/game/server/tf/tf_player.cpp
@@ -292,6 +292,11 @@ extern ConVar sv_vote_allow_spectators;
 ConVar sv_vote_late_join_time( "sv_vote_late_join_time", "90", FCVAR_NONE, "Grace period after the match starts before players who join the match receive a vote-creation cooldown" );
 ConVar sv_vote_late_join_cooldown( "sv_vote_late_join_cooldown", "300", FCVAR_NONE, "Length of the vote-creation cooldown when joining the server after the grace period has expired" );
 
+#if defined(QUIVER_DLL) || defined(QUIVER_CLIENT_DLL)
+ConVar qf_tdm_spawnprotection("qf_tdm_spawnprotection", "1", FCVAR_NOTIFY, "");
+ConVar qf_tdm_spawnprotection_length("qf_tdm_spawnprotection_length", "8", FCVAR_NOTIFY, "");
+#endif
+
 #ifdef BDSBASE
 extern ConVar tf_voice_command_suspension_mode;
 #endif
@@ -4058,37 +4063,83 @@ void CTFPlayer::Spawn()
 
 	SetRespawnOverride( -1.f, NULL_STRING );
 
-	// Remove all powerups and add temporary invuln on spawn
-	if ( TFGameRules()  && TFGameRules()->IsPowerupMode() )
+#if defined(QUIVER_DLL) || defined(QUIVER_CLIENT_DLL)
+	if (TFGameRules() && ((TFGameRules()->IsInTDMMode() && qf_tdm_spawnprotection.GetBool()) || TFGameRules()->IsPowerupMode()))
 	{
-		m_Shared.AddCond( TF_COND_INVULNERABLE_USER_BUFF, 8.f );
+		m_Shared.AddCond(TF_COND_INVULNERABLE_USER_BUFF, (TFGameRules()->IsInTDMMode() ? qf_tdm_spawnprotection_length.GetFloat() : 8.f));
 
-		if ( !m_bIsInMannpowerDominantCondition )
+		if (TFGameRules()->IsPowerupMode())
 		{
-			if ( ( GetTeamNumber() == TF_TEAM_BLUE ) || ( GetTeamNumber() == TF_TEAM_RED ) )
+			if (!m_bIsInMannpowerDominantCondition)
+			{
+				if ((GetTeamNumber() == TF_TEAM_BLUE) || (GetTeamNumber() == TF_TEAM_RED))
+				{
+					CSteamID steamIDForPlayer;
+					if (GetSteamID(&steamIDForPlayer))
+					{
+						float flRemoveDominantConditionTime = TFGameRules()->CheckPowerupModeDominantDisconnect(steamIDForPlayer);
+						if (flRemoveDominantConditionTime > 0)
+						{
+							ClientPrint(this, HUD_PRINTCENTER, "#TF_Powerup_Dominant_Continue");
+							ClientPrint(this, HUD_PRINTTALK, "#TF_Powerup_Dominant_Continue");
+
+							m_Shared.AddCond(TF_COND_POWERUPMODE_DOMINANT, PERMANENT_CONDITION);
+
+							m_flRemoveDominantConditionTime = flRemoveDominantConditionTime;
+							m_bIsInMannpowerDominantCondition = true;
+
+							int nEnemyTeam = (GetTeamNumber() == TF_TEAM_RED) ? TF_TEAM_BLUE : TF_TEAM_RED;
+							for (int i = 0; i < MAX_PLAYERS; ++i)
+							{
+								CTFPlayer* pTFPlayer = ToTFPlayer(UTIL_PlayerByIndex(i));
+								if (pTFPlayer && (pTFPlayer->GetTeamNumber() == nEnemyTeam))
+								{
+									ClientPrint(pTFPlayer, HUD_PRINTCENTER, "#TF_Powerup_Dominant_Other_Team");
+									ClientPrint(pTFPlayer, HUD_PRINTTALK, "#TF_Powerup_Dominant_Other_Team");
+								}
+							}
+						}
+					}
+				}
+			}
+			else
+			{
+				m_Shared.AddCond(TF_COND_POWERUPMODE_DOMINANT);
+				ClientPrint(this, HUD_PRINTCENTER, "#TF_Powerup_Dominant_StillIn");
+			}
+		}
+	}
+#else
+	if (TFGameRules() && TFGameRules()->IsPowerupMode())
+	{
+		m_Shared.AddCond(TF_COND_INVULNERABLE_USER_BUFF, 8.f);
+
+		if (!m_bIsInMannpowerDominantCondition)
+		{
+			if ((GetTeamNumber() == TF_TEAM_BLUE) || (GetTeamNumber() == TF_TEAM_RED))
 			{
 				CSteamID steamIDForPlayer;
-				if ( GetSteamID( &steamIDForPlayer ) )
+				if (GetSteamID(&steamIDForPlayer))
 				{
-					float flRemoveDominantConditionTime = TFGameRules()->CheckPowerupModeDominantDisconnect( steamIDForPlayer );
-					if ( flRemoveDominantConditionTime > 0 )
+					float flRemoveDominantConditionTime = TFGameRules()->CheckPowerupModeDominantDisconnect(steamIDForPlayer);
+					if (flRemoveDominantConditionTime > 0)
 					{
-						ClientPrint( this, HUD_PRINTCENTER, "#TF_Powerup_Dominant_Continue" );
-						ClientPrint( this, HUD_PRINTTALK, "#TF_Powerup_Dominant_Continue" );
+						ClientPrint(this, HUD_PRINTCENTER, "#TF_Powerup_Dominant_Continue");
+						ClientPrint(this, HUD_PRINTTALK, "#TF_Powerup_Dominant_Continue");
 
-						m_Shared.AddCond( TF_COND_POWERUPMODE_DOMINANT, PERMANENT_CONDITION );
+						m_Shared.AddCond(TF_COND_POWERUPMODE_DOMINANT, PERMANENT_CONDITION);
 
 						m_flRemoveDominantConditionTime = flRemoveDominantConditionTime;
 						m_bIsInMannpowerDominantCondition = true;
 
-						int nEnemyTeam = ( GetTeamNumber() == TF_TEAM_RED ) ? TF_TEAM_BLUE : TF_TEAM_RED;
-						for ( int i = 0; i < MAX_PLAYERS; ++i )
+						int nEnemyTeam = (GetTeamNumber() == TF_TEAM_RED) ? TF_TEAM_BLUE : TF_TEAM_RED;
+						for (int i = 0; i < MAX_PLAYERS; ++i)
 						{
-							CTFPlayer *pTFPlayer = ToTFPlayer( UTIL_PlayerByIndex( i ) );
-							if ( pTFPlayer && ( pTFPlayer->GetTeamNumber() == nEnemyTeam ) )
+							CTFPlayer* pTFPlayer = ToTFPlayer(UTIL_PlayerByIndex(i));
+							if (pTFPlayer && (pTFPlayer->GetTeamNumber() == nEnemyTeam))
 							{
-								ClientPrint( pTFPlayer, HUD_PRINTCENTER, "#TF_Powerup_Dominant_Other_Team" );
-								ClientPrint( pTFPlayer, HUD_PRINTTALK, "#TF_Powerup_Dominant_Other_Team" );
+								ClientPrint(pTFPlayer, HUD_PRINTCENTER, "#TF_Powerup_Dominant_Other_Team");
+								ClientPrint(pTFPlayer, HUD_PRINTTALK, "#TF_Powerup_Dominant_Other_Team");
 							}
 						}
 					}
@@ -4097,10 +4148,11 @@ void CTFPlayer::Spawn()
 		}
 		else
 		{
-			m_Shared.AddCond( TF_COND_POWERUPMODE_DOMINANT );
-			ClientPrint( this, HUD_PRINTCENTER, "#TF_Powerup_Dominant_StillIn" );
+			m_Shared.AddCond(TF_COND_POWERUPMODE_DOMINANT);
+			ClientPrint(this, HUD_PRINTCENTER, "#TF_Powerup_Dominant_StillIn");
 		}
 	}
+#endif
 
 	if ( TFGameRules() )
 	{
diff --git a/src/game/shared/tf/tf_classdata.cpp b/src/game/shared/tf/tf_classdata.cpp
@@ -167,6 +167,8 @@ void TFPlayerClassData_t::ParseData( KeyValues *pKeyValuesData )
 	m_flBhopBoost = pKeyValuesData->GetFloat("bhop_speed_boost");
 
 	m_flAirSpeedCapMultiplier = pKeyValuesData->GetFloat("airspeed_cap_mult");
+
+	m_flAimedSpeedAdjust = pKeyValuesData->GetFloat("aimed_speed_mult");
 #endif
 
 	// Weapons.
diff --git a/src/game/shared/tf/tf_classdata.h b/src/game/shared/tf/tf_classdata.h
@@ -60,6 +60,7 @@ struct TFPlayerClassData_t
 
 	float		m_flBhopBoost;
 	float		m_flAirSpeedCapMultiplier;
+	float		m_flAimedSpeedAdjust;
 #endif
 	int			m_aWeapons[TF_PLAYER_WEAPON_COUNT];
 	int			m_aGrenades[TF_PLAYER_GRENADE_COUNT];
diff --git a/src/game/shared/tf/tf_player_shared.cpp b/src/game/shared/tf/tf_player_shared.cpp
@@ -11260,6 +11260,33 @@ float CTFPlayer::TeamFortress_CalculateMaxSpeed( bool bIgnoreSpecialAbility /*=
 		{
 			float flAimMax = 0;
 
+#if defined(QUIVER_DLL) || defined(QUIVER_CLIENT_DLL)
+			// Heavies are allowed to move slightly faster than a sniper when spun-up
+			float flAimMult = GetPlayerClass()->GetAimedSpeedMultiplier();
+
+			if (flAimMult > 0)
+			{
+				flAimMax = default_speed * flAimMult;
+			}
+			else
+			{
+				if (playerclass == TF_CLASS_HEAVYWEAPONS)
+				{
+					flAimMax = 110;
+				}
+				else
+				{
+					if (GetActiveTFWeapon() && (GetActiveTFWeapon()->GetWeaponID() == TF_WEAPON_COMPOUND_BOW))
+					{
+						flAimMax = 160;
+					}
+					else
+					{
+						flAimMax = 80;
+					}
+				}
+			}
+#else
 			// Heavies are allowed to move slightly faster than a sniper when spun-up
 			if ( playerclass == TF_CLASS_HEAVYWEAPONS )
 			{
@@ -11278,6 +11305,7 @@ float CTFPlayer::TeamFortress_CalculateMaxSpeed( bool bIgnoreSpecialAbility /*=
 					flAimMax = 80;
 				}
 			}
+#endif
 			
 			CALL_ATTRIB_HOOK_FLOAT( flAimMax, mult_player_aiming_movespeed );
 			maxfbspeed = MIN( maxfbspeed, flAimMax );
diff --git a/src/game/shared/tf/tf_playerclass_shared.h b/src/game/shared/tf/tf_playerclass_shared.h
@@ -72,6 +72,7 @@ class CTFPlayerClassShared
 	float		GetArmorMetalPenaltyMult(void) const			{ return GetPlayerClassData(m_iClass)->m_flArmorMetalPenaltyMult; }
 	float		GetBhopSpeedBoost(void) const					{ return GetPlayerClassData(m_iClass)->m_flBhopBoost; }
 	float		GetSpeedCapMultiplier(void) const				{ return GetPlayerClassData(m_iClass)->m_flAirSpeedCapMultiplier; }
+	float		GetAimedSpeedMultiplier(void) const				{ return GetPlayerClassData(m_iClass)->m_flAimedSpeedAdjust; }
 #endif
 	Vector		GetCustomModelOffset( void ) const				{ return m_vecCustomModelOffset.Get(); }
 	QAngle		GetCustomModelRotation( void ) const			{ return m_angCustomModelRotation.Get(); }

Original file line number	Diff line number	Diff line change
`@@ -565,7 +565,7 @@`
`565`	`565`	`"armor damage increased on target"`
`566`	`566`	`{`
`567`	`567`	`"attribute_class" "mult_armor_onhit"`
`568`		`- "value" "1.35"`
	`568`	`+ "value" "1.20"`
`569`	`569`	`}`
`570`	`570`	`"aiming knockback resistance heavy ver"`
`571`	`571`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18589,6 +18589,11 @@`
`18589`	`18589`	`"attribute_class" "allowed_in_medieval_mode"`
`18590`	`18590`	`"value" "1"`
`18591`	`18591`	`}`
	`18592`	`+ "aiming movespeed increased"`
	`18593`	`+ {`
	`18594`	`+ "attribute_class" "mult_player_aiming_movespeed"`
	`18595`	`+ "value" "1.65"`
	`18596`	`+ }`
`18592`	`18597`	`}`
`18593`	`18598`	`"visuals"`
`18594`	`18599`	`{`
`@@ -25713,7 +25718,7 @@`
`25713`	`25718`	`"engineer sentry build rate multiplier"`
`25714`	`25719`	`{`
`25715`	`25720`	`"attribute_class" "sentry_build_rate_multiplier"`
`25716`		`- "value" "2.3"`
	`25721`	`+ "value" "2.5"`
`25717`	`25722`	`}`
`25718`	`25723`	`"engy sentry radius decreased"`
`25719`	`25724`	`{`
Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ void CTFHudObjectiveStatus::SetVisiblePanels( void )`
`327`	`327`	`#if defined(QUIVER_CLIENT_DLL)`
`328`	`328`	`bool bTDMVisible = TFGameRules()->IsInTDMMode();`
`329`	`329`
`330`		`- if (m_pTDMPanel && m_pFlagPanel->IsVisible() != bTDMVisible)`
	`330`	`+ if (m_pTDMPanel && m_pTDMPanel->IsVisible() != bTDMVisible)`
`331`	`331`	`{`
`332`	`332`	`m_pTDMPanel->SetVisible(bTDMVisible);`
`333`	`333`	`}`