Skip to content

Commit f292775

Browse files
committed
misc. quiver changes. fix hl2mp menu
1 parent 23c4a24 commit f292775

File tree

8 files changed

+29
-3
lines changed

8 files changed

+29
-3
lines changed

game/mod_hl2mp/scripts/HudLayout.res

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,11 @@
448448
"enabled" "1"
449449
"wide" "640"
450450
"tall" "480"
451+
"zpos" "1"
452+
453+
"TextFont" "Default"
454+
"ItemFont" "Default"
455+
"ItemFontPulsing" "Default"
451456
}
452457

453458
HudCloseCaption

game/quiver/info_changelog.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Whitelists:
2828
- The Sun-on-a-Stick
2929
- The B.A.S.E. Jumper
3030
- The Atomizer
31+
- The Beggar's Bazooka
3132

3233
Blacklists:
3334
- The Spy-Cicle
@@ -57,10 +58,12 @@ Details:
5758
- Reduced the jump height when using the Atomizer by 10%.
5859
- The Atomizer's triple jump is now passive. Mini-Crits will no longer occur when dealing hits while airborne.
5960
- Decreased the Baby Face's Blaster's movement speed penalty back to 10%
60-
- The Baby Face's Blaster now takes 200 damage to fill boost instead of 100.
61+
- The Baby Face's Blaster now takes 150 damage to fill boost instead of 100.
6162
- The Sandman's ball now does guaranteed crits against armored players, alongside breaking armor.
6263
- The Sandman's ball now marks players for death if they're unarmored.
6364
- Fixed a bug where the Sandman doesn't play special sounds when hitting a player with a ball.
65+
- Fixed the broken armor effect sometimes not completely getting removed when the player gets an armor refill.
66+
- Made it so the Beggar's Bazooka no longer reduces ammo during a misfire.
6467

6568
Quiver Private Alpha 1.1.0:
6669
Whitelists:

game/quiver/info_highlights.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ Unlockable weapon balance changes:
9595
- Lowered the blast radius of the Scorch Shot by 20%
9696
- Reduced the jump height when using the Atomizer by 10%.
9797
- The Atomizer's triple jump is now passive. Mini-Crits will no longer occur when dealing hits while airborne.
98-
- The Baby Face's Blaster now takes 200 damage to fill boost instead of 100.
98+
- The Baby Face's Blaster now takes 150 damage to fill boost instead of 100.
99+
- Made it so the Beggar's Bazooka no longer reduces ammo during a misfire.
99100

100101
MvM Changes:
101102
- Added armor-related upgrades to MvM (max armor, pierces damage resistances, and armor resistance).

game/quiver/info_whitelist.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,6 @@
7575
- The Sun-on-a-Stick* (w/ balance changes)
7676
- The B.A.S.E. Jumper
7777
- The Atomizer* (w/ balance changes)
78+
- The Beggar's Bazooka (w/ balance changes)
7879

7980
* - Weapon was whitelisted as long as it got a rebalance.

game/quiver/scripts/items/items_game.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47042,6 +47042,7 @@
4704247042
"image_inventory_size_h" "82"
4704347043
"model_player" "models/workshop/weapons/c_models/c_dumpster_device/c_dumpster_device.mdl"
4704447044
"attach_to_hands" "1"
47045+
"stock_whitelist" "1"
4704547046
"used_by_classes"
4704647047
{
4704747048
"soldier" "1"
@@ -48507,7 +48508,7 @@
4850748508
"boost on damage div"
4850848509
{
4850948510
"attribute_class" "boost_on_damage_div"
48510-
"value" "2"
48511+
"value" "1.5"
4851148512
}
4851248513
// kinda not needed because it's 45% in code already. better for readability i guess
4851348514
"max boost speed multiplier"

game/survivor2/scripts/HudLayout.res

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,11 @@
448448
"enabled" "1"
449449
"wide" "640"
450450
"tall" "480"
451+
"zpos" "1"
452+
453+
"TextFont" "Default"
454+
"ItemFont" "Default"
455+
"ItemFontPulsing" "Default"
451456
}
452457

453458
HudCloseCaption

src/game/shared/tf/tf_player_shared.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5276,6 +5276,11 @@ void CTFPlayerShared::OnRemoveRuneResist( void )
52765276
//-----------------------------------------------------------------------------
52775277
void CTFPlayerShared::OnAddArmor(void)
52785278
{
5279+
if (InCond(QF_COND_ARMORJUSTBROKE))
5280+
{
5281+
RemoveCond(QF_COND_ARMORJUSTBROKE);
5282+
}
5283+
52795284
#ifdef CLIENT_DLL
52805285
// Do use the condition bit here, it's passed along and is expected to be a cond.
52815286
AddResistShield(&m_pOuter->m_pTempShield, m_pOuter, QF_COND_ARMOR);

src/game/shared/tf/tf_weapon_rocketlauncher.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,11 @@ void CTFRocketLauncher::Misfire( void )
253253
UTIL_TraceLine( pRocket->GetAbsOrigin(), pPlayer->EyePosition(), MASK_SOLID, pRocket, COLLISION_GROUP_NONE, &tr );
254254
pRocket->Explode( &tr, pPlayer );
255255
}
256+
257+
#if defined(QUIVER_DLL)
258+
// in Quiver, make it so we regain 1 rocket if it explodes (similar to 2013 beggars)
259+
m_iClip1 = m_iClip1 + 1;
260+
#endif
256261
}
257262
#endif
258263
}

0 commit comments

Comments
 (0)