misc changes. again.

Bitl · Bitl · commit 0ac785d3bd5e · 2025-08-05T22:51:11.000-07:00
diff --git a/game/mod_tf/scripts/items/items_game.txt b/game/mod_tf/scripts/items/items_game.txt
@@ -227202,6 +227202,26 @@
 			"effect_type"	"negative"
 			"stored_as_integer"	"0"
 		}
+		"909"
+		{
+			"name"	"airblast cost increased nonflamethrower"
+			"attribute_class"	"mult_airblast_cost_nonflamethrower"
+			"description_string"	"#Attrib_AirblastCost_Increased"
+			"description_format"	"value_is_percentage"
+			"hidden"	"0"
+			"effect_type"	"negative"
+			"stored_as_integer"	"0"
+		}
+		"910"
+		{
+			"name"	"airblast cost decreased nonflamethrower"
+			"attribute_class"	"mult_airblast_cost_nonflamethrower"
+			"description_string"	"#Attrib_AirblastCost_Decreased"
+			"description_format"	"value_is_percentage"
+			"hidden"	"0"
+			"effect_type"	"positive"
+			"stored_as_integer"	"0"
+		}
 
 		"1000"
 		{
diff --git a/game/quiver/info_changelog.txt b/game/quiver/info_changelog.txt
@@ -10,7 +10,6 @@ Whitelists:
 	- The Homewrecker/Maul
 	- The Powerjack
 	- The Hot Hand
-	- The Brass Beast
 	- The Huo-Long Heater
 	- The Dalokoh's Bar/Fishcake
 	- The Second Banana
@@ -32,6 +31,7 @@ Whitelists:
 	- Darwin's Danger Shield
 	- The Cleaner's Carbine
 	- The Reserve Shooter
+	- The Pain Train
 
 Blacklists:
 	- The Spy-Cicle
@@ -73,12 +73,14 @@ Details:
 - Instead of a meter that does mini-crits when filled, The Cleaner's Carbine has been rebalanced to give 3 seconds of crits on kill, however these crits are affected by falloff (similar to the post-JI Ambassador)
 - Fixed the Engineer's build PDA not having proper mini-crit glow colors
 - Fixed the stock flame thrower not having proper mini-crit glow colors
-- The Reserve Shooter now crits airborne opponents (not including jumping or air jumping players) within 3 seconds of it being deployed. After the 3 seconds has elapsed, the crits are downgraded to mini-crits.
-- The Reserve Shooter now has a 15% fire rate penalty.
 - Fixed a bug where you couldn't send armored enemies airborne.
 - Fixed the armor broken condition not respecting some mini-crit attributes.
 - Made it so the the Flying Guillotine guarantees full crits on long distance hits with enemies that just got their armor broken.
 - Increased the recharge time for the Flying Guillotine from 5.1 seconds to 7.6 seconds.
+- Changed out the Dragon's Fury's -20 max armor attribute for a 25% damage reduction against unarmored players.
+- Added a 25% damage penalty on the Vita-Saw.
+- Removed the -10 max health penalty on the Vita-Saw.
+- Made it so the Vita-Saw saves up to 20% ÜberCharge after death, instead of using the organ mechanic.
 
 Quiver Private Alpha 1.1.0:
 Whitelists:
diff --git a/game/quiver/info_highlights.txt b/game/quiver/info_highlights.txt
@@ -81,7 +81,7 @@ Unlockable weapon balance changes:
 - Fixed Ullapool Caber explosions not counting as melee kills.
 - Fixed Ullapool Caber not using mini-crits when charging.
 - Restored the Dragon's Fury to its original Jungle Inferno version.
-- 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 now 100% crits vs players that just had their armor break, in return for 25% reduced damage against armor.
 - The Dragon's Fury's unused pressure meter now shows up by default, allowing you to view its pressure when switching weapons.
 - Fixed Gunslinger being able to pause melee hit combos when holstering the weapon.
 - Reduced the reload penalty on the Shortstop from 50% to 25%.
@@ -99,10 +99,11 @@ Unlockable weapon balance changes:
 - Made it so the Beggar's Bazooka no longer reduces ammo during a misfire.
 - The Darwin's Danger Shield now only gives a 15 max health bonus and a 10 max armor bonus instead of afterburn immunity and fire resistance.
 - Instead of a meter that does mini-crits when filled, The Cleaner's Carbine has been rebalanced to give 3 seconds of crits on kill, however these crits are affected by falloff (similar to the post-JI Ambassador)
-- The Reserve Shooter now crits airborne opponents (not including jumping or air jumping players) within 3 seconds of it being deployed. After the 3 seconds has elapsed, the crits are downgraded to mini-crits.
-- The Reserve Shooter now has a 15% fire rate penalty.
 - Made it so the the Flying Guillotine guarantees full crits on long distance hits with enemies that just got their armor broken.
 - Increased the recharge time for the Flying Guillotine from 5.1 seconds to 7.6 seconds.
+- Added a 25% damage penalty on the Vita-Saw.
+- Removed the -10 max health penalty on the Vita-Saw.
+- Made it so the Vita-Saw saves up to 20% ÜberCharge after death, instead of using the organ mechanic.
 
 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
@@ -27,7 +27,7 @@
 - The Quick-Fix (w/ balance changes)
 - The Übersaw
 - The Amputator
-- The Vita-Saw
+- The Vita-Saw (w/ balance changes)
 - The Huntsman/Fortified Compound (w/ balance changes)
 - The Killing Gloves of Boxing
 - The Cloak and Dagger (w/ balance changes)
@@ -57,7 +57,6 @@
 - The Homewrecker/Maul
 - The Powerjack
 - The Hot Hand
-- The Brass Beast
 - The Huo-Long Heater
 - The Dalokoh's Bar/Fishcake
 - The Second Banana
@@ -78,6 +77,7 @@
 - The Beggar's Bazooka (w/ balance changes)
 - Darwin's Danger Shield* (w/ balance changes)
 - The Cleaner's Carbine* (w/ balance changes)
-- The Reserve Shooter (w/ balance changes)
+- The Reserve Shooter
+- The Pain Train
 
 * - Weapon was whitelisted as long as it got a rebalance.
diff --git a/game/quiver/resource/quiver_english.txt b/game/quiver/resource/quiver_english.txt
diff --git a/game/quiver/scripts/items/items_game.txt b/game/quiver/scripts/items/items_game.txt
@@ -18186,7 +18186,6 @@
 			"item_quality"	"unique"
 			"min_ilevel"	"5"
 			"max_ilevel"	"5"
-			"stock_whitelist" "1"
 			"used_by_classes"
 			{
 				"heavy"	"1"
@@ -19977,15 +19976,10 @@
 					"attribute_class"	"mult_clipsize"
 					"value" "0.66"
 				}
-				"fire rate penalty"
-				{
-					"attribute_class"	"mult_postfiredelay"
-					"value"	"1.15"
-				}
-				"mod crit switch mode airborne deploy"
+				"mod mini-crit airborne"
 				{
-					"attribute_class"	"crit_mode_switch_airborne_deploy"
-					"value" "3"
+					"attribute_class"	"mini_crit_airborne"
+					"value" "1"
 				}
 				"single wep deploy time decreased"
 				{
@@ -26373,6 +26367,7 @@
 			"propername"	"1"
 			"min_ilevel"	"5"
 			"max_ilevel"	"5"
+			"stock_whitelist" "1"
 			"used_by_classes"
 			{
 				"demoman"	"1"
@@ -27254,7 +27249,6 @@
 			"show_in_armory"	"1"
 			"item_type_name"	"#TF_Weapon_Bonesaw"
 			"item_name"	"#TF_Unique_BattleSaw"
-			"item_description" "#TF_Unique_BattleSaw_Desc"
 			"item_slot"	"melee"
 			"image_inventory"	"backpack/workshop/weapons/c_models/c_uberneedle/c_uberneedle"
 			"image_inventory_size_w"		"128"
@@ -27277,21 +27271,26 @@
 			}
 			"attributes"
 			{
-				"ubercharge_preserved_on_spawn_max"
+				"preserve ubercharge"
 				{
-					"attribute_class"	"ubercharge_preserved_on_spawn_max"
-					"value" "0.6"
-				}
-				"max health additive penalty"
-				{
-					"attribute_class"	"add_maxhealth"
-					"value" "-10"
+					"attribute_class"	"preserve_ubercharge"
+					"value" "20"
 				}
 				"lunchbox adds minicrits"
 				{
 					"attribute_class"	"set_weapon_mode"
 					"value"	"2"
 				}
+				"heal rate penalty"
+				{
+					"attribute_class"	"mult_medigun_healrate"
+					"value"	"0.85"
+				}
+				"damage penalty"
+				{
+					"attribute_class"	"mult_dmg"
+					"value"	"0.75"
+				}
 			}
 			"visuals"
 			{
@@ -61895,7 +61894,7 @@
 				"dragons fury negative properties"		"1"
 				"extinguish restores health"			"20"
 				"crit vs fresh meat"					"4194304"
-				"max armor additive penalty"			"-20"
+				"armor damage reduced on target"		"0.85"
 			}
 			"visuals"
 			{
@@ -227395,6 +227394,26 @@
 			"effect_type"	"negative"
 			"stored_as_integer"	"0"
 		}
+		"909"
+		{
+			"name"	"airblast cost increased nonflamethrower"
+			"attribute_class"	"mult_airblast_cost_nonflamethrower"
+			"description_string"	"#Attrib_AirblastCost_Increased"
+			"description_format"	"value_is_percentage"
+			"hidden"	"0"
+			"effect_type"	"negative"
+			"stored_as_integer"	"0"
+		}
+		"910"
+		{
+			"name"	"airblast cost decreased nonflamethrower"
+			"attribute_class"	"mult_airblast_cost_nonflamethrower"
+			"description_string"	"#Attrib_AirblastCost_Decreased"
+			"description_format"	"value_is_percentage"
+			"hidden"	"0"
+			"effect_type"	"positive"
+			"stored_as_integer"	"0"
+		}
 		
 		"1000"
 		{
diff --git a/src/game/server/tf/tf_player.cpp b/src/game/server/tf/tf_player.cpp
@@ -10034,6 +10034,7 @@ int CTFPlayer::OnTakeDamage( const CTakeDamageInfo &inputInfo )
 		}
 	}
 	
+#if !defined(QUIVER_DLL)
 #ifdef BDSBASE
 	if (pTFAttacker && pTFAttacker->IsPlayerClass(TF_CLASS_MEDIC) && pWeapon && pWeapon->GetWeaponID() == TF_WEAPON_BONESAW)
 	{
@@ -10125,6 +10126,7 @@ int CTFPlayer::OnTakeDamage( const CTakeDamageInfo &inputInfo )
 			}
 		}
 	}
