eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

*** empty log message ***

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1819 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Magnus 2006-01-07 22:51:52 +00:00
parent 778b2e09a7
commit dfe07bef90
1 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
quakec/fallout2/items.qc
View file

@ -826,7 +826,7 @@ float() GetRandomAmmo =
void() ammo_touch = void() ammo_touch =
{ {
local entity stemp; local entity stemp;
local string ammoname; local string ammoname, ammocountftos;
local float best, ammotype, ammocount; local float best, ammotype, ammocount;
if (other.classname != "player") if (other.classname != "player")
@ -866,62 +866,88 @@ void() ammo_touch =
if (ammotype == IID_AM_45ACP) if (ammotype == IID_AM_45ACP)
ammocount = 5 + random()*10; ammocount = 5 + random()*10;
ammocount = ceil(ammocount);
ammoname = GetItemName(ammotype); ammoname = GetItemName(ammotype);
ammocountftos = ftos(ammocount);
// shotgun // shotgun
if (self.weapon == 1) if (self.weapon == 1)
{ {
sprint (other, 2, ammoname); sprint (other, 2, ammoname);
sprint (other, 2, "(");
sprint (other, 2, ammocountftos);
sprint (other, 2, ") ");
AddStackable(other, ammotype, ammocount); AddStackable(other, ammotype, ammocount);
if (random()*20 <= 10) if (random()*20 <= 10)
{ {
other.ammo_shells = other.ammo_shells + 2; other.ammo_shells = other.ammo_shells + 2;
sprint (other, PRINT_LOW, " and bottle caps.\n"); sprint (other, 2, " and bottle caps.\n");
} }
else
sprint (other, 2, "\n");
} }
// spikes // spikes
if (self.weapon == 2) if (self.weapon == 2)
{ {
sprint (other, 2, ammoname); sprint (other, 2, ammoname);
sprint (other, 2, "(");
sprint (other, 2, ammocountftos);
sprint (other, 2, ") ");
AddStackable(other, ammotype, ammocount); AddStackable(other, ammotype, ammocount);
if (random()*20 <= 10) if (random()*20 <= 10)
{ {
other.ammo_shells = other.ammo_shells + 2; other.ammo_shells = other.ammo_shells + 2;
sprint (other, PRINT_LOW, " and bottle caps.\n"); sprint (other, 2, " and bottle caps.\n");
} }
else
sprint (other, 2, "\n");
} }
// rockets // rockets
if (self.weapon == 3) if (self.weapon == 3)
{ {
sprint (other, 2, ammoname); sprint (other, 2, ammoname);
sprint (other, 2, "(");
sprint (other, 2, ammocountftos);
sprint (other, 2, ") ");
AddStackable(other, ammotype, ammocount); AddStackable(other, ammotype, ammocount);
if (random()*20 <= 10) if (random()*20 <= 10)
{ {
other.ammo_shells = other.ammo_shells + 2; other.ammo_shells = other.ammo_shells + 2;
sprint (other, PRINT_LOW, " and bottle caps.\n"); sprint (other, 2, " and bottle caps.\n");
} }
else
sprint (other, 2, "\n");
} }
// cells // cells
if (self.weapon == 4) if (self.weapon == 4)
{ {
sprint (other, 2, ammoname); sprint (other, 2, ammoname);
sprint (other, 2, "(");
sprint (other, 2, ammocountftos);
sprint (other, 2, ") ");
AddStackable(other, ammotype, ammocount); AddStackable(other, ammotype, ammocount);
if (random()*20 <= 10) if (random()*20 <= 10)
{ {
other.ammo_shells = other.ammo_shells + 2; other.ammo_shells = other.ammo_shells + 2;
sprint (other, PRINT_LOW, " and bottle caps.\n"); sprint (other, 2, " and bottle caps.\n");
} }
else
sprint (other, 2, "\n");
} }
bound_other_ammo (); bound_other_ammo ();