r103 - trunk/progsqc
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Mar 4 06:48:46 EST 2008
Author: vermeulen
Date: 2008-03-04 06:48:46 -0500 (Tue, 04 Mar 2008)
New Revision: 103
Modified:
trunk/progsqc/bots.qc
trunk/progsqc/inventory.qc
trunk/progsqc/player.qc
Log:
Bots only go for players now
player no longer is given extra ammo
Modified: trunk/progsqc/bots.qc
===================================================================
--- trunk/progsqc/bots.qc 2008-02-22 06:24:59 UTC (rev 102)
+++ trunk/progsqc/bots.qc 2008-03-04 11:48:46 UTC (rev 103)
@@ -117,6 +117,7 @@
while (e)
{
if (e.team != self.team)
+ if (e.classname == "playerclass")
if (e.takedamage)
if (!e.deadflag)
if (!(e.flags & FL_NOTARGET))
Modified: trunk/progsqc/inventory.qc
===================================================================
--- trunk/progsqc/inventory.qc 2008-02-22 06:24:59 UTC (rev 102)
+++ trunk/progsqc/inventory.qc 2008-03-04 11:48:46 UTC (rev 103)
@@ -598,7 +598,7 @@
if (other.classname != "player")
return;
sound(other, CHAN_AUTO, self.noise, 1, ATTN_NORM);
- //bprint(self.netname,"\n");
+ bprint(self.netname,"\n");
if (self.health)
other.health = other.health + self.health;
@@ -650,7 +650,7 @@
if (cvar("g_itemtouchpickup"))
newmis.touch = Item_Pickup;
- newmis.noise = iteminfo_pickupsound;
+ //newmis.noise = strzone(iteminfo_pickupsound);
setorigin(newmis, org);
setmodel(newmis, iteminfo_pickupmodel);
setsize(newmis, '-25 -25 -25', '8 8 8');
@@ -660,6 +660,11 @@
newmis.scale = modelscale;
};
+void() weapon_weap10 =
+{
+ Item_Spawn(ITEMTYPE_WEAP10,1,50,self.origin,'0 0 0',10,1.5,world);
+}
+
/*
void() weapon_weap1 =
{
Modified: trunk/progsqc/player.qc
===================================================================
--- trunk/progsqc/player.qc 2008-02-22 06:24:59 UTC (rev 102)
+++ trunk/progsqc/player.qc 2008-03-04 11:48:46 UTC (rev 103)
@@ -23,9 +23,7 @@
pants = (pl.team - 1) & 0x0F;
- bprint(ftos(self.team)," 1\n");
setcolor(pl, 16*pants + pants);
- bprint(ftos(self.team)," 2\n");
}
entity(float actortyp, float aityp, string mdldir, string mdlext, string snddir) playerclass_spawn =
@@ -195,7 +193,6 @@
newweapon = cvar(cname,"_weapon",ftos(i)) - 1;
Inventory_GetItemInfo(pc, newweapon);
Inventory_ModifyItem(pc, newweapon, 1, iteminfo_ammomax);
- Inventory_ModifyItem(pc, ITEMTYPE_AMMO1 + newweapon, iteminfo_ammoinventorymax * 2, 0);
}
}
More information about the zymotic-commits
mailing list