armor changes

Author: Bitl

game/quiver/info_changelog.txt

@@ -82,13 +82,13 @@ Details:
 - Added "random" bot difficulty to the Offline Practice menu.
 - Increased the Offline Practice menu's player cap from 31 to 100.
 - Added Team Deathmatch to the Offline Practice menu.
-- Fixed Gunslinger being able to pause melee hit combos when holstering the weapon.
 - Reduced the reload penalty on the Shortstop from 50% to 25%.
 - Added a 25 max health increase to the Shortstop to mirror its original set.
 - Reverted the shield removal on the Wrangler, as it made the weapon less fun to use.
 - The Sandman's ball now breaks armor.
 - Set the Sniper's ammo count back from 16 to 25.
 - The Family Business is now a multi-class shotgun.
+- Added a visible team-colored shield as an indicator for armor.
 - 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
@@ -100,6 +100,7 @@ Details:
 	- #1452: Fix Vaccinator resist icons persisting when a player changes (displayed) team (Vaccinator is not whitelisted but this was added to keep the base up to date)
 	- #1448: Fix point_camera transmit state in multiplayer
 	- #1455: Reimplement "panic_attack" attribute
+	- #1463: Fix Engineer melee swing storage/double swing exploit
 - Updated the following Source SDK Pull Requests:
 	- #1192: Make it so Vita-Saw attacks on MvM robots spawn a bolt instead of a spleen (outside of Wave 666)
 	- #1380: all games: Add support for animated avatars

game/quiver/info_highlights.txt

@@ -87,6 +87,8 @@ Unlockable weapon balance changes:
 - Fixed Gunslinger being able to pause melee hit combos when holstering the weapon.
 - Reduced the reload penalty on the Shortstop from 50% to 25%.
 - Added a 25 max health increase to the Shortstop to mirror its original set.
+- The Sandman's ball now breaks armor.
+- The Family Business is now a multi-class shotgun.
 
 MvM Changes:
 - Added armor-related upgrades to MvM (max armor, pierces damage resistances, and armor resistance).

game/quiver/scripts/bot_names.txt

@@ -389,4 +389,6 @@
 	"name" "300 kromer"
 	"name" "BIG SHOT"
 	"name" "100,000 kromer"
+	//QF exclusive
+	"name" "BringBackQuickplay"
 }

src/game/client/tf/c_tf_player.cpp

@@ -5356,7 +5356,14 @@ void C_TFPlayer::UpdatedMarkedForDeathEffect( bool bForceStop )
 	if ( IsLocalPlayer() )
 		return;
 
+#if defined(QUIVER_DLL)
+	bool bShow = m_Shared.InCond(TF_COND_MARKEDFORDEATH) || 
+				m_Shared.InCond(TF_COND_MARKEDFORDEATH_SILENT) || 
+				m_Shared.InCond(QF_COND_ARMORJUSTBROKE) ||
+				m_Shared.InCond(TF_COND_PASSTIME_PENALTY_DEBUFF);
+#else
 	bool bShow = m_Shared.InCond( TF_COND_MARKEDFORDEATH ) || m_Shared.InCond( TF_COND_MARKEDFORDEATH_SILENT ) || m_Shared.InCond( TF_COND_PASSTIME_PENALTY_DEBUFF );
+#endif
 
 	// force stop
 	if ( bForceStop || m_Shared.IsStealthed() || m_Shared.InCond( TF_COND_DISGUISED ) )
@@ -10467,6 +10474,13 @@ void C_TFPlayer::UpdateSpyStateChange( void )
 		m_pTempShield->m_nSkin = ( m_Shared.GetDisplayedTeam() == TF_TEAM_RED ) ? 0 : 1;
 	}
 
+#if defined(QUIVER_DLL)
+	if (m_pTempShield && m_Shared.InCond(QF_COND_ARMOR))
+	{
+		m_pTempShield->m_nSkin = (m_Shared.GetDisplayedTeam() == TF_TEAM_RED) ? 0 : 1;
+	}
+#endif
+
 	UpdateRuneIcon( true );
 
 	// Remove Speed lines if Stealthed

