diff options
| -rw-r--r-- | datasrc/content.py | 4 | ||||
| -rw-r--r-- | src/game/server/entities/character.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/datasrc/content.py b/datasrc/content.py index 10828cf7..f3daa710 100644 --- a/datasrc/content.py +++ b/datasrc/content.py @@ -420,7 +420,7 @@ anim.attach.frames.Add(AnimKeyframe(1.00, 0, 0, -0.25)) container.animations.Add(anim) weapon = WeaponSpec(container, "hammer") -weapon.firedelay.Set(100) +weapon.firedelay.Set(125) weapon.damage.Set(3) weapon.visual_size.Set(96) weapon.offsetx.Set(4) @@ -429,7 +429,7 @@ container.weapons.hammer.base.Set(weapon) container.weapons.id.Add(weapon) weapon = WeaponSpec(container, "gun") -weapon.firedelay.Set(100) +weapon.firedelay.Set(125) weapon.ammoregentime.Set(500) weapon.visual_size.Set(64) weapon.offsetx.Set(32) diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index dba07ee7..3714bf08 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -275,6 +275,8 @@ void CHARACTER::fire_weapon() // check for ammo if(!weapons[active_weapon].ammo) { + // 125ms is a magical limit of how fast a human can click + reload_timer = 125 * server_tickspeed() / 1000;; game.create_sound(pos, SOUND_WEAPON_NOAMMO); return; } |