whitelist Back Scatter and FaN. increment version

Author: Bitl

game/quiver/info_changelog.txt

@@ -1,3 +1,7 @@
+Quiver Private Alpha 1.1.0:
+- Whitelisted the Back Scatter and Force-a-Nature.
+- Removed the Force-a-Nature's stun.
+
 Quiver Private Alpha 1.0.0:
 - Demoman and Soldier speed has been decreased to 315 from 340.
 - Sniper and Spy speed has been reduced to 325 from 340.

game/quiver/info_highlights.txt

@@ -56,6 +56,7 @@ Unlockable weapon balance changes:
 - The per-backstab health bonus you get with the Conniver's Kunai was decreased from 140 health to 85, reducing the maximum health per backstab kill from 210 to 155.
 - The Flare Gun now deploys 15% faster.
 - When using the Cloak and Dagger, the jumping/bunnyhopping cloak drain increases to 4x.
+- Removed the Force-a-Nature's stun.
 
 MvM Changes:
 - Added armor-related upgrades to MvM (max armor, pierces damage resistances, and armor resistance).

game/quiver/info_whitelist.txt

@@ -43,5 +43,7 @@
 - The Conniver's Kunai* (w/ balance changes)
 - The Spy-cicle
 - The Eternal Reward/Wanga Prick
+- The Back Scatter
+- The Force-a-Nature* (w/ balance changes)
 
 * - Weapon was whitelisted as long as it got a rebalance.

game/quiver/scripts/items/items_game.txt

@@ -17945,6 +17945,7 @@
 			"anim_slot"	"item2"
 			"item_quality"	"unique"
 			"propername"	"1"
+			"stock_whitelist" "1"
 			"min_ilevel"	"10"
 			"max_ilevel"	"10"
 			"image_inventory"	"backpack/weapons/c_models/c_double_barrel"
@@ -58523,6 +58524,7 @@
 			"item_quality"	"unique"
 			"baseitem" "0"
 			"reskin" "0"
+			"stock_whitelist"	"1"
 			"min_ilevel"	"1"
 			"max_ilevel"	"100"
 			"inspect_panel_dist" "38"
@@ -224372,6 +224374,15 @@
 			"armory_desc"	"on_wearer"
 			"stored_as_integer"	"0"
 		}
+		"933"
+		{
+			"name"	"scattergun knockback mult penalty"
+			"attribute_class"	"scattergun_knockback_mult"
+			"description_format"	"value_is_inverted_percentage"
+			"hidden"	"1"
+			"effect_type"	"negative"
+			"stored_as_integer"	"0"
+		}
 
 		"1000"
 		{

game/quiver/steam.inf

@@ -1,6 +1,6 @@
-PatchVersion=21000
-ClientVersion=21000
-ServerVersion=21000
+PatchVersion=21100
+ClientVersion=21100
+ServerVersion=21100
 ProductName=quiver
 appID=243750
 ServerAppID=244310

game/quiver/version.txt

@@ -1 +1 @@
-version=Private Alpha 1.0.0.0
+version=Private Alpha 1.1.0

src/game/client/tf/tf_hud_playerstatus.cpp

@@ -1295,10 +1295,8 @@ CTFHudPlayerArmor::CTFHudPlayerArmor(Panel* parent, const char* name) : Editable
 	m_iAnimState = HUD_HEALTH_NO_ANIM;
 	m_bAnimate = true;
 
-#ifdef BDSBASE
 	m_pPlayerArmorLabel = NULL;
 	m_pPlayerMaxArmorLabel = NULL;
-#endif
 }
 
 CTFHudPlayerArmor::~CTFHudPlayerArmor()
@@ -1346,18 +1344,15 @@ void CTFHudPlayerArmor::ApplySchemeSettings(IScheme* pScheme)
 
 	BaseClass::ApplySchemeSettings(pScheme);
 
-#ifdef BDSBASE
 	m_pPlayerArmorLabel = dynamic_cast<CExLabel*>(FindChildByName("PlayerStatusArmorValue"));
 	m_pPlayerMaxArmorLabel = dynamic_cast<CExLabel*>(FindChildByName("PlayerStatusMaxArmorValue"));