src/game/client/tf/tf_hud_playerstatus.cpp

@@ -1172,6 +1172,9 @@ void CTFHudPlayerHealth::OnThink()
 			SetPlayerHealthImagePanelVisibility( pPlayer, TF_COND_MAD_MILK,					m_pMilkImage,					nXOffset,	Color( color_fade, color_fade, color_fade, 255 ) );
 			SetPlayerHealthImagePanelVisibility( pPlayer, TF_COND_MARKEDFORDEATH,			m_pMarkedForDeathImage,			nXOffset,	Color( 255 - color_fade, 245 - color_fade, 245 - color_fade, 255 ) );
 			SetPlayerHealthImagePanelVisibility( pPlayer, TF_COND_MARKEDFORDEATH_SILENT,	m_pMarkedForDeathImageSilent,	nXOffset,	Color( 125 - color_fade, 255 - color_fade, 255 - color_fade, 255 ) );
+#if defined(QUIVER_DLL)
+			SetPlayerHealthImagePanelVisibility( pPlayer, QF_COND_ARMORJUSTBROKE,			m_pMarkedForDeathImage,			nXOffset,	Color(125 - color_fade, 255 - color_fade, 255 - color_fade, 255));
+#endif
 			SetPlayerHealthImagePanelVisibility( pPlayer, TF_COND_PASSTIME_PENALTY_DEBUFF,	m_pMarkedForDeathImageSilent,	nXOffset,	Color( 125 - color_fade, 255 - color_fade, 255 - color_fade, 255 ) );
 			SetPlayerHealthImagePanelVisibility( pPlayer, TF_COND_STUNNED,					m_pSlowedImage,					nXOffset,	Color( color_fade, color_fade, 0, 255 ) );
 			SetPlayerHealthImagePanelVisibility( pPlayer, TF_COND_GAS,						m_pGasImage,					nXOffset,	Color( color_fade, color_fade, color_fade, 255 ) );

src/game/server/tf/tf_player.cpp

@@ -4071,6 +4071,8 @@ void CTFPlayer::Spawn()
 	SetRespawnOverride( -1.f, NULL_STRING );
 
 #if defined(QUIVER_DLL)
+	SetMaxArmor();
+
 	if (TFGameRules() && ((TFGameRules()->IsInTDMMode() && qf_tdm_spawnprotection.GetBool()) || TFGameRules()->IsPowerupMode()))
 	{
 		m_Shared.AddCond(TF_COND_INVULNERABLE_USER_BUFF, (TFGameRules()->IsInTDMMode() ? qf_tdm_spawnprotection_length.GetFloat() : 8.f));
@@ -4329,6 +4331,9 @@ void CTFPlayer::Regenerate( bool bRefillHealthAndAmmo /*= true*/ )
 	m_bRegenerating.Set( true );
 	// This recomputes MaxHealth
 	InitClass();
+#ifdef QUIVER_DLL
+	SetMaxArmor();
+#endif
 	m_bRegenerating.Set( false );
 
 	if ( bBoosted )
@@ -4471,10 +4476,6 @@ void CTFPlayer::InitClass( void )
 	SetMaxHealth( GetMaxHealth() );
 	SetHealth( GetMaxHealth() );
 
-#ifdef QUIVER_DLL
-	SetMaxArmor();
-#endif
-
 	TeamFortress_SetSpeed();
 
 }
