From 362eb29123db527ff3fb2363591bcffcf0aef04f Mon Sep 17 00:00:00 2001
From: Alan Shen <sunzenshen@gmail.com>
Date: Wed, 14 Oct 2026 23:30:00 -0600
Subject: [PATCH] Hold an empty weapon on its empty idle

The Tachi and Milso viewmodels have an idle01empty sequence with the
slide held back, which neo never played: an emptied pistol held its
last fire frame for 2.0 s and then idled with the slide forward. The
original NEOTOKYO holds the slide back from the end of the last shot
until the reload. Send ACT_VM_IDLE_EMPTY for ACT_VM_IDLE while the
clip is empty, as the SDK crossbow does, and go to it as the emptying
shot's sequence ends. Models without the sequence are unchanged.
---
 .../weapons/weapon_neobasecombatweapon.cpp    | 22 +++++++++++++++++++
 .../neo/weapons/weapon_neobasecombatweapon.h  |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/src/game/shared/neo/weapons/weapon_neobasecombatweapon.cpp b/src/game/shared/neo/weapons/weapon_neobasecombatweapon.cpp
index 4d75d319dc..4808916e9c 100644
--- a/src/game/shared/neo/weapons/weapon_neobasecombatweapon.cpp
+++ b/src/game/shared/neo/weapons/weapon_neobasecombatweapon.cpp
@@ -941,6 +941,22 @@ void CNEOBaseCombatWeapon::DryFire()
 	m_flNextPrimaryAttack = gpGlobals->curtime + GetFastestDryRefireTime(); // SequenceDuration();
 }
 
+// An empty weapon idles on its empty sequence where the model has one, such as a pistol with its slide held back
+bool CNEOBaseCombatWeapon::SendWeaponAnim(int iActivity)
+{
+	if (iActivity == ACT_VM_IDLE && UsesClipsForAmmo1() && m_iClip1 <= 0 && HasEmptyIdle())
+	{
+		iActivity = ACT_VM_IDLE_EMPTY;
+	}
+
+	return BaseClass::SendWeaponAnim(iActivity);
+}
+
+bool CNEOBaseCombatWeapon::HasEmptyIdle()
+{
+	return SelectWeightedSequence(ACT_VM_IDLE_EMPTY) != ACTIVITY_NOT_AVAILABLE;
+}
+
 void CNEOBaseCombatWeapon::PrimaryAttack(void)
 {
 	if (ShootingIsPrevented())
@@ -1064,6 +1080,12 @@ void CNEOBaseCombatWeapon::PrimaryAttack(void)
 		m_iPrimaryAmmoCount -= info.m_iShots;
 	}
 
+	// the last round's shot goes straight on to the empty idle when it ends
+	if (UsesClipsForAmmo1() && m_iClip1 <= 0 && HasEmptyIdle())
+	{
+		SetWeaponIdleTime(gpGlobals->curtime + SequenceDuration());
+	}
+
 	info.m_flDistance = MAX_TRACE_LENGTH;
 	info.m_iAmmoType = m_iPrimaryAmmoType;
 	info.m_iTracerFreq = UsesTracers() ? 1 : 0;
diff --git a/src/game/shared/neo/weapons/weapon_neobasecombatweapon.h b/src/game/shared/neo/weapons/weapon_neobasecombatweapon.h
index b8a0afbefa..c3899d4ddc 100644
--- a/src/game/shared/neo/weapons/weapon_neobasecombatweapon.h
+++ b/src/game/shared/neo/weapons/weapon_neobasecombatweapon.h
@@ -191,6 +191,7 @@ class CNEOBaseCombatWeapon : public CBaseHL2MPCombatWeapon
 #endif
 
 	virtual void DryFire(void);
+	virtual bool SendWeaponAnim(int iActivity) override;
 
 	virtual Activity GetPrimaryAttackActivity(void) override;
 #ifdef CLIENT_DLL
@@ -292,6 +293,7 @@ class CNEOBaseCombatWeapon : public CBaseHL2MPCombatWeapon
 
 private:
 	CNEOBaseCombatWeapon(const CNEOBaseCombatWeapon &other);
+	bool HasEmptyIdle();
 
 };