-#endif
 }
 
 //-----------------------------------------------------------------------------
 // Purpose: 
 //-----------------------------------------------------------------------------
 void CTFHudPlayerArmor::SetArmor(int iNewHealth, int iMaxHealth)
 {
-#ifdef BDSBASE
 	if (m_nArmor != iNewHealth || m_nMaxArmor != iMaxHealth)
 	{
 		// set our health
@@ -1450,97 +1445,6 @@ void CTFHudPlayerArmor::SetArmor(int iNewHealth, int iMaxHealth)
 		SetDialogVariable("Armor", m_nArmor);
 		SetDialogVariable("MaxArmor", m_nMaxArmor);
 	}
-#else
-	// set our health
-	m_nArmor = iNewHealth;
-	m_nMaxArmor = iMaxHealth;
-	m_pArmorImage->SetArmor((float)(m_nArmor) / (float)(m_nMaxArmor));
-
-	if (m_pArmorImage)
-	{
-		m_pArmorImage->SetFgColor(Color(255, 255, 255, 255));
-	}
-
-	if (m_nArmor <= 0)
-	{
-		if (m_pArmorImageBG->IsVisible())
-		{
-			m_pArmorImageBG->SetVisible(false);
-		}
-
-		HideArmorBonusImage();
-	}
-	else
-	{
-		if (!m_pArmorImageBG->IsVisible())
-		{
-			m_pArmorImageBG->SetVisible(true);
-		}
-
-		// are we close to dying?
-		if (m_nArmor < m_nMaxArmor * m_flArmorDeathWarning)
-		{
-			if (m_pArmorBonusImage && m_nBonusArmorOrigW != -1)
-			{
-				if (!m_pArmorBonusImage->IsVisible())
-				{
-					m_pArmorBonusImage->SetVisible(true);
-				}
-
-				if (m_bAnimate && m_iAnimState != HUD_HEALTH_DYING_ANIM)
-				{
-					g_pClientMode->GetViewportAnimationController()->StartAnimationSequence(this, "HudArmorDyingPulse");
-
-					m_iAnimState = HUD_HEALTH_DYING_ANIM;
-				}
-
-				m_pArmorBonusImage->SetDrawColor(m_clrArmorDeathWarningColor);
-
-				// scale the flashing image based on how much health bonus we currently have
-				float flBoostMaxAmount = m_nMaxArmor * m_flArmorDeathWarning;
-				float flPercent = (flBoostMaxAmount - m_nArmor) / flBoostMaxAmount;
-
-				int nPosAdj = RoundFloatToInt(flPercent * m_nArmorBonusPosAdj);
-				int nSizeAdj = 2 * nPosAdj;
-
-				m_pArmorBonusImage->SetBounds(m_nBonusArmorOrigX - nPosAdj,
-					m_nBonusArmorOrigY - nPosAdj,
-					m_nBonusArmorOrigW + nSizeAdj,
-					m_nBonusArmorOrigH + nSizeAdj);
-			}
-
-			if (m_pArmorImage)
-			{
-				m_pArmorImage->SetFgColor(m_clrArmorDeathWarningColor);
-			}
-		}
-		// turn it off
-		else
-		{
-			HideArmorBonusImage();
-		}
-	}
-
-	// set our health display value
-	if (m_nArmor > 0)
-	{
-		SetDialogVariable("Armor", m_nArmor);
-
-		if (m_nMaxArmor - m_nArmor >= 5)
-		{
-			SetDialogVariable("MaxArmor", m_nMaxArmor);
-		}
-		else
-		{
-			SetDialogVariable("MaxArmor", "");
-		}
-	}
-	else
-	{
-		SetDialogVariable("Armor", "");
-		SetDialogVariable("MaxArmor", "");
-	}
-#endif	
 }
 
 //-----------------------------------------------------------------------------

src/game/client/tf/tf_hud_playerstatus.h

@@ -276,10 +276,8 @@ class CTFHudPlayerArmor : public vgui::EditablePanel
 	CTFArmorPanel* m_pArmorImage;
 	vgui::ImagePanel* m_pArmorBonusImage;
 	vgui::ImagePanel* m_pArmorImageBG;
-#ifdef BDSBASE
 	CExLabel* m_pPlayerArmorLabel;
 	CExLabel* m_pPlayerMaxArmorLabel;
-#endif
 
 	int					m_nArmor;
 	int					m_nMaxArmor;

src/game/shared/tf/tf_weapon_shotgun.cpp

@@ -355,12 +355,13 @@ void CTFScatterGun::FireBullet( CTFPlayer *pPlayer )
 		{
 			pPlayer->m_Shared.m_iScattergunJump += 1;
 
+#if !(defined(QUIVER_DLL) || defined(QUIVER_CLIENT_DLL))
 #ifndef CLIENT_DLL
 			pOwner->m_Shared.StunPlayer(0.3f, 1.f, TF_STUN_MOVEMENT | TF_STUN_MOVEMENT_FORWARD_ONLY);
+#endif
 #endif
 
 			float flForce = AirBurstDamageForce(pOwner->WorldAlignSize(), 60, 6.f);
-
 			Vector vecForward;
 			AngleVectors(pOwner->EyeAngles(), &vecForward);
 			Vector vecForce = vecForward * -flForce;
@@ -474,7 +475,9 @@ void CTFScatterGun::ApplyPostHitEffects( const CTakeDamageInfo &inputInfo, CTFPl
 
 	pTarget->ApplyGenericPushbackImpulse( vecForce, pAttacker );
 
+#if !(defined(QUIVER_DLL) || defined(QUIVER_CLIENT_DLL))
 	pTarget->m_Shared.StunPlayer( 0.3f, 1.f, TF_STUN_MOVEMENT | TF_STUN_MOVEMENT_FORWARD_ONLY, pAttacker );
+#endif
 	pTarget->m_Shared.SetWeaponKnockbackID( pAttacker->GetUserID() );
 
 #endif