@@ -9482,15 +9483,11 @@ void CTFPlayer::BreakArmor(const CTakeDamageInfo& info, CTFPlayer* pTFAttacker,
 
 	if (!(bitsDamage & (DMG_FALL)))
 	{
-		//someone damaged our armor? minicrit boost us for a few seconds so we have a chance to take down the asshole.
-		m_Shared.AddCond(TF_COND_MINICRITBOOSTED, 3.0f);
-		//mark us for death too...
-		m_Shared.AddCond(TF_COND_MARKEDFORDEATH_SILENT, 3.5f);
-		//heal 30 health over 3 seconds. doesn't transfer over to heal patient. 
-		m_Shared.AddCond(QF_COND_ARMORJUSTBROKE, 3.0f);
-		m_Shared.AddCond(QF_COND_ARMORBROKEN, -1);
-		//note: we should use the mvm skins instead maybe?
-		m_Shared.OnRemoveMedEffectUberBulletResist();
+		float duration = 3.0f;
+		//marks us for death, mini crit boost, and heal 30 health over 3 seconds. doesn't transfer over to heal patient. 
+		//heal patient gets the base conds.
+		m_Shared.AddCond(QF_COND_ARMORJUSTBROKE, duration);
+		m_Shared.RemoveCond(QF_COND_ARMOR);
 
 		//give our patient our mini-crit boost to help us.
 		if (IsPlayerClass(TF_CLASS_MEDIC))
@@ -9501,8 +9498,8 @@ void CTFPlayer::BreakArmor(const CTakeDamageInfo& info, CTFPlayer* pTFAttacker,
 				CTFPlayer* pPatient = ToTFPlayer(pHealTarget);
 				if (pPatient)
 				{
-					pPatient->m_Shared.AddCond(TF_COND_MINICRITBOOSTED, 3.0f);
-					pPatient->m_Shared.AddCond(TF_COND_MARKEDFORDEATH_SILENT, 3.5f);
+					pPatient->m_Shared.AddCond(TF_COND_MINICRITBOOSTED, duration);
+					pPatient->m_Shared.AddCond(TF_COND_MARKEDFORDEATH_SILENT, duration);
 				}
 			}
 		}
@@ -9657,10 +9654,8 @@ void CTFPlayer::IncrementArmorValue(int nCount, int nMaxValue)
 
 	if (ArmorValue() > oldArmor)
 	{
-		m_Shared.RemoveCond(QF_COND_ARMORBROKEN);
+		m_Shared.AddCond(QF_COND_ARMOR, -1);
 		m_Shared.RemoveCond(QF_COND_ARMORJUSTBROKE);
-		//note: we should use the mvm skins instead maybe?
-		m_Shared.OnAddMedEffectUberBulletResist();
 	}
 }
 
@@ -9670,13 +9665,10 @@ void CTFPlayer::SetArmorValue(int value)
 
 	if (ArmorValue() > 0)
 	{
-		m_Shared.RemoveCond(QF_COND_ARMORBROKEN);
+		m_Shared.AddCond(QF_COND_ARMOR, -1);
 		m_Shared.RemoveCond(QF_COND_ARMORJUSTBROKE);
-		//note: we should use the mvm skins instead maybe?
-		m_Shared.OnAddMedEffectUberBulletResist();
 	}
 }
-
 #endif
 
 //-----------------------------------------------------------------------------
@@ -11697,7 +11689,11 @@ int CTFPlayer::OnTakeDamage_Alive( const CTakeDamageInfo &info )
 	}
 
 	m_flLastDamageTime = gpGlobals->curtime; // not networked
+#if defined(QUIVER_DLL)
+	if ( ArmorValue() > 0 || TFGameRules()->IsMannVsMachineMode() )
+#else
 	if ( TFGameRules()->IsMannVsMachineMode() )
