Skip to content

Commit 5a94541

Browse files
committed
armor repair rate bonuses/penalties now effect the wrench as well.
1 parent 9b3be09 commit 5a94541

File tree

6 files changed

+17
-13
lines changed

6 files changed

+17
-13
lines changed

game/quiver/info_changelog.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Quiver Private Alpha 1.1.0 (WIP):
1+
Quiver Private Alpha 1.1.0:
22
- Disabled stun in most instances, except in MvM where it's crucial against robots.
33
- Disabled player glows on spawn and spectator (except in MvM).
44
- Fixed a bug where some kill feeds erroneously show the Pyro kill taunt kill icon.
@@ -25,11 +25,12 @@ Quiver Private Alpha 1.1.0 (WIP):
2525
- Improved the Ludmila's viewmodel.
2626
- Removed the Ludmila's spinup time penalty.
2727
- Lowered the Ludmila's damage penalty from 25% to 15%.
28-
- Added a 15% lower armor repair rate from dispensers to the Ludmila.
29-
- Increased the Gunslinger's dispenser armor repair penalty from 5% to 10%.
28+
- Added a 15% lower armor repair rate to the Ludmila.
29+
- Increased the Gunslinger's armor repair penalty from 5% to 10%.
3030
- Fixed the Vitality Gliitch's 50% lower armor durability penalty.
3131
- 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.
3232
- Added a 10% move penalty when carrying buildings, regardless if they are being built or moved.
33+
- Armor repair rate bonuses and penalties also now effect armor repairs using the Wrench.
3334
- Added the following Source SDK Pull Requests:
3435
- #1437: MvM: Fix Explosive Headshot working on invulnerable target
3536

324 Bytes
Binary file not shown.

game/quiver/scripts/items/items_custom.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"attribute_class" "mult_armor"
6666
"value" "0.7"
6767
}
68-
"armor taken from dispensers decreased"
68+
"armor repair rate decreased"
6969
{
7070
"attribute_class" "mult_dispenser_armor_rate"
7171
"value" "0.5"
@@ -577,7 +577,7 @@
577577
"attribute_class" "mult_dmg"
578578
"value" "0.85"
579579
}
580-
"armor taken from dispensers decreased"
580+
"armor repair rate decreased"
581581
{
582582
"attribute_class" "mult_dispenser_armor_rate"
583583
"value" "0.85"

game/quiver/scripts/items/items_game.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21516,7 +21516,7 @@
2151621516
"craft_material_type" "weapon"
2151721517
"item_type_name" "#TF_Weapon_Wrench"
2151821518
"item_name" "#TF_Weapon_Wrench"
21519-
"item_description" "#TF_Weapon_Wrench_Desc"
21519+
"item_description" "#Quiver_Weapon_Wrench_Desc"
2152021520
"item_slot" "melee"
2152121521
"item_quality" "normal"
2152221522
"baseitem" "0"
@@ -25705,7 +25705,7 @@
2570525705
"attribute_class" "add_maxarmor"
2570625706
"value" "10"
2570725707
}
25708-
"armor taken from dispensers decreased"
25708+
"armor repair rate decreased"
2570925709
{
2571025710
"attribute_class" "mult_dispenser_armor_rate"
2571125711
"value" "0.90"
@@ -224186,8 +224186,8 @@
224186224186
}
224187224187
"913"
224188224188
{
224189-
"name" "armor taken from dispensers increased"
224190-
"attribute_class" "mult_dispenser_armor_rate"
224189+
"name" "armor repair rate increased"
224190+
"attribute_class" "mult_armor_repair_cost"
224191224191
"description_string" "#Attrib_Armor_FasterRate"
224192224192
"description_format" "value_is_percentage"
224193224193
"hidden" "0"
@@ -224197,8 +224197,8 @@
224197224197
}
224198224198
"914"
224199224199
{
224200-
"name" "armor taken from dispensers decreased"
224201-
"attribute_class" "mult_dispenser_armor_rate"
224200+
"name" "armor repair rate decreased"
224201+
"attribute_class" "mult_armor_repair_cost"
224202224202
"description_string" "#Attrib_Armor_SlowerRate"
224203224203
"description_format" "value_is_inverted_percentage"
224204224204
"hidden" "0"

src/game/server/tf/tf_obj_dispenser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ bool CObjectDispenser::DispenseAmmo( CTFPlayer *pPlayer )
564564
#ifdef QUIVER_DLL
565565
//dispensers repair armor from the same beam
566566
float flArmorRate = GetArmorRepairRate();
567-
CALL_ATTRIB_HOOK_FLOAT_ON_OTHER(pPlayer->GetActiveWeapon(), flArmorRate, mult_dispenser_armor_rate);
567+
CALL_ATTRIB_HOOK_FLOAT_ON_OTHER(pPlayer->GetActiveWeapon(), flArmorRate, mult_armor_repair_cost);
568568
float flMaxArmor = pPlayer->GetMaxArmor();
569569

570570
pPlayer->IncrementArmorValue(flArmorRate, flMaxArmor);

src/game/shared/tf/tf_weapon_wrench.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,10 @@ void CTFWrench::OnFriendlyPlayerHit(CTFPlayer* pOtherPlayer, CTFPlayer* pPlayer,
171171
if (flCurArmor < flMaxArmor)
172172
{
173173
int iArmorToGive = (GetRepairAmount() * 0.25f);
174-
int iArmorRepairMultPenalty = pOtherPlayer->GetPlayerClass()->GetArmorMetalPenaltyMult();
174+
float iArmorRepairMultPenalty = pOtherPlayer->GetPlayerClass()->GetArmorMetalPenaltyMult();
175+
176+
CALL_ATTRIB_HOOK_FLOAT_ON_OTHER(pOtherPlayer, iArmorRepairMultPenalty, mult_armor_repair_cost);
177+
175178
int iRepairCost = iArmorToGive * iArmorRepairMultPenalty;
176179

177180
if (iRepairCost > pPlayer->GetBuildResources())

0 commit comments

Comments
 (0)