Implement ValveSoftware#1433

Author: Bitl

game/quiver/info_changelog.txt

@@ -17,13 +17,20 @@ Quiver Test 5:
 - Fixed a bug where bodyshots counted as armor penetration for weapons that headshot.
 - Removed penetrated sniper shots from the list of things that can penetrate armor, due to problems found when implementing the above bug fix.
 - The Railgun no longer has a move speed penalty when charging, however headshots are disabled at longer ranges (over 2400 hammer units) and the weapon has a 15% slower move speed penalty regardless if you charge or not.
-- Removed the Railgun's 25% charge rate in favor of a 10% charge rate penalty.
+- Removed the Railgun's 25% charge rate.
 - Removed the Railgun's armor penalty.
 - Added an option to enable/disable wall strafing.
 - Added the Hitman's Executioner, a revolver for the Spy that allows you to fire close-range headshots if you're behind the enemy, alongside minicrits. In return, more mini-crit damage is taken when active.
 - Added loading screen tips.
 - Added Team Deathmatch. Maps without a specified gamemode (no gamemode logic or entities), or with dm_ or tdm_ prefixes will be considered Team Deathmatch maps. Disable qf_allow_tdm if you wish to disable Team Deathmatch on your server and restore the original "no gamemode" logic.
 - Added dm_ravine, dm_lumberyard, and dm_2fort, the first Team Deathmatch maps, built off the Arena/CTF maps of the same name.
+- Added the following Source SDK Pull Requests:
+	- #1428: Fix steam input not working for the upgrade station menu 
+	- #1424: Auto-equip powerup canteen when ForceUpgrades is enabled (Freaky Fair)
+	- #1432: Fix joining a new lobby while being revived locking up the camera
+	- #1433: Add client ConVars for changing viewmodel position and angle offsets
+- Updated the following Source SDK Pull Requests:
+	- #1417: Add inverse kinematics solving in model panels
 
 Quiver Test 4:
 - Re-enabled shield break responses.

game/quiver/scripts/items/items_custom.txt

@@ -440,11 +440,6 @@
 					"attribute_class"	"set_weapon_mode"
 					"value"	"2"
 				}