+#endif
 	{
 		// We only need damage time networked while in MvM
 		m_flMvMLastDamageTime = gpGlobals->curtime;

src/game/server/vscript_server.cpp

@@ -3248,6 +3248,10 @@ DECLARE_SCRIPT_CONST( ETFCond, TF_COND_HALLOWEEN_HELL_HEAL )
 DECLARE_SCRIPT_CONST( ETFCond, TF_COND_POWERUPMODE_DOMINANT )
 DECLARE_SCRIPT_CONST( ETFCond, TF_COND_IMMUNE_TO_PUSHBACK )
 DECLARE_SCRIPT_CONST( ETFCond, TF_COND_MINICRITBOOSTED )
+#if defined(QUIVER_DLL)
+DECLARE_SCRIPT_CONST(ETFCond, QF_COND_ARMORJUSTBROKE)
+DECLARE_SCRIPT_CONST(ETFCond, QF_COND_ARMOR)
+#endif
 REGISTER_SCRIPT_CONST_TABLE( ETFCond )
 
 DECLARE_SCRIPT_CONST_TABLE( ECritType )

src/game/shared/tf/tf_gamerules.cpp

@@ -6305,13 +6305,20 @@ bool CTFGameRules::ApplyOnDamageModifyRules( CTakeDamageInfo &info, CBaseEntity
 			if ( pVictim && ( pVictim->m_Shared.InCond( TF_COND_URINE ) ||
 			                  pVictim->m_Shared.InCond( TF_COND_MARKEDFORDEATH ) ||
 			                  pVictim->m_Shared.InCond( TF_COND_MARKEDFORDEATH_SILENT ) ||
+#if defined(QUIVER_DLL)
+							  pVictim->m_Shared.InCond(QF_COND_ARMORJUSTBROKE) ||
+#endif
 			                  pVictim->m_Shared.InCond( TF_COND_PASSTIME_PENALTY_DEBUFF ) ) )
 			{
 				bAllSeeCrit = true;
 				info.SetCritType( CTakeDamageInfo::CRIT_MINI );
 				eBonusEffect = kBonusEffect_MiniCrit;
 
+#if defined(QUIVER_DLL)
+				if ( !pVictim->m_Shared.InCond( QF_COND_ARMORJUSTBROKE ) && !pVictim->m_Shared.InCond( TF_COND_MARKEDFORDEATH_SILENT ) )
+#else
 				if ( !pVictim->m_Shared.InCond( TF_COND_MARKEDFORDEATH_SILENT ) )
+#endif
 				{
 					eDamageBonusCond = pVictim->m_Shared.InCond( TF_COND_URINE ) ? TF_COND_URINE : TF_COND_MARKEDFORDEATH;
 				}
@@ -6323,6 +6330,14 @@ bool CTFGameRules::ApplyOnDamageModifyRules( CTakeDamageInfo &info, CBaseEntity
 				eBonusEffect = kBonusEffect_MiniCrit;
 				eDamageBonusCond = TF_COND_MINICRITBOOSTED;
 			}
+#if defined(QUIVER_DLL)
+			else if (pTFAttacker && (pTFAttacker->m_Shared.InCond(QF_COND_ARMORJUSTBROKE)))
+			{
+				info.SetCritType(CTakeDamageInfo::CRIT_MINI);
+				eBonusEffect = kBonusEffect_MiniCrit;
+				eDamageBonusCond = QF_COND_ARMORJUSTBROKE;
+			}
+#endif
 #endif
 			else if ( pTFAttacker && ( pTFAttacker->m_Shared.InCond( TF_COND_OFFENSEBUFF ) || pTFAttacker->m_Shared.InCond( TF_COND_NOHEALINGDAMAGEBUFF ) ) )
 			{

src/game/shared/tf/tf_player_shared.cpp

@@ -1927,6 +1927,19 @@ void CTFPlayerShared::OnConditionAdded( ETFCond eCond )
 		OnAddHalloweenHellHeal();
 		break;
 
+#if defined(QUIVER_DLL)
+	case QF_COND_ARMOR:
+		OnAddArmor();
+		break;
+
+	// this one is wierd because it does 3 things at once. 2 of the functions go here.
+	case QF_COND_ARMORJUSTBROKE:
+	{
+		OnAddCritBoost();
+		OnAddMarkedForDeathSilent();
+		break;
+	}
+#endif
 
 	default:
 		break;
@@ -2274,6 +2287,19 @@ void CTFPlayerShared::OnConditionRemoved( ETFCond eCond )
 		OnRemoveHalloweenHellHeal();
 		break;
 
+#if defined(QUIVER_DLL)
+	case QF_COND_ARMOR:
+		OnRemoveArmor();
+		break;
+
+	// this one is wierd because it does 3 things at once. 2 of the functions go here.
+	case QF_COND_ARMORJUSTBROKE:
+	{
+		OnRemoveCritBoost();
+		OnRemoveMarkedForDeathSilent();
+		break;
+	}
+#endif
 
 	default:
 		break;
@@ -4993,7 +5019,11 @@ static int GetResistShieldSkinForResistType( ETFCond eCond )
 //-----------------------------------------------------------------------------
 static void AddResistShield( C_LocalTempEntity** pShield, CTFPlayer* pPlayer, ETFCond eCond  )
 {
+#if defined(QUIVER_DLL)
+	if (eCond != QF_COND_ARMOR && CBasePlayer::GetLocalPlayer() == pPlayer)
+#else
 	if( CBasePlayer::GetLocalPlayer() == pPlayer )
+#endif
 		return;
 
 	// do not add if stealthed
@@ -5241,14 +5271,20 @@ void CTFPlayerShared::OnRemoveRuneResist( void )
 }
 
 #if defined(QUIVER_DLL)
+//-----------------------------------------------------------------------------
+// Purpose: 
+//-----------------------------------------------------------------------------
 void CTFPlayerShared::OnAddArmor(void)
 {
 #ifdef CLIENT_DLL
 	// Do use the condition bit here, it's passed along and is expected to be a cond.
-	AddResistShield(&m_pOuter->m_pTempShield, m_pOuter, TF_COND_INVALID);
+	AddResistShield(&m_pOuter->m_pTempShield, m_pOuter, QF_COND_ARMOR);
 #endif
 }
 
+//-----------------------------------------------------------------------------
+// Purpose: 
+//-----------------------------------------------------------------------------
 void CTFPlayerShared::OnRemoveArmor(void)
 {
 #ifdef CLIENT_DLL
@@ -7193,6 +7229,13 @@ void CTFPlayerShared::OnAddStealthed( void )
 	{
 		RemoveResistShield( &m_pOuter->m_pTempShield, m_pOuter );
 	}
+
+#if defined(QUIVER_DLL)
+	if (m_pOuter->m_pTempShield && InCond(QF_COND_ARMOR))
+	{
+		OnRemoveArmor();
+	}
+#endif
 #endif
 
 	bool bSetInvisChangeTime = true;
@@ -7302,6 +7345,13 @@ void CTFPlayerShared::OnRemoveStealthed( void )
 	{
 		AddResistShield( &m_pOuter->m_pTempShield, m_pOuter, TF_COND_RUNE_RESIST );
 	}
+
+#if defined(QUIVER_DLL)
+	if (!m_pOuter->m_pTempShield && InCond(QF_COND_ARMOR))
+	{
+		OnAddArmor();
+	}
+#endif
 #else
 	if ( m_flCloakStartTime > 0 )
 	{
@@ -7724,6 +7774,9 @@ void CTFPlayerShared::UpdateCritBoostEffect( ECritBoostUpdateType eUpdateType )
 									  //|| IsHypeBuffed()
 #ifdef BDSBASE
 									  || InCond(TF_COND_SNIPERCHARGE_RAGE_BUFF)
+#if defined(QUIVER_DLL)
+									  || InCond(QF_COND_ARMORJUSTBROKE)
+#endif
 									  || InCond(TF_COND_MINICRITBOOSTED);
 #else
 									  || InCond(TF_COND_SNIPERCHARGE_RAGE_BUFF);

src/game/shared/tf/tf_player_shared.h

@@ -336,11 +336,6 @@ class CTFPlayerShared : public CGameEventListener
 
 	bool	ShouldSuppressPrediction( void );
 
-#if defined(QUIVER_DLL)
-	void	OnAddArmor(void);
-	void	OnRemoveArmor(void);
-#endif
-
 	void SetCarryingRuneType( RuneTypes_t rt );
 	RuneTypes_t GetCarryingRuneType( void ) const;
 	bool IsCarryingRune( void ) const { return GetCarryingRuneType() != RUNE_NONE; }
@@ -923,6 +918,11 @@ class CTFPlayerShared : public CGameEventListener
 	void OnAddHalloweenHellHeal( void );
 	void OnRemoveHalloweenHellHeal( void );
 
+#if defined(QUIVER_DLL)
+	void OnAddArmor(void);
+	void OnRemoveArmor(void);
+#endif
+
 	float GetCritMult( void );
 
 #ifdef GAME_DLL