From 3ab3db536b97018a07ab332e90769a67b260cea3 Mon Sep 17 00:00:00 2001 From: lordhavoc Date: Fri, 8 Apr 2005 00:36:09 +0000 Subject: [PATCH] changed uzi to use 1 bullet per shot instead of 0.25, and changed bullet pickups (from uzi and ammo item) from 30 to 120 git-svn-id: svn://svn.icculus.org/nexuiz/trunk@356 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- qcsrc/gamec/t_items.c | 4 ++-- qcsrc/gamec/w_uzi.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qcsrc/gamec/t_items.c b/qcsrc/gamec/t_items.c index 34ec326ff..3f6cfd63b 100644 --- a/qcsrc/gamec/t_items.c +++ b/qcsrc/gamec/t_items.c @@ -133,7 +133,7 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, } -void weapon_uzi (void) {self.ammo_nails = 30;StartItem ("models/weapons/g_uzi.md3", "weapons/weaponpickup.wav", 15, "Uzi", IT_UZI, FL_WEAPON);} +void weapon_uzi (void) {self.ammo_nails = 120;StartItem ("models/weapons/g_uzi.md3", "weapons/weaponpickup.wav", 15, "Uzi", IT_UZI, FL_WEAPON);} void weapon_shotgun (void) {self.ammo_shells = 15;StartItem ("models/weapons/g_shotgun.md3", "weapons/weaponpickup.wav", 15, "Shotgun", IT_SHOTGUN, FL_WEAPON);} void weapon_grenadelauncher (void) {self.ammo_rockets = 15;StartItem ("models/weapons/g_gl.md3", "weapons/weaponpickup.wav", 15, "Grenade Launcher", IT_GRENADE_LAUNCHER, FL_WEAPON);} void weapon_electro (void) {self.ammo_cells = 25;StartItem ("models/weapons/g_electro.md3", "weapons/weaponpickup.wav", 15, "Electro", IT_ELECTRO, FL_WEAPON);} @@ -143,7 +143,7 @@ void weapon_hagar (void) {self.ammo_rockets = 15;StartItem ("models/weapons/g_ha void weapon_rocketlauncher (void) {self.ammo_rockets = 15;StartItem ("models/weapons/g_rl.md3", "weapons/weaponpickup.wav", 15, "Rocket Launcher", IT_ROCKET_LAUNCHER, FL_WEAPON);} void item_rockets (void) {self.ammo_rockets = 15;StartItem ("models/items/a_rockets.md3", "misc/itempickup.wav", 15, "rockets", IT_ROCKETS, 0);} -void item_bullets (void) {self.ammo_nails = 30;StartItem ("models/items/a_bullets.mdl", "misc/itempickup.wav", 15, "bullets", IT_NAILS, 0);} +void item_bullets (void) {self.ammo_nails = 120;StartItem ("models/items/a_bullets.mdl", "misc/itempickup.wav", 15, "bullets", IT_NAILS, 0);} void item_cells (void) {self.ammo_cells = 25;StartItem ("models/items/a_cells.md3", "misc/itempickup.wav", 15, "cells", IT_CELLS, 0);} void item_shells (void) {self.ammo_shells = 15;StartItem ("models/items/a_shells.md3", "misc/itempickup.wav", 15, "shells", IT_SHELLS, 0);} diff --git a/qcsrc/gamec/w_uzi.c b/qcsrc/gamec/w_uzi.c index 8c1aeaf8c..50a008e51 100644 --- a/qcsrc/gamec/w_uzi.c +++ b/qcsrc/gamec/w_uzi.c @@ -49,7 +49,7 @@ void W_Uzi_Attack (void) self.punchangle_z = random () - 0.5; //self.attack_finished = time + 0.2; - self.ammo_nails = self.ammo_nails - 0.25; + self.ammo_nails = self.ammo_nails - 1; // casing code if (cvar("g_casings") == 1) -- 2.39.2