+#endif
 #endif
 
 	if ( bIsSoldierRocketJumping || bIsDemomanPipeJumping )
diff --git a/src/game/shared/tf/tf_weapon_dragons_fury.cpp b/src/game/shared/tf/tf_weapon_dragons_fury.cpp
@@ -231,6 +231,10 @@ void CTFWeaponFlameBall::SecondaryAttack( void )
 	CALL_ATTRIB_HOOK_INT( iChargedAirblast, set_charged_airblast );
 	float flMultAmmoPerShot = 1.0f;
 	CALL_ATTRIB_HOOK_FLOAT( flMultAmmoPerShot, mult_airblast_cost );
+#ifdef BDSBASE
+	// after we calculate our airblast cost, consider other weapons
+	CALL_ATTRIB_HOOK_FLOAT_ON_OTHER(pPlayer, flMultAmmoPerShot, mult_airblast_cost_nonflamethrower);
+#endif
 	int iAmmoPerShot = tf_flamethrower_burstammo.GetInt() * flMultAmmoPerShot;
 
 
diff --git a/src/game/shared/tf/tf_weapon_flamethrower.cpp b/src/game/shared/tf/tf_weapon_flamethrower.cpp
@@ -659,6 +659,10 @@ void CTFFlameThrower::ItemPostFrame()
 				//FireProjectile( pOwner );
 				float flMultAmmoPerShot = 1.0f;
 				CALL_ATTRIB_HOOK_FLOAT( flMultAmmoPerShot, mult_airblast_cost );
