Revert "armor repair rate bonuses/penalties now effect the wrench as well."

This reverts commit 5a94541.

Author: Bitl

game/quiver/info_changelog.txt

@@ -1,4 +1,4 @@
-Quiver Private Alpha 1.1.0:
+Quiver Private Alpha 1.1.0 (WIP):
 - Disabled stun in most instances, except in MvM where it's crucial against robots.
 - Disabled player glows on spawn and spectator (except in MvM).
 - Fixed a bug where some kill feeds erroneously show the Pyro kill taunt kill icon.
@@ -25,12 +25,11 @@ Quiver Private Alpha 1.1.0:
 - Improved the Ludmila's viewmodel.
 - Removed the Ludmila's spinup time penalty.
 - Lowered the Ludmila's damage penalty from 25% to 15%.
-- Added a 15% lower armor repair rate  to the Ludmila.
-- Increased the Gunslinger's armor repair penalty from 5% to 10%.
+- Added a 15% lower armor repair rate from dispensers to the Ludmila.
+- Increased the Gunslinger's dispenser armor repair penalty from 5% to 10%.
 - 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.
-- Armor repair rate bonuses and penalties also now effect armor repairs using the Wrench.
 - Added the following Source SDK Pull Requests:
 	-  #1437: MvM: Fix Explosive Headshot working on invulnerable target
 

game/quiver/resource/quiver_english.txt

@@ -65,7 +65,7 @@
 					"attribute_class"	"mult_armor"
 					"value"			"0.7"
 				}
-				"armor repair rate decreased"
+				"armor taken from dispensers decreased"
 				{
 					"attribute_class"	"mult_dispenser_armor_rate"
 					"value"			"0.5"
@@ -577,7 +577,7 @@
 					"attribute_class"	"mult_dmg"
 					"value"	"0.85"
 				}
-				"armor repair rate decreased"
+				"armor taken from dispensers decreased"
 				{
 					"attribute_class"	"mult_dispenser_armor_rate"
 					"value"			"0.85"

game/quiver/scripts/items/items_custom.txt

@@ -21516,7 +21516,7 @@
 			"craft_material_type"	"weapon"
 			"item_type_name"	"#TF_Weapon_Wrench"
 			"item_name"	"#TF_Weapon_Wrench"
-			"item_description"	"#Quiver_Weapon_Wrench_Desc"
+			"item_description"	"#TF_Weapon_Wrench_Desc"
 			"item_slot"	"melee"
 			"item_quality"	"normal"
 			"baseitem" "0"
@@ -25705,7 +25705,7 @@
 					"attribute_class"	"add_maxarmor"
 					"value" "10"
 				}
-				"armor repair rate decreased"
+				"armor taken from dispensers decreased"
 				{
 					"attribute_class"	"mult_dispenser_armor_rate"
 					"value"			"0.90"
@@ -224186,8 +224186,8 @@
 		}
 		"913"
 		{
-			"name"	"armor repair rate increased"
-			"attribute_class"	"mult_armor_repair_cost"
+			"name"	"armor taken from dispensers increased"
+			"attribute_class"	"mult_dispenser_armor_rate"
 			"description_string"	"#Attrib_Armor_FasterRate"
 			"description_format"	"value_is_percentage"
 			"hidden"	"0"
@@ -224197,8 +224197,8 @@
 		}
 		"914"
 		{
-			"name"	"armor repair rate decreased"
-			"attribute_class"	"mult_armor_repair_cost"
+			"name"	"armor taken from dispensers decreased"
+			"attribute_class"	"mult_dispenser_armor_rate"
 			"description_string"	"#Attrib_Armor_SlowerRate"
 			"description_format"	"value_is_inverted_percentage"
 			"hidden"	"0"

game/quiver/scripts/items/items_game.txt

@@ -564,7 +564,7 @@ bool CObjectDispenser::DispenseAmmo( CTFPlayer *pPlayer )
 #ifdef QUIVER_DLL
 	//dispensers repair armor from the same beam
 	float flArmorRate = GetArmorRepairRate();
-	CALL_ATTRIB_HOOK_FLOAT_ON_OTHER(pPlayer->GetActiveWeapon(), flArmorRate, mult_armor_repair_cost);
+	CALL_ATTRIB_HOOK_FLOAT_ON_OTHER(pPlayer->GetActiveWeapon(), flArmorRate, mult_dispenser_armor_rate);
 	float flMaxArmor = pPlayer->GetMaxArmor();
 
 	pPlayer->IncrementArmorValue(flArmorRate, flMaxArmor);

src/game/server/tf/tf_obj_dispenser.cpp

@@ -171,10 +171,7 @@ void CTFWrench::OnFriendlyPlayerHit(CTFPlayer* pOtherPlayer, CTFPlayer* pPlayer,
 	if (flCurArmor < flMaxArmor)
 	{
 		int iArmorToGive = (GetRepairAmount() * 0.25f);
-		float iArmorRepairMultPenalty = pOtherPlayer->GetPlayerClass()->GetArmorMetalPenaltyMult();
-
-		CALL_ATTRIB_HOOK_FLOAT_ON_OTHER(pOtherPlayer, iArmorRepairMultPenalty, mult_armor_repair_cost);
-
+		int iArmorRepairMultPenalty = pOtherPlayer->GetPlayerClass()->GetArmorMetalPenaltyMult();
 		int iRepairCost = iArmorToGive * iArmorRepairMultPenalty;
 
 		if (iRepairCost > pPlayer->GetBuildResources())