-				"sniper charge per sec penalty"
-				{
-					"attribute_class"	"mult_sniper_charge_per_sec"
-					"value"	"0.80"
-				}
 				"sniper classic allow jump"
 				{
 					"attribute_class"	"sniper_classic_allow_jump"

src/game/shared/tf/tf_viewmodel.cpp

@@ -129,70 +129,188 @@ ConVar cl_gunlowerspeed( "cl_gunlowerspeed", "2", FCVAR_CLIENTDLL | FCVAR_CHEAT
 
 ConVar tf_use_min_viewmodels( "tf_use_min_viewmodels", "0", FCVAR_ARCHIVE, "Use minimized viewmodels." );
 
-ConVar tf_viewmodels_offset_override( "tf_viewmodels_offset_override", "", FCVAR_CHEAT, "If set, this will override the position of all viewmodels. Usage 'x y z'" );
+#ifdef BDSBASE
+ConVar tf_viewmodels_offset_override("tf_viewmodels_offset_override", "", FCVAR_CHEAT, "If set, this will override the position and angles of all viewmodels. Usage 'x y z pitch yaw roll'");
+
+ConVar viewmodel_offset_x("viewmodel_offset_x", "0", FCVAR_CLIENTDLL | FCVAR_ARCHIVE);
+ConVar viewmodel_offset_y("viewmodel_offset_y", "0", FCVAR_CLIENTDLL | FCVAR_ARCHIVE);
+ConVar viewmodel_offset_z("viewmodel_offset_z", "0", FCVAR_CLIENTDLL | FCVAR_ARCHIVE);
+ConVar viewmodel_offset_pitch("viewmodel_offset_pitch", "0", FCVAR_CLIENTDLL | FCVAR_ARCHIVE);
+ConVar viewmodel_offset_yaw("viewmodel_offset_yaw", "0", FCVAR_CLIENTDLL | FCVAR_ARCHIVE);
+ConVar viewmodel_offset_roll("viewmodel_offset_roll", "0", FCVAR_CLIENTDLL | FCVAR_ARCHIVE);
+#else
+ConVar tf_viewmodels_offset_override("tf_viewmodels_offset_override", "", FCVAR_CHEAT, "If set, this will override the position of all viewmodels. Usage 'x y z'");
+#endif
 #endif
 
-void CTFViewModel::CalcViewModelView( CBasePlayer *owner, const Vector& eyePosition, const QAngle& eyeAngles )
+#ifdef BDSBASE
+void CTFViewModel::CalcViewModelView(CBasePlayer* owner, const Vector& eyePosition, const QAngle& eyeAngles)
 {
 #if defined( CLIENT_DLL )
 
 	Vector vecNewOrigin = eyePosition;
 	QAngle vecNewAngles = eyeAngles;
 
 	// Check for lowering the weapon
-	C_TFPlayer *pPlayer = ToTFPlayer( owner );
+	C_TFPlayer* pPlayer = ToTFPlayer(owner);
 
-	Assert( pPlayer );
+	Assert(pPlayer);
 
 	bool bLowered = pPlayer->IsWeaponLowered();
 
-	QAngle vecLoweredAngles(0,0,0);
+	QAngle vecLoweredAngles(0, 0, 0);
 
-	m_vLoweredWeaponOffset.x = Approach( bLowered ? cl_gunlowerangle.GetFloat() : 0, m_vLoweredWeaponOffset.x, cl_gunlowerspeed.GetFloat() );
+	m_vLoweredWeaponOffset.x = Approach(bLowered ? cl_gunlowerangle.GetFloat() : 0, m_vLoweredWeaponOffset.x, cl_gunlowerspeed.GetFloat());
 	vecLoweredAngles.x += m_vLoweredWeaponOffset.x;
 
 	vecNewAngles += vecLoweredAngles;
 
-	CTFWeaponBase *pWeapon = assert_cast< CTFWeaponBase* >( GetWeapon() );
-	if ( pWeapon )
+	CTFWeaponBase* pWeapon = assert_cast<CTFWeaponBase*>(GetWeapon());
+	if (pWeapon)
 	{
 		bool bInspecting = pWeapon && pWeapon->GetInspectStage() != CTFWeaponBase::INSPECT_INVALID;
 
 		static float s_inspectInterp = 0.f;
-		if ( bInspecting )
+		if (bInspecting)
 		{
-			if ( pWeapon->GetInspectStage() == CTFWeaponBase::INSPECT_END )
+			if (pWeapon->GetInspectStage() == CTFWeaponBase::INSPECT_END)
 			{
 				// use the last second of the anim
 				const float flOutroDuration = 0.3f;
-				s_inspectInterp = Clamp( ( pWeapon->GetInspectAnimEndTime() - gpGlobals->curtime ) - flOutroDuration, 0.f, 1.f );
+				s_inspectInterp = Clamp((pWeapon->GetInspectAnimEndTime() - gpGlobals->curtime) - flOutroDuration, 0.f, 1.f);
 			}
 			else
 			{
-				s_inspectInterp = Clamp( s_inspectInterp + gpGlobals->frametime, 0.f, 1.f );
+				s_inspectInterp = Clamp(s_inspectInterp + gpGlobals->frametime, 0.f, 1.f);
 			}
 		}
 		else
 		{
-			s_inspectInterp = Clamp( s_inspectInterp - gpGlobals->frametime, 0.f, 1.f );
+			s_inspectInterp = Clamp(s_inspectInterp - gpGlobals->frametime, 0.f, 1.f);
 		}
 
 		// inspect custom offset
-		if ( bInspecting )
+		if (bInspecting)
 		{
 			CAttribute_String attrInspectOffsetVMOverride;
-			CALL_ATTRIB_HOOK_STRING_ON_OTHER( pWeapon, attrInspectOffsetVMOverride, inspect_viewmodel_offset );
-			const char *pszValue = attrInspectOffsetVMOverride.value().c_str();
-			if ( pszValue && *pszValue )
+			CALL_ATTRIB_HOOK_STRING_ON_OTHER(pWeapon, attrInspectOffsetVMOverride, inspect_viewmodel_offset);
+			const char* pszValue = attrInspectOffsetVMOverride.value().c_str();
+			if (pszValue && *pszValue)
 			{
 				Vector vmOffset;
-				UTIL_StringToVector( vmOffset.Base(), pszValue );
+				UTIL_StringToVector(vmOffset.Base(), pszValue);
 
 				Vector forward, right, up;
-				AngleVectors( eyeAngles, &forward, &right, &up );
+				AngleVectors(eyeAngles, &forward, &right, &up);
 
 				Vector vOffset = vmOffset.x * forward + vmOffset.y * right + vmOffset.z * up;
-				vOffset *= Gain( s_inspectInterp, 0.5f );
+				vOffset *= Gain(s_inspectInterp, 0.5f);
+				vecNewOrigin += vOffset;
+			}
+		}
+
+		// are we overriding vm offset?
+		const char* pszVMOffsetOverride = tf_viewmodels_offset_override.GetString();
+		bool bForceOverride = (pszVMOffsetOverride && *pszVMOffsetOverride);
+
+		Vector positionOffset(0, 0, 0);
+		QAngle anglesOffset(0, 0, 0);
+
+		if (bForceOverride)
+		{
+			float vmOffsets[6];
+			UTIL_StringToFloatArray(vmOffsets, 6, pszVMOffsetOverride);
+			positionOffset = Vector(vmOffsets[0], vmOffsets[1], vmOffsets[2]);
+			anglesOffset = QAngle(vmOffsets[3], vmOffsets[4], vmOffsets[5]);
+		}
+		else
+		{
+			// min mode custom offset
+			if (tf_use_min_viewmodels.GetBool())
+			{
+				positionOffset = pWeapon->GetViewmodelOffset();
+			}
+
+			positionOffset += Vector(viewmodel_offset_x.GetFloat(), viewmodel_offset_y.GetFloat(), viewmodel_offset_z.GetFloat());
+			anglesOffset += QAngle(viewmodel_offset_pitch.GetFloat(), viewmodel_offset_yaw.GetFloat(), viewmodel_offset_roll.GetFloat());
+		}
+
+		Vector forward, right, up;
+		AngleVectors(eyeAngles, &forward, &right, &up);
+
+		positionOffset = positionOffset.x * forward + positionOffset.y * right + positionOffset.z * up;
+		positionOffset *= Gain(1.f - s_inspectInterp, 0.5f);
+		vecNewOrigin += positionOffset;
+
+		vecNewAngles += anglesOffset * Gain(1.f - s_inspectInterp, 0.5f);
+	}
+
+	BaseClass::CalcViewModelView(owner, vecNewOrigin, vecNewAngles);
+
+#endif // CLIENT_DLL
+}
+#else
+void CTFViewModel::CalcViewModelView(CBasePlayer* owner, const Vector& eyePosition, const QAngle& eyeAngles)
+{
+#if defined( CLIENT_DLL )
+
+	Vector vecNewOrigin = eyePosition;
+	QAngle vecNewAngles = eyeAngles;
+
+	// Check for lowering the weapon
+	C_TFPlayer* pPlayer = ToTFPlayer(owner);
+
+	Assert(pPlayer);
+
+	bool bLowered = pPlayer->IsWeaponLowered();
+
+	QAngle vecLoweredAngles(0, 0, 0);
+
+	m_vLoweredWeaponOffset.x = Approach(bLowered ? cl_gunlowerangle.GetFloat() : 0, m_vLoweredWeaponOffset.x, cl_gunlowerspeed.GetFloat());
+	vecLoweredAngles.x += m_vLoweredWeaponOffset.x;
+
+	vecNewAngles += vecLoweredAngles;
+
+	CTFWeaponBase* pWeapon = assert_cast<CTFWeaponBase*>(GetWeapon());
+	if (pWeapon)
+	{
+		bool bInspecting = pWeapon && pWeapon->GetInspectStage() != CTFWeaponBase::INSPECT_INVALID;
+
+		static float s_inspectInterp = 0.f;
+		if (bInspecting)
+		{
+			if (pWeapon->GetInspectStage() == CTFWeaponBase::INSPECT_END)
+			{
+				// use the last second of the anim
+				const float flOutroDuration = 0.3f;
+				s_inspectInterp = Clamp((pWeapon->GetInspectAnimEndTime() - gpGlobals->curtime) - flOutroDuration, 0.f, 1.f);
+			}
+			else
+			{
+				s_inspectInterp = Clamp(s_inspectInterp + gpGlobals->frametime, 0.f, 1.f);
+			}
+		}
+		else
+		{
+			s_inspectInterp = Clamp(s_inspectInterp - gpGlobals->frametime, 0.f, 1.f);
+		}
+
+		// inspect custom offset
+		if (bInspecting)
+		{
+			CAttribute_String attrInspectOffsetVMOverride;
+			CALL_ATTRIB_HOOK_STRING_ON_OTHER(pWeapon, attrInspectOffsetVMOverride, inspect_viewmodel_offset);
+			const char* pszValue = attrInspectOffsetVMOverride.value().c_str();
+			if (pszValue && *pszValue)
+			{
+				Vector vmOffset;
+				UTIL_StringToVector(vmOffset.Base(), pszValue);
+
+				Vector forward, right, up;
+				AngleVectors(eyeAngles, &forward, &right, &up);
+
+				Vector vOffset = vmOffset.x * forward + vmOffset.y * right + vmOffset.z * up;
+				vOffset *= Gain(s_inspectInterp, 0.5f);
 				vecNewOrigin += vOffset;
 			}
 		}
@@ -201,35 +319,36 @@ void CTFViewModel::CalcViewModelView( CBasePlayer *owner, const Vector& eyePosit
 		bool bMinMode = tf_use_min_viewmodels.GetBool();
 
 		// are we overriding vm offset?
-		const char *pszVMOffsetOverride = tf_viewmodels_offset_override.GetString();
-		bool bForceOverride = ( pszVMOffsetOverride && *pszVMOffsetOverride );
+		const char* pszVMOffsetOverride = tf_viewmodels_offset_override.GetString();
+		bool bForceOverride = (pszVMOffsetOverride && *pszVMOffsetOverride);
 		bMinMode |= bForceOverride;
 
 		// min mode custom offset
-		if ( bMinMode )
+		if (bMinMode)
 		{
 			Vector forward, right, up;
-			AngleVectors( eyeAngles, &forward, &right, &up );
+			AngleVectors(eyeAngles, &forward, &right, &up);
 
 			Vector viewmodelOffset;
-			if ( bForceOverride )
+			if (bForceOverride)
 			{
-				UTIL_StringToVector( viewmodelOffset.Base(), pszVMOffsetOverride );
+				UTIL_StringToVector(viewmodelOffset.Base(), pszVMOffsetOverride);
 			}
 			else
 			{
 				viewmodelOffset = pWeapon->GetViewmodelOffset();
 			}
 			Vector vOffset = viewmodelOffset.x * forward + viewmodelOffset.y * right + viewmodelOffset.z * up;
-			vOffset *= Gain( 1.f - s_inspectInterp, 0.5f );
+			vOffset *= Gain(1.f - s_inspectInterp, 0.5f);
 			vecNewOrigin += vOffset;
 		}
 	}
 
-	BaseClass::CalcViewModelView( owner, vecNewOrigin, vecNewAngles );
+	BaseClass::CalcViewModelView(owner, vecNewOrigin, vecNewAngles);
 
 #endif // CLIENT_DLL
 }
+#endif
 
 #ifdef CLIENT_DLL
 //-----------------------------------------------------------------------------