+#ifdef BDSBASE
+				// after we calculate our airblast cost, consider other weapons
+				CALL_ATTRIB_HOOK_FLOAT_ON_OTHER(pOwner, flMultAmmoPerShot, mult_airblast_cost_nonflamethrower);
+#endif
 				int iAmmoPerShot = tf_flamethrower_burstammo.GetInt() * flMultAmmoPerShot;
 				FireAirBlast( iAmmoPerShot );
 			}
@@ -1205,6 +1209,10 @@ void CTFFlameThrower::SecondaryAttack()
 	CALL_ATTRIB_HOOK_INT( iBuffType, set_buff_type );
 	float flMultAmmoPerShot = 1.0f;
 	CALL_ATTRIB_HOOK_FLOAT( flMultAmmoPerShot, mult_airblast_cost );
+#ifdef BDSBASE
+	// after we calculate our airblast cost, consider other weapons
+	CALL_ATTRIB_HOOK_FLOAT_ON_OTHER(pOwner, flMultAmmoPerShot, mult_airblast_cost_nonflamethrower);
+#endif
 	int iAmmoPerShot = tf_flamethrower_burstammo.GetInt() * flMultAmmoPerShot;
 
 	if ( iBuffType != 0 )
diff --git a/src/game/shared/tf/tf_weapon_medigun.cpp b/src/game/shared/tf/tf_weapon_medigun.cpp
@@ -295,6 +295,14 @@ void CWeaponMedigun::WeaponReset( void )
 	if ( TFGameRules()->State_Get() == GR_STATE_RND_RUNNING )
 	{
 		// This is determined via an attribute in SetStoredChargeLevel()
+#ifdef BDSBASE
+		int iPreserveUber = 0;
+		CALL_ATTRIB_HOOK_INT_ON_OTHER(pOwner, iPreserveUber, preserve_ubercharge);
+		if (iPreserveUber)
+		{
+			m_flChargeLevelToPreserve = (iPreserveUber / 99.f);
+		}
+#endif
 		m_flChargeLevel = Min( (float)m_flChargeLevel, m_flChargeLevelToPreserve );
 	}
 	else
