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@1824 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Magnus 2006-01-08 23:02:40 +00:00
parent 4fb1c62dd5
commit 20f470ef8b
5 changed files with 66 additions and 241 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
quakec/fallout2/client.qc
View file

@ -1586,6 +1586,8 @@ called when a player connects to a server
*/
void() ClientConnect =
{
total_players = total_players + 1;
bprint (PRINT_HIGH, self.netname);
bprint (PRINT_HIGH, " entered the game\n");
@ -1632,6 +1634,8 @@ called when a player disconnects from a server
*/
void() ClientDisconnect =
{
total_players = total_players - 1;
// let everyone else know
bprint (PRINT_HIGH, self.netname);
bprint (PRINT_HIGH, " left the game with ");

1
quakec/fallout2/defs.qc
View file

@ -500,6 +500,7 @@ float z_skill;
float msgcount;
float max_zombies;
float gtimer;
float total_players;
//================================================

12
quakec/fallout2/inventory.qc
View file

@ -863,19 +863,7 @@ string(float iid) GetItemName =
string(float iid) GetItemDesc =
{
if (iid == IID_NONE)
return "";
if (iid == IID_WP_TOOLKIT)
return "a wattz(tm) brand toolkit consisting of many handy instruments, including a wrench. this kit is a repairman's dream, and allows those with the proper knowledge to perform technical tasks.";
if (iid == IID_WP_AK74)
return "the ak74 is the predecessor of the legendary ak-47. it is still the same old killing machine, except that it uses the 5.45mm high-velocity round that was common in the latest assault rifles just before the war.";
if (iid == IID_BUILD_MRAMMO)
return "a military prototype, the mr. ammo was designed to allow soldiers an extra source of ammunition in remote areas, as the handy little machine is capable of churning out ammo from things such as rocks, debris, and metal scraps.";
bprint(PRINT_MEDIUM, ftos(iid), " without a desc!\n");
return strcat("<no description>", ftos(iid));
};
string(float iid) GetItemImage =

284
quakec/fallout2/items.qc
View file

@ -872,6 +872,9 @@ void() ammo_touch =
ammocount = ceil(ammocount);
if (coop == 1 && total_players == 1)
ammocount = ammocount * 2;
ammoname = GetItemName(ammotype);
ammocountftos = ftos(ammocount);
@ -889,6 +892,9 @@ void() ammo_touch =
if (random()*20 <= 10)
{
other.ammo_shells = other.ammo_shells + 2;
if (coop == 1 && total_players == 1)
other.ammo_shells = other.ammo_shells + 2;
sprint (other, 2, " and bottle caps.\n");
}
else
@ -1001,6 +1007,9 @@ void() item_shells =
if (deathmatch == 4)
return;
if (coop == 1 && random()*4 <= 2)
return;
self.touch = ammo_touch;
if (self.spawnflags & WEAPON_BIG2)
@ -1029,6 +1038,9 @@ void() item_spikes =
if (deathmatch == 4)
return;
if (coop == 1 && random()*4 <= 1)
return;
self.touch = ammo_touch;
if (self.spawnflags & WEAPON_BIG2)
@ -1058,6 +1070,9 @@ void() item_rockets =
if (deathmatch == 4)
return;
if (coop == 1 && random()*4 <= 3)
return;
self.touch = ammo_touch;
if (self.spawnflags & WEAPON_BIG2)
@ -1088,6 +1103,9 @@ void() item_cells =
if (deathmatch == 4)
return;
if (coop == 1 && random()*4 <= 2)
return;
self.touch = ammo_touch;
if (self.spawnflags & WEAPON_BIG2)
@ -1120,61 +1138,14 @@ float WEAPON_SPIKES = 4;
float WEAPON_BIG = 8;
void() item_weapon =
{
if (coop == 1 && random()*4 <= 3)
return;
self.touch = ammo_touch;
if (self.spawnflags & WEAPON_SHOTGUN)
{
if (self.spawnflags & WEAPON_BIG)
{
precache_model ("maps/b_shell1.bsp");
setmodel (self, "maps/b_shell1.bsp");
self.aflag = 40;
}
else
{
precache_model ("maps/b_shell0.bsp");
setmodel (self, "maps/b_shell0.bsp");
self.aflag = 20;
}
self.weapon = 1;
self.netname = "shells";
}
precache_model ("maps/b_shell0.bsp");
setmodel (self, "maps/b_shell0.bsp");
if (self.spawnflags & WEAPON_SPIKES)
{
if (self.spawnflags & WEAPON_BIG)
{
precache_model ("maps/b_nail1.bsp");
setmodel (self, "maps/b_nail1.bsp");
self.aflag = 40;
}
else
{
precache_model ("maps/b_nail0.bsp");
setmodel (self, "maps/b_nail0.bsp");
self.aflag = 20;
}
self.weapon = 2;
self.netname = "spikes";
}
if (self.spawnflags & WEAPON_ROCKET)
{
if (self.spawnflags & WEAPON_BIG)
{
precache_model ("maps/b_rock1.bsp");
setmodel (self, "maps/b_rock1.bsp");
self.aflag = 10;
}
else
{
precache_model ("maps/b_rock0.bsp");
setmodel (self, "maps/b_rock0.bsp");
self.aflag = 5;
}
self.weapon = 3;
self.netname = "rockets";
}
setsize (self, '0 0 0', '32 32 56');
StartItem ();
@ -1547,160 +1518,43 @@ PLAYER BACKPACKS
void() BackpackTouch =
{
local string s;
local float best, old, new;
local entity stemp;
local float acount;
local float b_switch;
if (deathmatch == 4)
if (other.invincible_time > 0)
return;
sprint(other, 2, "loot: found ");
if ((stof(infokey(other,"b_switch"))) == 0)
b_switch = 8;
if (self.weapon == 1)
{
AddStackable(other, IID_AM_10MM, 9+random()*9);
sprint(other, 2, " 10mm ammo");
}
if (self.weapon == 2)
if (self.weapon == 3)
{
AddStackable(other, IID_AM_556MM, 5+random()*5);
sprint(other, 2, " 5mm ammo");
}
if (self.weapon == 3)
{
AddStackable(other, IID_AM_12GAUGESHELLS, 3+random()*3);
sprint(other, 2, " 12 gauge ammo");
}
if (self.weapon == 4)
{
AddStackable(other, IID_AM_10MM, 9+random()*9);
sprint(other, 2, " 10mm ammo");
}
if (random()*4 <= 2)
{
self.ammo_shells = self.ammo_shells + 1;
sprint(other, 2, " and some loot.\n");
if (total_players == 1)
self.ammo_shells = self.ammo_shells + 1;
}
else
b_switch = stof(infokey(other,"b_switch"));
sprint(other, 2, ".\n");
if (other.classname != "player")
return;
if (other.health <= 0)
return;
acount = 0;
sprint (other, PRINT_LOW, "You get ");
if (deathmatch == 4)
{
other.health = other.health + 10;
sprint (other, PRINT_LOW, "10 additional health\n");
if ((other.health > 250) && (other.health < 300))
sound (other, CHAN_ITEM, "items/protect3.wav", 1, ATTN_NORM);
else
sound (other, CHAN_ITEM, "weapons/lock4.wav", 1, ATTN_NORM);
stuffcmd (other, "bf\n");
remove(self);
if (other.health >299)
{
if (other.invincible_time != 1)
{
other.invincible_time = 1;
other.invincible_finished = time + 30;
other.items = other.items | IT_INVULNERABILITY;
other.super_time = 1;
other.super_damage_finished = time + 30;
other.items = other.items | IT_QUAD;
other.ammo_cells = 0;
sound (other, CHAN_VOICE, "boss1/sight1.wav", 1, ATTN_NORM);
stuffcmd (other, "bf\n");
bprint (PRINT_HIGH, other.netname);
bprint (PRINT_HIGH, " attains bonus powers!!!\n");
}
}
self = other;
return;
}
if (self.items)
if ((other.items & self.items) == 0)
{
acount = 1;
sprint (other, PRINT_LOW, "the ");
sprint (other, PRINT_LOW, self.netname);
}
// if the player was using his best weapon, change up to the new one if better
stemp = self;
self = other;
best = W_BestWeapon();
self = stemp;
// change weapons
other.ammo_shells = other.ammo_shells + self.ammo_shells;
other.ammo_nails = other.ammo_nails + self.ammo_nails;
other.ammo_rockets = other.ammo_rockets + self.ammo_rockets;
other.ammo_cells = other.ammo_cells + self.ammo_cells;
new = self.items;
if (!new)
new = other.weapon;
old = other.items;
other.items = other.items | self.items;
bound_other_ammo ();
if (self.ammo_shells)
{
if (acount)
sprint(other, PRINT_LOW, ", ");
acount = 1;
s = ftos(self.ammo_shells);
sprint (other, PRINT_LOW, s);
sprint (other, PRINT_LOW, " shells");
}
if (self.ammo_nails)
{
if (acount)
sprint(other, PRINT_LOW, ", ");
acount = 1;
s = ftos(self.ammo_nails);
sprint (other, PRINT_LOW, s);
sprint (other, PRINT_LOW, " nails");
}
if (self.ammo_rockets)
{
if (acount)
sprint(other, PRINT_LOW, ", ");
acount = 1;
s = ftos(self.ammo_rockets);
sprint (other, PRINT_LOW, s);
sprint (other, PRINT_LOW, " rockets");
}
if (self.ammo_cells)
{
if (acount)
sprint(other, PRINT_LOW, ", ");
acount = 1;
s = ftos(self.ammo_cells);
sprint (other, PRINT_LOW, s);
sprint (other,PRINT_LOW, " cells");
}
if ( (deathmatch==3 || deathmatch == 5) & ( (WeaponCode(new)==6) || (WeaponCode(new)==7) ) & (other.ammo_rockets < 5) )
other.ammo_rockets = 5;
sprint (other, PRINT_LOW, "\n");
// backpack touch sound
sound (other, CHAN_ITEM, "weapons/lock4.wav", 1, ATTN_NORM);
stuffcmd (other, "bf\n");
remove(self);
self = other;
// change to the weapon
if ( WeaponCode(new) <= b_switch )
{
if (self.flags & FL_INWATER)
{
if (new != IT_LIGHTNING)
{
Deathmatch_Weapon (old, new);
}
}
else
{
Deathmatch_Weapon (old, new);
}
}
W_SetCurrentAmmo ();
return;
};
/*
@ -1712,36 +1566,10 @@ void() DropBackpack =
{
local entity item;
if (!(self.ammo_shells + self.ammo_nails + self.ammo_rockets + self.ammo_cells))
return; // nothing in it
item = spawn();
item.origin = self.origin - '0 0 24';
item.items = self.weapon;
if (item.items == IT_AXE)
item.netname = "Axe";
else if (item.items == IT_SHOTGUN)
item.netname = "Shotgun";
else if (item.items == IT_SUPER_SHOTGUN)
item.netname = "Double-barrelled Shotgun";
else if (item.items == IT_NAILGUN)
item.netname = "Nailgun";
else if (item.items == IT_SUPER_NAILGUN)
item.netname = "Super Nailgun";
else if (item.items == IT_GRENADE_LAUNCHER)
item.netname = "Grenade Launcher";
else if (item.items == IT_ROCKET_LAUNCHER)
item.netname = "Rocket Launcher";
else if (item.items == IT_LIGHTNING)
item.netname = "Thunderbolt";
else
item.netname = "";
item.ammo_shells = self.ammo_shells;
item.ammo_nails = self.ammo_nails;
item.ammo_rockets = self.ammo_rockets;
item.ammo_cells = self.ammo_cells;
item.weapon = self.weapon;
item.velocity_z = 300;
item.velocity_x = -100 + (random() * 200);

6
quakec/fallout2/soldier.qc
View file

@ -1265,7 +1265,11 @@ void () army_die =
void () monster_army =
{
if (random()*10 <= 2)
local float x;
x = total_players;
if (random()*10 <= x*0.5)
{
precache_model2 ("progs/enforcer.mdl");
precache_model2 ("progs/h_mega.mdl");