From 63aeb28c09fad4f9072ecbf2c527fcfabf6d0c80 Mon Sep 17 00:00:00 2001 From: Alan Shen Date: Mon, 9 Nov 2026 21:08:23 -0700 Subject: [PATCH] Empty the Supa-7 side saddle with the last slugs With sv_neo_reload_experimental 1, the side saddle shows the last four slugs of the reserve: each slug insert hides the front round as it starts, and a refill shows them again. Holster and drop show the saddle full, since the viewmodel keeps its body. With the flag off the update is skipped and the saddle stays as shipped. --- src/game/shared/neo/weapons/weapon_supa7.cpp | 56 ++++++++++++++++++++ src/game/shared/neo/weapons/weapon_supa7.h | 4 ++ 2 files changed, 60 insertions(+) diff --git a/src/game/shared/neo/weapons/weapon_supa7.cpp b/src/game/shared/neo/weapons/weapon_supa7.cpp index d65f0ab02a..779b00dc4a 100644 --- a/src/game/shared/neo/weapons/weapon_supa7.cpp +++ b/src/game/shared/neo/weapons/weapon_supa7.cpp @@ -113,6 +113,10 @@ static constexpr const char *VM_SEQ_PUMP_AFTER_INSERT = "reloadpump"; static constexpr float PUMP_AFTER_INSERT_HOME_TIME = 17.0f / VM_FRAMES_PER_SECOND; // The shell shot without the pump clicks of the shipped shot sound static constexpr const char *SND_LAST_SHELL_SHOT = "weapon_murata.single_nopump"; +// Side-saddle rounds of the viewmodel, front (nearest the muzzle) first; the shipped viewmodel has none +static constexpr const char *VM_SADDLE_BODYGROUPS[] = { "saddle1", "saddle2", "saddle3", "saddle4" }; +static constexpr int SADDLE_ROUND_SHOWN = 0; +static constexpr int SADDLE_ROUND_HIDDEN = 1; CWeaponSupa7::CWeaponSupa7(void) { @@ -527,6 +531,7 @@ void CWeaponSupa7::ItemPostFrame(void) ProcessAnimationEvents(); TubePhasesOnFrame(); TubePhasesOnFreezeTime(); + UpdateSaddleRounds(); if (m_bInReload) { @@ -652,6 +657,7 @@ void CWeaponSupa7::ItemPostFrame(void) void CWeaponSupa7::ItemBusyFrame(void) { TubePhasesOnFreezeTime(); + UpdateSaddleRounds(); BaseClass::ItemBusyFrame(); } @@ -989,6 +995,7 @@ void CWeaponSupa7::StartInsert(Supa7Insert_t round) m_nInsert = round; m_flInsertCreditTime = gpGlobals->curtime + INSERT_ROUND_IN_TUBE_TIME; + UpdateSaddleRounds(); } void CWeaponSupa7::RunInsert() @@ -1176,9 +1183,57 @@ void CWeaponSupa7::EmitShotSoundPiece(const char *pszSound) bool CWeaponSupa7::Holster(CBaseCombatWeapon *pSwitchingTo) { TubePhasesOnHolster(); + ShowSaddleRounds(SUPA7_SADDLE_ROUNDS); return BaseClass::Holster(pSwitchingTo); } +// A slug is in the hand from the start of its insert until it is in the tube +bool CWeaponSupa7::IsSlugInHand() const +{ + return m_bSlugLoad && m_nInsert != SUPA7_INSERT_NONE && m_flInsertCreditTime > 0.0f; +} + +// The side saddle holds the last slugs of the reserve; a slug load takes its front round at once +void CWeaponSupa7::UpdateSaddleRounds() +{ + // With the flag off the saddle stays as shipped, at no cost per frame + if (!IsTubeEnabled()) + { + return; + } + + const int iSlugsLeft = m_iSecondaryAmmoCount - (IsSlugInHand() ? 1 : 0); + ShowSaddleRounds(Clamp(iSlugsLeft, 0, SUPA7_SADDLE_ROUNDS)); +} + +// Hides the front rounds of the side saddle; the viewmodel keeps its body for the next weapon, so a holster or drop +// shows them all again +void CWeaponSupa7::ShowSaddleRounds(int iShown) +{ + CBasePlayer *pOwner = ToBasePlayer(GetOwner()); + CBaseViewModel *pViewModel = pOwner ? pOwner->GetViewModel(m_nViewModelIndex) : NULL; + if (!pViewModel || pViewModel->GetOwningWeapon() != this) + { + return; + } + + const int iHidden = SUPA7_SADDLE_ROUNDS - iShown; + for (int i = 0; i < SUPA7_SADDLE_ROUNDS; ++i) + { + const int iGroup = pViewModel->FindBodygroupByName(VM_SADDLE_BODYGROUPS[i]); + if (iGroup < 0) + { + continue; + } + + const int iState = (i < iHidden) ? SADDLE_ROUND_HIDDEN : SADDLE_ROUND_SHOWN; + if (pViewModel->GetBodygroup(iGroup) != iState) + { + pViewModel->SetBodygroup(iGroup, iState); + } + } +} + bool CWeaponSupa7::HasChamberSlot() const { return IsTubeEnabled() || BaseClass::HasChamberSlot(); @@ -1229,6 +1284,7 @@ bool CWeaponSupa7::SlugLoaded() const void CWeaponSupa7::Drop(const Vector& vecVelocity) { ClearDelayedInputs(); + ShowSaddleRounds(SUPA7_SADDLE_ROUNDS); CNEOBaseCombatWeapon::Drop(vecVelocity); } diff --git a/src/game/shared/neo/weapons/weapon_supa7.h b/src/game/shared/neo/weapons/weapon_supa7.h index f65ae87c5f..8e282e4d4e 100644 --- a/src/game/shared/neo/weapons/weapon_supa7.h +++ b/src/game/shared/neo/weapons/weapon_supa7.h @@ -142,6 +142,9 @@ class CWeaponSupa7 : public CNEOBaseCombatWeapon float ViewModelSequenceDuration() const; int LookupViewModelSequence(const char *pszSequence) const; void EmitShotSoundPiece(const char *pszSound); + bool IsSlugInHand() const; + void UpdateSaddleRounds(); + void ShowSaddleRounds(int iShown); void SetShotgunShellVisible(bool is_visible) { @@ -159,6 +162,7 @@ class CWeaponSupa7 : public CNEOBaseCombatWeapon // sv_neo_reload_experimental: the tube is a stack, the last round loaded is the first fed static constexpr int SUPA7_CHAMBER_ROUNDS = 1; + static constexpr int SUPA7_SADDLE_ROUNDS = 4; CNetworkVar(int, m_nTubeCount); // rounds in the tube CNetworkVar(int, m_nTubeSlugs); // bit i: the round at tube position i (0 = loaded first) is a slug CNetworkVar(int, m_nChamber); // Supa7Chamber_t