diff --git a/src/game/shared/tf/tf_weapon_medigun.h b/src/game/shared/tf/tf_weapon_medigun.h
@@ -134,6 +134,9 @@ class CWeaponMedigun : public CTFWeaponBaseGun
 	void			SetChargeLevel( float flChargeLevel ) { m_flChargeLevel = flChargeLevel; }
 	void			SetChargeLevelToPreserve( float flAmount );
 	float			GetChargeLevel( void ) const { return m_flChargeLevel; }
+#ifdef BDSBASE
+	float			GetChargeLevelToPreserve(void) const { return m_flChargeLevelToPreserve; }
+#endif
 	float			GetMinChargeAmount( void ) const;
 
 	virtual void	OnControlStunned( void );

Original file line number	Diff line number	Diff line change
`@@ -10034,6 +10034,7 @@ int CTFPlayer::OnTakeDamage( const CTakeDamageInfo &inputInfo )`
`10034`	`10034`	`}`
`10035`	`10035`	`}`
`10036`	`10036`
	`10037`	`+#if !defined(QUIVER_DLL)`
`10037`	`10038`	`#ifdef BDSBASE`
`10038`	`10039`	`if (pTFAttacker && pTFAttacker->IsPlayerClass(TF_CLASS_MEDIC) && pWeapon && pWeapon->GetWeaponID() == TF_WEAPON_BONESAW)`
`10039`	`10040`	`{`
`@@ -10125,6 +10126,7 @@ int CTFPlayer::OnTakeDamage( const CTakeDamageInfo &inputInfo )`
`10125`	`10126`	`}`
`10126`	`10127`	`}`
`10127`	`10128`	`}`
	`10129`	`+#endif`
`10128`	`10130`	`#endif`
`10129`	`10131`
`10130`	`10132`	`if ( bIsSoldierRocketJumping \|\| bIsDemomanPipeJumping )`